From: Evan Hunt <each@isc.org>
Date: Wed, 15 Apr 2026 04:20:39 +0000 (-0700)
Subject: Continue removal of license headers from test zones
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=15cb1e50cbd8ffa2bc507aba711085130420ad21;p=thirdparty%2Fbind9.git

Continue removal of license headers from test zones

Copyright license headers were removed from system test zone files in
commit f144db6b686, but this change only applied to files named '*.db',
'*.db.in', etc. There were some zone files called '*.zone' which were
left unchanged; these have been updated now as well.
---

diff --git a/bin/tests/system/dnssectools/signer/general/test1.db b/bin/tests/system/dnssectools/signer/general/test1.db
new file mode 100644
index 00000000000..7c9c0eb620a
--- /dev/null
+++ b/bin/tests/system/dnssectools/signer/general/test1.db
@@ -0,0 +1,8 @@
+;	This is a zone which has two DNSKEY records, both of which have
+; existing private key files available.  They should be loaded automatically
+; and the zone correctly signed.
+;
+$TTL 3600
+example.com.	IN	SOA ns hostmaster 00090000 1200 3600 604800 300
+$include Kexample.com.+010+18240.key
+$include Kexample.com.+010+28633.key
diff --git a/bin/tests/system/dnssectools/signer/general/test1.zone b/bin/tests/system/dnssectools/signer/general/test1.zone
deleted file mode 100644
index 98c9f0233c3..00000000000
--- a/bin/tests/system/dnssectools/signer/general/test1.zone
+++ /dev/null
@@ -1,19 +0,0 @@
-; Copyright (C) Internet Systems Consortium, Inc. ("ISC")
-;
-; SPDX-License-Identifier: MPL-2.0
-;
-; 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 https://mozilla.org/MPL/2.0/.
-;
-; See the COPYRIGHT file distributed with this work for additional
-; information regarding copyright ownership.
-
-;	This is a zone which has two DNSKEY records, both of which have
-; existing private key files available.  They should be loaded automatically
-; and the zone correctly signed.
-;
-$TTL 3600
-example.com.	IN	SOA ns hostmaster 00090000 1200 3600 604800 300
-$include Kexample.com.+010+18240.key
-$include Kexample.com.+010+28633.key
diff --git a/bin/tests/system/dnssectools/signer/general/test10.db b/bin/tests/system/dnssectools/signer/general/test10.db
new file mode 100644
index 00000000000..3a150103361
--- /dev/null
+++ b/bin/tests/system/dnssectools/signer/general/test10.db
@@ -0,0 +1,9 @@
+;	This is a zone which has two DNSKEY records, both of which have
+; existing private key files available.  They should be loaded automatically
+; and the zone correctly signed.
+;
+$TTL 3600
+example.com.	IN	SOA ns hostmaster 00100000 1200 3600 604800 300
+extra.example.com. IN   A   1.2.3.4
+$include Kexample.com.+008+63613.key
+$include Kexample.com.+008+15002.key
diff --git a/bin/tests/system/dnssectools/signer/general/test10.zone b/bin/tests/system/dnssectools/signer/general/test10.zone
deleted file mode 100644
index 10a8bc97e1e..00000000000
--- a/bin/tests/system/dnssectools/signer/general/test10.zone
+++ /dev/null
@@ -1,20 +0,0 @@
-; Copyright (C) Internet Systems Consortium, Inc. ("ISC")
-;
-; SPDX-License-Identifier: MPL-2.0
-;
-; 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 https://mozilla.org/MPL/2.0/.
-;
-; See the COPYRIGHT file distributed with this work for additional
-; information regarding copyright ownership.
-
-;	This is a zone which has two DNSKEY records, both of which have
-; existing private key files available.  They should be loaded automatically
-; and the zone correctly signed.
-;
-$TTL 3600
-example.com.	IN	SOA ns hostmaster 00100000 1200 3600 604800 300
-extra.example.com. IN   A   1.2.3.4
-$include Kexample.com.+008+63613.key
-$include Kexample.com.+008+15002.key
diff --git a/bin/tests/system/dnssectools/signer/general/test11.db b/bin/tests/system/dnssectools/signer/general/test11.db
new file mode 100644
index 00000000000..14f93261d14
--- /dev/null
+++ b/bin/tests/system/dnssectools/signer/general/test11.db
@@ -0,0 +1,8 @@
+;	This is a zone which has two DNSKEY records, both of which have
+; existing private key files available.  They should be loaded automatically
+; and the zone correctly signed.
+;
+$TTL 3600
+example.com.	IN	SOA ns hostmaster 00090000 1200 3600 604800 300
+$include Kexample.com.+005+19857.key
+$include Kexample.com.+005+45884.key
diff --git a/bin/tests/system/dnssectools/signer/general/test11.zone b/bin/tests/system/dnssectools/signer/general/test11.zone
deleted file mode 100644
index 538305fc144..00000000000
--- a/bin/tests/system/dnssectools/signer/general/test11.zone
+++ /dev/null
@@ -1,19 +0,0 @@
-; Copyright (C) Internet Systems Consortium, Inc. ("ISC")
-;
-; SPDX-License-Identifier: MPL-2.0
-;
-; 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 https://mozilla.org/MPL/2.0/.
-;
-; See the COPYRIGHT file distributed with this work for additional
-; information regarding copyright ownership.
-
-;	This is a zone which has two DNSKEY records, both of which have
-; existing private key files available.  They should be loaded automatically
-; and the zone correctly signed.
-;
-$TTL 3600
-example.com.	IN	SOA ns hostmaster 00090000 1200 3600 604800 300
-$include Kexample.com.+005+19857.key
-$include Kexample.com.+005+45884.key
diff --git a/bin/tests/system/dnssectools/signer/general/test12.zone b/bin/tests/system/dnssectools/signer/general/test12.db
similarity index 70%
rename from bin/tests/system/dnssectools/signer/general/test12.zone
rename to bin/tests/system/dnssectools/signer/general/test12.db
index 4e4c9baef6a..1b2c28922b7 100644
--- a/bin/tests/system/dnssectools/signer/general/test12.zone
+++ b/bin/tests/system/dnssectools/signer/general/test12.db
@@ -1,14 +1,3 @@
-; Copyright (C) Internet Systems Consortium, Inc. ("ISC")
-;
-; SPDX-License-Identifier: MPL-2.0
-;
-; 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 https://mozilla.org/MPL/2.0/.
-;
-; See the COPYRIGHT file distributed with this work for additional
-; information regarding copyright ownership.
-
 ;	This is a zone which has two DNSKEY records, both of which have
 ; existing private key files available.  They should be loaded automatically
 ; and the zone correctly signed.
