diff --git a/Makefile.in b/Makefile.in
index 12903aeeff..1193a4f1c3 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -633,7 +633,7 @@ jafsadm: libjafsadm
 build_tools: config comerr rxgen
 	+${COMPILE_PART1} util ${COMPILE_PART2A} buildtools_clean
 
-finale: project cmd comerr afsd butc tbutc tbudb @ENABLE_KERNEL_MODULE@ \
+finale_notest: project cmd comerr afsd butc tbutc tbudb @ENABLE_KERNEL_MODULE@ \
 	libuafs audit kauth log ptserver tptserver scout bu_utils ubik uss \
 	bozo @VFSCK@ volser tvolser tsalvaged dviced dvolser libafscp \
 	venus venustests update xstat afsmonitor rxdebug libafsrpc rfc3961 \
@@ -641,7 +641,7 @@ finale: project cmd comerr afsd butc tbutc tbudb @ENABLE_KERNEL_MODULE@ \
 	authtools $(DIR_roken) rxgk
 	+${COMPILE_PART1} finale ${COMPILE_PART2}
 
-finale_nolibafs: project cmd comerr afsd butc tbutc tbudb libuafs audit kauth \
+finale_nolibafs_notest: project cmd comerr afsd butc tbutc tbudb libuafs audit kauth \
 	log ptserver tptserver scout bu_utils ubik tubik uss bozo @VFSCK@ \
 	volser tvolser tsalvaged dviced dvolser libafscp venus venustests \
 	update xstat afsmonitor rxdebug libafsrpc rfc3961 hcrypto \
@@ -652,7 +652,17 @@ finale_nolibafs: project cmd comerr afsd butc tbutc tbudb libuafs audit kauth \
 rpctestlib: util fsint rx opr libafsrpc libafsauthent
 	+${TEST_PART1} rpctestlib  ${COMPILE_PART2}
 
-check test: finale
+finale: finale_notest test_build
+
+finale_nolibafs: finale_nolibafs_notest test_build_nolibafs
+
+test_build: finale_notest
+	cd tests && $(MAKE)
+
+test_build_nolibafs: finale_nolibafs_notest
+	cd tests && $(MAKE)
+
+check test: finale_notest
 	cd tests && $(MAKE) check
 
 force: