diff --git a/bin/tests/.gitignore b/bin/tests/.gitignore
index cb5d4521d5..c60329dd75 100644
--- a/bin/tests/.gitignore
+++ b/bin/tests/.gitignore
@@ -3,7 +3,6 @@ genrandom
 headerdep_test.sh
 nxtify
 sdig
-t_journal
 *_test
 t_atomic
 t_db
diff --git a/bin/tests/Makefile.in b/bin/tests/Makefile.in
index 6e312887a2..d69c998284 100644
--- a/bin/tests/Makefile.in
+++ b/bin/tests/Makefile.in
@@ -33,237 +33,30 @@ ISCCFGDEPLIBS = ../../lib/isccfg/libisccfg.@A@
 LIBS =		@LIBS@
 
 SUBDIR =	atomic db dst master mem hashes names net rbt resolver \
-		sockaddr tasks timers system @PKCS11_TOOLS@
+		sockaddr tasks timers system @PKCS11_TOOLS@ optional
 
 TESTDIRS =	system
 
 # Test programs that are built by default:
 # cfg_test is needed for regenerating doc/misc/options
 # makejournal is needed by system tests
+# wire_test is needed for fuzz testing
+# other opptional test programs have been moved to ./optional
 
 # Alphabetically
-TARGETS =	@XTARGETS@ cfg_test@EXEEXT@ makejournal@EXEEXT@ \
+TARGETS =	cfg_test@EXEEXT@ makejournal@EXEEXT@ \
 		wire_test@EXEEXT@
 
-# All the other tests are optional and not built by default.
-
-# Alphabetically
-XTARGETS =	adb_test@EXEEXT@ \
-		byaddr_test@EXEEXT@ \
-		backtrace_test@EXEEXT@ \
-		backtrace_test_nosymtbl@EXEEXT@ \
-		byname_test@EXEEXT@ \
-		db_test@EXEEXT@ \
-		entropy_test@EXEEXT@ \
-		entropy2_test@EXEEXT@ \
-		hash_test@EXEEXT@ \
-		fsaccess_test@EXEEXT@ \
-		inter_test@EXEEXT@ \
-		keyboard_test@EXEEXT@ \
-		lex_test@EXEEXT@ \
-		lfsr_test@EXEEXT@ \
-		log_test@EXEEXT@ \
-		master_test@EXEEXT@ \
-		mempool_test@EXEEXT@ \
-		name_test@EXEEXT@ \
-		nsecify@EXEEXT@ \
-		ratelimiter_test@EXEEXT@ \
-		rbt_test@EXEEXT@ \
-		rwlock_test@EXEEXT@ \
-		serial_test@EXEEXT@ \
-		shutdown_test@EXEEXT@ \
-		sig0_test@EXEEXT@ \
-		sock_test@EXEEXT@ \
-		sym_test@EXEEXT@ \
-		task_test@EXEEXT@ \
-		timer_test@EXEEXT@ \
-		wire_test@EXEEXT@ \
-		zone_test@EXEEXT@
-
-# Alphabetically
-SRCS =		cfg_test.c makejournal.c wire_test.c ${XSRCS}
-
-XSRCS =		adb_test.c \
-		byaddr_test.c \
-		backtrace_test.c \
-		byname_test.c \
-		db_test.c \
-		entropy_test.c \
-		entropy2_test.c \
-		hash_test.c \
-		fsaccess_test.c \
-		inter_test.c \
-		keyboard_test.c \
-		lex_test.c \
-		lfsr_test.c \
-		log_test.c \
-		master_test.c \
-		mempool_test.c \
-		name_test.c \
-		nsecify.c \
-		ratelimiter_test.c \
-		rbt_test.c \
-		rwlock_test.c \
-		serial_test.c \
-		shutdown_test.c \
-		sig0_test.c \
-		sock_test.c \
-		sym_test.c \
-		task_test.c \
-		timer_test.c \
-		wire_test.c \
-		zone_test.c
+SRCS =		cfg_test.c makejournal.c wire_test.c
 
 @BIND9_MAKE_RULES@
 
-# disable optimization for backtrace test to get the expected result
-BTTEST_CFLAGS =	${BACKTRACECFLAGS} ${EXT_CFLAGS} ${ALL_CPPFLAGS} -g \
-		${ALWAYS_WARNINGS} ${STD_CWARNINGS} ${CWARNINGS}
-
-all_tests: ${XTARGETS}
-
-adb_test@EXEEXT@: adb_test.@O@ ${ISCDEPLIBS} ${DNSDEPLIBS}
-	${LIBTOOL_MODE_LINK} ${PURIFY} ${CC} ${CFLAGS} ${LDFLAGS} -o $@ adb_test.@O@ \
-		${DNSLIBS} ${ISCLIBS} ${LIBS}
-
-backtrace_test_nosymtbl@EXEEXT@: ${srcdir}/backtrace_test.c ${ISCDEPLIBS}
-	${LIBTOOL_MODE_LINK} ${PURIFY} ${CC} ${BTTEST_CFLAGS} ${LDFLAGS} -o $@ \
-	${srcdir}/backtrace_test.c ${ISCLIBS} ${LIBS}
-
-backtrace_test@EXEEXT@: ${srcdir}/backtrace_test.c backtrace_test_nosymtbl@EXEEXT@
-	#first step: create a first symbol table
-	rm -f symtbl.c
-	if test X${MKSYMTBL_PROGRAM} != X; then \
-	${MKSYMTBL_PROGRAM} ${top_srcdir}/util/mksymtbl.pl \
-	backtrace_test_nosymtbl@EXEEXT@; else \
-	cp ${top_srcdir}/lib/isc/backtrace-emptytbl.c symtbl.c; fi
-	#second step: build a binary with the first symbol table
-	${LIBTOOL_MODE_LINK} ${PURIFY} ${CC} ${BTTEST_CFLAGS} ${LDFLAGS} \
-	-o $@0 ${srcdir}/backtrace_test.c symtbl.c \
-	${ISCNOSYMLIBS} ${LIBS}
-	rm -f symtbl.c
-	#third step: create a second symbol table
-	if test X${MKSYMTBL_PROGRAM} != X; then \
-	${MKSYMTBL_PROGRAM} ${top_srcdir}/util/mksymtbl.pl $@0; else \
-	cp ${top_srcdir}/lib/isc/backtrace-emptytbl.c symtbl.c; fi
-	#fourth step: build the final binary
-	rm -f $@0
-	${LIBTOOL_MODE_LINK} ${PURIFY} ${CC} ${BTTEST_CFLAGS} ${LDFLAGS} \
-	-o $@ ${srcdir}/backtrace_test.c symtbl.c ${ISCNOSYMLIBS} ${LIBS}
-	rm -f symtbl.c
-
-nsecify@EXEEXT@: nsecify.@O@ ${ISCDEPLIBS} ${DNSDEPLIBS}
-	${LIBTOOL_MODE_LINK} ${PURIFY} ${CC} ${CFLAGS} ${LDFLAGS} -o $@ nsecify.@O@ \
-		${DNSLIBS} ${ISCLIBS} ${LIBS}
-
-byaddr_test@EXEEXT@: byaddr_test.@O@ ${ISCDEPLIBS} ${DNSDEPLIBS}
-	${LIBTOOL_MODE_LINK} ${PURIFY} ${CC} ${CFLAGS} ${LDFLAGS} -o $@ byaddr_test.@O@ \
-		${DNSLIBS} ${ISCLIBS} ${LIBS}
-
-byname_test@EXEEXT@: byname_test.@O@ ${ISCDEPLIBS} ${DNSDEPLIBS}
-	${LIBTOOL_MODE_LINK} ${PURIFY} ${CC} ${CFLAGS} ${LDFLAGS} -o $@ byname_test.@O@ \
-		${DNSLIBS} ${ISCLIBS} ${LIBS}
-
-lex_test@EXEEXT@: lex_test.@O@ ${ISCDEPLIBS}
-	${LIBTOOL_MODE_LINK} ${PURIFY} ${CC} ${CFLAGS} ${LDFLAGS} -o $@ lex_test.@O@ \
-		${ISCLIBS} ${LIBS}
-
-lfsr_test@EXEEXT@: lfsr_test.@O@ ${ISCDEPLIBS}
-	${LIBTOOL_MODE_LINK} ${PURIFY} ${CC} ${CFLAGS} ${LDFLAGS} -o $@ lfsr_test.@O@ \
-		${ISCLIBS} ${LIBS}
-
-log_test@EXEEXT@: log_test.@O@ ${ISCDEPLIBS} ${DNSDEPLIBS}
-	${LIBTOOL_MODE_LINK} ${PURIFY} ${CC} ${CFLAGS} ${LDFLAGS} -o $@ log_test.@O@ \
-		${DNSLIBS} ${ISCLIBS} ${LIBS}
-
-name_test@EXEEXT@: name_test.@O@ ${ISCDEPLIBS} ${DNSDEPLIBS}
-	${LIBTOOL_MODE_LINK} ${PURIFY} ${CC} ${CFLAGS} ${LDFLAGS} -o $@ name_test.@O@ \
-		${DNSLIBS} ${ISCLIBS} ${LIBS}
-
-hash_test@EXEEXT@: hash_test.@O@ ${ISCDEPLIBS}
-	${LIBTOOL_MODE_LINK} ${PURIFY} ${CC} ${CFLAGS} ${LDFLAGS} -o $@ hash_test.@O@ \
-		${ISCLIBS} ${LIBS}
-
-entropy_test@EXEEXT@: entropy_test.@O@ ${ISCDEPLIBS}
-	${LIBTOOL_MODE_LINK} ${PURIFY} ${CC} ${CFLAGS} ${LDFLAGS} -o $@ entropy_test.@O@ \
-		${ISCLIBS} ${LIBS}
-
-entropy2_test@EXEEXT@: entropy2_test.@O@ ${ISCDEPLIBS}
-	${LIBTOOL_MODE_LINK} ${PURIFY} ${CC} ${CFLAGS} ${LDFLAGS} -o $@ entropy2_test.@O@ \
-		${ISCLIBS} ${LIBS}
-
-sock_test@EXEEXT@: sock_test.@O@ ${ISCDEPLIBS}
-	${LIBTOOL_MODE_LINK} ${PURIFY} ${CC} ${CFLAGS} ${LDFLAGS} -o $@ sock_test.@O@ \
-		${ISCLIBS} ${LIBS}
-
-sym_test@EXEEXT@: sym_test.@O@ ${ISCDEPLIBS}
-	${LIBTOOL_MODE_LINK} ${PURIFY} ${CC} ${CFLAGS} ${LDFLAGS} -o $@ sym_test.@O@ \
-		${ISCLIBS} ${LIBS}
-
-task_test@EXEEXT@: task_test.@O@ ${ISCDEPLIBS}
-	${LIBTOOL_MODE_LINK} ${PURIFY} ${CC} ${CFLAGS} ${LDFLAGS} -o $@ task_test.@O@ \
-		${ISCLIBS} ${LIBS}
-
-shutdown_test@EXEEXT@: shutdown_test.@O@ ${ISCDEPLIBS}
-	${LIBTOOL_MODE_LINK} ${PURIFY} ${CC} ${CFLAGS} ${LDFLAGS} -o $@ shutdown_test.@O@ \
-		${ISCLIBS} ${LIBS}
-
-timer_test@EXEEXT@: timer_test.@O@ ${ISCDEPLIBS}
-	${LIBTOOL_MODE_LINK} ${PURIFY} ${CC} ${CFLAGS} ${LDFLAGS} -o $@ timer_test.@O@ \
-		${ISCLIBS} ${LIBS}
-
-ratelimiter_test@EXEEXT@: ratelimiter_test.@O@ ${ISCDEPLIBS} ${DNSDEPLIBS}
-	${LIBTOOL_MODE_LINK} ${PURIFY} ${CC} ${CFLAGS} ${LDFLAGS} -o $@ ratelimiter_test.@O@ \
-		${DNSLIBS} ${ISCLIBS} ${LIBS}
-
-rbt_test@EXEEXT@: rbt_test.@O@ ${ISCDEPLIBS} ${DNSDEPLIBS}
-	${LIBTOOL_MODE_LINK} ${PURIFY} ${CC} ${CFLAGS} ${LDFLAGS} -o $@ rbt_test.@O@ \
-		${DNSLIBS} ${ISCLIBS} ${LIBS}
-
-rwlock_test@EXEEXT@: rwlock_test.@O@ ${ISCDEPLIBS}
-	${LIBTOOL_MODE_LINK} ${PURIFY} ${CC} ${CFLAGS} ${LDFLAGS} -o $@ rwlock_test.@O@ \
-		${ISCLIBS} ${LIBS}
+all_tests: subdirs
 
 wire_test@EXEEXT@: wire_test.@O@ ${ISCDEPLIBS} ${DNSDEPLIBS}
 	${LIBTOOL_MODE_LINK} ${PURIFY} ${CC} ${CFLAGS} ${LDFLAGS} -o $@ wire_test.@O@ \
 		${DNSLIBS} ${ISCLIBS} ${LIBS}
 
-master_test@EXEEXT@: master_test.@O@ ${ISCDEPLIBS} ${DNSDEPLIBS}
-	${LIBTOOL_MODE_LINK} ${PURIFY} ${CC} ${CFLAGS} ${LDFLAGS} -o $@ master_test.@O@ \
-		${DNSLIBS} ${ISCLIBS} ${LIBS}
-
-db_test@EXEEXT@: db_test.@O@ ${ISCDEPLIBS} ${DNSDEPLIBS}
-	${LIBTOOL_MODE_LINK} ${PURIFY} ${CC} ${CFLAGS} ${LDFLAGS} -o $@ db_test.@O@ \
-		${DNSLIBS} ${ISCLIBS} ${LIBS}
-
-mempool_test@EXEEXT@: mempool_test.@O@ ${ISCDEPLIBS}
-	${LIBTOOL_MODE_LINK} ${PURIFY} ${CC} ${CFLAGS} ${LDFLAGS} -o $@ mempool_test.@O@ \
-		${ISCLIBS} ${LIBS}
-
-serial_test@EXEEXT@: serial_test.@O@ ${ISCDEPLIBS}
-	${LIBTOOL_MODE_LINK} ${PURIFY} ${CC} ${CFLAGS} ${LDFLAGS} -o $@ serial_test.@O@ \
-		${ISCLIBS} ${LIBS}
-
-zone_test@EXEEXT@: zone_test.@O@ ${ISCDEPLIBS} ${DNSDEPLIBS}
-	${LIBTOOL_MODE_LINK} ${PURIFY} ${CC} ${CFLAGS} ${LDFLAGS} -o $@ zone_test.@O@ \
-		${DNSLIBS} ${ISCLIBS} ${LIBS}
-
-fsaccess_test@EXEEXT@: fsaccess_test.@O@ ${ISCDEPLIBS}
-	${LIBTOOL_MODE_LINK} ${PURIFY} ${CC} ${CFLAGS} ${LDFLAGS} -o $@ fsaccess_test.@O@ \
-		${ISCLIBS} ${LIBS}
-
-inter_test@EXEEXT@: inter_test.@O@ ${ISCDEPLIBS}
-	${LIBTOOL_MODE_LINK} ${PURIFY} ${CC} ${CFLAGS} ${LDFLAGS} -o $@ inter_test.@O@ \
-		${ISCLIBS} ${LIBS}
-
-keyboard_test@EXEEXT@: keyboard_test.@O@ ${ISCDEPLIBS}
-	${LIBTOOL_MODE_LINK} ${PURIFY} ${CC} ${CFLAGS} ${LDFLAGS} -o $@ keyboard_test.@O@ \
-		${ISCLIBS} ${LIBS}
-
-sig0_test@EXEEXT@: sig0_test.@O@ ${ISCDEPLIBS} ${DNSDEPLIBS}
-	${LIBTOOL_MODE_LINK} ${PURIFY} ${CC} ${CFLAGS} ${LDFLAGS} -o $@ sig0_test.@O@ \
-		${DNSLIBS} ${ISCLIBS} ${LIBS}
-
 cfg_test@EXEEXT@: cfg_test.@O@ ${ISCCFGDEPLIBS} ${ISCDEPLIBS}
 	${LIBTOOL_MODE_LINK} ${CC} ${CFLAGS} ${LDFLAGS} -o $@ cfg_test.@O@ \
 		${ISCCFGLIBS} ${DNSLIBS} ${ISCLIBS} ${LIBS}
@@ -276,9 +69,7 @@ distclean::
 	rm -f headerdep_test.sh
 
 clean distclean::
-	rm -f ${TARGETS} ${XTARGETS}
-	rm -f t_journal
-	rm -f backtrace_test_symtbl.c
+	rm -f ${TARGETS}
 
 check: test
 
diff --git a/bin/tests/dst/Makefile.in b/bin/tests/dst/Makefile.in
index c408d9a009..ec802e82ff 100644
--- a/bin/tests/dst/Makefile.in
+++ b/bin/tests/dst/Makefile.in
@@ -14,9 +14,9 @@ top_srcdir =	@top_srcdir@
 @BIND9_MAKE_INCLUDES@
 
 CINCLUDES =	${TEST_INCLUDES} ${DNS_INCLUDES} \
-		${ISC_INCLUDES} @DST_OPENSSL_INC@ @DST_GSSAPI_INC@
+		${ISC_INCLUDES} @DST_OPENSSL_INC@
 
-CDEFINES =	@CRYPTO@ @USE_GSSAPI@
+CDEFINES =	@CRYPTO@
 CWARNINGS =
 
 DNSLIBS =	../../../lib/dns/libdns.@A@ @DNS_CRYPTO_LIBS@
@@ -31,24 +31,16 @@ LIBS =		${DNSLIBS} ${ISCLIBS} @LIBS@
 
 TLIB =		../../../lib/tests/libt_api.@A@
 
-TARGETS =	dst_test@EXEEXT@ t_dst@EXEEXT@ gsstest@EXEEXT@
+TARGETS =	t_dst@EXEEXT@
 
-SRCS =		dst_test.c t_dst.c gsstest.c
+SRCS =		t_dst.c
 
 @BIND9_MAKE_RULES@
 
-dst_test@EXEEXT@: dst_test.@O@ ${DEPLIBS}
-	${LIBTOOL_MODE_LINK} ${PURIFY} ${CC} ${CFLAGS} ${LDFLAGS} -o $@ \
-		dst_test.@O@ ${LIBS}
-
 t_dst@EXEEXT@: t_dst.@O@ ${DEPLIBS} ${TLIB}
 	${LIBTOOL_MODE_LINK} ${PURIFY} ${CC} ${CFLAGS} ${LDFLAGS} -o $@ \
 		t_dst.@O@ ${TLIB} ${LIBS}
 
-gsstest@EXEEXT@: gsstest.@O@ ${DEPLIBS}
-	${LIBTOOL_MODE_LINK} ${PURIFY} ${CC} ${CFLAGS} ${LDFLAGS} -o $@ \
-		gsstest.@O@ ${LIBS}
-
 test: t_dst@EXEEXT@ randomfile
 	../../tools/genrandom@EXEEXT@ 100 randomfile
 	-@ ./t_dst@EXEEXT@ -q 1800 -a
