diff --git a/bin/tests/system/Makefile.in b/bin/tests/system/Makefile.in
index a552f4667e..c17fac83d2 100644
--- a/bin/tests/system/Makefile.in
+++ b/bin/tests/system/Makefile.in
@@ -64,7 +64,7 @@ PARALLEL = rpzrecurse serve-stale dnssec \
 	   legacy limits logfileconfig \
 	   masterfile masterformat metadata mkeys \
 	   names notify nslookup nsupdate nzd2nzf \
-	   padding pending pipelined \
+	   padding pending pipelined qmin \
 	   reclimit redirect resolver rndc rootkeysentinel rpz \
 	   rrchecker rrl rrsetorder rsabigexponent runtime \
 	   sfcache smartsign sortlist \
diff --git a/bin/tests/system/additional/ns2/root.db b/bin/tests/system/additional/ns2/root.db
index c5371e111a..3241240784 100644
--- a/bin/tests/system/additional/ns2/root.db
+++ b/bin/tests/system/additional/ns2/root.db
@@ -1,3 +1,12 @@
+; Copyright (C) Internet Systems Consortium, Inc. ("ISC")
+;
+; This Source Code Form is subject to the terms of the Mozilla Public
+; License, v. 2.0. If a copy of the MPL was not distributed with this
+; file, You can obtain one at http://mozilla.org/MPL/2.0/.
+;
+; See the COPYRIGHT file distributed with this work for additional
+; information regarding copyright ownership.
+
 . IN SOA ns2. hostmaster ( 2 8H 2H 4W 1D);
 . NS ns2.
 ns1. A 10.53.0.1
diff --git a/bin/tests/system/conf.sh.in b/bin/tests/system/conf.sh.in
index e4d60eaa18..1e4f97d106 100644
--- a/bin/tests/system/conf.sh.in
+++ b/bin/tests/system/conf.sh.in
@@ -95,7 +95,7 @@ PARALLELDIRS="acl additional addzone allow-query auth autosign \
 	legacy limits logfileconfig \
 	masterfile masterformat metadata mkeys \
 	names notify nslookup nsupdate nzd2nzf \
-	padding pending pipelined \
+	padding pending pipelined qmin \
 	reclimit redirect resolver rndc rootkeysentinel rpz rpzrecurse \
 	rrchecker rrl rrsetorder rsabigexponent runtime \
 	serve-stale sfcache smartsign sortlist \
diff --git a/bin/tests/system/conf.sh.win32 b/bin/tests/system/conf.sh.win32
index 6bfac1357c..b178179909 100644
--- a/bin/tests/system/conf.sh.win32
+++ b/bin/tests/system/conf.sh.win32
@@ -91,8 +91,8 @@ SEQUENTIALDIRS="acl additional addzone autosign builtin \
 	 fetchlimit filter-aaaa formerr forward geoip glue idna inline ixfr \
 	 keepalive @KEYMGR@ legacy limits logfileconfig masterfile \
 	 masterformat metadata mkeys names notify nslookup nsupdate \
-	 nzd2nzf padding pending pipelined @PKCS11_TEST@ reclimit \
-	 redirect resolver rndc rpz rrchecker rrl \
+	 nzd2nzf padding pending pipelined @PKCS11_TEST@ qmin
+         reclimit redirect resolver rndc rpz rrchecker rrl \
 	 rrsetorder rsabigexponent runtime sfcache smartsign sortlist \
 	 spf staticstub statistics statschannel stub tcp tkey tsig \
 	 tsiggss unknown upforwd verify views wildcard xfer xferquota \
diff --git a/bin/tests/system/qname-minimization/ans2/ans.py b/bin/tests/system/qmin/ans2/ans.py
similarity index 100%
rename from bin/tests/system/qname-minimization/ans2/ans.py
rename to bin/tests/system/qmin/ans2/ans.py
diff --git a/bin/tests/system/qname-minimization/ans3/ans.py b/bin/tests/system/qmin/ans3/ans.py
similarity index 99%
rename from bin/tests/system/qname-minimization/ans3/ans.py
rename to bin/tests/system/qmin/ans3/ans.py
index d767403da0..1a0d82e5ce 100755
--- a/bin/tests/system/qname-minimization/ans3/ans.py
+++ b/bin/tests/system/qmin/ans3/ans.py
@@ -34,7 +34,7 @@ def logquery(type, qname):
 ############################################################################
 # Respond to a DNS query.
 # For good. it serves:
-# zoop.boing.good. NS ns3.good. 
+# zoop.boing.good. NS ns3.good.
 # icky.ptang.zoop.boing.good. NS a.bit.longer.ns.name.good.
 # it responds properly (with NODATA empty response) to non-empty terminals
 #
diff --git a/bin/tests/system/qname-minimization/ans4/ans.py b/bin/tests/system/qmin/ans4/ans.py
similarity index 100%
rename from bin/tests/system/qname-minimization/ans4/ans.py
rename to bin/tests/system/qmin/ans4/ans.py
diff --git a/bin/tests/system/qname-minimization/clean.sh b/bin/tests/system/qmin/clean.sh
similarity index 100%
rename from bin/tests/system/qname-minimization/clean.sh
rename to bin/tests/system/qmin/clean.sh
diff --git a/bin/tests/system/qname-minimization/ns1/named.conf.in b/bin/tests/system/qmin/ns1/named.conf.in
similarity index 100%
rename from bin/tests/system/qname-minimization/ns1/named.conf.in
rename to bin/tests/system/qmin/ns1/named.conf.in
diff --git a/bin/tests/system/qname-minimization/ns1/root.db b/bin/tests/system/qmin/ns1/root.db
similarity index 100%
rename from bin/tests/system/qname-minimization/ns1/root.db
rename to bin/tests/system/qmin/ns1/root.db
diff --git a/bin/tests/system/qname-minimization/ns5/named.conf.in b/bin/tests/system/qmin/ns5/named.conf.in
similarity index 100%
rename from bin/tests/system/qname-minimization/ns5/named.conf.in
rename to bin/tests/system/qmin/ns5/named.conf.in
diff --git a/bin/tests/system/qname-minimization/ns6/named.conf.in b/bin/tests/system/qmin/ns6/named.conf.in
similarity index 100%
rename from bin/tests/system/qname-minimization/ns6/named.conf.in
rename to bin/tests/system/qmin/ns6/named.conf.in
diff --git a/bin/tests/system/qname-minimization/ns7/named.conf.in b/bin/tests/system/qmin/ns7/named.conf.in
similarity index 100%
rename from bin/tests/system/qname-minimization/ns7/named.conf.in
rename to bin/tests/system/qmin/ns7/named.conf.in
diff --git a/bin/tests/system/qname-minimization/setup.sh b/bin/tests/system/qmin/setup.sh
similarity index 100%
rename from bin/tests/system/qname-minimization/setup.sh
rename to bin/tests/system/qmin/setup.sh
diff --git a/bin/tests/system/qname-minimization/tests.sh b/bin/tests/system/qmin/tests.sh
similarity index 99%
rename from bin/tests/system/qname-minimization/tests.sh
rename to bin/tests/system/qmin/tests.sh
index bd06cdd123..edd76942ae 100755
--- a/bin/tests/system/qname-minimization/tests.sh
+++ b/bin/tests/system/qmin/tests.sh
@@ -89,7 +89,7 @@ grep "status: NOERROR" dig.out.test$n > /dev/null || ret=1
 grep "icky.icky.icky.ptang.zoop.boing.good. 1	IN A	192.0.2.1" dig.out.test$n > /dev/null || ret=1
 # Duplicated NS queries are there because we're not creating
 # a separate fetch when doing qname minimization - so two
-# queries running for the same name but different RRTYPE 
+# queries running for the same name but different RRTYPE
 # (A and AAAA in this case) will create separate queries
 # for NSes on the way. Those will be cached though, so it
 # should not be a problem
diff --git a/lib/dns/adb.c b/lib/dns/adb.c
index c163053db5..adcf733b51 100644
--- a/lib/dns/adb.c
+++ b/lib/dns/adb.c
@@ -4029,7 +4029,7 @@ fetch_name(dns_adbname_t *adbname, isc_boolean_t start_at_zone,
 		nameservers = &rdataset;
 		options |= DNS_FETCHOPT_UNSHARED;
 	}
