diff --git a/bin/tests/mem/Makefile.in b/bin/tests/mem/Makefile.in
index 6f589f48c7..9674b076f9 100644
--- a/bin/tests/mem/Makefile.in
+++ b/bin/tests/mem/Makefile.in
@@ -19,22 +19,20 @@ top_srcdir =	@top_srcdir@
 
 @BIND9_INCLUDES@
 
-CINCLUDES =	${TEST_INCLUDES} ${DNS_INCLUDES} ${ISC_INCLUDES}
+CINCLUDES =	${TEST_INCLUDES} ${ISC_INCLUDES}
 
 CDEFINES =
 CWARNINGS =
 
-DNSLIBS =	../../../lib/dns/libdns.@A@ @DNS_OPENSSL_LIBS@
 ISCLIBS =	../../../lib/isc/libisc.@A@
 TAPIDEPLIBS =	../../../lib/tests/libt_api.@A@
 
-DNSDEPLIBS =	../../../lib/dns/libdns.@A@
 ISCDEPLIBS =	../../../lib/isc/libisc.@A@
 TAPILIBS =	../../../lib/tests/libt_api.@A@
 
-DEPLIBS =	${DNSDEPLIBS} ${TAPIDEPLIBS} ${ISCDEPLIBS} 
+DEPLIBS =	${TAPIDEPLIBS} ${ISCDEPLIBS} 
 
-LIBS =		${DNSLIBS} ${TAPILIBS} ${ISCLIBS} @LIBS@
+LIBS =		${TAPILIBS} ${ISCLIBS} @LIBS@
 
 TARGETS =	t_mem
 
diff --git a/bin/tests/sockaddr/Makefile.in b/bin/tests/sockaddr/Makefile.in
index fe656fad19..48294dd0d7 100644
--- a/bin/tests/sockaddr/Makefile.in
+++ b/bin/tests/sockaddr/Makefile.in
@@ -19,22 +19,20 @@ top_srcdir =	@top_srcdir@
 
 @BIND9_INCLUDES@
 
-CINCLUDES =	${TEST_INCLUDES} ${DNS_INCLUDES} ${ISC_INCLUDES}
+CINCLUDES =	${TEST_INCLUDES} ${ISC_INCLUDES}
 
 CDEFINES =
 CWARNINGS =
 
-DNSLIBS =	../../../lib/dns/libdns.@A@ @DNS_OPENSSL_LIBS@
 ISCLIBS =	../../../lib/isc/libisc.@A@
 TAPIDEPLIBS =	../../../lib/tests/libt_api.@A@
 
-DNSDEPLIBS =	../../../lib/dns/libdns.@A@
 ISCDEPLIBS =	../../../lib/isc/libisc.@A@
 TAPILIBS =	../../../lib/tests/libt_api.@A@
 
-DEPLIBS =	${DNSDEPLIBS} ${TAPIDEPLIBS} ${ISCDEPLIBS} 
+DEPLIBS =	${TAPIDEPLIBS} ${ISCDEPLIBS} 
 
-LIBS =		${DNSLIBS} ${TAPILIBS} ${ISCLIBS} @LIBS@
+LIBS =		${TAPILIBS} ${ISCLIBS} @LIBS@
 
 TARGETS =	t_sockaddr
 
diff --git a/bin/tests/tasks/Makefile.in b/bin/tests/tasks/Makefile.in
index 1c36caaac3..5d0f1694cc 100644
--- a/bin/tests/tasks/Makefile.in
+++ b/bin/tests/tasks/Makefile.in
@@ -19,22 +19,20 @@ top_srcdir =	@top_srcdir@
 
 @BIND9_INCLUDES@
 
-CINCLUDES =	${TEST_INCLUDES} ${DNS_INCLUDES} ${ISC_INCLUDES}
+CINCLUDES =	${TEST_INCLUDES} ${ISC_INCLUDES}
 
 CDEFINES =
 CWARNINGS =
 
-DNSLIBS =	../../../lib/dns/libdns.@A@ @DNS_OPENSSL_LIBS@
 ISCLIBS =	../../../lib/isc/libisc.@A@
 TAPIDEPLIBS =	../../../lib/tests/libt_api.@A@
 
-DNSDEPLIBS =	../../../lib/dns/libdns.@A@
 ISCDEPLIBS =	../../../lib/isc/libisc.@A@
 TAPILIBS =	../../../lib/tests/libt_api.@A@
 
-DEPLIBS =	${DNSDEPLIBS} ${TAPIDEPLIBS} ${ISCDEPLIBS} 
+DEPLIBS =	${TAPIDEPLIBS} ${ISCDEPLIBS} 
 
-LIBS =		${DNSLIBS} ${TAPILIBS} ${ISCLIBS} @LIBS@
+LIBS =		${TAPILIBS} ${ISCLIBS} @LIBS@
 
 TARGETS =	t_tasks
 
diff --git a/bin/tests/timers/Makefile.in b/bin/tests/timers/Makefile.in
index fa90643a06..25c7cfa115 100644
--- a/bin/tests/timers/Makefile.in
+++ b/bin/tests/timers/Makefile.in
@@ -19,20 +19,18 @@ top_srcdir =	@top_srcdir@
 
 @BIND9_INCLUDES@
 
-CINCLUDES =	${TEST_INCLUDES} ${DNS_INCLUDES} ${ISC_INCLUDES}
+CINCLUDES =	${TEST_INCLUDES} ${ISC_INCLUDES}
 
 CDEFINES =
 CWARNINGS =
 
-DNSLIBS =	../../../lib/dns/libdns.@A@ @DNS_OPENSSL_LIBS@
 ISCLIBS =	../../../lib/isc/libisc.@A@
 
-DNSDEPLIBS =	../../../lib/dns/libdns.@A@
 ISCDEPLIBS =	../../../lib/isc/libisc.@A@
 
-DEPLIBS =	${DNSDEPLIBS} ${ISCDEPLIBS}
+DEPLIBS =	${ISCDEPLIBS}
 
-LIBS =		${DNSLIBS} ${ISCLIBS} @LIBS@
+LIBS =		${ISCLIBS} @LIBS@
 
 TLIB =		../../../lib/tests/libt_api.@A@