diff --git a/bin/tests/ndc.conf b/bin/tests/ndc.conf
deleted file mode 100644
index aa06c3eda3..0000000000
--- a/bin/tests/ndc.conf
+++ /dev/null
@@ -1,30 +0,0 @@
-/*
- * Copyright (C) Internet Systems Consortium, Inc. ("ISC")
- *
- * This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/.
- *
- * See the COPYRIGHT file distributed with this work for additional
- * information regarding copyright ownership.
- */
-
-/* $Id: ndc.conf,v 1.11 2007/06/19 23:46:59 tbox Exp $ */
-
-options {
-	default-server  "velo.jab.fr" ;
-#	[ default-key key_name; ]
-};
-
-server "velo.jab.fr" {
-	key "akey";
-	host "1.2.3.4";
-};
-
-include "ndc.conf-include";
-
-key "akey" {
-	algorithm "algo";
-	secret  "c2Vj";
-};
-
diff --git a/bin/tests/ndc.conf-include b/bin/tests/ndc.conf-include
deleted file mode 100644
index 8884d75ffa..0000000000
--- a/bin/tests/ndc.conf-include
+++ /dev/null
@@ -1,19 +0,0 @@
-/*
- * Copyright (C) Internet Systems Consortium, Inc. ("ISC")
- *
- * This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/.
- *
- * See the COPYRIGHT file distributed with this work for additional
- * information regarding copyright ownership.
- */
-
-/* $Id: ndc.conf-include,v 1.6 2007/06/19 23:46:59 tbox Exp $ */
-
-key "another-key" {
-	algorithm "al-gore-rhythm";
-	secret "R29yZSBpbiAyMDA0IQo"; # "Gore in 2004!"
-};
-
-
diff --git a/bin/tests/Kchild.example.+003+04017.key b/bin/tests/optional/Kchild.example.+003+04017.key
similarity index 100%
rename from bin/tests/Kchild.example.+003+04017.key
rename to bin/tests/optional/Kchild.example.+003+04017.key
diff --git a/bin/tests/Kchild.example.+003+04017.private b/bin/tests/optional/Kchild.example.+003+04017.private
similarity index 100%
rename from bin/tests/Kchild.example.+003+04017.private
rename to bin/tests/optional/Kchild.example.+003+04017.private
diff --git a/bin/tests/optional/Makefile.in b/bin/tests/optional/Makefile.in
new file mode 100644
index 0000000000..8cefb5a916
--- /dev/null
+++ b/bin/tests/optional/Makefile.in
@@ -0,0 +1,273 @@
+# Copyright (C) Internet Systems Consortium, Inc. ("ISC")
+#
+# This Source Code Form is subject to the terms of the Mozilla Public
+# License, v. 2.0. If a copy of the MPL was not distributed with this
+# file, You can obtain one at http://mozilla.org/MPL/2.0/.
+#
+# See the COPYRIGHT file distributed with this work for additional
+# information regarding copyright ownership.
+
+srcdir =	@srcdir@
+VPATH =		@srcdir@
+top_srcdir =	@top_srcdir@
+
+@BIND9_MAKE_INCLUDES@
+
+CINCLUDES =	${DNS_INCLUDES} ${ISC_INCLUDES} ${ISCCFG_INCLUDES} \
+		@DST_OPENSSL_INC@ @DST_GSSAPI_INC@
+
+CDEFINES =	@CRYPTO@ @USE_GSSAPI@
+
+CWARNINGS =
+BACKTRACECFLAGS = @BACKTRACECFLAGS@
+
+DNSLIBS =	../../../lib/dns/libdns.@A@ @DNS_CRYPTO_LIBS@
+ISCLIBS =	../../../lib/isc/libisc.@A@ @ISC_OPENSSL_LIBS@
+ISCNOSYMLIBS =	../../../lib/isc/libisc-nosymtbl.@A@ @ISC_OPENSSL_LIBS@
+ISCCFGLIBS = 	../../../lib/isccfg/libisccfg.@A@
+
+DNSDEPLIBS =	../../../lib/dns/libdns.@A@
+ISCDEPLIBS =	../../../lib/isc/libisc.@A@
+ISCDEPNOSYMLIBS = ../../../lib/isc/libisc-nosymtbl.@A@
+ISCCFGDEPLIBS = ../../../lib/isccfg/libisccfg.@A@
+
+LIBS =		@LIBS@
+
+SUBDIRS =
+
+# These programs are not built by default, but only when
+# configured with --enable-developer or built explicitly with
+# "make all_tests"
+
+TARGETS =	@XTARGETS@
+XTARGETS =	adb_test@EXEEXT@ \
+		byaddr_test@EXEEXT@ \
+		backtrace_test@EXEEXT@ \
+		backtrace_test_nosymtbl@EXEEXT@ \
+		byname_test@EXEEXT@ \
+		db_test@EXEEXT@ \
+		dst_test@EXEEXT@ \
+		entropy_test@EXEEXT@ \
+		entropy2_test@EXEEXT@ \
+		gsstest@EXEEXT@ \
+		hash_test@EXEEXT@ \
+		fsaccess_test@EXEEXT@ \
+		inter_test@EXEEXT@ \
+		keyboard_test@EXEEXT@ \
+		lex_test@EXEEXT@ \
+		lfsr_test@EXEEXT@ \
+		log_test@EXEEXT@ \
+		master_test@EXEEXT@ \
+		mempool_test@EXEEXT@ \
+		name_test@EXEEXT@ \
+		nsecify@EXEEXT@ \
+		ratelimiter_test@EXEEXT@ \
+		rbt_test@EXEEXT@ \
+		rwlock_test@EXEEXT@ \
+		serial_test@EXEEXT@ \
+		shutdown_test@EXEEXT@ \
+		sig0_test@EXEEXT@ \
+		sock_test@EXEEXT@ \
+		sym_test@EXEEXT@ \
+		task_test@EXEEXT@ \
+		timer_test@EXEEXT@ \
+		zone_test@EXEEXT@
+
+SRCS =		${XSRCS}
+XSRCS =		adb_test.c \
+		byaddr_test.c \
+		backtrace_test.c \
+		byname_test.c \
+		db_test.c \
+		dst_test.c \
+		entropy_test.c \
+		entropy2_test.c \
+		hash_test.c \
+		fsaccess_test.c \
+		gsstest.c \
+		inter_test.c \
+		keyboard_test.c \
+		lex_test.c \
+		lfsr_test.c \
+		log_test.c \
+		master_test.c \
+		mempool_test.c \
+		name_test.c \
+		nsecify.c \
+		ratelimiter_test.c \
+		rbt_test.c \
+		rwlock_test.c \
+		serial_test.c \
+		shutdown_test.c \
+		sig0_test.c \
+		sock_test.c \
+		sym_test.c \
+		task_test.c \
+		timer_test.c \
+		zone_test.c
+
+@BIND9_MAKE_RULES@
+
+# disable optimization for backtrace test to get the expected result
+BTTEST_CFLAGS =	${BACKTRACECFLAGS} ${EXT_CFLAGS} ${ALL_CPPFLAGS} -g \
+		${ALWAYS_WARNINGS} ${STD_CWARNINGS} ${CWARNINGS}
+
+all_tests: ${XTARGETS}
+
+adb_test@EXEEXT@: adb_test.@O@ ${ISCDEPLIBS} ${DNSDEPLIBS}
+	${LIBTOOL_MODE_LINK} ${PURIFY} ${CC} ${CFLAGS} ${LDFLAGS} -o $@ adb_test.@O@ \
+		${DNSLIBS} ${ISCLIBS} ${LIBS}
+
+backtrace_test_nosymtbl@EXEEXT@: ${srcdir}/backtrace_test.c ${ISCDEPLIBS}
+	${LIBTOOL_MODE_LINK} ${PURIFY} ${CC} ${BTTEST_CFLAGS} ${LDFLAGS} -o $@ \
+	${srcdir}/backtrace_test.c ${ISCLIBS} ${LIBS}
+
+backtrace_test@EXEEXT@: ${srcdir}/backtrace_test.c backtrace_test_nosymtbl@EXEEXT@
+	#first step: create a first symbol table
+	rm -f symtbl.c
+	if test X${MKSYMTBL_PROGRAM} != X; then \
+	${MKSYMTBL_PROGRAM} ${top_srcdir}/util/mksymtbl.pl \
+	backtrace_test_nosymtbl@EXEEXT@; else \
+	cp ${top_srcdir}/lib/isc/backtrace-emptytbl.c symtbl.c; fi
+	#second step: build a binary with the first symbol table
+	${LIBTOOL_MODE_LINK} ${PURIFY} ${CC} ${BTTEST_CFLAGS} ${LDFLAGS} \
+	-o $@0 ${srcdir}/backtrace_test.c symtbl.c \
+	${ISCNOSYMLIBS} ${LIBS}
+	rm -f symtbl.c
+	#third step: create a second symbol table
+	if test X${MKSYMTBL_PROGRAM} != X; then \
+	${MKSYMTBL_PROGRAM} ${top_srcdir}/util/mksymtbl.pl $@0; else \
+	cp ${top_srcdir}/lib/isc/backtrace-emptytbl.c symtbl.c; fi
+	#fourth step: build the final binary
+	rm -f $@0
+	${LIBTOOL_MODE_LINK} ${PURIFY} ${CC} ${BTTEST_CFLAGS} ${LDFLAGS} \
+	-o $@ ${srcdir}/backtrace_test.c symtbl.c ${ISCNOSYMLIBS} ${LIBS}
+	rm -f symtbl.c
+
+nsecify@EXEEXT@: nsecify.@O@ ${ISCDEPLIBS} ${DNSDEPLIBS}
+	${LIBTOOL_MODE_LINK} ${PURIFY} ${CC} ${CFLAGS} ${LDFLAGS} -o $@ nsecify.@O@ \
+		${DNSLIBS} ${ISCLIBS} ${LIBS}
+
+byaddr_test@EXEEXT@: byaddr_test.@O@ ${ISCDEPLIBS} ${DNSDEPLIBS}
+	${LIBTOOL_MODE_LINK} ${PURIFY} ${CC} ${CFLAGS} ${LDFLAGS} -o $@ byaddr_test.@O@ \
+		${DNSLIBS} ${ISCLIBS} ${LIBS}
+
+byname_test@EXEEXT@: byname_test.@O@ ${ISCDEPLIBS} ${DNSDEPLIBS}
+	${LIBTOOL_MODE_LINK} ${PURIFY} ${CC} ${CFLAGS} ${LDFLAGS} -o $@ byname_test.@O@ \
+		${DNSLIBS} ${ISCLIBS} ${LIBS}
+
+lex_test@EXEEXT@: lex_test.@O@ ${ISCDEPLIBS}
+	${LIBTOOL_MODE_LINK} ${PURIFY} ${CC} ${CFLAGS} ${LDFLAGS} -o $@ lex_test.@O@ \
+		${ISCLIBS} ${LIBS}
+
+lfsr_test@EXEEXT@: lfsr_test.@O@ ${ISCDEPLIBS}
+	${LIBTOOL_MODE_LINK} ${PURIFY} ${CC} ${CFLAGS} ${LDFLAGS} -o $@ lfsr_test.@O@ \
+		${ISCLIBS} ${LIBS}
+
+log_test@EXEEXT@: log_test.@O@ ${ISCDEPLIBS} ${DNSDEPLIBS}
+	${LIBTOOL_MODE_LINK} ${PURIFY} ${CC} ${CFLAGS} ${LDFLAGS} -o $@ log_test.@O@ \
+		${DNSLIBS} ${ISCLIBS} ${LIBS}
+
+name_test@EXEEXT@: name_test.@O@ ${ISCDEPLIBS} ${DNSDEPLIBS}
+	${LIBTOOL_MODE_LINK} ${PURIFY} ${CC} ${CFLAGS} ${LDFLAGS} -o $@ name_test.@O@ \
+		${DNSLIBS} ${ISCLIBS} ${LIBS}
+
+hash_test@EXEEXT@: hash_test.@O@ ${ISCDEPLIBS}
+	${LIBTOOL_MODE_LINK} ${PURIFY} ${CC} ${CFLAGS} ${LDFLAGS} -o $@ hash_test.@O@ \
+		${ISCLIBS} ${LIBS}
+
+entropy_test@EXEEXT@: entropy_test.@O@ ${ISCDEPLIBS}
+	${LIBTOOL_MODE_LINK} ${PURIFY} ${CC} ${CFLAGS} ${LDFLAGS} -o $@ entropy_test.@O@ \
+		${ISCLIBS} ${LIBS}
+
+entropy2_test@EXEEXT@: entropy2_test.@O@ ${ISCDEPLIBS}
+	${LIBTOOL_MODE_LINK} ${PURIFY} ${CC} ${CFLAGS} ${LDFLAGS} -o $@ entropy2_test.@O@ \
+		${ISCLIBS} ${LIBS}
+
+sock_test@EXEEXT@: sock_test.@O@ ${ISCDEPLIBS}
+	${LIBTOOL_MODE_LINK} ${PURIFY} ${CC} ${CFLAGS} ${LDFLAGS} -o $@ sock_test.@O@ \
+		${ISCLIBS} ${LIBS}
+
+sym_test@EXEEXT@: sym_test.@O@ ${ISCDEPLIBS}
+	${LIBTOOL_MODE_LINK} ${PURIFY} ${CC} ${CFLAGS} ${LDFLAGS} -o $@ sym_test.@O@ \
+		${ISCLIBS} ${LIBS}
+
+task_test@EXEEXT@: task_test.@O@ ${ISCDEPLIBS}
+	${LIBTOOL_MODE_LINK} ${PURIFY} ${CC} ${CFLAGS} ${LDFLAGS} -o $@ task_test.@O@ \
+		${ISCLIBS} ${LIBS}
+
+shutdown_test@EXEEXT@: shutdown_test.@O@ ${ISCDEPLIBS}
+	${LIBTOOL_MODE_LINK} ${PURIFY} ${CC} ${CFLAGS} ${LDFLAGS} -o $@ shutdown_test.@O@ \
+		${ISCLIBS} ${LIBS}
+
+timer_test@EXEEXT@: timer_test.@O@ ${ISCDEPLIBS}
+	${LIBTOOL_MODE_LINK} ${PURIFY} ${CC} ${CFLAGS} ${LDFLAGS} -o $@ timer_test.@O@ \
+		${ISCLIBS} ${LIBS}
+
+ratelimiter_test@EXEEXT@: ratelimiter_test.@O@ ${ISCDEPLIBS} ${DNSDEPLIBS}
+	${LIBTOOL_MODE_LINK} ${PURIFY} ${CC} ${CFLAGS} ${LDFLAGS} -o $@ ratelimiter_test.@O@ \
+		${DNSLIBS} ${ISCLIBS} ${LIBS}
+
+rbt_test@EXEEXT@: rbt_test.@O@ ${ISCDEPLIBS} ${DNSDEPLIBS}
+	${LIBTOOL_MODE_LINK} ${PURIFY} ${CC} ${CFLAGS} ${LDFLAGS} -o $@ rbt_test.@O@ \
+		${DNSLIBS} ${ISCLIBS} ${LIBS}
+
+rwlock_test@EXEEXT@: rwlock_test.@O@ ${ISCDEPLIBS}
+	${LIBTOOL_MODE_LINK} ${PURIFY} ${CC} ${CFLAGS} ${LDFLAGS} -o $@ rwlock_test.@O@ \
+		${ISCLIBS} ${LIBS}
+
+master_test@EXEEXT@: master_test.@O@ ${ISCDEPLIBS} ${DNSDEPLIBS}
+	${LIBTOOL_MODE_LINK} ${PURIFY} ${CC} ${CFLAGS} ${LDFLAGS} -o $@ master_test.@O@ \
+		${DNSLIBS} ${ISCLIBS} ${LIBS}
+
+db_test@EXEEXT@: db_test.@O@ ${ISCDEPLIBS} ${DNSDEPLIBS}
+	${LIBTOOL_MODE_LINK} ${PURIFY} ${CC} ${CFLAGS} ${LDFLAGS} -o $@ db_test.@O@ \
+		${DNSLIBS} ${ISCLIBS} ${LIBS}
+
+mempool_test@EXEEXT@: mempool_test.@O@ ${ISCDEPLIBS}
+	${LIBTOOL_MODE_LINK} ${PURIFY} ${CC} ${CFLAGS} ${LDFLAGS} -o $@ mempool_test.@O@ \
+		${ISCLIBS} ${LIBS}
+
+serial_test@EXEEXT@: serial_test.@O@ ${ISCDEPLIBS}
+	${LIBTOOL_MODE_LINK} ${PURIFY} ${CC} ${CFLAGS} ${LDFLAGS} -o $@ serial_test.@O@ \
+		${ISCLIBS} ${LIBS}
+
+zone_test@EXEEXT@: zone_test.@O@ ${ISCDEPLIBS} ${DNSDEPLIBS}
+	${LIBTOOL_MODE_LINK} ${PURIFY} ${CC} ${CFLAGS} ${LDFLAGS} -o $@ zone_test.@O@ \
+		${DNSLIBS} ${ISCLIBS} ${LIBS}
+
+fsaccess_test@EXEEXT@: fsaccess_test.@O@ ${ISCDEPLIBS}
+	${LIBTOOL_MODE_LINK} ${PURIFY} ${CC} ${CFLAGS} ${LDFLAGS} -o $@ fsaccess_test.@O@ \
+		${ISCLIBS} ${LIBS}
+
+inter_test@EXEEXT@: inter_test.@O@ ${ISCDEPLIBS}
+	${LIBTOOL_MODE_LINK} ${PURIFY} ${CC} ${CFLAGS} ${LDFLAGS} -o $@ inter_test.@O@ \
+		${ISCLIBS} ${LIBS}
+
+keyboard_test@EXEEXT@: keyboard_test.@O@ ${ISCDEPLIBS}
+	${LIBTOOL_MODE_LINK} ${PURIFY} ${CC} ${CFLAGS} ${LDFLAGS} -o $@ keyboard_test.@O@ \
+		${ISCLIBS} ${LIBS}
+
+sig0_test@EXEEXT@: sig0_test.@O@ ${ISCDEPLIBS} ${DNSDEPLIBS}
+	${LIBTOOL_MODE_LINK} ${PURIFY} ${CC} ${CFLAGS} ${LDFLAGS} -o $@ sig0_test.@O@ \
+		${DNSLIBS} ${ISCLIBS} ${LIBS}
+
+dst_test@EXEEXT@: dst_test.@O@ ${ISCDEPLIBS} ${DNSDEPLIBS}
+	${LIBTOOL_MODE_LINK} ${PURIFY} ${CC} ${CFLAGS} ${LDFLAGS} \
+		-o $@ dst_test.@O@ ${DNSLIBS} ${ISCLIBS} ${LIBS}
+
+gsstest@EXEEXT@: gsstest.@O@ ${ISCDEPLIBS} ${DNSDEPLIBS}
+	${LIBTOOL_MODE_LINK} ${PURIFY} ${CC} ${CFLAGS} ${LDFLAGS} \
+		-o $@ gsstest.@O@ ${DNSLIBS} ${ISCLIBS} ${LIBS}
+
+clean distclean::
+	rm -f ${TARGETS} ${XTARGETS}
+	rm -f backtrace_test_symtbl.c
+
+check: test
+
+test:
+	@for dir in $(TESTDIRS) ;\
+	do \
+		( cd $$dir; $(MAKE) test ) ;\
+	done
diff --git a/bin/tests/adb_test.c b/bin/tests/optional/adb_test.c
similarity index 99%
rename from bin/tests/adb_test.c
rename to bin/tests/optional/adb_test.c
index 4f0b3b34ed..9cd96a4a7a 100644
--- a/bin/tests/adb_test.c
+++ b/bin/tests/optional/adb_test.c
@@ -9,8 +9,6 @@
  * information regarding copyright ownership.
  */
 
