diff --git a/sets/resolver/iter_dname_insec.rpl b/sets/resolver/iter_dname_insec.rpl
index ce1a441d8118301bbded52735a2de332d1232ca6..b0110087fc7925f3001a2d55ef1a86d2dc3fa99c 100644
--- a/sets/resolver/iter_dname_insec.rpl
+++ b/sets/resolver/iter_dname_insec.rpl
@@ -1004,6 +1004,16 @@ y.example.net. IN NS
 SECTION ANSWER
 ENTRY_END
 
+; empty non-terminal for QNAME minimization
+ENTRY_BEGIN
+MATCH opcode qname
+ADJUST copy_id copy_query
+REPLY QR AA NOERROR
+SECTION QUESTION
+b.example.net. IN NS
+SECTION ANSWER
+ENTRY_END
+
 ENTRY_BEGIN
 MATCH opcode qtype qname
 ADJUST copy_id
diff --git a/sets/resolver/iter_ns_badip.rpl b/sets/resolver/iter_ns_badip.rpl
index 091c10b18fdab62cd11ce96b0f692ef6668d3767..a432f8fda9ee59dedece799a89479178daf8fc38 100644
--- a/sets/resolver/iter_ns_badip.rpl
+++ b/sets/resolver/iter_ns_badip.rpl
@@ -24,7 +24,7 @@ ENTRY_END
 ENTRY_BEGIN
 MATCH opcode qtype qname
 ADJUST copy_id
-REPLY QR NOERROR
+REPLY QR AA NOERROR
 SECTION QUESTION
 K.ROOT-SERVERS.NET.	IN	AAAA
 SECTION ANSWER
@@ -43,7 +43,7 @@ ENTRY_END
 ENTRY_BEGIN
 MATCH opcode qname
 ADJUST copy_id copy_query
-REPLY QR NOERROR
+REPLY QR AA NOERROR
 SECTION QUESTION
 net. IN A
 SECTION ANSWER
@@ -61,7 +61,7 @@ ENTRY_END
 ENTRY_BEGIN
 MATCH opcode qtype qname
 ADJUST copy_id copy_query
-REPLY QR NOERROR
+REPLY QR AA NOERROR
 SECTION QUESTION
 a.gtld-servers.net.	IN	A
 SECTION ANSWER
diff --git a/sets/resolver/iter_pc_aaaa.rpl b/sets/resolver/iter_pc_aaaa.rpl
index 817434b540ee0c80436c85a00111df5c4e209825..58502a47ca627deaaf3e1de1b97c78290462c831 100644
--- a/sets/resolver/iter_pc_aaaa.rpl
+++ b/sets/resolver/iter_pc_aaaa.rpl
@@ -25,7 +25,7 @@ ENTRY_END
 ENTRY_BEGIN
 MATCH opcode qtype qname
 ADJUST copy_id
-REPLY QR NOERROR
+REPLY QR AA NOERROR
 SECTION QUESTION
 K.ROOT-SERVERS.NET.	IN	AAAA
 SECTION ANSWER
diff --git a/sets/resolver/val_dname_bogus.rpl b/sets/resolver/val_dname_bogus.rpl
index 3dd01c15a12c8bae671d8c45905b783ea606b808..e75712879ca3583b0873797b888fc52bf6968be4 100644
--- a/sets/resolver/val_dname_bogus.rpl
+++ b/sets/resolver/val_dname_bogus.rpl
@@ -4,6 +4,7 @@ do-ip6: no
 trust-anchor: ".	IN	DS	37471 5 1 da74e4e0fe4067c2afd1d4a3cceb852a3c0d4401"
 stub-addr: 193.0.14.129         # K.ROOT-SERVERS.NET.
 val-override-date: "20170301000000"
+domain-insecure: net.
 CONFIG_END
 
 SCENARIO_BEGIN Test DNAME validation
@@ -11,6 +12,28 @@ SCENARIO_BEGIN Test DNAME validation
 ; all the data are on the "root servers"
 RANGE_BEGIN 0 10000000
 	ADDRESS 193.0.14.129
+
+ENTRY_BEGIN
+MATCH qname qtype
+ADJUST copy_id copy_query
+REPLY QR AA NOERROR
+SECTION QUESTION
+net. IN NS
+SECTION ANSWER
+net. 3600 IN NS K.ROOT-SERVERS.NET.
+ENTRY_END
+
+ENTRY_BEGIN
+MATCH qname qtype
+ADJUST copy_id copy_query
+REPLY QR AA NOERROR
+SECTION QUESTION
+root-servers.net. IN NS
+SECTION AUTHORITY
+.       86400   IN      SOA     . . 2017021500 1800 900 604800 86400
+.       86400   IN      RRSIG   SOA 5 0 86400 20170315140518 20170215140518 37471 . drrv7SjrOkuNwlILiziPxHTuIKs/tO2WcVEdipA/LNkt0h09zuWbr3Rk5gtEDTSECbZEXYTa4YaeJs3ODmikzVaJd5EVLsDdGnV3mZ/w7WYHA0Uc1GH5HZm1uQwA4DlwY5e5Ry80pIhInZ1Lqiz1ut9yWbHzODdcUOdpE+XiPzYCKR1hRWi099dIQtDhZYottvQNXXmsJDY41PwvWaxqbXGYgiQCX3cN/W5PM0hs7xMxAjanKh32PXKcHSfTeko87BvERMZnibc2O8efl7S62Zp68Q4guMfe4P++ue22PctjwfeR5nDi31c3+USi63ujrKSDGujaIsIMyIHNFm1/zQ==
+ENTRY_END
+
 ENTRY_BEGIN
 MATCH qname qtype opcode
 ADJUST copy_id