From: Nicki Křížek <nicki@isc.org>
Date: Tue, 28 Jul 2026 18:11:34 +0000 (+0200)
Subject: Use the root-hint template for identical hint configs
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=269c1ad41000191f48a55584cd50fd152bb67aba;p=thirdparty%2Fbind9.git

Use the root-hint template for identical hint configs

Replace hand-written root hint zone with the template in cases where it
exactly matches the reference.

Assisted-by: Claude:claude-fable-5
---

diff --git a/bin/tests/system/acl/ns2/named.conf.j2 b/bin/tests/system/acl/ns2/named.conf.j2
index c67e29d2b79..b123137245b 100644
--- a/bin/tests/system/acl/ns2/named.conf.j2
+++ b/bin/tests/system/acl/ns2/named.conf.j2
@@ -18,10 +18,7 @@ key two {
 	secret "1234abcd8765";
 };
 
-zone "." {
-	type hint;
-	file "../../_common/root.hint";
-};
+{% include "_common/root.hint.conf" %}
 
 zone "example" {
 	type primary;
diff --git a/bin/tests/system/acl/ns2/named2.conf.j2 b/bin/tests/system/acl/ns2/named2.conf.j2
index 0bda32e0fe1..c63fc8e1855 100644
--- a/bin/tests/system/acl/ns2/named2.conf.j2
+++ b/bin/tests/system/acl/ns2/named2.conf.j2
@@ -18,10 +18,7 @@ key two {
 	secret "1234abcd8765";
 };
 
-zone "." {
-	type hint;
-	file "../../_common/root.hint";
-};
+{% include "_common/root.hint.conf" %}
 
 zone "example" {
 	type primary;
diff --git a/bin/tests/system/acl/ns2/named3.conf.j2 b/bin/tests/system/acl/ns2/named3.conf.j2
index 92d26f7671d..ea1b90db79c 100644
--- a/bin/tests/system/acl/ns2/named3.conf.j2
+++ b/bin/tests/system/acl/ns2/named3.conf.j2
@@ -31,10 +31,7 @@ acl accept {
 	10.53.0.1; 10.53.0.2;
 };
 
-zone "." {
-	type hint;
-	file "../../_common/root.hint";
-};
+{% include "_common/root.hint.conf" %}
 
 zone "example" {
 	type primary;
diff --git a/bin/tests/system/acl/ns2/named4.conf.j2 b/bin/tests/system/acl/ns2/named4.conf.j2
index a853cd4e793..db2ca0cb594 100644
--- a/bin/tests/system/acl/ns2/named4.conf.j2
+++ b/bin/tests/system/acl/ns2/named4.conf.j2
@@ -30,10 +30,7 @@ acl check1 { !key one; 10.53.0.1; };
 
 acl check2 { !key two; 10.53.0.2; };
 
-zone "." {
-	type hint;
-	file "../../_common/root.hint";
-};
+{% include "_common/root.hint.conf" %}
 
 zone "example" {
 	type primary;
diff --git a/bin/tests/system/acl/ns2/named5.conf.j2 b/bin/tests/system/acl/ns2/named5.conf.j2
index baad0db74ec..ea34e269d0f 100644
--- a/bin/tests/system/acl/ns2/named5.conf.j2
+++ b/bin/tests/system/acl/ns2/named5.conf.j2
@@ -20,10 +20,7 @@ key two {
 	secret "1234abcd8765";
 };
 
-zone "." {
-	type hint;
-	file "../../_common/root.hint";
-};
+{% include "_common/root.hint.conf" %}
 
 zone "example" {
 	type primary;
diff --git a/bin/tests/system/addzone/ns1/named.conf.j2 b/bin/tests/system/addzone/ns1/named.conf.j2
index 09f9c44dbd5..add20e6ce34 100644
--- a/bin/tests/system/addzone/ns1/named.conf.j2
+++ b/bin/tests/system/addzone/ns1/named.conf.j2
@@ -15,10 +15,7 @@ options {
 	dnssec-validation no;
 };
 
-zone "." {
-	type hint;
-	file "../../_common/root.hint";
-};
+{% include "_common/root.hint.conf" %}
 
 zone "inlinesec.example" {
 	type primary;
diff --git a/bin/tests/system/addzone/ns2/named.conf.j2 b/bin/tests/system/addzone/ns2/named.conf.j2
index 5f909bcb656..4772e26e66e 100644
--- a/bin/tests/system/addzone/ns2/named.conf.j2
+++ b/bin/tests/system/addzone/ns2/named.conf.j2
@@ -23,10 +23,7 @@ template bad {
 	min-retry-time 0;
 };
 
-zone "." {
-	type hint;
-	file "../../_common/root.hint";
-};
+{% include "_common/root.hint.conf" %}
 
 zone "normal.example" {
 	type primary;
diff --git a/bin/tests/system/allow_query/ns2/named.conf.j2 b/bin/tests/system/allow_query/ns2/named.conf.j2
index 038fc32c339..e00efc044fe 100644
--- a/bin/tests/system/allow_query/ns2/named.conf.j2
+++ b/bin/tests/system/allow_query/ns2/named.conf.j2
@@ -6,10 +6,7 @@ options {
 
 {% include "_common/controls.conf.j2" %}
 
-zone "." {
-	type hint;
-	file "../../_common/root.hint";
-};
+{% include "_common/root.hint.conf" %}
 
 zone "normal.example" {
 	type primary;
diff --git a/bin/tests/system/allow_query/ns2/named02.conf.j2 b/bin/tests/system/allow_query/ns2/named02.conf.j2
index b300cbe2ca9..77982b20555 100644
--- a/bin/tests/system/allow_query/ns2/named02.conf.j2
+++ b/bin/tests/system/allow_query/ns2/named02.conf.j2
@@ -7,10 +7,7 @@ options {
 
 {% include "_common/controls.conf.j2" %}
 
-zone "." {
-	type hint;
-	file "../../_common/root.hint";
-};
+{% include "_common/root.hint.conf" %}
 
 zone "normal.example" {
 	type primary;
diff --git a/bin/tests/system/allow_query/ns2/named03.conf.j2 b/bin/tests/system/allow_query/ns2/named03.conf.j2
index ceacd8992b3..421d60968f5 100644
--- a/bin/tests/system/allow_query/ns2/named03.conf.j2
+++ b/bin/tests/system/allow_query/ns2/named03.conf.j2
@@ -7,10 +7,7 @@ options {
 
 {% include "_common/controls.conf.j2" %}
 
-zone "." {
-	type hint;
-	file "../../_common/root.hint";
-};
+{% include "_common/root.hint.conf" %}
 
 zone "normal.example" {
 	type primary;
diff --git a/bin/tests/system/allow_query/ns2/named04.conf.j2 b/bin/tests/system/allow_query/ns2/named04.conf.j2
index 96f0581e4f6..10626932627 100644
--- a/bin/tests/system/allow_query/ns2/named04.conf.j2
+++ b/bin/tests/system/allow_query/ns2/named04.conf.j2
@@ -7,10 +7,7 @@ options {
 
 {% include "_common/controls.conf.j2" %}
 
-zone "." {
-	type hint;
-	file "../../_common/root.hint";
-};
+{% include "_common/root.hint.conf" %}
 
 zone "normal.example" {
 	type primary;
diff --git a/bin/tests/system/allow_query/ns2/named05.conf.j2 b/bin/tests/system/allow_query/ns2/named05.conf.j2
index 3d5a7308877..c40797e1f27 100644
--- a/bin/tests/system/allow_query/ns2/named05.conf.j2
+++ b/bin/tests/system/allow_query/ns2/named05.conf.j2
@@ -7,10 +7,7 @@ options {
 
 {% include "_common/controls.conf.j2" %}
 
-zone "." {
-	type hint;
-	file "../../_common/root.hint";
-};
+{% include "_common/root.hint.conf" %}
 
 zone "normal.example" {
 	type primary;
diff --git a/bin/tests/system/allow_query/ns2/named06.conf.j2 b/bin/tests/system/allow_query/ns2/named06.conf.j2
index a80954685be..223ee6ad09a 100644
--- a/bin/tests/system/allow_query/ns2/named06.conf.j2
+++ b/bin/tests/system/allow_query/ns2/named06.conf.j2
@@ -7,10 +7,7 @@ options {
 
 {% include "_common/controls.conf.j2" %}
 
-zone "." {
-	type hint;
-	file "../../_common/root.hint";
-};
+{% include "_common/root.hint.conf" %}
 
 zone "normal.example" {
 	type primary;
diff --git a/bin/tests/system/allow_query/ns2/named07.conf.j2 b/bin/tests/system/allow_query/ns2/named07.conf.j2
index b2dfcec3787..f8128756f88 100644
--- a/bin/tests/system/allow_query/ns2/named07.conf.j2
+++ b/bin/tests/system/allow_query/ns2/named07.conf.j2
@@ -9,10 +9,7 @@ options {
 
 {% include "_common/controls.conf.j2" %}
 
-zone "." {
-	type hint;
-	file "../../_common/root.hint";
-};
+{% include "_common/root.hint.conf" %}
 
 zone "normal.example" {
 	type primary;
diff --git a/bin/tests/system/allow_query/ns2/named08.conf.j2 b/bin/tests/system/allow_query/ns2/named08.conf.j2
index d90a8f5dcc6..7dd1ac22454 100644
--- a/bin/tests/system/allow_query/ns2/named08.conf.j2
+++ b/bin/tests/system/allow_query/ns2/named08.conf.j2
@@ -9,10 +9,7 @@ options {
 
 {% include "_common/controls.conf.j2" %}
 
-zone "." {
-	type hint;
-	file "../../_common/root.hint";
-};
+{% include "_common/root.hint.conf" %}
 
 zone "normal.example" {
 	type primary;
diff --git a/bin/tests/system/allow_query/ns2/named09.conf.j2 b/bin/tests/system/allow_query/ns2/named09.conf.j2
index 4601cf3b775..95a991baf45 100644
--- a/bin/tests/system/allow_query/ns2/named09.conf.j2
+++ b/bin/tests/system/allow_query/ns2/named09.conf.j2
@@ -9,10 +9,7 @@ options {
 
 {% include "_common/controls.conf.j2" %}
 
-zone "." {
-	type hint;
-	file "../../_common/root.hint";
-};
+{% include "_common/root.hint.conf" %}
 
 zone "normal.example" {
 	type primary;
diff --git a/bin/tests/system/allow_query/ns2/named10.conf.j2 b/bin/tests/system/allow_query/ns2/named10.conf.j2
index 51f7317853d..6fa5a4e324f 100644
--- a/bin/tests/system/allow_query/ns2/named10.conf.j2
+++ b/bin/tests/system/allow_query/ns2/named10.conf.j2
@@ -12,10 +12,7 @@ options {
 
 {% include "_common/controls.conf.j2" %}
 
-zone "." {
-	type hint;
-	file "../../_common/root.hint";
-};
+{% include "_common/root.hint.conf" %}
 
 zone "normal.example" {
 	type primary;
diff --git a/bin/tests/system/allow_query/ns2/named11.conf.j2 b/bin/tests/system/allow_query/ns2/named11.conf.j2
index a6b9fc3a517..025613b7012 100644
--- a/bin/tests/system/allow_query/ns2/named11.conf.j2
+++ b/bin/tests/system/allow_query/ns2/named11.conf.j2
@@ -18,10 +18,7 @@ options {
 
 {% include "_common/controls.conf.j2" %}
 
-zone "." {
-	type hint;
-	file "../../_common/root.hint";
-};
+{% include "_common/root.hint.conf" %}
 
 zone "normal.example" {
 	type primary;
diff --git a/bin/tests/system/allow_query/ns2/named12.conf.j2 b/bin/tests/system/allow_query/ns2/named12.conf.j2
index 1dd296d7f1c..ec0c214df31 100644
--- a/bin/tests/system/allow_query/ns2/named12.conf.j2
+++ b/bin/tests/system/allow_query/ns2/named12.conf.j2
@@ -12,10 +12,7 @@ options {
 
 {% include "_common/controls.conf.j2" %}
 
-zone "." {
-	type hint;
-	file "../../_common/root.hint";
-};
+{% include "_common/root.hint.conf" %}
 
 zone "normal.example" {
 	type primary;
diff --git a/bin/tests/system/allow_query/ns2/named40.conf.j2 b/bin/tests/system/allow_query/ns2/named40.conf.j2
index 1ffefb89097..57fb02875b2 100644
--- a/bin/tests/system/allow_query/ns2/named40.conf.j2
+++ b/bin/tests/system/allow_query/ns2/named40.conf.j2
@@ -20,10 +20,7 @@ options {
 
 {% include "_common/controls.conf.j2" %}
 
-zone "." {
-	type hint;
-	file "../../_common/root.hint";
-};
+{% include "_common/root.hint.conf" %}
 
 zone "normal.example" {
 	type primary;
diff --git a/bin/tests/system/allow_query/ns2/named53.conf.j2 b/bin/tests/system/allow_query/ns2/named53.conf.j2
index 666afedb4c7..5130bb28ec6 100644
--- a/bin/tests/system/allow_query/ns2/named53.conf.j2
+++ b/bin/tests/system/allow_query/ns2/named53.conf.j2
@@ -7,10 +7,7 @@ options {
 
 {% include "_common/controls.conf.j2" %}
 
-zone "." {
-	type hint;
-	file "../../_common/root.hint";
-};
+{% include "_common/root.hint.conf" %}
 
 zone "normal.example" {
 	type primary;
diff --git a/bin/tests/system/allow_query/ns2/named54.conf.j2 b/bin/tests/system/allow_query/ns2/named54.conf.j2
index d8181e95b1c..96dcef0c80d 100644
--- a/bin/tests/system/allow_query/ns2/named54.conf.j2
+++ b/bin/tests/system/allow_query/ns2/named54.conf.j2
@@ -7,10 +7,7 @@ options {
 
 {% include "_common/controls.conf.j2" %}
 
-zone "." {
-	type hint;
-	file "../../_common/root.hint";
-};
+{% include "_common/root.hint.conf" %}
 
 zone "normal.example" {
 	type primary;
diff --git a/bin/tests/system/allow_query/ns3/named.conf.j2 b/bin/tests/system/allow_query/ns3/named.conf.j2
index 1aff3cc7022..4a5e0029be0 100644
--- a/bin/tests/system/allow_query/ns3/named.conf.j2
+++ b/bin/tests/system/allow_query/ns3/named.conf.j2
@@ -5,7 +5,4 @@ options {
 
 {% include "_common/controls.conf.j2" %}
 
-zone "." {
-	type hint;
-	file "../../_common/root.hint";
-};
+{% include "_common/root.hint.conf" %}
diff --git a/bin/tests/system/allow_query/ns3/named2.conf.j2 b/bin/tests/system/allow_query/ns3/named2.conf.j2
index 9ee2442873e..f56bb62e854 100644
--- a/bin/tests/system/allow_query/ns3/named2.conf.j2
+++ b/bin/tests/system/allow_query/ns3/named2.conf.j2
@@ -8,7 +8,4 @@ options {
 
 {% include "_common/controls.conf.j2" %}
 
-zone "." {
-	type hint;
-	file "../../_common/root.hint";
-};
+{% include "_common/root.hint.conf" %}
diff --git a/bin/tests/system/allow_query/ns3/named3.conf.j2 b/bin/tests/system/allow_query/ns3/named3.conf.j2
index e9e9a910516..cc9f2434861 100644
--- a/bin/tests/system/allow_query/ns3/named3.conf.j2
+++ b/bin/tests/system/allow_query/ns3/named3.conf.j2
@@ -11,7 +11,4 @@ options {
 
 {% include "_common/controls.conf.j2" %}
 
-zone "." {
-	type hint;
-	file "../../_common/root.hint";
-};
+{% include "_common/root.hint.conf" %}
diff --git a/bin/tests/system/allow_query/ns3/named4.conf.j2 b/bin/tests/system/allow_query/ns3/named4.conf.j2
index bafba133913..2771591dac9 100644
--- a/bin/tests/system/allow_query/ns3/named4.conf.j2
+++ b/bin/tests/system/allow_query/ns3/named4.conf.j2
@@ -11,7 +11,4 @@ options {
 
 {% include "_common/controls.conf.j2" %}
 
-zone "." {
-	type hint;
-	file "../../_common/root.hint";
-};
+{% include "_common/root.hint.conf" %}
diff --git a/bin/tests/system/autosign/ns2/named.conf.j2 b/bin/tests/system/autosign/ns2/named.conf.j2
index a09bbcf3d7c..7105cb74100 100644
--- a/bin/tests/system/autosign/ns2/named.conf.j2
+++ b/bin/tests/system/autosign/ns2/named.conf.j2
@@ -44,10 +44,7 @@ dnssec-policy "optout" {
 	nsec3param iterations 0 optout yes salt-length 0;
 };
 
-zone "." {
-	type hint;
-	file "../../_common/root.hint";
-};
+{% include "_common/root.hint.conf" %}
 
 zone "example" {
 	type primary;
diff --git a/bin/tests/system/autosign/ns3/named.conf.j2 b/bin/tests/system/autosign/ns3/named.conf.j2
index 06e13e9bf5d..5af706ae4c0 100644
--- a/bin/tests/system/autosign/ns3/named.conf.j2
+++ b/bin/tests/system/autosign/ns3/named.conf.j2
@@ -93,10 +93,7 @@ dnssec-policy "rsasha512" {
 	};
 };
 
-zone "." {
-	type hint;
-	file "../../_common/root.hint";
-};
+{% include "_common/root.hint.conf" %}
 
 zone "example" {
 	type secondary;
diff --git a/bin/tests/system/autosign/ns4/named.conf.j2 b/bin/tests/system/autosign/ns4/named.conf.j2
index 53201e9d4a9..8e5469203fb 100644
--- a/bin/tests/system/autosign/ns4/named.conf.j2
+++ b/bin/tests/system/autosign/ns4/named.conf.j2
@@ -7,10 +7,7 @@ options {
 
 {% include "_common/controls.conf.j2" %}
 
-zone "." {
-	type hint;
-	file "../../_common/root.hint";
-};
+{% include "_common/root.hint.conf" %}
 
 include "trusted.conf";
 include "private.conf";
diff --git a/bin/tests/system/autosign/ns5/named.conf.j2 b/bin/tests/system/autosign/ns5/named.conf.j2
index a1774fd5a9e..ffcd594a944 100644
--- a/bin/tests/system/autosign/ns5/named.conf.j2
+++ b/bin/tests/system/autosign/ns5/named.conf.j2
@@ -7,9 +7,6 @@ options {
 
 {% include "_common/controls.conf.j2" %}
 
-zone "." {
-	type hint;
-	file "../../_common/root.hint";
-};
+{% include "_common/root.hint.conf" %}
 
 include "trusted.conf";
diff --git a/bin/tests/system/bailiwick/ns4/named.conf.j2 b/bin/tests/system/bailiwick/ns4/named.conf.j2
index c3b0e86f05f..59151ed141e 100644
--- a/bin/tests/system/bailiwick/ns4/named.conf.j2
+++ b/bin/tests/system/bailiwick/ns4/named.conf.j2
@@ -6,7 +6,4 @@ options {
 
 {% include "_common/controls.conf.j2" %}
 
-zone "." {
-	type hint;
-	file "../../_common/root.hint";
-};
+{% include "_common/root.hint.conf" %}
diff --git a/bin/tests/system/cacheclean/ns2/named.conf.j2 b/bin/tests/system/cacheclean/ns2/named.conf.j2
index 2e5791bf26b..a9aabcca3f8 100644
--- a/bin/tests/system/cacheclean/ns2/named.conf.j2
+++ b/bin/tests/system/cacheclean/ns2/named.conf.j2
@@ -11,10 +11,7 @@ options {
 
 {% include "_common/controls.conf.j2" %}
 
-zone "." {
-	type hint;
-	file "../../_common/root.hint";
-};
+{% include "_common/root.hint.conf" %}
 
 zone "flushtest.example" {
 	type forward;
diff --git a/bin/tests/system/cdnxdomain/ns1/named.conf.j2 b/bin/tests/system/cdnxdomain/ns1/named.conf.j2
index ca30edca58e..8ba9671eaa6 100644
--- a/bin/tests/system/cdnxdomain/ns1/named.conf.j2
+++ b/bin/tests/system/cdnxdomain/ns1/named.conf.j2
@@ -11,10 +11,7 @@ options {
 // Trust anchor for "example" (static-ds of NS2's KSK).
 include "trusted.conf";
 
-zone "." {
-	type hint;
-	file "../../_common/root.hint";
-};
+{% include "_common/root.hint.conf" %}
 
 // Resolve "example" only via the signed authoritative server.  The static
 // trust anchor above lets the forwarded answers validate to dns_trust_secure.
diff --git a/bin/tests/system/chain/ns2/named.conf.j2 b/bin/tests/system/chain/ns2/named.conf.j2
index ae49e812734..3c1b694c0a2 100644
--- a/bin/tests/system/chain/ns2/named.conf.j2
+++ b/bin/tests/system/chain/ns2/named.conf.j2
@@ -8,10 +8,7 @@ options {
 
 {% include "_common/controls.conf.j2" %}
 
-zone . {
-       type hint;
-       file "../../_common/root.hint";
-};
+{% include "_common/root.hint.conf" %}
 
 zone "example" {
 	type primary;
diff --git a/bin/tests/system/chain/ns5/named.conf.j2 b/bin/tests/system/chain/ns5/named.conf.j2
index dfc7e3efdad..8f629c7a9d0 100644
--- a/bin/tests/system/chain/ns5/named.conf.j2
+++ b/bin/tests/system/chain/ns5/named.conf.j2
@@ -8,10 +8,7 @@ options {
 
 {% include "_common/controls.conf.j2" %}
 
-zone "." {
-	type hint;
-	file "../../_common/root.hint";
-};
+{% include "_common/root.hint.conf" %}
 
 zone "sub5.example" {
 	type primary;
diff --git a/bin/tests/system/chase_ds/ns3/named.conf.j2 b/bin/tests/system/chase_ds/ns3/named.conf.j2
index e8f5da5ba1a..4fa71acbb4e 100644
--- a/bin/tests/system/chase_ds/ns3/named.conf.j2
+++ b/bin/tests/system/chase_ds/ns3/named.conf.j2
@@ -3,10 +3,7 @@ options {
 	dnssec-validation yes;
 };
 
-zone "." {
-	type hint;
-	file "../../_common/root.hint";
-};
+{% include "_common/root.hint.conf" %}
 
 {% include "_common/controls.conf.j2" %}
 
diff --git a/bin/tests/system/checkds/ns2/named.conf.j2 b/bin/tests/system/checkds/ns2/named.conf.j2
index c893b95bec5..f80ea59dc79 100644
--- a/bin/tests/system/checkds/ns2/named.conf.j2
+++ b/bin/tests/system/checkds/ns2/named.conf.j2
@@ -9,10 +9,7 @@ options {
 
 {% include "_common/controls.conf.j2" %}
 
-zone "." {
-	type hint;
-	file "../../_common/root.hint";
-};
+{% include "_common/root.hint.conf" %}
 
 zone "ns2" {
 	type primary;
diff --git a/bin/tests/system/checkds/ns3/named.conf.j2 b/bin/tests/system/checkds/ns3/named.conf.j2
index c0d82f5fa44..25bc78c8737 100644
--- a/bin/tests/system/checkds/ns3/named.conf.j2
+++ b/bin/tests/system/checkds/ns3/named.conf.j2
@@ -8,9 +8,6 @@ options {
 
 {% include "_common/controls.conf.j2" %}
 
-zone "." {
-	type hint;
-	file "../../_common/root.hint";
-};
+{% include "_common/root.hint.conf" %}
 
 include "trusted.conf";
diff --git a/bin/tests/system/checkds/ns5/named.conf.j2 b/bin/tests/system/checkds/ns5/named.conf.j2
index 98630361003..04f93514417 100644
--- a/bin/tests/system/checkds/ns5/named.conf.j2
+++ b/bin/tests/system/checkds/ns5/named.conf.j2
@@ -9,10 +9,7 @@ options {
 
 {% include "_common/controls.conf.j2" %}
 
-zone "." {
-	type hint;
-	file "../../_common/root.hint";
-};
+{% include "_common/root.hint.conf" %}
 
 zone "ns2" {
 	type primary;
diff --git a/bin/tests/system/checkds/ns6/named.conf.j2 b/bin/tests/system/checkds/ns6/named.conf.j2
index b84a62c5d53..036585b256b 100644
--- a/bin/tests/system/checkds/ns6/named.conf.j2
+++ b/bin/tests/system/checkds/ns6/named.conf.j2
@@ -9,10 +9,7 @@ options {
 
 {% include "_common/controls.conf.j2" %}
 
-zone "." {
-	type hint;
-	file "../../_common/root.hint";
-};
+{% include "_common/root.hint.conf" %}
 
 zone "foo" {
 	type primary;
diff --git a/bin/tests/system/checkds/ns9/named.conf.j2 b/bin/tests/system/checkds/ns9/named.conf.j2
index 9ff1e7c149c..7dfe66b6e63 100644
--- a/bin/tests/system/checkds/ns9/named.conf.j2
+++ b/bin/tests/system/checkds/ns9/named.conf.j2
@@ -15,10 +15,7 @@ remote-servers "ns8" port @PORT@ {
 	10.53.0.8;
 };
 
-zone "." {
-	type hint;
-	file "../../_common/root.hint";
-};
+{% include "_common/root.hint.conf" %}
 
 /*
  * 1.     Enabling DNSSEC
diff --git a/bin/tests/system/cipher_suites/ns2/named.conf.j2 b/bin/tests/system/cipher_suites/ns2/named.conf.j2
index 2cec45e1330..b479b75cf92 100644
--- a/bin/tests/system/cipher_suites/ns2/named.conf.j2
+++ b/bin/tests/system/cipher_suites/ns2/named.conf.j2
@@ -17,10 +17,7 @@ options {
 };
 
 
-zone "." {
-	type hint;
-	file "../../_common/root.hint";
-};
+{% include "_common/root.hint.conf" %}
 
 tls tls-v1.3 {
 	protocols { TLSv1.3; };
diff --git a/bin/tests/system/cipher_suites/ns3/named.conf.j2 b/bin/tests/system/cipher_suites/ns3/named.conf.j2
index cea46eef9be..e46a2639ca4 100644
--- a/bin/tests/system/cipher_suites/ns3/named.conf.j2
+++ b/bin/tests/system/cipher_suites/ns3/named.conf.j2
@@ -17,10 +17,7 @@ options {
 };
 
 
-zone "." {
-	type hint;
-	file "../../_common/root.hint";
-};
+{% include "_common/root.hint.conf" %}
 
 tls tls-v1.3 {
 	protocols { TLSv1.3; };
diff --git a/bin/tests/system/cipher_suites/ns4/named.conf.j2 b/bin/tests/system/cipher_suites/ns4/named.conf.j2
index bc31a82a556..343343601b2 100644
--- a/bin/tests/system/cipher_suites/ns4/named.conf.j2
+++ b/bin/tests/system/cipher_suites/ns4/named.conf.j2
@@ -17,10 +17,7 @@ options {
 };
 
 
-zone "." {
-	type hint;
-	file "../../_common/root.hint";
-};
+{% include "_common/root.hint.conf" %}
 
 tls tls-v1.3 {
 	protocols { TLSv1.3; };
diff --git a/bin/tests/system/cipher_suites/ns5/named.conf.j2 b/bin/tests/system/cipher_suites/ns5/named.conf.j2
index d798fb1786c..abc14908603 100644
--- a/bin/tests/system/cipher_suites/ns5/named.conf.j2
+++ b/bin/tests/system/cipher_suites/ns5/named.conf.j2
@@ -17,10 +17,7 @@ options {
 };
 
 
-zone "." {
-	type hint;
-	file "../../_common/root.hint";
-};
+{% include "_common/root.hint.conf" %}
 
 tls tls-v1.2 {
 	protocols { TLSv1.2; };
diff --git a/bin/tests/system/cyclic_glue/ns4/named.conf.j2 b/bin/tests/system/cyclic_glue/ns4/named.conf.j2
index cb949796d33..b5d854701ea 100644
--- a/bin/tests/system/cyclic_glue/ns4/named.conf.j2
+++ b/bin/tests/system/cyclic_glue/ns4/named.conf.j2
@@ -3,9 +3,6 @@ options {
 	dnssec-validation no;
 };
 
-zone "." {
-	type hint;
-	file "../../_common/root.hint";
-};
+{% include "_common/root.hint.conf" %}
 
 {% include "_common/controls.conf.j2" %}
diff --git a/bin/tests/system/digdelv/ns2/named.conf.j2 b/bin/tests/system/digdelv/ns2/named.conf.j2
index a24eeb69867..6ca58fd78e5 100644
--- a/bin/tests/system/digdelv/ns2/named.conf.j2
+++ b/bin/tests/system/digdelv/ns2/named.conf.j2
@@ -9,10 +9,7 @@ options {
 
 {% include "_common/controls.conf.j2" %}
 
-zone "." {
-	type hint;
-	file "../../_common/root.hint";
-};
+{% include "_common/root.hint.conf" %}
 
 zone "example" {
 	type primary;
diff --git a/bin/tests/system/digdelv/ns3/named.conf.j2 b/bin/tests/system/digdelv/ns3/named.conf.j2
index b965d96e34f..fdb705c79bd 100644
--- a/bin/tests/system/digdelv/ns3/named.conf.j2
+++ b/bin/tests/system/digdelv/ns3/named.conf.j2
@@ -7,7 +7,4 @@ options {
 
 {% include "_common/controls.conf.j2" %}
 
-zone "." {
-	type hint;
-	file "../../_common/root.hint";
-};
+{% include "_common/root.hint.conf" %}
diff --git a/bin/tests/system/dispatch/ns2/named.conf.j2 b/bin/tests/system/dispatch/ns2/named.conf.j2
index 29a90f62e82..b496e29c0dc 100644
--- a/bin/tests/system/dispatch/ns2/named.conf.j2
+++ b/bin/tests/system/dispatch/ns2/named.conf.j2
@@ -9,10 +9,7 @@ options {
 	dnssec-validation no;
 };
 
-zone "." {
-	type hint;
-	file "../../_common/root.hint";
-};
+{% include "_common/root.hint.conf" %}
 
 zone "example" {
 	type primary;
diff --git a/bin/tests/system/dns64/ns2/named.conf.j2 b/bin/tests/system/dns64/ns2/named.conf.j2
index 54fe2e8fa1c..d8c3a4a76e6 100644
--- a/bin/tests/system/dns64/ns2/named.conf.j2
+++ b/bin/tests/system/dns64/ns2/named.conf.j2
@@ -41,10 +41,7 @@ options {
 
 {% include "_common/controls.conf.j2" %}
 
-zone "." {
-	type hint;
-	file "../../_common/root.hint";
-};
+{% include "_common/root.hint.conf" %}
 
 zone "rpz" {
 	type primary;
diff --git a/bin/tests/system/dnssec/ns2/named.conf.j2 b/bin/tests/system/dnssec/ns2/named.conf.j2
index 8d7a1bafea5..70a4a047162 100644
--- a/bin/tests/system/dnssec/ns2/named.conf.j2
+++ b/bin/tests/system/dnssec/ns2/named.conf.j2
@@ -41,10 +41,7 @@ dnssec-policy "not-enough-hours-in-day" {
 	signatures-validity 500d;
 };
 
-zone "." {
-	type hint;
-	file "../../_common/root.hint";
-};
+{% include "_common/root.hint.conf" %}
 
 zone "trusted" {
 	type primary;
diff --git a/bin/tests/system/dnssec/ns3/named.conf.j2 b/bin/tests/system/dnssec/ns3/named.conf.j2
index 2fe1c4bac2e..126856fd4ac 100644
--- a/bin/tests/system/dnssec/ns3/named.conf.j2
+++ b/bin/tests/system/dnssec/ns3/named.conf.j2
@@ -50,10 +50,7 @@ dnssec-policy "autonsec3" {
 	nsec3param iterations 0 optout no salt-length 0;
 };
 
-zone "." {
-	type hint;
-	file "../../_common/root.hint";
-};
+{% include "_common/root.hint.conf" %}
 
 zone "example" {
 	type secondary;
diff --git a/bin/tests/system/dnssec/ns6/named.conf.j2 b/bin/tests/system/dnssec/ns6/named.conf.j2
index 9f5ecbb4b48..49e27d3e7fc 100644
--- a/bin/tests/system/dnssec/ns6/named.conf.j2
+++ b/bin/tests/system/dnssec/ns6/named.conf.j2
@@ -9,10 +9,7 @@ options {
 
 {% include "_common/controls.conf.j2" %}
 
-zone "." {
-	type hint;
-	file "../../_common/root.hint";
-};
+{% include "_common/root.hint.conf" %}
 
 zone "optout-tld" {
 	type primary;
diff --git a/bin/tests/system/dnssec_bypass/ns4/named.conf.j2 b/bin/tests/system/dnssec_bypass/ns4/named.conf.j2
index 385e6a5f614..4155769a060 100644
--- a/bin/tests/system/dnssec_bypass/ns4/named.conf.j2
+++ b/bin/tests/system/dnssec_bypass/ns4/named.conf.j2
@@ -24,7 +24,4 @@ trust-anchors {
 	@root.domain@ @root.type@ @root.contents@;
 };
 
-zone "." {
-	type hint;
-	file "../../_common/root.hint";
-};
+{% include "_common/root.hint.conf" %}
diff --git a/bin/tests/system/dnssec_nsec3/ns2/named.conf.j2 b/bin/tests/system/dnssec_nsec3/ns2/named.conf.j2
index 88d3c7fc946..66b07753fad 100644
--- a/bin/tests/system/dnssec_nsec3/ns2/named.conf.j2
+++ b/bin/tests/system/dnssec_nsec3/ns2/named.conf.j2
@@ -9,10 +9,7 @@ options {
 
 {% include "_common/controls.conf.j2" %}
 
-zone "." {
-	type hint;
-	file "../../_common/root.hint";
-};
+{% include "_common/root.hint.conf" %}
 
 zone "f025.test" {
 	type static-stub;
diff --git a/bin/tests/system/dnssec_parent_rrsig/ns2/named.conf.j2 b/bin/tests/system/dnssec_parent_rrsig/ns2/named.conf.j2
index b23c4296f14..c85187080d4 100644
--- a/bin/tests/system/dnssec_parent_rrsig/ns2/named.conf.j2
+++ b/bin/tests/system/dnssec_parent_rrsig/ns2/named.conf.j2
@@ -11,10 +11,7 @@ options {
 
 {% include "_common/controls.conf.j2" %}
 
-zone "." {
-	type hint;
-	file "../../_common/root.hint";
-};
+{% include "_common/root.hint.conf" %}
 
 zone "f044.test" {
 	type static-stub;
diff --git a/bin/tests/system/dnssec_wildcard/ns2/named.conf.j2 b/bin/tests/system/dnssec_wildcard/ns2/named.conf.j2
index 78760e5b427..811dd8a2347 100644
--- a/bin/tests/system/dnssec_wildcard/ns2/named.conf.j2
+++ b/bin/tests/system/dnssec_wildcard/ns2/named.conf.j2
@@ -8,10 +8,7 @@ options {
 
 {% include "_common/controls.conf.j2" %}
 
-zone "." {
-	type hint;
-	file "../../_common/root.hint";
-};
+{% include "_common/root.hint.conf" %}
 
 
 {% if PARENT_DNSKEY is defined and PARENT_DNSKEY|length %}
diff --git a/bin/tests/system/dnstap/ns2/named.conf.j2 b/bin/tests/system/dnstap/ns2/named.conf.j2
index d4f9c160bec..3a685f9c138 100644
--- a/bin/tests/system/dnstap/ns2/named.conf.j2
+++ b/bin/tests/system/dnstap/ns2/named.conf.j2
@@ -14,10 +14,7 @@ options {
 
 {% include "_common/controls.conf.j2" %}
 
-zone "." {
-	type hint;
-	file "../../_common/root.hint";
-};
+{% include "_common/root.hint.conf" %}
 
 zone "example" {
 	type primary;
diff --git a/bin/tests/system/dnstap/ns3/named.conf.j2 b/bin/tests/system/dnstap/ns3/named.conf.j2
index ffd76d231e7..67bf4b5f0ae 100644
--- a/bin/tests/system/dnstap/ns3/named.conf.j2
+++ b/bin/tests/system/dnstap/ns3/named.conf.j2
@@ -16,7 +16,4 @@ server 10.53.0.1 { tcp-only yes; };
 
 {% include "_common/controls.conf.j2" %}
 
-zone "." {
-	type hint;
-	file "../../_common/root.hint";
-};
+{% include "_common/root.hint.conf" %}
diff --git a/bin/tests/system/dnstap/ns4/named.conf.j2 b/bin/tests/system/dnstap/ns4/named.conf.j2
index 1ad087cc59c..72e78160dc5 100644
--- a/bin/tests/system/dnstap/ns4/named.conf.j2
+++ b/bin/tests/system/dnstap/ns4/named.conf.j2
@@ -15,7 +15,4 @@ server 10.53.0.1 { tcp-only yes; };
 
 {% include "_common/controls.conf.j2" %}
 
-zone "." {
-	type hint;
-	file "../../_common/root.hint";
-};
+{% include "_common/root.hint.conf" %}
diff --git a/bin/tests/system/doth/ns2/named.conf.j2 b/bin/tests/system/doth/ns2/named.conf.j2
index f074665dda6..d18f818500f 100644
--- a/bin/tests/system/doth/ns2/named.conf.j2
+++ b/bin/tests/system/doth/ns2/named.conf.j2
@@ -34,10 +34,7 @@ options {
 };
 
 
-zone "." {
-	type hint;
-	file "../../_common/root.hint";
-};
+{% include "_common/root.hint.conf" %}
 
 tls tls-example-primary-wrong-ca {
 	remote-hostname "srv01.crt01.example.com"; // enable Strict TLS
diff --git a/bin/tests/system/doth/ns3/named.conf.j2 b/bin/tests/system/doth/ns3/named.conf.j2
index c1dc279363e..93f1a192302 100644
--- a/bin/tests/system/doth/ns3/named.conf.j2
+++ b/bin/tests/system/doth/ns3/named.conf.j2
@@ -25,10 +25,7 @@ options {
 };
 
 
-zone "." {
-	type hint;
-	file "../../_common/root.hint";
-};
+{% include "_common/root.hint.conf" %}
 
 tls tls-v1.2-pfs {
 	protocols { TLSv1.2; };
diff --git a/bin/tests/system/doth/ns4/named.conf.j2 b/bin/tests/system/doth/ns4/named.conf.j2
index b1b5d456321..72cad042ea6 100644
--- a/bin/tests/system/doth/ns4/named.conf.j2
+++ b/bin/tests/system/doth/ns4/named.conf.j2
@@ -33,10 +33,7 @@ options {
 };
 
 
-zone "." {
-	type hint;
-	file "../../_common/root.hint";
-};
+{% include "_common/root.hint.conf" %}
 
 tls tls-v1.2-pfs {
 	protocols { TLSv1.2; };
diff --git a/bin/tests/system/doth/ns5/named.conf.j2 b/bin/tests/system/doth/ns5/named.conf.j2
index d7a094e711a..bc8b302d6d0 100644
--- a/bin/tests/system/doth/ns5/named.conf.j2
+++ b/bin/tests/system/doth/ns5/named.conf.j2
@@ -21,10 +21,7 @@ options {
 };
 
 
-zone "." {
-	type hint;
-	file "../../_common/root.hint";
-};
+{% include "_common/root.hint.conf" %}
 
 # Let's reuse the same entry multiple times to see if transfers will succeed
 
diff --git a/bin/tests/system/dsdigest/ns2/named.conf.j2 b/bin/tests/system/dsdigest/ns2/named.conf.j2
index 783d651a8f7..db109b7718a 100644
--- a/bin/tests/system/dsdigest/ns2/named.conf.j2
+++ b/bin/tests/system/dsdigest/ns2/named.conf.j2
@@ -8,10 +8,7 @@ options {
 	dnssec-validation yes;
 };
 
-zone "." {
-	type hint;
-	file "../../_common/root.hint";
-};
+{% include "_common/root.hint.conf" %}
 
 zone "good" {
 	type primary;
diff --git a/bin/tests/system/dsdigest/ns3/named.conf.j2 b/bin/tests/system/dsdigest/ns3/named.conf.j2
index 6c403bb431a..ead15cd8c35 100644
--- a/bin/tests/system/dsdigest/ns3/named.conf.j2
+++ b/bin/tests/system/dsdigest/ns3/named.conf.j2
@@ -10,9 +10,6 @@ options {
 
 };
 
-zone "." {
-	type hint;
-	file "../../_common/root.hint";
-};
+{% include "_common/root.hint.conf" %}
 
 include "trusted.conf";
diff --git a/bin/tests/system/dsdigest/ns4/named.conf.j2 b/bin/tests/system/dsdigest/ns4/named.conf.j2
index ba8ca55dad4..ce3567d17f7 100644
--- a/bin/tests/system/dsdigest/ns4/named.conf.j2
+++ b/bin/tests/system/dsdigest/ns4/named.conf.j2
@@ -9,9 +9,6 @@ options {
 	disable-ds-digests . { SHA-1; SHA-384; 5; 6; 7; 8; 9; };
 };
 
-zone "." {
-	type hint;
-	file "../../_common/root.hint";
-};
+{% include "_common/root.hint.conf" %}
 
 include "trusted.conf";
diff --git a/bin/tests/system/ecdsa/ns2/named.conf.j2 b/bin/tests/system/ecdsa/ns2/named.conf.j2
index 8bc2a669ea5..901996884ee 100644
--- a/bin/tests/system/ecdsa/ns2/named.conf.j2
+++ b/bin/tests/system/ecdsa/ns2/named.conf.j2
@@ -7,9 +7,6 @@ options {
 	dnssec-validation yes;
 };
 
-zone "." {
-	type hint;
-	file "../../_common/root.hint";
-};
+{% include "_common/root.hint.conf" %}
 
 include "trusted.conf";
diff --git a/bin/tests/system/ecdsa/ns3/named.conf.j2 b/bin/tests/system/ecdsa/ns3/named.conf.j2
index 8bc2a669ea5..901996884ee 100644
--- a/bin/tests/system/ecdsa/ns3/named.conf.j2
+++ b/bin/tests/system/ecdsa/ns3/named.conf.j2
@@ -7,9 +7,6 @@ options {
 	dnssec-validation yes;
 };
 
-zone "." {
-	type hint;
-	file "../../_common/root.hint";
-};
+{% include "_common/root.hint.conf" %}
 
 include "trusted.conf";
diff --git a/bin/tests/system/eddsa/ns2/named.conf.j2 b/bin/tests/system/eddsa/ns2/named.conf.j2
index 8bc2a669ea5..901996884ee 100644
--- a/bin/tests/system/eddsa/ns2/named.conf.j2
+++ b/bin/tests/system/eddsa/ns2/named.conf.j2
@@ -7,9 +7,6 @@ options {
 	dnssec-validation yes;
 };
 
-zone "." {
-	type hint;
-	file "../../_common/root.hint";
-};
+{% include "_common/root.hint.conf" %}
 
 include "trusted.conf";
diff --git a/bin/tests/system/eddsa/ns3/named.conf.j2 b/bin/tests/system/eddsa/ns3/named.conf.j2
index 8bc2a669ea5..901996884ee 100644
--- a/bin/tests/system/eddsa/ns3/named.conf.j2
+++ b/bin/tests/system/eddsa/ns3/named.conf.j2
@@ -7,9 +7,6 @@ options {
 	dnssec-validation yes;
 };
 
-zone "." {
-	type hint;
-	file "../../_common/root.hint";
-};
+{% include "_common/root.hint.conf" %}
 
 include "trusted.conf";
diff --git a/bin/tests/system/fwdfirst/ns4/named.conf.j2 b/bin/tests/system/fwdfirst/ns4/named.conf.j2
index 59881ddbd60..66ca243f0e0 100644
--- a/bin/tests/system/fwdfirst/ns4/named.conf.j2
+++ b/bin/tests/system/fwdfirst/ns4/named.conf.j2
@@ -8,10 +8,7 @@ options {
 
 {% include "_common/controls.conf.j2" %}
 
-zone "." {
-	type hint;
-	file "../../_common/root.hint";
-};
+{% include "_common/root.hint.conf" %}
 
 zone "fwd.hack" {
 	type forward;
diff --git a/bin/tests/system/fwdfirst/ns5/named.conf.j2 b/bin/tests/system/fwdfirst/ns5/named.conf.j2
index 4b7f2689c16..fa5cb9f98e9 100644
--- a/bin/tests/system/fwdfirst/ns5/named.conf.j2
+++ b/bin/tests/system/fwdfirst/ns5/named.conf.j2
@@ -10,7 +10,4 @@ options {
 
 {% include "_common/controls.conf.j2" %}
 
-zone "." {
-	type hint;
-	file "../../_common/root.hint";
-};
+{% include "_common/root.hint.conf" %}
diff --git a/bin/tests/system/inline/ns6/named.conf.j2 b/bin/tests/system/inline/ns6/named.conf.j2
index 18bfaac55ed..1af644d501f 100644
--- a/bin/tests/system/inline/ns6/named.conf.j2
+++ b/bin/tests/system/inline/ns6/named.conf.j2
@@ -8,9 +8,6 @@ options {
 	dnssec-validation yes;
 };
 
-zone "." {
-	type hint;
-	file "../../_common/root.hint";
-};
+{% include "_common/root.hint.conf" %}
 
 include "trusted.conf";
diff --git a/bin/tests/system/integrity/ns1/named.conf.j2 b/bin/tests/system/integrity/ns1/named.conf.j2
index f55bb75d543..43206193890 100644
--- a/bin/tests/system/integrity/ns1/named.conf.j2
+++ b/bin/tests/system/integrity/ns1/named.conf.j2
@@ -8,10 +8,7 @@ options {
 
 {% include "_common/controls.conf.j2" %}
 
-zone "." {
-	type hint;
-	file "../../_common/root.hint";
-};
+{% include "_common/root.hint.conf" %}
 
 zone "mx-cname-fail" {
 	type primary;
diff --git a/bin/tests/system/keepalive/ns2/named.conf.j2 b/bin/tests/system/keepalive/ns2/named.conf.j2
index e4e9efd42e3..ce201c73a8d 100644
--- a/bin/tests/system/keepalive/ns2/named.conf.j2
+++ b/bin/tests/system/keepalive/ns2/named.conf.j2
@@ -7,10 +7,7 @@ options {
 	dnssec-validation no;
 };
 
-zone "." {
-	type hint;
-	file "../../_common/root.hint";
-};
+{% include "_common/root.hint.conf" %}
 
 zone "example" {
 	type primary;
diff --git a/bin/tests/system/keepalive/ns3/named.conf.j2 b/bin/tests/system/keepalive/ns3/named.conf.j2
index a9bbe5c9133..72acf0d2476 100644
--- a/bin/tests/system/keepalive/ns3/named.conf.j2
+++ b/bin/tests/system/keepalive/ns3/named.conf.j2
@@ -10,7 +10,4 @@ server 10.53.0.2 {
 
 {% include "_common/controls.conf.j2" %}
 
-zone "." {
-	type hint;
-	file "../../_common/root.hint";
-};
+{% include "_common/root.hint.conf" %}
diff --git a/bin/tests/system/masterfile/ns2/named.conf.j2 b/bin/tests/system/masterfile/ns2/named.conf.j2
index e556e97d586..4034698ac63 100644
--- a/bin/tests/system/masterfile/ns2/named.conf.j2
+++ b/bin/tests/system/masterfile/ns2/named.conf.j2
@@ -9,10 +9,7 @@ options {
 
 {% include "_common/controls.conf.j2" %}
 
-zone "." {
-	type hint;
-	file "../../_common/root.hint";
-};
+{% include "_common/root.hint.conf" %}
 
 template primary {
 	type primary;
diff --git a/bin/tests/system/minimalresponses/ns3/named.conf.j2 b/bin/tests/system/minimalresponses/ns3/named.conf.j2
index c7128cd60cf..67527bee073 100644
--- a/bin/tests/system/minimalresponses/ns3/named.conf.j2
+++ b/bin/tests/system/minimalresponses/ns3/named.conf.j2
@@ -8,9 +8,6 @@ options {
 
 {% include "_common/controls.conf.j2" %}
 
-zone "." {
-	type hint;
-	file "../../_common/root.hint";
-};
+{% include "_common/root.hint.conf" %}
 
 
diff --git a/bin/tests/system/minimalresponses/ns4/named.conf.j2 b/bin/tests/system/minimalresponses/ns4/named.conf.j2
index 2ebff3c1ce9..019d194d982 100644
--- a/bin/tests/system/minimalresponses/ns4/named.conf.j2
+++ b/bin/tests/system/minimalresponses/ns4/named.conf.j2
@@ -8,10 +8,7 @@ options {
 
 {% include "_common/controls.conf.j2" %}
 
-zone "." {
-	type hint;
-	file "../../_common/root.hint";
-};
+{% include "_common/root.hint.conf" %}
 
 zone "example4" {
 	type primary;
diff --git a/bin/tests/system/mirror/ns3/named.conf.j2 b/bin/tests/system/mirror/ns3/named.conf.j2
index 693ba93f4f8..d1b9dca07a7 100644
--- a/bin/tests/system/mirror/ns3/named.conf.j2
+++ b/bin/tests/system/mirror/ns3/named.conf.j2
@@ -8,10 +8,7 @@ options {
 	dnssec-validation yes;
 };
 
-zone "." {
-	type hint;
-	file "../../_common/root.hint";
-};
+{% include "_common/root.hint.conf" %}
 
 zone "." {
 	type mirror;
diff --git a/bin/tests/system/mkeys/ns2/named.conf.j2 b/bin/tests/system/mkeys/ns2/named.conf.j2
index d16a02c327c..9884d10baee 100644
--- a/bin/tests/system/mkeys/ns2/named.conf.j2
+++ b/bin/tests/system/mkeys/ns2/named.conf.j2
@@ -9,7 +9,4 @@ options {
 
 {% include "_common/controls.conf.j2" %}
 
-zone "." {
-	type hint;
-	file "../../_common/root.hint";
-};
+{% include "_common/root.hint.conf" %}
diff --git a/bin/tests/system/mkeys/ns3/named.conf.j2 b/bin/tests/system/mkeys/ns3/named.conf.j2
index 970878a1403..065be8f9a29 100644
--- a/bin/tests/system/mkeys/ns3/named.conf.j2
+++ b/bin/tests/system/mkeys/ns3/named.conf.j2
@@ -9,9 +9,6 @@ options {
 
 {% include "_common/controls.conf.j2" %}
 
-zone "." {
-	type hint;
-	file "../../_common/root.hint";
-};
+{% include "_common/root.hint.conf" %}
 
 include "broken.conf";
diff --git a/bin/tests/system/mkeys/ns4/named.conf.j2 b/bin/tests/system/mkeys/ns4/named.conf.j2
index 1b28bc3243b..d1a71c1920a 100644
--- a/bin/tests/system/mkeys/ns4/named.conf.j2
+++ b/bin/tests/system/mkeys/ns4/named.conf.j2
@@ -9,10 +9,7 @@ options {
 
 {% include "_common/controls.conf.j2" %}
 
-zone "." {
-	type hint;
-	file "../../_common/root.hint";
-};
+{% include "_common/root.hint.conf" %}
 
 zone "sub.foo" {
 	type primary;
diff --git a/bin/tests/system/mkeys/ns5/named.conf.j2 b/bin/tests/system/mkeys/ns5/named.conf.j2
index 89a40a5279b..f40878e74d6 100644
--- a/bin/tests/system/mkeys/ns5/named.conf.j2
+++ b/bin/tests/system/mkeys/ns5/named.conf.j2
@@ -9,10 +9,7 @@ options {
 
 {% include "_common/controls.conf.j2" %}
 
-zone "." {
-	type hint;
-	file "../../_common/root.hint";
-};
+{% include "_common/root.hint.conf" %}
 
 zone "foo" {
 	type primary;
diff --git a/bin/tests/system/mkeys/ns6/named.conf.j2 b/bin/tests/system/mkeys/ns6/named.conf.j2
index a8da3412af8..58613224e78 100644
--- a/bin/tests/system/mkeys/ns6/named.conf.j2
+++ b/bin/tests/system/mkeys/ns6/named.conf.j2
@@ -9,9 +9,6 @@ options {
 
 {% include "_common/controls.conf.j2" %}
 
-zone "." {
-	type hint;
-	file "../../_common/root.hint";
-};
+{% include "_common/root.hint.conf" %}
 
 include "managed.conf";
diff --git a/bin/tests/system/multisigner/ns2/named.conf.j2 b/bin/tests/system/multisigner/ns2/named.conf.j2
index 42a649d586b..edbfe0c19ce 100644
--- a/bin/tests/system/multisigner/ns2/named.conf.j2
+++ b/bin/tests/system/multisigner/ns2/named.conf.j2
@@ -29,9 +29,6 @@ zone "secondary" {
 	file "secondary.db.signed";
 };
 
-zone "." {
-	type hint;
-	file "../../_common/root.hint";
-};
+{% include "_common/root.hint.conf" %}
 
 include "trusted.conf";
diff --git a/bin/tests/system/multisigner/ns3/named.conf.j2 b/bin/tests/system/multisigner/ns3/named.conf.j2
index 05553bfd8db..0007f12d3a2 100644
--- a/bin/tests/system/multisigner/ns3/named.conf.j2
+++ b/bin/tests/system/multisigner/ns3/named.conf.j2
@@ -45,9 +45,6 @@ zone "model2.secondary." {
 	notify no;
 };
 
-zone "." {
-	type hint;
-	file "../../_common/root.hint";
-};
+{% include "_common/root.hint.conf" %}
 
 include "trusted.conf";
diff --git a/bin/tests/system/multisigner/ns4/named.conf.j2 b/bin/tests/system/multisigner/ns4/named.conf.j2
index d949a390966..9a37802af67 100644
--- a/bin/tests/system/multisigner/ns4/named.conf.j2
+++ b/bin/tests/system/multisigner/ns4/named.conf.j2
@@ -45,9 +45,6 @@ zone "model2.secondary." {
 	notify no;
 };
 
-zone "." {
-	type hint;
-	file "../../_common/root.hint";
-};
+{% include "_common/root.hint.conf" %}
 
 include "trusted.conf";
diff --git a/bin/tests/system/multisigner/ns5/named.conf.j2 b/bin/tests/system/multisigner/ns5/named.conf.j2
index 0774490484b..565d5f0f0dd 100644
--- a/bin/tests/system/multisigner/ns5/named.conf.j2
+++ b/bin/tests/system/multisigner/ns5/named.conf.j2
@@ -18,9 +18,6 @@ zone "model2.secondary." {
 	file "model2.secondary.db";
 };
 
-zone "." {
-	type hint;
-	file "../../_common/root.hint";
-};
+{% include "_common/root.hint.conf" %}
 
 include "trusted.conf";
diff --git a/bin/tests/system/notify/ns2/named.conf.j2 b/bin/tests/system/notify/ns2/named.conf.j2
index 994d9b2fb38..28835ed95d0 100644
--- a/bin/tests/system/notify/ns2/named.conf.j2
+++ b/bin/tests/system/notify/ns2/named.conf.j2
@@ -22,10 +22,7 @@ options {
 
 {% include "_common/controls.conf.j2" %}
 
-zone "." {
-	type hint;
-	file "../../_common/root.hint";
-};
+{% include "_common/root.hint.conf" %}
 
 zone "example" {
 	type primary;
diff --git a/bin/tests/system/notify/ns3/named.conf.j2 b/bin/tests/system/notify/ns3/named.conf.j2
index 931f6d6e1eb..7704e467512 100644
--- a/bin/tests/system/notify/ns3/named.conf.j2
+++ b/bin/tests/system/notify/ns3/named.conf.j2
@@ -16,10 +16,7 @@ options {
 
 {% include "_common/controls.conf.j2" %}
 
-zone "." {
-	type hint;
-	file "../../_common/root.hint";
-};
+{% include "_common/root.hint.conf" %}
 
 zone "example" {
 	type secondary;
diff --git a/bin/tests/system/notify/ns4/named.conf.j2 b/bin/tests/system/notify/ns4/named.conf.j2
index ea332d1906c..3912e6bba4e 100644
--- a/bin/tests/system/notify/ns4/named.conf.j2
+++ b/bin/tests/system/notify/ns4/named.conf.j2
@@ -9,10 +9,7 @@ options {
 
 {% include "_common/controls.conf.j2" %}
 
-zone "." {
-	type hint;
-	file "../../_common/root.hint";
-};
+{% include "_common/root.hint.conf" %}
 
 zone "x21" {
 	type secondary;
diff --git a/bin/tests/system/nsec/ns3/named.conf.j2 b/bin/tests/system/nsec/ns3/named.conf.j2
index 5e7c3ecd982..b254b4faa42 100644
--- a/bin/tests/system/nsec/ns3/named.conf.j2
+++ b/bin/tests/system/nsec/ns3/named.conf.j2
@@ -9,9 +9,6 @@ options {
 
 {% include "_common/controls.conf.j2" %}
 
-zone "." {
-        type hint;
-        file "../../_common/root.hint";
-};
+{% include "_common/root.hint.conf" %}
 
 include "trusted.conf";
diff --git a/bin/tests/system/nsec3_impersonation/ns2/named.conf.j2 b/bin/tests/system/nsec3_impersonation/ns2/named.conf.j2
index 7193ba0e48b..826e91420d0 100644
--- a/bin/tests/system/nsec3_impersonation/ns2/named.conf.j2
+++ b/bin/tests/system/nsec3_impersonation/ns2/named.conf.j2
@@ -7,10 +7,7 @@ options {
 
 {% include "_common/controls.conf.j2" %}
 
-zone "." {
-	type hint;
-	file "../../_common/root.hint";
-};
+{% include "_common/root.hint.conf" %}
 
 zone "tld.test" {
 	type static-stub;
diff --git a/bin/tests/system/nsec_grandparent/ns2/named.conf.j2 b/bin/tests/system/nsec_grandparent/ns2/named.conf.j2
index 9a34387e777..db2245a50ac 100644
--- a/bin/tests/system/nsec_grandparent/ns2/named.conf.j2
+++ b/bin/tests/system/nsec_grandparent/ns2/named.conf.j2
@@ -8,10 +8,7 @@ options {
 
 {% include "_common/controls.conf.j2" %}
 
-zone "." {
-	type hint;
-	file "../../_common/root.hint";
-};
+{% include "_common/root.hint.conf" %}
 
 zone "p031.test" {
 	type static-stub;
diff --git a/bin/tests/system/nsec_piggyback/ns3/named.conf.j2 b/bin/tests/system/nsec_piggyback/ns3/named.conf.j2
index 8e79c395f08..610eccce718 100644
--- a/bin/tests/system/nsec_piggyback/ns3/named.conf.j2
+++ b/bin/tests/system/nsec_piggyback/ns3/named.conf.j2
@@ -8,10 +8,7 @@ options {
 
 {% include "_common/controls.conf.j2" %}
 
-zone "." {
-	type hint;
-	file "../../_common/root.hint";
-};
+{% include "_common/root.hint.conf" %}
 
 zone "p22.hack" {
 	type static-stub;
diff --git a/bin/tests/system/nsec_synthesis/ns2/named.conf.j2 b/bin/tests/system/nsec_synthesis/ns2/named.conf.j2
index 8b6e1bad2ee..820c17f4def 100644
--- a/bin/tests/system/nsec_synthesis/ns2/named.conf.j2
+++ b/bin/tests/system/nsec_synthesis/ns2/named.conf.j2
@@ -8,10 +8,7 @@ options {
 
 {% include "_common/controls.conf.j2" %}
 
-zone "." {
-	type hint;
-	file "../../_common/root.hint";
-};
+{% include "_common/root.hint.conf" %}
 
 zone "f004.test" {
 	type static-stub;
diff --git a/bin/tests/system/nsec_synthesis/ns3/named.conf.j2 b/bin/tests/system/nsec_synthesis/ns3/named.conf.j2
index 75c7de27ecf..fcf00e88558 100644
--- a/bin/tests/system/nsec_synthesis/ns3/named.conf.j2
+++ b/bin/tests/system/nsec_synthesis/ns3/named.conf.j2
@@ -7,10 +7,7 @@ options {
 
 {% include "_common/controls.conf.j2" %}
 
-zone "." {
-	type hint;
-	file "../../_common/root.hint";
-};
+{% include "_common/root.hint.conf" %}
 
 zone "f007.test" {
 	type primary;
diff --git a/bin/tests/system/nta/ns4/named.conf.j2 b/bin/tests/system/nta/ns4/named.conf.j2
index 98321e1c0d0..e3565fb9a62 100644
--- a/bin/tests/system/nta/ns4/named.conf.j2
+++ b/bin/tests/system/nta/ns4/named.conf.j2
@@ -15,10 +15,7 @@ include "trusted.conf";
 
 {% include "_common/controls.conf.j2" %}
 
-zone "." {
-	type hint;
-	file "../../_common/root.hint";
-};
+{% include "_common/root.hint.conf" %}
 
 zone "corp" {
 	type static-stub;
diff --git a/bin/tests/system/padding/ns2/named.conf.j2 b/bin/tests/system/padding/ns2/named.conf.j2
index 9ebf12d913f..046cce77bc6 100644
--- a/bin/tests/system/padding/ns2/named.conf.j2
+++ b/bin/tests/system/padding/ns2/named.conf.j2
@@ -7,10 +7,7 @@ options {
 	dnssec-validation no;
 };
 
-zone "." {
-	type hint;
-	file "../../_common/root.hint";
-};
+{% include "_common/root.hint.conf" %}
 
 zone "example" {
 	type primary;
diff --git a/bin/tests/system/padding/ns3/named.conf.j2 b/bin/tests/system/padding/ns3/named.conf.j2
index 7ee3f0183e0..a4e6cf85f4a 100644
--- a/bin/tests/system/padding/ns3/named.conf.j2
+++ b/bin/tests/system/padding/ns3/named.conf.j2
@@ -10,7 +10,4 @@ server 10.53.0.2 {
 
 {% include "_common/controls.conf.j2" %}
 
-zone "." {
-	type hint;
-	file "../../_common/root.hint";
-};
+{% include "_common/root.hint.conf" %}
diff --git a/bin/tests/system/padding/ns4/named.conf.j2 b/bin/tests/system/padding/ns4/named.conf.j2
index 3b94e5ff432..70e4706623e 100644
--- a/bin/tests/system/padding/ns4/named.conf.j2
+++ b/bin/tests/system/padding/ns4/named.conf.j2
@@ -10,7 +10,4 @@ server 10.53.0.2 {
 
 {% include "_common/controls.conf.j2" %}
 
-zone "." {
-	type hint;
-	file "../../_common/root.hint";
-};
+{% include "_common/root.hint.conf" %}
diff --git a/bin/tests/system/pending/ns2/named.conf.j2 b/bin/tests/system/pending/ns2/named.conf.j2
index 78cf1ae21c6..9fee7070643 100644
--- a/bin/tests/system/pending/ns2/named.conf.j2
+++ b/bin/tests/system/pending/ns2/named.conf.j2
@@ -10,10 +10,7 @@ options {
 
 {% include "_common/controls.conf.j2" %}
 
-zone "." {
-	type hint;
-	file "../../_common/root.hint";
-};
+{% include "_common/root.hint.conf" %}
 
 zone "example" {
 	type primary;
diff --git a/bin/tests/system/pending/ns3/named.conf.j2 b/bin/tests/system/pending/ns3/named.conf.j2
index 34a912d5e14..437ef1e9bac 100644
--- a/bin/tests/system/pending/ns3/named.conf.j2
+++ b/bin/tests/system/pending/ns3/named.conf.j2
@@ -11,10 +11,7 @@ options {
 
 {% include "_common/controls.conf.j2" %}
 
-zone "." {
-	type hint;
-	file "../../_common/root.hint";
-};
+{% include "_common/root.hint.conf" %}
 
 zone "mail.example" {
 	type primary;
diff --git a/bin/tests/system/pending/ns4/named.conf.j2 b/bin/tests/system/pending/ns4/named.conf.j2
index 3a3d770f99a..f10bfabe512 100644
--- a/bin/tests/system/pending/ns4/named.conf.j2
+++ b/bin/tests/system/pending/ns4/named.conf.j2
@@ -7,7 +7,4 @@ options {
 
 {% include "_common/controls.conf.j2" %}
 
-zone "." {
-	type hint;
-	file "../../_common/root.hint";
-};
+{% include "_common/root.hint.conf" %}
diff --git a/bin/tests/system/pipelined/ns2/named.conf.j2 b/bin/tests/system/pipelined/ns2/named.conf.j2
index c5cf78303f4..949f8e03aff 100644
--- a/bin/tests/system/pipelined/ns2/named.conf.j2
+++ b/bin/tests/system/pipelined/ns2/named.conf.j2
@@ -6,10 +6,7 @@ options {
 
 {% include "_common/controls.conf.j2" %}
 
-zone "." {
-	type hint;
-	file "../../_common/root.hint";
-};
+{% include "_common/root.hint.conf" %}
 
 zone "examplea" {
 	type primary;
diff --git a/bin/tests/system/pipelined/ns3/named.conf.j2 b/bin/tests/system/pipelined/ns3/named.conf.j2
index 92fea51cea9..ca52d0eec58 100644
--- a/bin/tests/system/pipelined/ns3/named.conf.j2
+++ b/bin/tests/system/pipelined/ns3/named.conf.j2
@@ -6,10 +6,7 @@ options {
 
 {% include "_common/controls.conf.j2" %}
 
-zone "." {
-	type hint;
-	file "../../_common/root.hint";
-};
+{% include "_common/root.hint.conf" %}
 
 zone "exampleb" {
 	type primary;
diff --git a/bin/tests/system/pipelined/ns4/named.conf.j2 b/bin/tests/system/pipelined/ns4/named.conf.j2
index 74a532e9d32..b5aee432d26 100644
--- a/bin/tests/system/pipelined/ns4/named.conf.j2
+++ b/bin/tests/system/pipelined/ns4/named.conf.j2
@@ -6,7 +6,4 @@ options {
 
 {% include "_common/controls.conf.j2" %}
 
-zone "." {
-	type hint;
-	file "../../_common/root.hint";
-};
+{% include "_common/root.hint.conf" %}
diff --git a/bin/tests/system/qmin/ns5/named.conf.j2 b/bin/tests/system/qmin/ns5/named.conf.j2
index 3a1ba825b3a..070c64bc313 100644
--- a/bin/tests/system/qmin/ns5/named.conf.j2
+++ b/bin/tests/system/qmin/ns5/named.conf.j2
@@ -16,10 +16,7 @@ options {
 
 {% include "_common/controls.conf.j2" %}
 
-zone "." {
-	type hint;
-	file "../../_common/root.hint";
-};
+{% include "_common/root.hint.conf" %}
 
 zone "in-addr.arpa" {
 	type primary;
diff --git a/bin/tests/system/qmin/ns6/named.conf.j2 b/bin/tests/system/qmin/ns6/named.conf.j2
index 35052b289e5..091e4982808 100644
--- a/bin/tests/system/qmin/ns6/named.conf.j2
+++ b/bin/tests/system/qmin/ns6/named.conf.j2
@@ -10,7 +10,4 @@ options {
 
 {% include "_common/controls.conf.j2" %}
 
-zone "." {
-	type hint;
-	file "../../_common/root.hint";
-};
+{% include "_common/root.hint.conf" %}
diff --git a/bin/tests/system/qmin/ns7/named.conf.j2 b/bin/tests/system/qmin/ns7/named.conf.j2
index 765a4e3801c..4cbd3a00eac 100644
--- a/bin/tests/system/qmin/ns7/named.conf.j2
+++ b/bin/tests/system/qmin/ns7/named.conf.j2
@@ -11,10 +11,7 @@ options {
 
 {% include "_common/controls.conf.j2" %}
 
-zone "." {
-	type hint;
-	file "../../_common/root.hint";
-};
+{% include "_common/root.hint.conf" %}
 
 zone "fwd." IN {
 	type forward;
diff --git a/bin/tests/system/randomizens/ns6/named.conf.j2 b/bin/tests/system/randomizens/ns6/named.conf.j2
index d74ec52867b..5e3c4cb1f72 100644
--- a/bin/tests/system/randomizens/ns6/named.conf.j2
+++ b/bin/tests/system/randomizens/ns6/named.conf.j2
@@ -6,7 +6,4 @@ options {
 
 {% include "_common/controls.conf.j2" %}
 
-zone "." {
-	type hint;
-	file "../../_common/root.hint";
-};
+{% include "_common/root.hint.conf" %}
diff --git a/bin/tests/system/redirect/ns2/named.conf.j2 b/bin/tests/system/redirect/ns2/named.conf.j2
index fc8b394c4c5..76a97e21696 100644
--- a/bin/tests/system/redirect/ns2/named.conf.j2
+++ b/bin/tests/system/redirect/ns2/named.conf.j2
@@ -11,10 +11,7 @@ options {
 
 {% include "_common/controls.conf.j2" %}
 
-zone "." {
-	type hint;
-	file "../../_common/root.hint";
-};
+{% include "_common/root.hint.conf" %}
 
 zone "." {
 	type redirect;
diff --git a/bin/tests/system/rndc/ns2/named.conf.j2 b/bin/tests/system/rndc/ns2/named.conf.j2
index 0c467e63d01..a7a273b1f64 100644
--- a/bin/tests/system/rndc/ns2/named.conf.j2
+++ b/bin/tests/system/rndc/ns2/named.conf.j2
@@ -21,10 +21,7 @@ controls {
 };
 
 
-zone "." {
-	type hint;
-	file "../../_common/root.hint";
-};
+{% include "_common/root.hint.conf" %}
 
 zone "nil" {
 	type primary;
diff --git a/bin/tests/system/rndc/ns5/named.conf.j2 b/bin/tests/system/rndc/ns5/named.conf.j2
index 435453eec40..af36a4ec849 100644
--- a/bin/tests/system/rndc/ns5/named.conf.j2
+++ b/bin/tests/system/rndc/ns5/named.conf.j2
@@ -14,7 +14,4 @@ controls {
 	inet 10.53.0.5 port @CONTROLPORT@ allow { any; } keys { rndc_key; } read-only yes;
 };
 
-zone "." {
-	type hint;
-	file "../../_common/root.hint";
-};
+{% include "_common/root.hint.conf" %}
diff --git a/bin/tests/system/rollover/ns2/named.conf.j2 b/bin/tests/system/rollover/ns2/named.conf.j2
index 45d16d1f366..b26d6150f24 100644
--- a/bin/tests/system/rollover/ns2/named.conf.j2
+++ b/bin/tests/system/rollover/ns2/named.conf.j2
@@ -10,10 +10,7 @@ options {
 
 {% include "_common/controls.conf.j2" %}
 
-zone "." {
-	type hint;
-	file "../../_common/root.hint";
-};
+{% include "_common/root.hint.conf" %}
 
 {% for zone in tlds %}
 zone "@zone@" {
diff --git a/bin/tests/system/rollover/ns3/named.common.conf.j2 b/bin/tests/system/rollover/ns3/named.common.conf.j2
index f94c07d81ad..90c690a49d9 100644
--- a/bin/tests/system/rollover/ns3/named.common.conf.j2
+++ b/bin/tests/system/rollover/ns3/named.common.conf.j2
@@ -15,7 +15,4 @@ options {
 
 {% include "_common/controls.conf.j2" %}
 
-zone "." {
-        type hint;
-        file "../../_common/root.hint";
-};
+{% include "_common/root.hint.conf" %}
diff --git a/bin/tests/system/rrsetorder/ns3/named.conf.j2 b/bin/tests/system/rrsetorder/ns3/named.conf.j2
index e1053301918..f2f36b3e68c 100644
--- a/bin/tests/system/rrsetorder/ns3/named.conf.j2
+++ b/bin/tests/system/rrsetorder/ns3/named.conf.j2
@@ -12,7 +12,4 @@ options {
 
 {% include "_common/controls.conf.j2" %}
 
-zone "." {
-	type hint;
-	file "../../_common/root.hint";
-};
+{% include "_common/root.hint.conf" %}
diff --git a/bin/tests/system/rrsetorder/ns4/named.conf.j2 b/bin/tests/system/rrsetorder/ns4/named.conf.j2
index 636fbed1564..e41e26b23f2 100644
--- a/bin/tests/system/rrsetorder/ns4/named.conf.j2
+++ b/bin/tests/system/rrsetorder/ns4/named.conf.j2
@@ -9,7 +9,4 @@ options {
 
 {% include "_common/controls.conf.j2" %}
 
-zone "." {
-	type hint;
-	file "../../_common/root.hint";
-};
+{% include "_common/root.hint.conf" %}
diff --git a/bin/tests/system/rrsetorder/ns5/named.conf.j2 b/bin/tests/system/rrsetorder/ns5/named.conf.j2
index 1aff3cc7022..4a5e0029be0 100644
--- a/bin/tests/system/rrsetorder/ns5/named.conf.j2
+++ b/bin/tests/system/rrsetorder/ns5/named.conf.j2
@@ -5,7 +5,4 @@ options {
 
 {% include "_common/controls.conf.j2" %}
 
-zone "." {
-	type hint;
-	file "../../_common/root.hint";
-};
+{% include "_common/root.hint.conf" %}
diff --git a/bin/tests/system/rsabigexponent/ns2/named.conf.j2 b/bin/tests/system/rsabigexponent/ns2/named.conf.j2
index 92abbc1c29e..fe239454b36 100644
--- a/bin/tests/system/rsabigexponent/ns2/named.conf.j2
+++ b/bin/tests/system/rsabigexponent/ns2/named.conf.j2
@@ -8,10 +8,7 @@ options {
 
 {% include "_common/controls.conf.j2" %}
 
-zone "." {
-	type hint;
-	file "../../_common/root.hint";
-};
+{% include "_common/root.hint.conf" %}
 
 zone "example" {
 	type primary;
diff --git a/bin/tests/system/serve_stale_tcp/ns2/named.conf.j2 b/bin/tests/system/serve_stale_tcp/ns2/named.conf.j2
index 5a0b7a8e638..4cbcb6b62eb 100644
--- a/bin/tests/system/serve_stale_tcp/ns2/named.conf.j2
+++ b/bin/tests/system/serve_stale_tcp/ns2/named.conf.j2
@@ -28,7 +28,4 @@ options {
 	stale-answer-client-timeout off;
 };
 
-zone "." {
-	type hint;
-	file "../../_common/root.hint";
-};
+{% include "_common/root.hint.conf" %}
diff --git a/bin/tests/system/sfcache/ns2/named.conf.j2 b/bin/tests/system/sfcache/ns2/named.conf.j2
index e24808b1fac..6181d658097 100644
--- a/bin/tests/system/sfcache/ns2/named.conf.j2
+++ b/bin/tests/system/sfcache/ns2/named.conf.j2
@@ -8,10 +8,7 @@ options {
 
 {% include "_common/controls.conf.j2" %}
 
-zone "." {
-	type hint;
-	file "../../_common/root.hint";
-};
+{% include "_common/root.hint.conf" %}
 
 zone "example" {
 	type primary;
diff --git a/bin/tests/system/sfcache/ns5/named.conf.j2 b/bin/tests/system/sfcache/ns5/named.conf.j2
index 96b98f138a8..4f79a230f1b 100644
--- a/bin/tests/system/sfcache/ns5/named.conf.j2
+++ b/bin/tests/system/sfcache/ns5/named.conf.j2
@@ -10,9 +10,6 @@ options {
 
 {% include "_common/controls.conf.j2" %}
 
-zone "." {
-	type hint;
-	file "../../_common/root.hint";
-};
+{% include "_common/root.hint.conf" %}
 
 include "trusted.conf";
diff --git a/bin/tests/system/srtt/ns6/named.conf.j2 b/bin/tests/system/srtt/ns6/named.conf.j2
index cd4b2b8f6ee..b634a8e4518 100644
--- a/bin/tests/system/srtt/ns6/named.conf.j2
+++ b/bin/tests/system/srtt/ns6/named.conf.j2
@@ -21,7 +21,4 @@ options {
 
 {% include "_common/controls.conf.j2" %}
 
-zone "." {
-	type hint;
-	file "../../_common/root.hint";
-};
+{% include "_common/root.hint.conf" %}
diff --git a/bin/tests/system/staticstub/ns2/named.conf.j2 b/bin/tests/system/staticstub/ns2/named.conf.j2
index 2d0386db044..b2aede9edc3 100644
--- a/bin/tests/system/staticstub/ns2/named.conf.j2
+++ b/bin/tests/system/staticstub/ns2/named.conf.j2
@@ -11,10 +11,7 @@ options {
 	minimal-responses no;
 };
 
-zone "." {
-	type hint;
-	file "../../_common/root.hint";
-};
+{% include "_common/root.hint.conf" %}
 
 zone "example" {
 	type static-stub;
diff --git a/bin/tests/system/statistics/ns2/named1.conf.j2 b/bin/tests/system/statistics/ns2/named1.conf.j2
index 3149b99d66f..e944ffda011 100644
--- a/bin/tests/system/statistics/ns2/named1.conf.j2
+++ b/bin/tests/system/statistics/ns2/named1.conf.j2
@@ -12,10 +12,7 @@ statistics-channels {
 {% include "_common/controls.conf.j2" %}
 
 
-zone "." {
-	type hint;
-	file "../../_common/root.hint";
-};
+{% include "_common/root.hint.conf" %}
 
 zone "example" {
 	type primary;
diff --git a/bin/tests/system/statistics/ns2/named2.conf.j2 b/bin/tests/system/statistics/ns2/named2.conf.j2
index 6acaab8f34a..e7757d74ff3 100644
--- a/bin/tests/system/statistics/ns2/named2.conf.j2
+++ b/bin/tests/system/statistics/ns2/named2.conf.j2
@@ -12,10 +12,7 @@ statistics-channels {
 {% include "_common/controls.conf.j2" %}
 
 
-zone "." {
-	type hint;
-	file "../../_common/root.hint";
-};
+{% include "_common/root.hint.conf" %}
 
 zone "example" {
 	type primary;
diff --git a/bin/tests/system/stub/ns2/named.conf.j2 b/bin/tests/system/stub/ns2/named.conf.j2
index 2b5999e2284..dcfa6a171b3 100644
--- a/bin/tests/system/stub/ns2/named.conf.j2
+++ b/bin/tests/system/stub/ns2/named.conf.j2
@@ -7,10 +7,7 @@ options {
 
 {% include "_common/controls.conf.j2" %}
 
-zone "." {
-	type hint;
-	file "../../_common/root.hint";
-};
+{% include "_common/root.hint.conf" %}
 
 zone "child.example" {
 	type primary;
diff --git a/bin/tests/system/stub/ns3/named.conf.j2 b/bin/tests/system/stub/ns3/named.conf.j2
index 74274d67c74..fe123f771f5 100644
--- a/bin/tests/system/stub/ns3/named.conf.j2
+++ b/bin/tests/system/stub/ns3/named.conf.j2
@@ -6,10 +6,7 @@ options {
 
 {% include "_common/controls.conf.j2" %}
 
-zone "." {
-	type hint;
-	file "../../_common/root.hint";
-};
+{% include "_common/root.hint.conf" %}
 
 zone "example" {
 	type primary;
diff --git a/bin/tests/system/stub/ns5/named.conf.j2 b/bin/tests/system/stub/ns5/named.conf.j2
index aeea20d7eea..eac65ee0700 100644
--- a/bin/tests/system/stub/ns5/named.conf.j2
+++ b/bin/tests/system/stub/ns5/named.conf.j2
@@ -5,10 +5,7 @@ options {
 
 {% include "_common/controls.conf.j2" %}
 
-zone "." {
-	type hint;
-	file "../../_common/root.hint";
-};
+{% include "_common/root.hint.conf" %}
 
 zone "example" {
 	type stub;
diff --git a/bin/tests/system/tcp/ns2/named.conf.j2 b/bin/tests/system/tcp/ns2/named.conf.j2
index b9f21db3e55..acb68cc0083 100644
--- a/bin/tests/system/tcp/ns2/named.conf.j2
+++ b/bin/tests/system/tcp/ns2/named.conf.j2
@@ -7,10 +7,7 @@ options {
 {% include "_common/controls.conf.j2" %}
 
 
-zone "." {
-	type hint;
-	file "../../_common/root.hint";
-};
+{% include "_common/root.hint.conf" %}
 
 zone "example" {
 	type primary;
diff --git a/bin/tests/system/tcp/ns3/named.conf.j2 b/bin/tests/system/tcp/ns3/named.conf.j2
index 5c6b735e1c7..07b8816a99c 100644
--- a/bin/tests/system/tcp/ns3/named.conf.j2
+++ b/bin/tests/system/tcp/ns3/named.conf.j2
@@ -7,7 +7,4 @@ server 10.53.0.1 { tcp-only yes; };
 
 {% include "_common/controls.conf.j2" %}
 
-zone "." {
-	type hint;
-	file "../../_common/root.hint";
-};
+{% include "_common/root.hint.conf" %}
diff --git a/bin/tests/system/tcp/ns4/named.conf.j2 b/bin/tests/system/tcp/ns4/named.conf.j2
index 953e1c928c5..f30392c0d79 100644
--- a/bin/tests/system/tcp/ns4/named.conf.j2
+++ b/bin/tests/system/tcp/ns4/named.conf.j2
@@ -9,7 +9,4 @@ server 10.53.0.2 { tcp-only yes; };
 
 {% include "_common/controls.conf.j2" %}
 
-zone "." {
-	type hint;
-	file "../../_common/root.hint";
-};
+{% include "_common/root.hint.conf" %}
diff --git a/bin/tests/system/tcp/ns5/named.conf.j2 b/bin/tests/system/tcp/ns5/named.conf.j2
index e4568b7403e..b8dad4269ec 100644
--- a/bin/tests/system/tcp/ns5/named.conf.j2
+++ b/bin/tests/system/tcp/ns5/named.conf.j2
@@ -10,7 +10,4 @@ options {
 	dnssec-validation no;
 };
 
-zone "." {
-	type hint;
-	file "../../_common/root.hint";
-};
+{% include "_common/root.hint.conf" %}
diff --git a/bin/tests/system/ttl/ns1/named.conf.j2 b/bin/tests/system/ttl/ns1/named.conf.j2
index 7c498878e00..28e4879c7f1 100644
--- a/bin/tests/system/ttl/ns1/named.conf.j2
+++ b/bin/tests/system/ttl/ns1/named.conf.j2
@@ -7,10 +7,7 @@ options {
 	check-integrity no;
 };
 
-zone "." {
-	type hint;
-	file "../../_common/root.hint";
-};
+{% include "_common/root.hint.conf" %}
 
 zone "min-example" {
 	type primary;
diff --git a/bin/tests/system/views/ns2/named.conf.j2 b/bin/tests/system/views/ns2/named.conf.j2
index bbe5e1ec9d4..7c3a5855f0c 100644
--- a/bin/tests/system/views/ns2/named.conf.j2
+++ b/bin/tests/system/views/ns2/named.conf.j2
@@ -13,10 +13,7 @@ dnssec-policy "views" {
 	};
 };
 
-zone "." {
-	type hint;
-	file "../../_common/root.hint";
-};
+{% include "_common/root.hint.conf" %}
 
 zone "example" {
 	type primary;
diff --git a/bin/tests/system/views/ns3/named.conf.j2 b/bin/tests/system/views/ns3/named.conf.j2
index ae705222bbe..b17af1bc109 100644
--- a/bin/tests/system/views/ns3/named.conf.j2
+++ b/bin/tests/system/views/ns3/named.conf.j2
@@ -5,10 +5,7 @@ options {
 
 {% include "_common/controls.conf.j2" %}
 
-zone "." {
-	type hint;
-	file "../../_common/root.hint";
-};
+{% include "_common/root.hint.conf" %}
 
 zone "example" {
 	type primary;
diff --git a/bin/tests/system/views/ns3/named2.conf.j2 b/bin/tests/system/views/ns3/named2.conf.j2
index 6bd2e088965..644916fb1c7 100644
--- a/bin/tests/system/views/ns3/named2.conf.j2
+++ b/bin/tests/system/views/ns3/named2.conf.j2
@@ -5,10 +5,7 @@ options {
 
 {% include "_common/controls.conf.j2" %}
 
-zone "." {
-	type hint;
-	file "../../_common/root.hint";
-};
+{% include "_common/root.hint.conf" %}
 
 zone "example" {
 	type secondary;
diff --git a/bin/tests/system/views/ns5/named.conf.j2 b/bin/tests/system/views/ns5/named.conf.j2
index dbdd18f6854..30d7f8cc7fa 100644
--- a/bin/tests/system/views/ns5/named.conf.j2
+++ b/bin/tests/system/views/ns5/named.conf.j2
@@ -5,10 +5,7 @@ options {
 
 {% include "_common/controls.conf.j2" %}
 
-zone "." {
-	type hint;
-	file "../../_common/root.hint";
-};
+{% include "_common/root.hint.conf" %}
 
 zone "child.clone" {
 	type primary;
diff --git a/bin/tests/system/wildcard/ns2/named.conf.j2 b/bin/tests/system/wildcard/ns2/named.conf.j2
index 1aff3cc7022..4a5e0029be0 100644
--- a/bin/tests/system/wildcard/ns2/named.conf.j2
+++ b/bin/tests/system/wildcard/ns2/named.conf.j2
@@ -5,7 +5,4 @@ options {
 
 {% include "_common/controls.conf.j2" %}
 
-zone "." {
-	type hint;
-	file "../../_common/root.hint";
-};
+{% include "_common/root.hint.conf" %}
diff --git a/bin/tests/system/wildcard/ns3/named.conf.j2 b/bin/tests/system/wildcard/ns3/named.conf.j2
index 423cf682a73..d0c559e2ff0 100644
--- a/bin/tests/system/wildcard/ns3/named.conf.j2
+++ b/bin/tests/system/wildcard/ns3/named.conf.j2
@@ -7,7 +7,4 @@ options {
 
 include "../ns1/trusted.conf";
 
-zone "." {
-	type hint;
-	file "../../_common/root.hint";
-};
+{% include "_common/root.hint.conf" %}
diff --git a/bin/tests/system/wildcard/ns5/named.conf.j2 b/bin/tests/system/wildcard/ns5/named.conf.j2
index 423cf682a73..d0c559e2ff0 100644
--- a/bin/tests/system/wildcard/ns5/named.conf.j2
+++ b/bin/tests/system/wildcard/ns5/named.conf.j2
@@ -7,7 +7,4 @@ options {
 
 include "../ns1/trusted.conf";
 
-zone "." {
-	type hint;
-	file "../../_common/root.hint";
-};
+{% include "_common/root.hint.conf" %}
diff --git a/bin/tests/system/xfer/ns2/named.conf.j2 b/bin/tests/system/xfer/ns2/named.conf.j2
index 791f826e9fa..64125866208 100644
--- a/bin/tests/system/xfer/ns2/named.conf.j2
+++ b/bin/tests/system/xfer/ns2/named.conf.j2
@@ -18,10 +18,7 @@ acl tzkey {
 	key tsigzone.;
 };
 
-zone "." {
-	type hint;
-	file "../../_common/root.hint";
-};
+{% include "_common/root.hint.conf" %}
 
 zone "example" {
 	type primary;
diff --git a/bin/tests/system/xfer/ns3/named.conf.j2 b/bin/tests/system/xfer/ns3/named.conf.j2
index 8052a927418..1ae5503b14d 100644
--- a/bin/tests/system/xfer/ns3/named.conf.j2
+++ b/bin/tests/system/xfer/ns3/named.conf.j2
@@ -11,10 +11,7 @@ key tsigzone. {
 	secret "1234abcd8765";
 };
 
-zone "." {
-	type hint;
-	file "../../_common/root.hint";
-};
+{% include "_common/root.hint.conf" %}
 
 zone "example" {
 	type secondary;
diff --git a/bin/tests/system/xfer/ns6/named.conf.j2 b/bin/tests/system/xfer/ns6/named.conf.j2
index 9d6c31947b5..8a4845994ad 100644
--- a/bin/tests/system/xfer/ns6/named.conf.j2
+++ b/bin/tests/system/xfer/ns6/named.conf.j2
@@ -11,10 +11,7 @@ options {
 	min-transfer-rate-in 10240 300;  # this is tested as seconds, when used with '-T transferinsecs' (i.e. convert the default '10240 5' back so that it doesn't interfere with other tests)
 };
 
-zone "." {
-	type hint;
-	file "../../_common/root.hint";
-};
+{% include "_common/root.hint.conf" %}
 
 zone "primary" {
 	type primary;
diff --git a/bin/tests/system/xfer/ns7/named.conf.j2 b/bin/tests/system/xfer/ns7/named.conf.j2
index 0b677a7e574..cc1e70dbdb7 100644
--- a/bin/tests/system/xfer/ns7/named.conf.j2
+++ b/bin/tests/system/xfer/ns7/named.conf.j2
@@ -9,10 +9,7 @@ options {
 	check-integrity no;
 };
 
-zone "." {
-	type hint;
-	file "../../_common/root.hint";
-};
+{% include "_common/root.hint.conf" %}
 
 zone "primary2" {
 	type primary;
diff --git a/bin/tests/system/xferquota/ns2/named.conf.j2 b/bin/tests/system/xferquota/ns2/named.conf.j2
index 62e3f4f88ca..d681e72fc6a 100644
--- a/bin/tests/system/xferquota/ns2/named.conf.j2
+++ b/bin/tests/system/xferquota/ns2/named.conf.j2
@@ -11,10 +11,7 @@ options {
 
 {% include "_common/controls.conf.j2" %}
 
-zone "." {
-	type hint;
-	file "../../_common/root.hint";
-};
+{% include "_common/root.hint.conf" %}
 
 zone "changing." {
 	type secondary;