-/* $Id: adb_test.c,v 1.73 2011/08/30 23:46:51 tbox Exp $ */
-
 /*! \file */
 
 #include <config.h>
diff --git a/bin/tests/backtrace_test.c b/bin/tests/optional/backtrace_test.c
similarity index 96%
rename from bin/tests/backtrace_test.c
rename to bin/tests/optional/backtrace_test.c
index f18d9ed1a6..cd89a68b5f 100644
--- a/bin/tests/backtrace_test.c
+++ b/bin/tests/optional/backtrace_test.c
@@ -9,8 +9,6 @@
  * information regarding copyright ownership.
  */
 
-/* $Id: backtrace_test.c,v 1.4 2009/09/02 23:48:01 tbox Exp $ */
-
 #include <config.h>
 
 #include <stdio.h>
diff --git a/bin/tests/byaddr_test.c b/bin/tests/optional/byaddr_test.c
similarity index 98%
rename from bin/tests/byaddr_test.c
rename to bin/tests/optional/byaddr_test.c
index ba3ab02a7c..39b8b253e9 100644
--- a/bin/tests/byaddr_test.c
+++ b/bin/tests/optional/byaddr_test.c
@@ -9,8 +9,6 @@
  * information regarding copyright ownership.
  */
 
-/* $Id: byaddr_test.c,v 1.28 2007/06/19 23:46:59 tbox Exp $ */
-
 /*! \file
  * \author
  * Principal Author: Bob Halley
diff --git a/bin/tests/byname_test.c b/bin/tests/optional/byname_test.c
similarity index 99%
rename from bin/tests/byname_test.c
rename to bin/tests/optional/byname_test.c
index c5458a77ab..d4853c4760 100644
--- a/bin/tests/byname_test.c
+++ b/bin/tests/optional/byname_test.c
@@ -9,8 +9,6 @@
  * information regarding copyright ownership.
  */
 
-/* $Id: byname_test.c,v 1.33 2009/09/02 23:48:01 tbox Exp $ */
-
 /*! \file
  * \author
  * Principal Author: Bob Halley
diff --git a/bin/tests/db_test.c b/bin/tests/optional/db_test.c
similarity index 99%
rename from bin/tests/db_test.c
rename to bin/tests/optional/db_test.c
index f22cde5d64..bc5d08f9e1 100644
--- a/bin/tests/db_test.c
+++ b/bin/tests/optional/db_test.c
@@ -9,8 +9,6 @@
  * information regarding copyright ownership.
  */
 
-/* $Id: db_test.c,v 1.70 2011/08/29 23:46:44 tbox Exp $ */
-
 /*! \file
  * \author
  * Principal Author: Bob Halley
diff --git a/bin/tests/dst/dst_test.c b/bin/tests/optional/dst_test.c
similarity index 99%
rename from bin/tests/dst/dst_test.c
rename to bin/tests/optional/dst_test.c
index 867668b791..f2b1bc15bf 100644
--- a/bin/tests/dst/dst_test.c
+++ b/bin/tests/optional/dst_test.c
@@ -9,8 +9,6 @@
  * information regarding copyright ownership.
  */
 
-/* $Id: dst_test.c,v 1.46 2009/09/01 00:22:25 jinmei Exp $ */
-
 #include <config.h>
 
 #include <stdlib.h>
diff --git a/bin/tests/entropy2_test.c b/bin/tests/optional/entropy2_test.c
similarity index 98%
rename from bin/tests/entropy2_test.c
rename to bin/tests/optional/entropy2_test.c
index b1208e3e0d..d7ae39e4bd 100644
--- a/bin/tests/entropy2_test.c
+++ b/bin/tests/optional/entropy2_test.c
@@ -9,8 +9,6 @@
  * information regarding copyright ownership.
  */
 
-/* $Id: entropy2_test.c,v 1.16 2007/06/19 23:46:59 tbox Exp $ */
-
 /*! \file */
 
 #include <config.h>
@@ -167,4 +165,3 @@ main(int argc, char **argv) {
 
 	return (0);
 }
