diff --git a/bin/tests/system/case/ns1/dynamic.db.in b/bin/tests/system/case/ns1/dynamic.db
similarity index 100%
rename from bin/tests/system/case/ns1/dynamic.db.in
rename to bin/tests/system/case/ns1/dynamic.db
diff --git a/bin/tests/system/case/ns1/named.conf.in b/bin/tests/system/case/ns1/named.conf.j2
similarity index 100%
rename from bin/tests/system/case/ns1/named.conf.in
rename to bin/tests/system/case/ns1/named.conf.j2
diff --git a/bin/tests/system/case/ns2/named.conf.in b/bin/tests/system/case/ns2/named.conf.j2
similarity index 100%
rename from bin/tests/system/case/ns2/named.conf.in
rename to bin/tests/system/case/ns2/named.conf.j2
diff --git a/bin/tests/system/case/setup.sh b/bin/tests/system/case/setup.sh
deleted file mode 100644
index c9de4ee81c..0000000000
--- a/bin/tests/system/case/setup.sh
+++ /dev/null
@@ -1,18 +0,0 @@
-#!/bin/sh
-
-# 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.
-
-. ../conf.sh
-
-cp -f ns1/dynamic.db.in ns1/dynamic.db
-copy_setports ns1/named.conf.in ns1/named.conf
-copy_setports ns2/named.conf.in ns2/named.conf
diff --git a/bin/tests/system/checkconf/bad-kasp-keydir1.conf.in b/bin/tests/system/checkconf/bad-kasp-keydir1.conf.j2
similarity index 100%
rename from bin/tests/system/checkconf/bad-kasp-keydir1.conf.in
rename to bin/tests/system/checkconf/bad-kasp-keydir1.conf.j2
diff --git a/bin/tests/system/checkconf/bad-kasp-keydir2.conf.in b/bin/tests/system/checkconf/bad-kasp-keydir2.conf.j2
similarity index 100%
rename from bin/tests/system/checkconf/bad-kasp-keydir2.conf.in
rename to bin/tests/system/checkconf/bad-kasp-keydir2.conf.j2
diff --git a/bin/tests/system/checkconf/bad-kasp-keydir3.conf.in b/bin/tests/system/checkconf/bad-kasp-keydir3.conf.j2
similarity index 100%
rename from bin/tests/system/checkconf/bad-kasp-keydir3.conf.in
rename to bin/tests/system/checkconf/bad-kasp-keydir3.conf.j2
diff --git a/bin/tests/system/checkconf/bad-kasp-keydir4.conf.in b/bin/tests/system/checkconf/bad-kasp-keydir4.conf.j2
similarity index 100%
rename from bin/tests/system/checkconf/bad-kasp-keydir4.conf.in
rename to bin/tests/system/checkconf/bad-kasp-keydir4.conf.j2
diff --git a/bin/tests/system/checkconf/bad-kasp-keydir5.conf.in b/bin/tests/system/checkconf/bad-kasp-keydir5.conf.j2
similarity index 100%
rename from bin/tests/system/checkconf/bad-kasp-keydir5.conf.in
rename to bin/tests/system/checkconf/bad-kasp-keydir5.conf.j2
diff --git a/bin/tests/system/checkconf/bad-tsig.conf.in b/bin/tests/system/checkconf/bad-tsig.conf.j2
similarity index 100%
rename from bin/tests/system/checkconf/bad-tsig.conf.in
rename to bin/tests/system/checkconf/bad-tsig.conf.j2
diff --git a/bin/tests/system/checkconf/good-server-christmas-tree.conf.in b/bin/tests/system/checkconf/good-server-christmas-tree.conf
similarity index 100%
rename from bin/tests/system/checkconf/good-server-christmas-tree.conf.in
rename to bin/tests/system/checkconf/good-server-christmas-tree.conf
diff --git a/bin/tests/system/checkconf/good.conf.in b/bin/tests/system/checkconf/good.conf.j2
similarity index 100%
rename from bin/tests/system/checkconf/good.conf.in
rename to bin/tests/system/checkconf/good.conf.j2
diff --git a/bin/tests/system/checkconf/setup.sh b/bin/tests/system/checkconf/setup.sh
deleted file mode 100644
index 77707226c9..0000000000
--- a/bin/tests/system/checkconf/setup.sh
+++ /dev/null
@@ -1,22 +0,0 @@
-#!/bin/sh
-# 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.
-
-. ../conf.sh
-
-copy_setports bad-kasp-keydir1.conf.in bad-kasp-keydir1.conf
-copy_setports bad-kasp-keydir2.conf.in bad-kasp-keydir2.conf
-copy_setports bad-kasp-keydir3.conf.in bad-kasp-keydir3.conf
-copy_setports bad-kasp-keydir4.conf.in bad-kasp-keydir4.conf
-copy_setports bad-kasp-keydir5.conf.in bad-kasp-keydir5.conf
-copy_setports bad-tsig.conf.in bad-tsig.conf
-copy_setports good.conf.in good.conf
-cp -f good-server-christmas-tree.conf.in good-server-christmas-tree.conf
diff --git a/bin/tests/system/checknames/ns1/fail.example.db.in b/bin/tests/system/checknames/ns1/fail.example.db
similarity index 100%
rename from bin/tests/system/checknames/ns1/fail.example.db.in
rename to bin/tests/system/checknames/ns1/fail.example.db
diff --git a/bin/tests/system/checknames/ns1/fail.update.db.in b/bin/tests/system/checknames/ns1/fail.update.db
similarity index 100%
rename from bin/tests/system/checknames/ns1/fail.update.db.in
rename to bin/tests/system/checknames/ns1/fail.update.db
diff --git a/bin/tests/system/checknames/ns1/ignore.example.db.in b/bin/tests/system/checknames/ns1/ignore.example.db
similarity index 100%
rename from bin/tests/system/checknames/ns1/ignore.example.db.in
rename to bin/tests/system/checknames/ns1/ignore.example.db
diff --git a/bin/tests/system/checknames/ns1/ignore.update.db.in b/bin/tests/system/checknames/ns1/ignore.update.db
similarity index 100%
rename from bin/tests/system/checknames/ns1/ignore.update.db.in
rename to bin/tests/system/checknames/ns1/ignore.update.db
diff --git a/bin/tests/system/checknames/ns1/named.conf.in b/bin/tests/system/checknames/ns1/named.conf.j2
similarity index 100%
rename from bin/tests/system/checknames/ns1/named.conf.in
rename to bin/tests/system/checknames/ns1/named.conf.j2
diff --git a/bin/tests/system/checknames/ns1/warn.example.db.in b/bin/tests/system/checknames/ns1/warn.example.db
similarity index 100%
rename from bin/tests/system/checknames/ns1/warn.example.db.in
rename to bin/tests/system/checknames/ns1/warn.example.db
diff --git a/bin/tests/system/checknames/ns1/warn.update.db.in b/bin/tests/system/checknames/ns1/warn.update.db
similarity index 100%
rename from bin/tests/system/checknames/ns1/warn.update.db.in
rename to bin/tests/system/checknames/ns1/warn.update.db
diff --git a/bin/tests/system/checknames/ns2/named.conf.in b/bin/tests/system/checknames/ns2/named.conf.j2
similarity index 100%
rename from bin/tests/system/checknames/ns2/named.conf.in
rename to bin/tests/system/checknames/ns2/named.conf.j2
diff --git a/bin/tests/system/checknames/ns3/named.conf.in b/bin/tests/system/checknames/ns3/named.conf.j2
similarity index 100%
rename from bin/tests/system/checknames/ns3/named.conf.in
rename to bin/tests/system/checknames/ns3/named.conf.j2
diff --git a/bin/tests/system/checknames/ns4/named.conf.in b/bin/tests/system/checknames/ns4/named.conf.j2
similarity index 100%
rename from bin/tests/system/checknames/ns4/named.conf.in
rename to bin/tests/system/checknames/ns4/named.conf.j2
diff --git a/bin/tests/system/checknames/ns4/primary-ignore.update.db.in b/bin/tests/system/checknames/ns4/primary-ignore.update.db
similarity index 100%
rename from bin/tests/system/checknames/ns4/primary-ignore.update.db.in
rename to bin/tests/system/checknames/ns4/primary-ignore.update.db
diff --git a/bin/tests/system/checknames/ns5/master-ignore.update.db.in b/bin/tests/system/checknames/ns5/master-ignore.update.db
similarity index 100%
rename from bin/tests/system/checknames/ns5/master-ignore.update.db.in
rename to bin/tests/system/checknames/ns5/master-ignore.update.db
diff --git a/bin/tests/system/checknames/ns5/named.conf.in b/bin/tests/system/checknames/ns5/named.conf.j2
similarity index 100%
rename from bin/tests/system/checknames/ns5/named.conf.in
rename to bin/tests/system/checknames/ns5/named.conf.j2
diff --git a/bin/tests/system/checknames/setup.sh b/bin/tests/system/checknames/setup.sh
deleted file mode 100644
index 25f05ef33f..0000000000
--- a/bin/tests/system/checknames/setup.sh
+++ /dev/null
@@ -1,32 +0,0 @@
-#!/bin/sh
-
-# 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.
-
-. ../conf.sh
-
-copy_setports ns1/named.conf.in ns1/named.conf
-copy_setports ns2/named.conf.in ns2/named.conf
-copy_setports ns3/named.conf.in ns3/named.conf
-copy_setports ns4/named.conf.in ns4/named.conf
-copy_setports ns5/named.conf.in ns5/named.conf
-
-cp ns1/ignore.example.db.in ns1/ignore.example.db
-cp ns1/warn.example.db.in ns1/warn.example.db
-cp ns1/fail.example.db.in ns1/fail.example.db
-
-cp ns1/ignore.update.db.in ns1/ignore.update.db
-cp ns1/warn.update.db.in ns1/warn.update.db
-cp ns1/fail.update.db.in ns1/fail.update.db
-
-cp ns4/primary-ignore.update.db.in ns4/primary-ignore.update.db
-
-cp ns5/master-ignore.update.db.in ns5/master-ignore.update.db
diff --git a/bin/tests/system/dnstap/ns1/named.conf.in b/bin/tests/system/dnstap/ns1/named.conf.j2
similarity index 100%
rename from bin/tests/system/dnstap/ns1/named.conf.in
rename to bin/tests/system/dnstap/ns1/named.conf.j2
diff --git a/bin/tests/system/dnstap/ns2/example.db.in b/bin/tests/system/dnstap/ns2/example.db.j2
similarity index 100%
rename from bin/tests/system/dnstap/ns2/example.db.in
rename to bin/tests/system/dnstap/ns2/example.db.j2
diff --git a/bin/tests/system/dnstap/ns2/named.conf.in b/bin/tests/system/dnstap/ns2/named.conf.j2
similarity index 100%
rename from bin/tests/system/dnstap/ns2/named.conf.in
rename to bin/tests/system/dnstap/ns2/named.conf.j2
diff --git a/bin/tests/system/dnstap/ns3/named.conf.in b/bin/tests/system/dnstap/ns3/named.conf.j2
similarity index 100%
rename from bin/tests/system/dnstap/ns3/named.conf.in
rename to bin/tests/system/dnstap/ns3/named.conf.j2
diff --git a/bin/tests/system/dnstap/ns4/named.conf.in b/bin/tests/system/dnstap/ns4/named.conf.j2
similarity index 100%
rename from bin/tests/system/dnstap/ns4/named.conf.in
rename to bin/tests/system/dnstap/ns4/named.conf.j2
diff --git a/bin/tests/system/dnstap/setup.sh b/bin/tests/system/dnstap/setup.sh
deleted file mode 100644
index 90a257e391..0000000000
--- a/bin/tests/system/dnstap/setup.sh
+++ /dev/null
@@ -1,21 +0,0 @@
-#!/bin/sh
-
-# 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.
-
-. ../conf.sh
-
-copy_setports ns1/named.conf.in ns1/named.conf
-copy_setports ns2/named.conf.in ns2/named.conf
-copy_setports ns3/named.conf.in ns3/named.conf
-copy_setports ns4/named.conf.in ns4/named.conf
-
-cp ns2/example.db.in ns2/example.db