diff --git a/bin/tests/system/dnssectools/signer/general/test13.db b/bin/tests/system/dnssectools/signer/general/test13.db
new file mode 100644
index 00000000000..265ec5ba34e
--- /dev/null
+++ b/bin/tests/system/dnssectools/signer/general/test13.db
@@ -0,0 +1,6 @@
+;	This is a zone which has two DNSKEY records, both of which have
+; existing private key files available.  They should be loaded automatically
+; and the zone correctly signed.
+;
+$TTL 3600
+example.com.	IN	SOA ns hostmaster 00090000 1200 3600 604800 300
diff --git a/bin/tests/system/dnssectools/signer/general/test13.zone b/bin/tests/system/dnssectools/signer/general/test13.zone
deleted file mode 100644
index 3f2c7207f3e..00000000000
--- a/bin/tests/system/dnssectools/signer/general/test13.zone
+++ /dev/null
@@ -1,17 +0,0 @@
-; Copyright (C) Internet Systems Consortium, Inc. ("ISC")
-;
-; SPDX-License-Identifier: MPL-2.0
-;
-; 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 https://mozilla.org/MPL/2.0/.
-;
-; See the COPYRIGHT file distributed with this work for additional
-; information regarding copyright ownership.
-
-;	This is a zone which has two DNSKEY records, both of which have
-; existing private key files available.  They should be loaded automatically
-; and the zone correctly signed.
-;
-$TTL 3600
-example.com.	IN	SOA ns hostmaster 00090000 1200 3600 604800 300
diff --git a/bin/tests/system/dnssectools/signer/general/test2.db b/bin/tests/system/dnssectools/signer/general/test2.db
new file mode 100644
index 00000000000..abaeaf3c5d1
--- /dev/null
+++ b/bin/tests/system/dnssectools/signer/general/test2.db
@@ -0,0 +1,7 @@
+;	This is a zone which has one non-KSK DNSKEY record for which the
+; private key file exists.  It should be loaded automatically and the zone
+; correctly signed.
+;
+$TTL 3600
+example.com.	IN	SOA ns hostmaster 00090000 1200 3600 604800 300
+$include Kexample.com.+010+18240.key
diff --git a/bin/tests/system/dnssectools/signer/general/test2.zone b/bin/tests/system/dnssectools/signer/general/test2.zone
deleted file mode 100644
index 97c0d3d8dc2..00000000000
--- a/bin/tests/system/dnssectools/signer/general/test2.zone
+++ /dev/null
@@ -1,18 +0,0 @@
-; Copyright (C) Internet Systems Consortium, Inc. ("ISC")
-;
-; SPDX-License-Identifier: MPL-2.0
-;
-; 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 https://mozilla.org/MPL/2.0/.
-;
-; See the COPYRIGHT file distributed with this work for additional
-; information regarding copyright ownership.
-
-;	This is a zone which has one non-KSK DNSKEY record for which the
-; private key file exists.  It should be loaded automatically and the zone
-; correctly signed.
-;
-$TTL 3600
-example.com.	IN	SOA ns hostmaster 00090000 1200 3600 604800 300
-$include Kexample.com.+010+18240.key
diff --git a/bin/tests/system/dnssectools/signer/general/test3.db b/bin/tests/system/dnssectools/signer/general/test3.db
new file mode 100644
index 00000000000..d8b0d994f92
--- /dev/null
+++ b/bin/tests/system/dnssectools/signer/general/test3.db
@@ -0,0 +1,7 @@
+;       This is a zone which has one KSK DNSKEY record for which the
+; private key file exists.  It should be loaded automatically.  As there
+; is no non-KSK DNSKEY the resulting zone should be rejected.
+;
+$TTL 3600
+example.com.	IN	SOA ns hostmaster 00090000 1200 3600 604800 300
+$include Kexample.com.+010+28633.key
diff --git a/bin/tests/system/dnssectools/signer/general/test3.zone b/bin/tests/system/dnssectools/signer/general/test3.zone
deleted file mode 100644
index bf9bc66c56f..00000000000
--- a/bin/tests/system/dnssectools/signer/general/test3.zone
+++ /dev/null
@@ -1,18 +0,0 @@
-; Copyright (C) Internet Systems Consortium, Inc. ("ISC")
-;
-; SPDX-License-Identifier: MPL-2.0
-;
-; 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 https://mozilla.org/MPL/2.0/.
-;
-; See the COPYRIGHT file distributed with this work for additional
-; information regarding copyright ownership.
-
-;       This is a zone which has one KSK DNSKEY record for which the
-; private key file exists.  It should be loaded automatically.  As there
-; is no non-KSK DNSKEY the resulting zone should be rejected.
-;
-$TTL 3600
-example.com.	IN	SOA ns hostmaster 00090000 1200 3600 604800 300
-$include Kexample.com.+010+28633.key
diff --git a/bin/tests/system/dnssectools/signer/general/test4.db b/bin/tests/system/dnssectools/signer/general/test4.db
new file mode 100644
index 00000000000..b8285f8395b
--- /dev/null
+++ b/bin/tests/system/dnssectools/signer/general/test4.db
@@ -0,0 +1,9 @@
+;	This is a zone which has three DNSKEY records, two (KSK + ZSK) of
+; which have existing private key files available.  The third is a
+; pre-published ZSK.
+;
+$TTL 3600
+example.com.	IN	SOA ns hostmaster 00090000 1200 3600 604800 300
+$include Kexample.com.+010+18240.key
+$include Kexample.com.+010+28633.key
+$include bogus-zsk.key
diff --git a/bin/tests/system/dnssectools/signer/general/test4.zone b/bin/tests/system/dnssectools/signer/general/test4.zone
deleted file mode 100644
index 9f05de50fb1..00000000000
--- a/bin/tests/system/dnssectools/signer/general/test4.zone
+++ /dev/null
@@ -1,20 +0,0 @@
-; Copyright (C) Internet Systems Consortium, Inc. ("ISC")
-;
-; SPDX-License-Identifier: MPL-2.0
-;
-; 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 https://mozilla.org/MPL/2.0/.
-;
-; See the COPYRIGHT file distributed with this work for additional
-; information regarding copyright ownership.
-
-;	This is a zone which has three DNSKEY records, two (KSK + ZSK) of
-; which have existing private key files available.  The third is a
-; pre-published ZSK.
-;
-$TTL 3600
-example.com.	IN	SOA ns hostmaster 00090000 1200 3600 604800 300
-$include Kexample.com.+010+18240.key
-$include Kexample.com.+010+28633.key
-$include bogus-zsk.key
diff --git a/bin/tests/system/dnssectools/signer/general/test5.db b/bin/tests/system/dnssectools/signer/general/test5.db
new file mode 100644
index 00000000000..1fd0b892bdf
--- /dev/null
+++ b/bin/tests/system/dnssectools/signer/general/test5.db
@@ -0,0 +1,8 @@
+;	This is a zone which has three DNSKEY records, two (KSK +ZSK) of which
+; have existing private key files available.  The third is a KSK.
+;
+$TTL 3600
+example.com.	IN	SOA ns hostmaster 00090000 1200 3600 604800 300
+$include Kexample.com.+010+18240.key
+$include Kexample.com.+010+28633.key
+$include bogus-ksk.key
diff --git a/bin/tests/system/dnssectools/signer/general/test5.zone b/bin/tests/system/dnssectools/signer/general/test5.zone
deleted file mode 100644
index d61504fbf91..00000000000
--- a/bin/tests/system/dnssectools/signer/general/test5.zone
+++ /dev/null
@@ -1,19 +0,0 @@
-; Copyright (C) Internet Systems Consortium, Inc. ("ISC")
-;
-; SPDX-License-Identifier: MPL-2.0
-;
-; 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 https://mozilla.org/MPL/2.0/.
-;
-; See the COPYRIGHT file distributed with this work for additional
-; information regarding copyright ownership.
-
-;	This is a zone which has three DNSKEY records, two (KSK +ZSK) of which
-; have existing private key files available.  The third is a KSK.
-;
-$TTL 3600
-example.com.	IN	SOA ns hostmaster 00090000 1200 3600 604800 300
-$include Kexample.com.+010+18240.key
-$include Kexample.com.+010+28633.key
-$include bogus-ksk.key
diff --git a/bin/tests/system/dnssectools/signer/general/test6.db b/bin/tests/system/dnssectools/signer/general/test6.db
new file mode 100644
index 00000000000..20fae27456b
--- /dev/null
+++ b/bin/tests/system/dnssectools/signer/general/test6.db
@@ -0,0 +1,10 @@
+;	This is a zone which has four DNSKEY records, two (KK + ZSK) of which
+; have existing private key files available.  There are also a KSK and ZSK
+; for which there will be no signatures.
+;
+$TTL 3600
+example.com.	IN	SOA ns hostmaster 00090000 1200 3600 604800 300
+$include Kexample.com.+010+18240.key
+$include Kexample.com.+010+28633.key
+$include bogus-ksk.key
+$include bogus-zsk.key
diff --git a/bin/tests/system/dnssectools/signer/general/test6.zone b/bin/tests/system/dnssectools/signer/general/test6.zone
deleted file mode 100644
index fcfb1ec2607..00000000000
--- a/bin/tests/system/dnssectools/signer/general/test6.zone
+++ /dev/null
@@ -1,21 +0,0 @@
-; Copyright (C) Internet Systems Consortium, Inc. ("ISC")
-;
-; SPDX-License-Identifier: MPL-2.0
-;
-; 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 https://mozilla.org/MPL/2.0/.
-;
-; See the COPYRIGHT file distributed with this work for additional
-; information regarding copyright ownership.
-
-;	This is a zone which has four DNSKEY records, two (KK + ZSK) of which
-; have existing private key files available.  There are also a KSK and ZSK
-; for which there will be no signatures.
-;
-$TTL 3600
-example.com.	IN	SOA ns hostmaster 00090000 1200 3600 604800 300
-$include Kexample.com.+010+18240.key
-$include Kexample.com.+010+28633.key
-$include bogus-ksk.key
-$include bogus-zsk.key
diff --git a/bin/tests/system/dnssectools/signer/general/test7.db b/bin/tests/system/dnssectools/signer/general/test7.db
new file mode 100644
index 00000000000..bcdfbc45e1e
--- /dev/null
+++ b/bin/tests/system/dnssectools/signer/general/test7.db
@@ -0,0 +1,8 @@
+;	This is a zone which has two DNSKEY records, none of which have
+; existing private key files available.  The resulting zone should fail
+; the consistency tests.
+;
+$TTL 3600
+example.com.	IN	SOA ns hostmaster 00090000 1200 3600 604800 300
+$include bogus-ksk.key
+$include bogus-zsk.key
diff --git a/bin/tests/system/dnssectools/signer/general/test7.zone b/bin/tests/system/dnssectools/signer/general/test7.zone
deleted file mode 100644
index e52c5355275..00000000000
--- a/bin/tests/system/dnssectools/signer/general/test7.zone
+++ /dev/null
@@ -1,19 +0,0 @@
-; Copyright (C) Internet Systems Consortium, Inc. ("ISC")
-;
-; SPDX-License-Identifier: MPL-2.0
-;
-; 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 https://mozilla.org/MPL/2.0/.
-;
-; See the COPYRIGHT file distributed with this work for additional
-; information regarding copyright ownership.
-
-;	This is a zone which has two DNSKEY records, none of which have
-; existing private key files available.  The resulting zone should fail
-; the consistency tests.
-;
-$TTL 3600
-example.com.	IN	SOA ns hostmaster 00090000 1200 3600 604800 300
-$include bogus-ksk.key
-$include bogus-zsk.key
diff --git a/bin/tests/system/dnssectools/signer/general/test8.db b/bin/tests/system/dnssectools/signer/general/test8.db
new file mode 100644
index 00000000000..dd5be5ad4b3
--- /dev/null
+++ b/bin/tests/system/dnssectools/signer/general/test8.db
@@ -0,0 +1,8 @@
+;	This is a zone which has two DNSKEY records, one of which,
+; the KSK, has a private key.  The resulting zone should be rejected as
+; it has no ZSK signatures.
+;
+$TTL 3600
+example.com.	IN	SOA ns hostmaster 00090000 1200 3600 604800 300
+$include Kexample.com.+010+28633.key
+$include bogus-zsk.key
diff --git a/bin/tests/system/dnssectools/signer/general/test8.zone b/bin/tests/system/dnssectools/signer/general/test8.zone
deleted file mode 100644
index 893d32da10b..00000000000
--- a/bin/tests/system/dnssectools/signer/general/test8.zone
+++ /dev/null
@@ -1,19 +0,0 @@
-; Copyright (C) Internet Systems Consortium, Inc. ("ISC")
-;
-; SPDX-License-Identifier: MPL-2.0
-;
-; 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 https://mozilla.org/MPL/2.0/.
-;
-; See the COPYRIGHT file distributed with this work for additional
-; information regarding copyright ownership.
-
-;	This is a zone which has two DNSKEY records, one of which,
-; the KSK, has a private key.  The resulting zone should be rejected as
-; it has no ZSK signatures.
-;
-$TTL 3600
-example.com.	IN	SOA ns hostmaster 00090000 1200 3600 604800 300
-$include Kexample.com.+010+28633.key
-$include bogus-zsk.key
diff --git a/bin/tests/system/dnssectools/signer/general/test9.db b/bin/tests/system/dnssectools/signer/general/test9.db
new file mode 100644
index 00000000000..e21178c88cb
--- /dev/null
+++ b/bin/tests/system/dnssectools/signer/general/test9.db
@@ -0,0 +1,8 @@
+;	This is a zone which has two DNSKEY records, both of which have
+; existing private key files available.  They should be loaded automatically
+; and the zone correctly signed.
+;
+$TTL 3600
+example.com.	IN	SOA ns hostmaster 00090000 1200 3600 604800 300
+$include Kexample.com.+008+63613.key
+$include Kexample.com.+008+15002.key
diff --git a/bin/tests/system/dnssectools/signer/general/test9.zone b/bin/tests/system/dnssectools/signer/general/test9.zone
deleted file mode 100644
index 14c47d040cd..00000000000
--- a/bin/tests/system/dnssectools/signer/general/test9.zone
+++ /dev/null
@@ -1,19 +0,0 @@
-; Copyright (C) Internet Systems Consortium, Inc. ("ISC")
-;
-; SPDX-License-Identifier: MPL-2.0
-;
-; 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 https://mozilla.org/MPL/2.0/.
-;
-; See the COPYRIGHT file distributed with this work for additional
-; information regarding copyright ownership.
-
-;	This is a zone which has two DNSKEY records, both of which have
-; existing private key files available.  They should be loaded automatically
-; and the zone correctly signed.
-;
-$TTL 3600
-example.com.	IN	SOA ns hostmaster 00090000 1200 3600 604800 300
-$include Kexample.com.+008+63613.key
-$include Kexample.com.+008+15002.key
diff --git a/bin/tests/system/dnssectools/tests.sh b/bin/tests/system/dnssectools/tests.sh
index 666c6ebe855..96e4500b579 100644
--- a/bin/tests/system/dnssectools/tests.sh
+++ b/bin/tests/system/dnssectools/tests.sh
@@ -43,7 +43,7 @@ ret=0
 (
   cd signer/general || exit 1
   rm -f signed.zone
-  $SIGNER -f signed.zone -o example.com. test1.zone >signer.out.$n
+  $SIGNER -f signed.zone -o example.com. test1.db >signer.out.$n
   test -f signed.zone
 ) || ret=1
 n=$((n + 1))
@@ -55,7 +55,7 @@ ret=0
 (
   cd signer/general || exit 1
   rm -f signed.zone
-  $SIGNER -s now-1mo -e now+2d -P -x -f signed.zone -O full -o example.com. test1.zone >signer.out.$n
+  $SIGNER -s now-1mo -e now+2d -P -x -f signed.zone -O full -o example.com. test1.db >signer.out.$n
   test -f signed.zone
 ) || ret=1
 n=$((n + 1))
@@ -82,7 +82,7 @@ ret=0
 (
   cd signer/general || exit 0
   rm -f signed.zone
-  $SIGNER -f signed.zone -o example.com. test2.zone >signer.out.$n
+  $SIGNER -f signed.zone -o example.com. test2.db >signer.out.$n
   test -f signed.zone
 ) && ret=1
 n=$((n + 1))
@@ -94,7 +94,7 @@ ret=0
 (
   cd signer/general || exit 0
   rm -f signed.zone
-  $SIGNER -f signed.zone -o example.com. test3.zone >signer.out.$n 2>/dev/null
+  $SIGNER -f signed.zone -o example.com. test3.db >signer.out.$n 2>/dev/null
   test -f signed.zone
 ) && ret=1
 n=$((n + 1))
@@ -106,7 +106,7 @@ ret=0
 (
   cd signer/general || exit 1
   rm -f signed.zone
-  $SIGNER -f signed.zone -o example.com. test4.zone >signer.out.$n 2>/dev/null
+  $SIGNER -f signed.zone -o example.com. test4.db >signer.out.$n 2>/dev/null
   test -f signed.zone
 ) || ret=1
 n=$((n + 1))