-
diff --git a/bin/tests/entropy_test.c b/bin/tests/optional/entropy_test.c
similarity index 97%
rename from bin/tests/entropy_test.c
rename to bin/tests/optional/entropy_test.c
index e2656403df..ffe2a47b18 100644
--- a/bin/tests/entropy_test.c
+++ b/bin/tests/optional/entropy_test.c
@@ -9,8 +9,6 @@
  * information regarding copyright ownership.
  */
 
-/* $Id: entropy_test.c,v 1.23 2007/06/19 23:46:59 tbox Exp $ */
-
 /*! \file */
 
 #include <config.h>
@@ -132,4 +130,3 @@ main(int argc, char **argv) {
 
 	return (0);
 }
-
diff --git a/bin/tests/fsaccess_test.c b/bin/tests/optional/fsaccess_test.c
similarity index 95%
rename from bin/tests/fsaccess_test.c
rename to bin/tests/optional/fsaccess_test.c
index d2bd440453..f2e4c24f64 100644
--- a/bin/tests/fsaccess_test.c
+++ b/bin/tests/optional/fsaccess_test.c
@@ -9,8 +9,6 @@
  * information regarding copyright ownership.
  */
 
-/* $Id: fsaccess_test.c,v 1.13 2007/06/19 23:46:59 tbox Exp $ */
-
 /*! \file */
 
 #include <config.h>
diff --git a/bin/tests/dst/gsstest.c b/bin/tests/optional/gsstest.c
similarity index 100%
rename from bin/tests/dst/gsstest.c
rename to bin/tests/optional/gsstest.c
diff --git a/bin/tests/hash_test.c b/bin/tests/optional/hash_test.c
similarity index 99%
rename from bin/tests/hash_test.c
rename to bin/tests/optional/hash_test.c
index 20d2dd3922..bf2891ad4c 100644
--- a/bin/tests/hash_test.c
+++ b/bin/tests/optional/hash_test.c
@@ -9,8 +9,6 @@
  * information regarding copyright ownership.
  */
 
-/* $Id: hash_test.c,v 1.19 2007/06/19 23:46:59 tbox Exp $ */
-
 /*! \file */
 #include <config.h>
 
diff --git a/bin/tests/inter_test.c b/bin/tests/optional/inter_test.c
similarity index 100%
rename from bin/tests/inter_test.c
rename to bin/tests/optional/inter_test.c
diff --git a/bin/tests/keyboard_test.c b/bin/tests/optional/keyboard_test.c
similarity index 95%
rename from bin/tests/keyboard_test.c
rename to bin/tests/optional/keyboard_test.c
index ab4be5ffac..085b314e02 100644
--- a/bin/tests/keyboard_test.c
+++ b/bin/tests/optional/keyboard_test.c
@@ -9,8 +9,6 @@
  * information regarding copyright ownership.
  */
 
-/* $Id: keyboard_test.c,v 1.13 2007/06/19 23:46:59 tbox Exp $ */
-
 /*! \file */
 #include <config.h>
 
@@ -67,4 +65,3 @@ main(int argc, char **argv) {
 
 	return (0);
 }
-
diff --git a/bin/tests/lex_test.c b/bin/tests/optional/lex_test.c
similarity index 98%
rename from bin/tests/lex_test.c
rename to bin/tests/optional/lex_test.c
index 4c9221b0a2..4631242602 100644
--- a/bin/tests/lex_test.c
+++ b/bin/tests/optional/lex_test.c
@@ -9,8 +9,6 @@
  * information regarding copyright ownership.
  */
 
-/* $Id: lex_test.c,v 1.23 2007/06/19 23:46:59 tbox Exp $ */
-
 /*! \file */
 #include <config.h>
 
diff --git a/bin/tests/lfsr_test.c b/bin/tests/optional/lfsr_test.c
similarity index 97%
rename from bin/tests/lfsr_test.c
rename to bin/tests/optional/lfsr_test.c
index adf2858265..af55a31abe 100644
--- a/bin/tests/lfsr_test.c
+++ b/bin/tests/optional/lfsr_test.c
@@ -9,8 +9,6 @@
  * information regarding copyright ownership.
  */
 
-/* $Id: lfsr_test.c,v 1.16 2007/06/19 23:46:59 tbox Exp $ */
-
 /*! \file */
 #include <config.h>
 
diff --git a/bin/tests/log_test.c b/bin/tests/optional/log_test.c
similarity index 99%
rename from bin/tests/log_test.c
rename to bin/tests/optional/log_test.c
index 93fb6b78e4..50807e8c02 100644
--- a/bin/tests/log_test.c
+++ b/bin/tests/optional/log_test.c
@@ -9,8 +9,6 @@
  * information regarding copyright ownership.
  */
 
-/* $Id: log_test.c,v 1.29 2011/08/28 23:46:51 marka Exp $ */
-
 /* Principal Authors: DCL */
 
 #include <config.h>
diff --git a/bin/tests/master_test.c b/bin/tests/optional/master_test.c
similarity index 97%
rename from bin/tests/master_test.c
rename to bin/tests/optional/master_test.c
index ae7c0a6518..8d021842ae 100644
--- a/bin/tests/master_test.c
+++ b/bin/tests/optional/master_test.c
@@ -9,8 +9,6 @@
  * information regarding copyright ownership.
  */
 
-/* $Id: master_test.c,v 1.32 2009/09/02 23:48:01 tbox Exp $ */
-
 #include <config.h>
 
 #include <stdlib.h>
diff --git a/bin/tests/mempool_test.c b/bin/tests/optional/mempool_test.c
similarity index 97%
rename from bin/tests/mempool_test.c
rename to bin/tests/optional/mempool_test.c
index 7074450f95..6a878f449c 100644
--- a/bin/tests/mempool_test.c
+++ b/bin/tests/optional/mempool_test.c
@@ -9,8 +9,6 @@
  * information regarding copyright ownership.
  */
 
-/* $Id: mempool_test.c,v 1.17 2007/06/19 23:46:59 tbox Exp $ */
-
 #include <config.h>
 
 #include <isc/mem.h>
diff --git a/bin/tests/name_test.c b/bin/tests/optional/name_test.c
similarity index 100%
rename from bin/tests/name_test.c
rename to bin/tests/optional/name_test.c
diff --git a/bin/tests/nsecify.c b/bin/tests/optional/nsecify.c
similarity index 98%
rename from bin/tests/nsecify.c
rename to bin/tests/optional/nsecify.c
index 4b06d1e085..5371bc4d44 100644
--- a/bin/tests/nsecify.c
+++ b/bin/tests/optional/nsecify.c
@@ -9,8 +9,6 @@
  * information regarding copyright ownership.
  */
 
-/* $Id: nsecify.c,v 1.12 2011/08/29 23:46:44 tbox Exp $ */
-
 #include <config.h>
 
 #include <stdlib.h>
diff --git a/bin/tests/ratelimiter_test.c b/bin/tests/optional/ratelimiter_test.c
similarity index 98%
rename from bin/tests/ratelimiter_test.c
rename to bin/tests/optional/ratelimiter_test.c
index 5fa5ed55dc..02eadace52 100644
--- a/bin/tests/ratelimiter_test.c
+++ b/bin/tests/optional/ratelimiter_test.c
@@ -9,8 +9,6 @@
  * information regarding copyright ownership.
  */
 
-/* $Id: ratelimiter_test.c,v 1.18 2007/06/19 23:46:59 tbox Exp $ */
-
 #include <config.h>
 
 #include <isc/app.h>
diff --git a/bin/tests/rbt_test.c b/bin/tests/optional/rbt_test.c
similarity index 99%
rename from bin/tests/rbt_test.c
rename to bin/tests/optional/rbt_test.c
index 4bec961b18..055586d747 100644
--- a/bin/tests/rbt_test.c
+++ b/bin/tests/optional/rbt_test.c
@@ -9,8 +9,6 @@
  * information regarding copyright ownership.
  */
 
-/* $Id: rbt_test.c,v 1.52 2011/08/28 23:46:41 tbox Exp $ */
-
 #include <config.h>
 
 #include <stdlib.h>
diff --git a/bin/tests/rbt_test.out b/bin/tests/optional/rbt_test.out
similarity index 100%
rename from bin/tests/rbt_test.out
rename to bin/tests/optional/rbt_test.out
diff --git a/bin/tests/rbt_test.txt b/bin/tests/optional/rbt_test.txt
similarity index 94%
rename from bin/tests/rbt_test.txt
rename to bin/tests/optional/rbt_test.txt
index 2acee1ee6c..4821c34c0f 100644
--- a/bin/tests/rbt_test.txt
+++ b/bin/tests/optional/rbt_test.txt
@@ -7,81 +7,79 @@
 # See the COPYRIGHT file distributed with this work for additional
 # information regarding copyright ownership.
 
