diff --git a/bin/tests/.cvsignore b/bin/tests/.cvsignore
index 2624c32898..0c05d18a9d 100644
--- a/bin/tests/.cvsignore
+++ b/bin/tests/.cvsignore
@@ -3,21 +3,27 @@ Makefile
 *.la
 *.lo
 adb_test
+byaddr_test
+byname_test
 compress_test
 db_test
 dispatch_tcp_test
 dispatch_test
 gxba_test
 gxbn_test
+headerdep_test.sh
+inter_test
 keygen
 lex_test
 lfsr_test
 log_test
 lwres_test
+lwresconf_test
 master_test
 mem_test
 mempool_test
 name_test
+ndcconf_test
 nconf_test
 nxtify
 omapi_test
@@ -39,8 +45,3 @@ tkey_test
 wire_test
 zone2_test
 zone_test
-byaddr_test
-inter_test
-byname_test
-headerdep_test.sh
-ndcconf_test
diff --git a/bin/tests/Makefile.in b/bin/tests/Makefile.in
index 5167ff4186..a0753949cb 100644
--- a/bin/tests/Makefile.in
+++ b/bin/tests/Makefile.in
@@ -55,7 +55,7 @@ XTARGETS =	adb_test \
 		lfsr_test \
 		log_test \
 		lwres_test \
-		lwres_conftest \
+		lwresconf_test \
 		master_test \
 		mempool_test \
 		name_test \
@@ -95,8 +95,8 @@ SRCS =		adb_test.c \
 		lex_test.c \
 		lfsr_test.c \
 		log_test.c \
-		lwres_conftest.c \
 		lwres_test.c \
+		lwresconf_test.c \
 		master_test.c \
 		mempool_test.c \
 		name_test.c \
@@ -266,8 +266,8 @@ inter_test: inter_test.@O@ ${ISCDEPLIBS}
 	${LIBTOOL} ${CC} ${CFLAGS} -o $@ inter_test.@O@ \
 		${ISCLIBS} ${LIBS}
 
-lwres_conftest: lwres_conftest.@O@ ${ISCDEPLIBS} ${LWRESDEPLIBS}
-	${LIBTOOL} ${CC} ${CFLAGS} -o $@ lwres_conftest.@O@ \
+lwresconf_test: lwresconf_test.@O@ ${ISCDEPLIBS} ${LWRESDEPLIBS}
+	${LIBTOOL} ${CC} ${CFLAGS} -o $@ lwresconf_test.@O@ \
 		${LWRESLIBS} ${ISCLIBS} ${LIBS}
 
 lwres_test: lwres_test.@O@ ${ISCDEPLIBS} ${LWRESDEPLIBS}