@@ -118,7 +118,7 @@ ret=0
 (
   cd signer/general || exit 1
   rm -f signed.zone
-  $SIGNER -f signed.zone -o example.com. test5.zone >signer.out.$n 2>/dev/null
+  $SIGNER -f signed.zone -o example.com. test5.db >signer.out.$n 2>/dev/null
   test -f signed.zone
 ) || ret=1
 n=$((n + 1))
@@ -130,7 +130,7 @@ ret=0
 (
   cd signer/general || exit 1
   rm -f signed.zone
-  $SIGNER -f signed.zone -o example.com. test6.zone >signer.out.$n 2>/dev/null
+  $SIGNER -f signed.zone -o example.com. test6.db >signer.out.$n 2>/dev/null
   test -f signed.zone
 ) || ret=1
 n=$((n + 1))
@@ -142,7 +142,7 @@ ret=0
 (
   cd signer/general || exit 0
   rm -f signed.zone
-  $SIGNER -f signed.zone -o example.com. test7.zone >signer.out.$n 2>/dev/null
+  $SIGNER -f signed.zone -o example.com. test7.db >signer.out.$n 2>/dev/null
   test -f signed.zone
 ) && ret=1
 n=$((n + 1))
@@ -154,7 +154,7 @@ ret=0
 (
   cd signer/general || exit 0
   rm -f signed.zone
-  $SIGNER -f signed.zone -o example.com. test8.zone >signer.out.$n 2>/dev/null
+  $SIGNER -f signed.zone -o example.com. test8.db >signer.out.$n 2>/dev/null
   test -f signed.zone
 ) && ret=1
 n=$((n + 1))