-# $Id: rbt_test.txt,v 1.17 2007/06/19 23:46:59 tbox Exp $
-
-add a.vix.com
-add b.vix.com
-add c.vix.com
-print
-add a.b.c.d.e.f.vix.com
-add b.b.c.d.e.f.vix.com
-add c.b.c.d.e.f.vix.com
-print
-add a.d.e.f.vix.com
-add q.d.e.f.vix.com
-add d.e.f.vix.com
-print
-add g.h.vix.com
-print
-search q.d.e.f.vix.com
-search just-parent.a.vix.com
-search no-real-parent.vix.com
-search does.not.exist.at.all
-forward
-backward
-# existing name
-check vix.com.
-# greater than stop node, which has down pointer
-check zzz.com.
-# less than lowest in level (would be left link from stop node)
-check 0.vix.com
-# greater than stop node, no down pointer
-check d.vix.com
-# superdomain stored in existing node
-check f.vix.com
-# common ancestor stored in existing node; existing is successor
-check a.e.f.vix.com
-# common ancestor stored in existing node; existing is less but not predecessor
-check z.e.f.vix.com
-#
-check g.vix.com
-#
-check i.vix.com
-#
-check b.c.vix.com
-nuke d.e.f.vix.com
-print
-add x.a.vix.com
-add y.x.a.vix.com
-print
-delete a.vix.com
-delete x.a.vix.com
-print
-delete b.vix.com
-delete c.vix.com
-print
-delete y.x.a.vix.com
-print
-delete g.h.vix.com.
-add \[b100000].vix.com.
-add \[b010000].vix.com.
-add \[b001000].vix.com.
-add \[b000100].vix.com.
-add \[b000010].vix.com.
-add \[b000001].vix.com.
-p
-search \[b000100].vix.com.
-# zap the entire tree
-add vix.com.
-nuke vix.com.
-add a.b.c.d.e.f.g.h.i.j.k.l.m.n.o.p.q.r.s.t.u.v.w.x.y.z.a.b.c.d.e.f.g.h.i.j.k.l.m.n.o.p.q.r.s.t.u.v.w.x.y.z.a.b.c.d.e.f.g.h.i.j.k.l.m.n.o.p.q.r.s.t.u.v.w.x.y.z.a.b.c.d.e.f.g.h.i.j.k.l.m.n.o.p.q.r.s.t.u.v.w.x.y.z.a.b.c.d.e.f.g.h.i.j.k.l.m.n.o.p.q.r.s.t.u.v.w.
-add b.c.d.e.f.g.h.i.j.k.l.m.n.o.p.q.r.s.t.u.v.w.x.y.z.a.b.c.d.e.f.g.h.i.j.k.l.m.n.o.p.q.r.s.t.u.v.w.x.y.z.a.b.c.d.e.f.g.h.i.j.k.l.m.n.o.p.q.r.s.t.u.v.w.x.y.z.a.b.c.d.e.f.g.h.i.j.k.l.m.n.o.p.q.r.s.t.u.v.w.x.y.z.a.b.c.d.e.f.g.h.i.j.k.l.m.n.o.p.q.r.s.t.u.v.w.
-print
-add .
-# zap it again
-nuke .
-# test splitting of maximal bitstring
-add \[xFFFF/16].\[xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF/256].com
-add \[xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF/128].com
-print
-quit
+add a.vix.com
+add b.vix.com
+add c.vix.com
+print
+add a.b.c.d.e.f.vix.com
+add b.b.c.d.e.f.vix.com
+add c.b.c.d.e.f.vix.com
+print
+add a.d.e.f.vix.com
+add q.d.e.f.vix.com
+add d.e.f.vix.com
+print
+add g.h.vix.com
+print
+search q.d.e.f.vix.com
+search just-parent.a.vix.com
+search no-real-parent.vix.com
+search does.not.exist.at.all
+forward
+backward
+# existing name
+check vix.com.
+# greater than stop node, which has down pointer
+check zzz.com.
+# less than lowest in level (would be left link from stop node)
+check 0.vix.com
+# greater than stop node, no down pointer
+check d.vix.com
+# superdomain stored in existing node
+check f.vix.com
+# common ancestor stored in existing node; existing is successor
+check a.e.f.vix.com
+# common ancestor stored in existing node; existing is less but not predecessor
+check z.e.f.vix.com
+#
+check g.vix.com
+#
+check i.vix.com
+#
+check b.c.vix.com
+nuke d.e.f.vix.com
+print
+add x.a.vix.com
+add y.x.a.vix.com
+print
+delete a.vix.com
+delete x.a.vix.com
+print
+delete b.vix.com
+delete c.vix.com
+print
+delete y.x.a.vix.com
+print
+delete g.h.vix.com.
+add \[b100000].vix.com.
+add \[b010000].vix.com.
+add \[b001000].vix.com.
+add \[b000100].vix.com.
+add \[b000010].vix.com.
+add \[b000001].vix.com.
+p
+search \[b000100].vix.com.
+# zap the entire tree
+add vix.com.
+nuke vix.com.
+add a.b.c.d.e.f.g.h.i.j.k.l.m.n.o.p.q.r.s.t.u.v.w.x.y.z.a.b.c.d.e.f.g.h.i.j.k.l.m.n.o.p.q.r.s.t.u.v.w.x.y.z.a.b.c.d.e.f.g.h.i.j.k.l.m.n.o.p.q.r.s.t.u.v.w.x.y.z.a.b.c.d.e.f.g.h.i.j.k.l.m.n.o.p.q.r.s.t.u.v.w.x.y.z.a.b.c.d.e.f.g.h.i.j.k.l.m.n.o.p.q.r.s.t.u.v.w.
+add b.c.d.e.f.g.h.i.j.k.l.m.n.o.p.q.r.s.t.u.v.w.x.y.z.a.b.c.d.e.f.g.h.i.j.k.l.m.n.o.p.q.r.s.t.u.v.w.x.y.z.a.b.c.d.e.f.g.h.i.j.k.l.m.n.o.p.q.r.s.t.u.v.w.x.y.z.a.b.c.d.e.f.g.h.i.j.k.l.m.n.o.p.q.r.s.t.u.v.w.x.y.z.a.b.c.d.e.f.g.h.i.j.k.l.m.n.o.p.q.r.s.t.u.v.w.
+print
+add .
+# zap it again
+nuke .
+# test splitting of maximal bitstring
+add \[xFFFF/16].\[xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF/256].com
+add \[xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF/128].com
+print
+quit
diff --git a/bin/tests/rwlock_test.c b/bin/tests/optional/rwlock_test.c
similarity index 98%
rename from bin/tests/rwlock_test.c
rename to bin/tests/optional/rwlock_test.c
index a3178908a3..a540e3cd50 100644
--- a/bin/tests/rwlock_test.c
+++ b/bin/tests/optional/rwlock_test.c
@@ -9,8 +9,6 @@
  * information regarding copyright ownership.
  */
 
-/* $Id: rwlock_test.c,v 1.26 2007/06/19 23:46:59 tbox Exp $ */
-
 #include <config.h>
 
 #include <stdio.h>
diff --git a/bin/tests/serial_test.c b/bin/tests/optional/serial_test.c
similarity index 93%
rename from bin/tests/serial_test.c
rename to bin/tests/optional/serial_test.c
index 61b31c8b41..2c8715722c 100644
--- a/bin/tests/serial_test.c
+++ b/bin/tests/optional/serial_test.c
@@ -9,8 +9,6 @@
  * information regarding copyright ownership.
  */
 
-/* $Id: serial_test.c,v 1.15 2007/06/19 23:46:59 tbox Exp $ */
-
 #include <config.h>
 
 #include <stdio.h>
diff --git a/bin/tests/shutdown_test.c b/bin/tests/optional/shutdown_test.c
similarity index 98%
rename from bin/tests/shutdown_test.c
rename to bin/tests/optional/shutdown_test.c
index f4f041197f..3e98b2de7f 100644
--- a/bin/tests/shutdown_test.c
+++ b/bin/tests/optional/shutdown_test.c
@@ -9,8 +9,6 @@
  * information regarding copyright ownership.
  */
 
-/* $Id: shutdown_test.c,v 1.25 2011/08/28 23:46:41 tbox Exp $ */
-
 #include <config.h>
 
 #include <stdlib.h>
diff --git a/bin/tests/sig0_test.c b/bin/tests/optional/sig0_test.c
similarity index 99%
rename from bin/tests/sig0_test.c
rename to bin/tests/optional/sig0_test.c
index 343f023a60..b64e1ada2d 100644
--- a/bin/tests/sig0_test.c
+++ b/bin/tests/optional/sig0_test.c
@@ -9,8 +9,6 @@
  * information regarding copyright ownership.
  */
 
-/* $Id: sig0_test.c,v 1.19 2009/09/02 23:48:01 tbox Exp $ */
-
 #include <config.h>
 
 #include <stddef.h>
diff --git a/bin/tests/sock_test.c b/bin/tests/optional/sock_test.c
similarity index 99%
rename from bin/tests/sock_test.c
rename to bin/tests/optional/sock_test.c
index 22c4ee7bf0..f13a3ffe64 100644
--- a/bin/tests/sock_test.c
+++ b/bin/tests/optional/sock_test.c
@@ -9,8 +9,6 @@
  * information regarding copyright ownership.
  */
 
-/* $Id: sock_test.c,v 1.55 2008/07/23 23:27:54 marka Exp $ */
-
 #include <config.h>
 
 #include <stdlib.h>
diff --git a/bin/tests/sym_test.c b/bin/tests/optional/sym_test.c
similarity index 97%
rename from bin/tests/sym_test.c
rename to bin/tests/optional/sym_test.c
index 6ff95d8bba..1191d2ae63 100644
--- a/bin/tests/sym_test.c
+++ b/bin/tests/optional/sym_test.c
@@ -9,8 +9,6 @@
  * information regarding copyright ownership.
  */
 
-/* $Id: sym_test.c,v 1.28 2007/06/19 23:46:59 tbox Exp $ */
-
 #include <config.h>
 
 #include <string.h>
diff --git a/bin/tests/task_test.c b/bin/tests/optional/task_test.c
similarity index 98%
rename from bin/tests/task_test.c
rename to bin/tests/optional/task_test.c
index 8ec77c0746..1088010349 100644
--- a/bin/tests/task_test.c
+++ b/bin/tests/optional/task_test.c
@@ -9,8 +9,6 @@
  * information regarding copyright ownership.
  */
 
-/* $Id: task_test.c,v 1.51 2007/06/19 23:46:59 tbox Exp $ */
-
 #include <config.h>
 
 #include <stdlib.h>
diff --git a/bin/tests/timer_test.c b/bin/tests/optional/timer_test.c
similarity index 98%
rename from bin/tests/timer_test.c
rename to bin/tests/optional/timer_test.c
index d2f10737ab..6fa112417c 100644
--- a/bin/tests/timer_test.c
+++ b/bin/tests/optional/timer_test.c
@@ -9,8 +9,6 @@
  * information regarding copyright ownership.
  */
 
-/* $Id: timer_test.c,v 1.40 2007/06/19 23:46:59 tbox Exp $ */
-
 #include <config.h>
 
 #include <stdlib.h>
diff --git a/bin/tests/zone_test.c b/bin/tests/optional/zone_test.c
similarity index 99%
rename from bin/tests/zone_test.c
rename to bin/tests/optional/zone_test.c
index f4658e8aac..c7af967431 100644
--- a/bin/tests/zone_test.c
+++ b/bin/tests/optional/zone_test.c
@@ -9,8 +9,6 @@
  * information regarding copyright ownership.
  */
 
-/* $Id: zone_test.c,v 1.35 2009/09/02 23:48:01 tbox Exp $ */
-
 #include <config.h>
 
 #include <sys/param.h>