-	
+
 	if (adb->view->qminimization) {
 		options |= DNS_FETCHOPT_QMINIMIZE;
 		options |= DNS_FETCHOPT_QMIN_SKIP_ON_IP6A;
diff --git a/lib/dns/resolver.c b/lib/dns/resolver.c
index 312d8efa16..e1c1753498 100644
--- a/lib/dns/resolver.c
+++ b/lib/dns/resolver.c
@@ -8509,7 +8509,7 @@ rctx_answer_none(respctx_t *rctx) {
 				      DNS_LOGMODULE_RESOLVER, ISC_LOG_INFO,
 				      "disabling qname minimization for '%s'"
 				      " due to formerr", fctx->info);
-		        fctx->qmin_labels = DNS_MAX_LABELS+1;
+			fctx->qmin_labels = DNS_MAX_LABELS+1;
 			return rctx_answer_minimized(rctx);
 		}
 		return (DNS_R_FORMERR);
@@ -8545,7 +8545,7 @@ rctx_answer_none(respctx_t *rctx) {
 	 * NXDOMAIN we go straight to the full query.
 	 */
 	if (fctx->minimized && !(fctx->options & DNS_FETCHOPT_QMIN_STRICT)) {
-	        fctx->qmin_labels = DNS_MAX_LABELS+1;
+		fctx->qmin_labels = DNS_MAX_LABELS+1;
 		return rctx_answer_minimized(rctx);
 	}
 	/*
diff --git a/util/copyrights b/util/copyrights
index 22dbf69854..84bfd1ed00 100644
--- a/util/copyrights
+++ b/util/copyrights
@@ -1731,17 +1731,17 @@
 ./bin/tests/system/pkcs11ssl/setup.sh		SH	2014,2016,2018
 ./bin/tests/system/pkcs11ssl/tests.sh		SH	2014,2016,2018
 ./bin/tests/system/pkcs11ssl/usepkcs11		X	2014,2018
-./bin/tests/system/qname-minimization/ans2/ans.py	PYTHON	2018
-./bin/tests/system/qname-minimization/ans3/ans.py	PYTHON	2018
-./bin/tests/system/qname-minimization/ans4/ans.py	PYTHON	2018
-./bin/tests/system/qname-minimization/clean.sh	SH	2018
-./bin/tests/system/qname-minimization/ns1/named.conf.in	CONF-C	2018
-./bin/tests/system/qname-minimization/ns1/root.db	ZONE	2018
-./bin/tests/system/qname-minimization/ns5/named.conf.in	CONF-C	2018
-./bin/tests/system/qname-minimization/ns6/named.conf.in	CONF-C	2018
-./bin/tests/system/qname-minimization/ns7/named.conf.in	CONF-C	2018
-./bin/tests/system/qname-minimization/setup.sh	SH	2018
-./bin/tests/system/qname-minimization/tests.sh	SH	2018
+./bin/tests/system/qmin/ans2/ans.py		PYTHON	2018
+./bin/tests/system/qmin/ans3/ans.py		PYTHON	2018
+./bin/tests/system/qmin/ans4/ans.py		PYTHON	2018
+./bin/tests/system/qmin/clean.sh		SH	2018
+./bin/tests/system/qmin/ns1/named.conf.in	CONF-C	2018
+./bin/tests/system/qmin/ns1/root.db		ZONE	2018
+./bin/tests/system/qmin/ns5/named.conf.in	CONF-C	2018
+./bin/tests/system/qmin/ns6/named.conf.in	CONF-C	2018
+./bin/tests/system/qmin/ns7/named.conf.in	CONF-C	2018
+./bin/tests/system/qmin/setup.sh		SH	2018
+./bin/tests/system/qmin/tests.sh		SH	2018
 ./bin/tests/system/reclimit/README		TXT.BRIEF	2014,2016,2017,2018
 ./bin/tests/system/reclimit/ans2/ans.pl		PERL	2014,2015,2016,2017,2018
 ./bin/tests/system/reclimit/ans7/ans.pl		PERL	2014,2016,2018