@@ -167,7 +167,7 @@ if $FEATURETEST --fips-provider; then
   (
     cd signer/general || exit 1
     rm -f signed.zone
-    $SIGNER -F -f signed.zone -o example.com. test1.zone >signer.out.$n
+    $SIGNER -F -f signed.zone -o example.com. test1.db >signer.out.$n
     test -f signed.zone
   ) || ret=1
 else
@@ -187,7 +187,7 @@ else
   (
     cd signer/general || exit 1
     rm -f signed.zone
-    $SIGNER -F -f signed.zone -o example.com. test11.zone >signer.out.$n 2>&1 && exit 1
+    $SIGNER -F -f signed.zone -o example.com. test11.db >signer.out.$n 2>&1 && exit 1
     grep -F -e "fatal: No signing keys specified or found" \
       -e "fatal: dnskey 'example.com/RSASHA1/19857' failed to sign data" signer.out.$n >/dev/null
   ) || ret=1
@@ -202,7 +202,7 @@ ret=0
 (
   cd signer/general || exit 0
   rm -f signed.zone
-  $SIGNER -S -f signed.zone -o . test12.zone >signer.out.$n 2>/dev/null
+  $SIGNER -S -f signed.zone -o . test12.db >signer.out.$n 2>/dev/null
 ) && ret=1
 n=$((n + 1))
 test "$ret" -eq 0 || echo_i "failed"
