diff --git a/bin/tests/db/Makefile.in b/bin/tests/db/Makefile.in
index ebd29d0fb9..8077135efa 100644
--- a/bin/tests/db/Makefile.in
+++ b/bin/tests/db/Makefile.in
@@ -26,8 +26,8 @@ CINCLUDES =	-I${srcdir}/../../../lib/isc/unix/include \
 CDEFINES =
 CWARNINGS =
 
-LIBS =		../../../lib/dns/libdns.a \
-		../../../lib/isc/libisc.a \
+LIBS =		../../../lib/dns/libdns.@A@ \
+		../../../lib/isc/libisc.@A@ \
 		../../../lib/tests/libt_api.a \
 		@LIBS@
 
@@ -36,7 +36,7 @@ TARGETS =	t_db
 @BIND9_MAKE_RULES@
 
 t_db: t_db.o
-	${CC} -o $@ t_db.o ${LIBS}
+	${LIBTOOL} ${CC} -o $@ t_db.o ${LIBS}
 
 test:
 	-@./t_db -c @top_srcdir@/t_config -a >> ../t_journal 2>&1
diff --git a/bin/tests/dst/Makefile.in b/bin/tests/dst/Makefile.in
index 7ddc6801bf..24b0ecccba 100644
--- a/bin/tests/dst/Makefile.in
+++ b/bin/tests/dst/Makefile.in
@@ -33,7 +33,7 @@ DEPLIBS = 	../../../lib/dns/libdns.@A@ \
 LIBS =		${DEPLIBS} \
 		@LIBS@
 
-TLIB =		../../../lib/tests/libt_api.@A@
+TLIB =		../../../lib/tests/libt_api.a
 
 TARGETS =	dst_test t_dst
 
diff --git a/bin/tests/mem/Makefile.in b/bin/tests/mem/Makefile.in
index a1f5ae03ec..6d29d0ca36 100644
--- a/bin/tests/mem/Makefile.in
+++ b/bin/tests/mem/Makefile.in
@@ -26,8 +26,8 @@ CINCLUDES =	-I${srcdir}/../../../lib/isc/unix/include \
 CDEFINES =
 CWARNINGS =
 
-DEPLIBS =	../../../lib/dns/libdns.a \
-		../../../lib/isc/libisc.a \
+DEPLIBS =	../../../lib/dns/libdns.@A@ \
+		../../../lib/isc/libisc.@A@ \
 		../../../lib/tests/libt_api.a 
 
 LIBS =		${DEPLIBS} \
@@ -38,7 +38,7 @@ TARGETS =	t_mem
 @BIND9_MAKE_RULES@
 
 t_mem: t_mem.o ${DEPLIBS}
-	${CC} -o $@ t_mem.o ${LIBS}
+	${LIBTOOL} ${CC} -o $@ t_mem.o ${LIBS}
 
 test:
 	-@./t_mem -c @top_srcdir@/t_config >>@top_srcdir@/bin/tests/t_journal 2>&1
diff --git a/bin/tests/tasks/Makefile.in b/bin/tests/tasks/Makefile.in
index 8816175eb5..7974744db9 100644
--- a/bin/tests/tasks/Makefile.in
+++ b/bin/tests/tasks/Makefile.in
@@ -29,7 +29,7 @@ CWARNINGS =
 
 DEPLIBS =	../../../lib/dns/libdns.@A@ \
 		../../../lib/isc/libisc.@A@ \
-		../../../lib/tests/libt_api.@A@
+		../../../lib/tests/libt_api.a
 
 LIBS =		${DEPLIBS} \
 		@LIBS@
@@ -39,7 +39,7 @@ TARGETS =	t_tasks
 @BIND9_MAKE_RULES@
 
 t_tasks: t_tasks.o ${DEPLIBS}
-	${CC} -o $@ t_tasks.o ${LIBS}
+	${LIBTOOL} ${CC} -o $@ t_tasks.o ${LIBS}
 
 test:
 	-@./t_tasks -c @top_srcdir@/t_config >>@top_srcdir@/bin/tests/t_journal 2>&1
diff --git a/bin/tests/timers/Makefile.in b/bin/tests/timers/Makefile.in
index cde1c28437..2bb150cba9 100644
--- a/bin/tests/timers/Makefile.in
+++ b/bin/tests/timers/Makefile.in
@@ -26,8 +26,8 @@ CINCLUDES =	-I${srcdir}/../../../lib/isc/unix/include \
 CDEFINES =
 CWARNINGS =
 
-LIBS =		../../../lib/dns/libdns.a \
-		../../../lib/isc/libisc.a \
+LIBS =		../../../lib/dns/libdns.@A@ \
+		../../../lib/isc/libisc.@A@ \
 		../../../lib/tests/libt_api.a \
 		@LIBS@
 
@@ -36,7 +36,7 @@ TARGETS =	t_timers
 @BIND9_MAKE_RULES@
 
 t_timers: t_timers.o
-	${CC} -o $@ t_timers.o ${LIBS}
+	${LIBTOOL} ${CC} -o $@ t_timers.o ${LIBS}
 
 test:
 	-@./t_timers -c @top_srcdir@/t_config -a >> ../t_journal 2>&1