diff --git a/bin/tests/t_api.pl b/bin/tests/t_api.pl
deleted file mode 100644
index d34eaa7bd5..0000000000
--- a/bin/tests/t_api.pl
+++ /dev/null
@@ -1,217 +0,0 @@
-#!/usr/local/bin/perl
-#
-# Copyright (C) Internet Systems Consortium, Inc. ("ISC")
-#
-# This Source Code Form is subject to the terms of the Mozilla Public
-# License, v. 2.0. If a copy of the MPL was not distributed with this
-# file, You can obtain one at http://mozilla.org/MPL/2.0/.
-#
-# See the COPYRIGHT file distributed with this work for additional
-# information regarding copyright ownership.
-
-# $Id: t_api.pl,v 1.10 2007/06/19 23:46:59 tbox Exp $
-
-require "getopts.pl";
-
-#
-# a minimalistic test api in perl compatable with the C api
-# used for the bind 9 regression tests
-#
-
-sub t_info {
-	package t_api;
-	local($format, @rest) = @_;
-	printf("I:${format}%s", @rest);
-}
-
-sub t_result {
-	package t_api;
-	local($result) = @_;
-	$T_inresult = 1;
-	printf("R:$result\n");
-}
-
-sub t_assert {
-	package t_api;
-	local($component, $anum, $class, $what, @rest) = @_;
-	printf("A:%s:%d:%s:$what\n", $component, $anum, $class, @rest);
-}
-
-sub t_getenv {
-	package t_api;
-	local($name) = @_;
-	return($T_env{$name}) if (defined($T_env{$name}));
-}
-
-package t_api;
-
-$| = 1;
-
-sub t_on_abort {
-	$T_aborted = 1;
-	&t_info("got abort\n");
-	die;
-}
-
-sub t_on_alarm {
-	$T_timedout = 1;
-	&t_info("got alarm\n");
-	die;
-}
-
-sub t_on_int {
-	$T_terminated = 1;
-	&t_info("got int\n");
-	die;
-}
-
-# initialize the test environment
-sub t_initconf {
-	local($cfile) = @_;
-	local($name, $value);
-
-	if ((-f $cfile) && (-s _)) {
-		open(XXX, "< $cfile");
-		while (<XXX>) {
-			next if (/^\#/);
-			next unless (/=/);
-			chop;
-			($name, $value) = split(/=/, $_, 2);
-			$T_env{$name} = $value;
-		}
-		close(XXX);
-	}
-}
-
-# dump the configuration to the journal
-sub t_dumpconf {
-	local($name, $value);
-
-	foreach $name (sort keys %T_env) {
-		&main't_info("%s\t%s\n", $name, $T_env{$name});
-	}
-}
-
-# run a test
-sub doTestN {
-	package main;
-	local($testnumber) = @_;
-	local($status);
-
-	if (defined($T_testlist[$testnumber])) {
-
-		$t_api'T_inresult	= 0;
-		$t_api'T_aborted	= 0;
-		$t_api'T_timedout	= 0;
-		$t_api'T_terminated	= 0;
-		$t_api'T_unresolved	= 0;
-
-		alarm($t_api'T_timeout);
-		$status = eval($T_testlist[$testnumber]);
-		alarm(0);
-
-		if (! defined($status)) {
-			&t_info("The test case timed out\n") if ($t_api'T_timedout);
-			&t_info("The test case was terminated\n") if ($t_api'T_terminated);
-			&t_info("The test case was aborted\n") if ($t_api'T_aborted);
-			&t_result("UNRESOLVED");
-		}
-		elsif (! $t_api'T_inresult) {
-			&t_result("NORESULT");
-		}
-	}
-	else {
-		&t_info("Test %d is not defined\n", $testnumber);
-		&t_result("UNTESTED");
-	}
-}
-
-$T_usage = "Usage:
-	a               : run all tests
-        b <dir>         : cd to dir before running tests
-        c <configfile>  : use configfile instead of t_config
-        d <level>       : set debug level to level
-        h               : print test info                       (not implemented)
-        u               : print usage info
-        n <testnumber>  : run test number testnumber
-        t <name>        : run test named testname		(not implemented)
-        q <seconds>     : use seconds as the timeout value
-        x               : don't execute tests in a subproc      (n/a)
-";
-
-# get command line args
-&main'Getopts('ab:c:d:hun:t:q:x');
-
-# if -u, print usage and exit
-if (defined($main'opt_u)) {
-	print $T_usage;
-	exit(0);
-}
-
-# implement -h and -t after we add test descriptions to T_testlist ZZZ
-if (defined($main'opt_h)) {
-	print "the -h option is not implemented\n";
-	exit(0);
-}
-
-if (defined($main'opt_t)) {
-	print "the -t option is not implemented\n";
-	exit(0);
-}
-
-#
-# silently ignore the -x option
-# this exists in the C version of the api
-# to facilitate exception debugging with gdb
-# and is not meaningful here
-#
-
-$T_configfile	= "t_config";
-$T_debug	= 0;
-$T_timeout	= 10;
-$T_testnum	= -1;
-
-$T_dir		= $main'opt_b if (defined($main'opt_b));
-$T_debug	= $main'opt_d if (defined($main'opt_d));
-$T_configfile	= $main'opt_c if (defined($main'opt_c));
-$T_testnum	= $main'opt_n if (defined($main'opt_n));
-$T_timeout	= $main'opt_q if (defined($main'opt_q));
-
-$SIG{'ABRT'} = 't_api\'t_on_abort';
-$SIG{'ALRM'} = 't_api\'t_on_alarm';
-$SIG{'INT'}  = 't_api\'t_on_int';
-$SIG{'QUIT'} = 't_api\'t_on_int';
-
-# print the start line
-$date = `date`;
-chop $date;
-($cmd = $0) =~ s/\.\///g;
-printf("S:$cmd:$date\n");
-
-# initialize the test environment
-&t_initconf($T_configfile);
-&t_dumpconf() if ($T_debug);
-
-# establish working directory if requested
-chdir("$T_dir") if (defined($T_dir) && (-d "$T_dir"));
-
-# run the tests
-if ($T_testnum == -1) {
-	# run all tests
-	$T_ntests = $#main'T_testlist + 1;
-	for ($T_cnt = 0; $T_cnt < $T_ntests; ++$T_cnt) {
-		&doTestN($T_cnt);
-	}
-}
-else {
-	# otherwise run the specified test
-	&doTest($T_testnum);
-}
-
-# print the end line
-$date = `date`;
-chop $date;
-printf("E:$cmd:$date\n");
-
-1;
-
diff --git a/bin/tests/wire_test.data b/bin/tests/testdata/wire/wire_test.data
similarity index 100%
rename from bin/tests/wire_test.data
rename to bin/tests/testdata/wire/wire_test.data
diff --git a/bin/tests/wire_test.data2 b/bin/tests/testdata/wire/wire_test.data2
similarity index 100%
rename from bin/tests/wire_test.data2
rename to bin/tests/testdata/wire/wire_test.data2
diff --git a/bin/tests/wire_test.data3 b/bin/tests/testdata/wire/wire_test.data3
similarity index 100%
rename from bin/tests/wire_test.data3
rename to bin/tests/testdata/wire/wire_test.data3
diff --git a/bin/tests/wire_test.data4 b/bin/tests/testdata/wire/wire_test.data4
similarity index 100%
rename from bin/tests/wire_test.data4
rename to bin/tests/testdata/wire/wire_test.data4
diff --git a/configure b/configure
index 06ef2c2ff8..b4a396cbbb 100755
--- a/configure
+++ b/configure
@@ -942,6 +942,7 @@ infodir
 docdir
 oldincludedir
 includedir
+runstatedir
 localstatedir
 sharedstatedir
 sysconfdir
@@ -1106,6 +1107,7 @@ datadir='${datarootdir}'
 sysconfdir='${prefix}/etc'
 sharedstatedir='${prefix}/com'
 localstatedir='${prefix}/var'
+runstatedir='${localstatedir}/run'
 includedir='${prefix}/include'
 oldincludedir='/usr/include'
 docdir='${datarootdir}/doc/${PACKAGE_TARNAME}'
@@ -1358,6 +1360,15 @@ do
   | -silent | --silent | --silen | --sile | --sil)
     silent=yes ;;
 
+  -runstatedir | --runstatedir | --runstatedi | --runstated \
+  | --runstate | --runstat | --runsta | --runst | --runs \
+  | --run | --ru | --r)
+    ac_prev=runstatedir ;;
+  -runstatedir=* | --runstatedir=* | --runstatedi=* | --runstated=* \
+  | --runstate=* | --runstat=* | --runsta=* | --runst=* | --runs=* \
+  | --run=* | --ru=* | --r=*)
+    runstatedir=$ac_optarg ;;
+
   -sbindir | --sbindir | --sbindi | --sbind | --sbin | --sbi | --sb)
     ac_prev=sbindir ;;
   -sbindir=* | --sbindir=* | --sbindi=* | --sbind=* | --sbin=* \
@@ -1495,7 +1506,7 @@ fi
 for ac_var in	exec_prefix prefix bindir sbindir libexecdir datarootdir \
 		datadir sysconfdir sharedstatedir localstatedir includedir \
 		oldincludedir docdir infodir htmldir dvidir pdfdir psdir \
-		libdir localedir mandir
+		libdir localedir mandir runstatedir
 do
   eval ac_val=\$$ac_var
   # Remove trailing slashes.
@@ -1648,6 +1659,7 @@ Fine tuning of the installation directories:
   --sysconfdir=DIR        read-only single-machine data [PREFIX/etc]
   --sharedstatedir=DIR    modifiable architecture-independent data [PREFIX/com]
   --localstatedir=DIR     modifiable single-machine data [PREFIX/var]
+  --runstatedir=DIR       modifiable per-process data [LOCALSTATEDIR/run]
   --libdir=DIR            object code libraries [EPREFIX/lib]
   --includedir=DIR        C header files [PREFIX/include]
   --oldincludedir=DIR     C header files for non-gcc [/usr/include]
@@ -24145,7 +24157,7 @@ ac_config_commands="$ac_config_commands chmod"
 # elsewhere if there's a good reason for doing so.
 #
 