@@ -213,7 +213,7 @@ ret=0
 (
   cd signer/general || exit 0
   rm -f signed.zone
-  $SIGNER -f signed.zone -3 - -H 51 -o example.com. test9.zone >signer.out.$n
+  $SIGNER -f signed.zone -3 - -H 51 -o example.com. test9.db >signer.out.$n
   test -f signed.zone
 ) && ret=1
 n=$((n + 1))
@@ -225,8 +225,8 @@ ret=0
 (
   cd signer/general || exit 0
   rm -f signed.zone
-  $MAKEJOURNAL example.com. test9.zone test10.zone test9.zone.jnl
-  $SIGNER -f signed.zone -o example.com. -J test9.zone.jnl test9.zone >signer.out.$n
+  $MAKEJOURNAL example.com. test9.db test10.db test9.db.jnl
+  $SIGNER -f signed.zone -o example.com. -J test9.db.jnl test9.db >signer.out.$n
   grep -q extra signed.zone
 ) || ret=1
 n=$((n + 1))
@@ -238,7 +238,7 @@ ret=0
 (
   cd signer/general || exit 1
   rm -f signed.zone
-  $SIGNER -f signed.zone -3 - -H 50 -o example.com. test9.zone >signer.out.$n
+  $SIGNER -f signed.zone -3 - -H 50 -o example.com. test9.db >signer.out.$n
   test -f signed.zone
 ) || ret=1
 n=$((n + 1))
@@ -791,7 +791,7 @@ status=$((status + ret))
 
 echo_i "checking dnssec-signzone without -o and zone is in directory (incorrect basename) ($n)"
 ret=0
-cp signer/general/test13.zone signer/bad.db
+cp signer/general/test13.db signer/bad.db
 $SIGNER -O full -S signer/bad.db 2>signer.err.$n && ret=1
 grep "example.com: not at top of zone" signer.err.$n >/dev/null || ret=1
 n=$((n + 1))
@@ -800,7 +800,7 @@ status=$((status + ret))
 
 echo_i "checking dnssec-signzone without -o and zone is in directory ($n)"
 ret=0
-cp signer/general/test13.zone signer/example.com
+cp signer/general/test13.db signer/example.com
 $SIGNER -S -K signer/general -O full signer/example.com >signer.out.$n || ret=1
 test -f signer/example.com.signed
 n=$((n + 1))
diff --git a/bin/tests/system/forward/ns10/fakenet.zone b/bin/tests/system/forward/ns10/fakenet.db
similarity index 100%
rename from bin/tests/system/forward/ns10/fakenet.zone
rename to bin/tests/system/forward/ns10/fakenet.db
diff --git a/bin/tests/system/forward/ns10/fakenet2.zone b/bin/tests/system/forward/ns10/fakenet2.db
similarity index 100%
rename from bin/tests/system/forward/ns10/fakenet2.zone
rename to bin/tests/system/forward/ns10/fakenet2.db
diff --git a/bin/tests/system/forward/ns10/fakesublocalnet.zone b/bin/tests/system/forward/ns10/fakesublocalnet.db
similarity index 100%
rename from bin/tests/system/forward/ns10/fakesublocalnet.zone
rename to bin/tests/system/forward/ns10/fakesublocalnet.db
diff --git a/bin/tests/system/forward/ns10/fakesublocaltld.zone b/bin/tests/system/forward/ns10/fakesublocaltld.db
similarity index 100%
rename from bin/tests/system/forward/ns10/fakesublocaltld.zone
rename to bin/tests/system/forward/ns10/fakesublocaltld.db
diff --git a/bin/tests/system/forward/ns10/named.conf.j2 b/bin/tests/system/forward/ns10/named.conf.j2
index 1b5d855daa7..d12882ef764 100644
--- a/bin/tests/system/forward/ns10/named.conf.j2
+++ b/bin/tests/system/forward/ns10/named.conf.j2
@@ -12,22 +12,22 @@ options {
 
 zone "net." {
 	type master;
-	file "fakenet.zone";
+	file "fakenet.db";
 };
 
 zone "spoofed.net." {
 	type master;
-	file "spoofednet.zone";
+	file "spoofednet.db";
 };
 
 zone "sub.local.net." {
 	type master;
-	file "fakesublocalnet.zone";
+	file "fakesublocalnet.db";
 };
 
 zone "net2" {
 	type master;
-	file "fakenet2.zone";
+	file "fakenet2.db";
 };
 
 zone "net.example.lll" {
@@ -37,5 +37,5 @@ zone "net.example.lll" {
 
 zone "sub.local.tld." {
 	type master;
-	file "fakesublocaltld.zone";
+	file "fakesublocaltld.db";
 };
diff --git a/bin/tests/system/forward/ns10/net.example.lll b/bin/tests/system/forward/ns10/net.example.lll.db
similarity index 100%
rename from bin/tests/system/forward/ns10/net.example.lll
rename to bin/tests/system/forward/ns10/net.example.lll.db
diff --git a/bin/tests/system/forward/ns10/spoofednet.zone b/bin/tests/system/forward/ns10/spoofednet.db
similarity index 100%
rename from bin/tests/system/forward/ns10/spoofednet.zone
rename to bin/tests/system/forward/ns10/spoofednet.db