-ac_config_files="$ac_config_files make/Makefile make/mkdep Makefile bin/Makefile bin/check/Makefile bin/confgen/Makefile bin/confgen/unix/Makefile bin/delv/Makefile bin/dig/Makefile bin/dnssec/Makefile bin/named/Makefile bin/named/unix/Makefile bin/nsupdate/Makefile bin/pkcs11/Makefile bin/python/Makefile bin/python/isc/Makefile bin/python/isc/utils.py bin/python/isc/tests/Makefile bin/python/dnssec-checkds.py bin/python/dnssec-coverage.py bin/python/dnssec-keymgr.py bin/python/isc/__init__.py bin/python/isc/checkds.py bin/python/isc/coverage.py bin/python/isc/dnskey.py bin/python/isc/eventlist.py bin/python/isc/keydict.py bin/python/isc/keyevent.py bin/python/isc/keymgr.py bin/python/isc/keyseries.py bin/python/isc/keyzone.py bin/python/isc/policy.py bin/python/isc/rndc.py bin/python/isc/tests/dnskey_test.py bin/python/isc/tests/policy_test.py bin/rndc/Makefile bin/tests/Makefile bin/tests/atomic/Makefile bin/tests/db/Makefile bin/tests/dst/Makefile bin/tests/dst/Kdh.+002+18602.key bin/tests/dst/Kdh.+002+18602.private bin/tests/dst/Kdh.+002+48957.key bin/tests/dst/Kdh.+002+48957.private bin/tests/dst/Ktest.+001+00002.key bin/tests/dst/Ktest.+001+54622.key bin/tests/dst/Ktest.+001+54622.private bin/tests/dst/Ktest.+003+23616.key bin/tests/dst/Ktest.+003+23616.private bin/tests/dst/Ktest.+003+49667.key bin/tests/dst/dst_2_data bin/tests/dst/t2_data_1 bin/tests/dst/t2_data_2 bin/tests/dst/t2_dsasig bin/tests/dst/t2_rsasig bin/tests/hashes/Makefile bin/tests/headerdep_test.sh bin/tests/master/Makefile bin/tests/mem/Makefile bin/tests/names/Makefile bin/tests/net/Makefile bin/tests/pkcs11/Makefile bin/tests/pkcs11/benchmarks/Makefile bin/tests/rbt/Makefile bin/tests/resolver/Makefile bin/tests/sockaddr/Makefile bin/tests/system/Makefile bin/tests/system/conf.sh bin/tests/system/dlz/prereq.sh bin/tests/system/dlzexternal/Makefile bin/tests/system/dlzexternal/ns1/dlzs.conf bin/tests/system/dyndb/Makefile bin/tests/system/dyndb/driver/Makefile bin/tests/system/inline/checkdsa.sh bin/tests/system/pipelined/Makefile bin/tests/system/rndc/Makefile bin/tests/system/rpz/Makefile bin/tests/system/rsabigexponent/Makefile bin/tests/system/tkey/Makefile bin/tests/tasks/Makefile bin/tests/timers/Makefile bin/tests/virtual-time/Makefile bin/tests/virtual-time/conf.sh bin/tools/Makefile contrib/scripts/check-secure-delegation.pl contrib/scripts/zone-edit.sh doc/Makefile doc/arm/Makefile doc/arm/noteversion.xml doc/arm/pkgversion.xml doc/arm/releaseinfo.xml doc/doxygen/Doxyfile doc/doxygen/Makefile doc/doxygen/doxygen-input-filter doc/misc/Makefile doc/tex/Makefile doc/tex/armstyle.sty doc/xsl/Makefile doc/xsl/isc-docbook-chunk.xsl doc/xsl/isc-docbook-html.xsl doc/xsl/isc-manpage.xsl doc/xsl/isc-notes-html.xsl isc-config.sh lib/Makefile lib/bind9/Makefile lib/bind9/include/Makefile lib/bind9/include/bind9/Makefile lib/dns/Makefile lib/dns/include/Makefile lib/dns/include/dns/Makefile lib/dns/include/dst/Makefile lib/dns/tests/Makefile lib/irs/Makefile lib/irs/include/Makefile lib/irs/include/irs/Makefile lib/irs/include/irs/netdb.h lib/irs/include/irs/platform.h lib/irs/tests/Makefile lib/isc/$arch/Makefile lib/isc/$arch/include/Makefile lib/isc/$arch/include/isc/Makefile lib/isc/$thread_dir/Makefile lib/isc/$thread_dir/include/Makefile lib/isc/$thread_dir/include/isc/Makefile lib/isc/Makefile lib/isc/include/Makefile lib/isc/include/isc/Makefile lib/isc/include/isc/platform.h lib/isc/include/pk11/Makefile lib/isc/include/pkcs11/Makefile lib/isc/tests/Makefile lib/isc/nls/Makefile lib/isc/unix/Makefile lib/isc/unix/include/Makefile lib/isc/unix/include/isc/Makefile lib/isc/unix/include/pkcs11/Makefile lib/isccc/Makefile lib/isccc/include/Makefile lib/isccc/include/isccc/Makefile lib/isccfg/Makefile lib/isccfg/include/Makefile lib/isccfg/include/isccfg/Makefile lib/isccfg/tests/Makefile lib/ns/Makefile lib/ns/include/Makefile lib/ns/include/ns/Makefile lib/ns/tests/Makefile lib/tests/Makefile lib/tests/include/Makefile lib/tests/include/tests/Makefile lib/samples/Makefile lib/samples/Makefile-postinstall unit/Makefile unit/unittest.sh"
+ac_config_files="$ac_config_files make/Makefile make/mkdep Makefile bin/Makefile bin/check/Makefile bin/confgen/Makefile bin/confgen/unix/Makefile bin/delv/Makefile bin/dig/Makefile bin/dnssec/Makefile bin/named/Makefile bin/named/unix/Makefile bin/nsupdate/Makefile bin/pkcs11/Makefile bin/python/Makefile bin/python/isc/Makefile bin/python/isc/utils.py bin/python/isc/tests/Makefile bin/python/dnssec-checkds.py bin/python/dnssec-coverage.py bin/python/dnssec-keymgr.py bin/python/isc/__init__.py bin/python/isc/checkds.py bin/python/isc/coverage.py bin/python/isc/dnskey.py bin/python/isc/eventlist.py bin/python/isc/keydict.py bin/python/isc/keyevent.py bin/python/isc/keymgr.py bin/python/isc/keyseries.py bin/python/isc/keyzone.py bin/python/isc/policy.py bin/python/isc/rndc.py bin/python/isc/tests/dnskey_test.py bin/python/isc/tests/policy_test.py bin/rndc/Makefile bin/tests/Makefile bin/tests/atomic/Makefile bin/tests/db/Makefile bin/tests/dst/Makefile bin/tests/dst/Kdh.+002+18602.key bin/tests/dst/Kdh.+002+18602.private bin/tests/dst/Kdh.+002+48957.key bin/tests/dst/Kdh.+002+48957.private bin/tests/dst/Ktest.+001+00002.key bin/tests/dst/Ktest.+001+54622.key bin/tests/dst/Ktest.+001+54622.private bin/tests/dst/Ktest.+003+23616.key bin/tests/dst/Ktest.+003+23616.private bin/tests/dst/Ktest.+003+49667.key bin/tests/dst/dst_2_data bin/tests/dst/t2_data_1 bin/tests/dst/t2_data_2 bin/tests/dst/t2_dsasig bin/tests/dst/t2_rsasig bin/tests/hashes/Makefile bin/tests/headerdep_test.sh bin/tests/master/Makefile bin/tests/mem/Makefile bin/tests/names/Makefile bin/tests/net/Makefile bin/tests/optional/Makefile bin/tests/pkcs11/Makefile bin/tests/pkcs11/benchmarks/Makefile bin/tests/rbt/Makefile bin/tests/resolver/Makefile bin/tests/sockaddr/Makefile bin/tests/system/Makefile bin/tests/system/conf.sh bin/tests/system/dlz/prereq.sh bin/tests/system/dlzexternal/Makefile bin/tests/system/dlzexternal/ns1/dlzs.conf bin/tests/system/dyndb/Makefile bin/tests/system/dyndb/driver/Makefile bin/tests/system/inline/checkdsa.sh bin/tests/system/pipelined/Makefile bin/tests/system/rndc/Makefile bin/tests/system/rpz/Makefile bin/tests/system/rsabigexponent/Makefile bin/tests/system/tkey/Makefile bin/tests/tasks/Makefile bin/tests/timers/Makefile bin/tests/virtual-time/Makefile bin/tests/virtual-time/conf.sh bin/tools/Makefile contrib/scripts/check-secure-delegation.pl contrib/scripts/zone-edit.sh doc/Makefile doc/arm/Makefile doc/arm/noteversion.xml doc/arm/pkgversion.xml doc/arm/releaseinfo.xml doc/doxygen/Doxyfile doc/doxygen/Makefile doc/doxygen/doxygen-input-filter doc/misc/Makefile doc/tex/Makefile doc/tex/armstyle.sty doc/xsl/Makefile doc/xsl/isc-docbook-chunk.xsl doc/xsl/isc-docbook-html.xsl doc/xsl/isc-manpage.xsl doc/xsl/isc-notes-html.xsl isc-config.sh lib/Makefile lib/bind9/Makefile lib/bind9/include/Makefile lib/bind9/include/bind9/Makefile lib/dns/Makefile lib/dns/include/Makefile lib/dns/include/dns/Makefile lib/dns/include/dst/Makefile lib/dns/tests/Makefile lib/irs/Makefile lib/irs/include/Makefile lib/irs/include/irs/Makefile lib/irs/include/irs/netdb.h lib/irs/include/irs/platform.h lib/irs/tests/Makefile lib/isc/$arch/Makefile lib/isc/$arch/include/Makefile lib/isc/$arch/include/isc/Makefile lib/isc/$thread_dir/Makefile lib/isc/$thread_dir/include/Makefile lib/isc/$thread_dir/include/isc/Makefile lib/isc/Makefile lib/isc/include/Makefile lib/isc/include/isc/Makefile lib/isc/include/isc/platform.h lib/isc/include/pk11/Makefile lib/isc/include/pkcs11/Makefile lib/isc/tests/Makefile lib/isc/nls/Makefile lib/isc/unix/Makefile lib/isc/unix/include/Makefile lib/isc/unix/include/isc/Makefile lib/isc/unix/include/pkcs11/Makefile lib/isccc/Makefile lib/isccc/include/Makefile lib/isccc/include/isccc/Makefile lib/isccfg/Makefile lib/isccfg/include/Makefile lib/isccfg/include/isccfg/Makefile lib/isccfg/tests/Makefile lib/ns/Makefile lib/ns/include/Makefile lib/ns/include/ns/Makefile lib/ns/tests/Makefile lib/tests/Makefile lib/tests/include/Makefile lib/tests/include/tests/Makefile lib/samples/Makefile lib/samples/Makefile-postinstall unit/Makefile unit/unittest.sh"
 
 
 #
@@ -25208,6 +25220,7 @@ do
     "bin/tests/mem/Makefile") CONFIG_FILES="$CONFIG_FILES bin/tests/mem/Makefile" ;;
     "bin/tests/names/Makefile") CONFIG_FILES="$CONFIG_FILES bin/tests/names/Makefile" ;;
     "bin/tests/net/Makefile") CONFIG_FILES="$CONFIG_FILES bin/tests/net/Makefile" ;;
+    "bin/tests/optional/Makefile") CONFIG_FILES="$CONFIG_FILES bin/tests/optional/Makefile" ;;
     "bin/tests/pkcs11/Makefile") CONFIG_FILES="$CONFIG_FILES bin/tests/pkcs11/Makefile" ;;
     "bin/tests/pkcs11/benchmarks/Makefile") CONFIG_FILES="$CONFIG_FILES bin/tests/pkcs11/benchmarks/Makefile" ;;
     "bin/tests/rbt/Makefile") CONFIG_FILES="$CONFIG_FILES bin/tests/rbt/Makefile" ;;
diff --git a/configure.in b/configure.in
index b94b1d593f..291bf1a7eb 100644
--- a/configure.in
+++ b/configure.in
@@ -5337,6 +5337,7 @@ AC_CONFIG_FILES([
 	bin/tests/mem/Makefile
 	bin/tests/names/Makefile
 	bin/tests/net/Makefile
+	bin/tests/optional/Makefile
 	bin/tests/pkcs11/Makefile
 	bin/tests/pkcs11/benchmarks/Makefile
 	bin/tests/rbt/Makefile