diff --git a/bin/tests/Makefile.in b/bin/tests/Makefile.in
index 6d0619b21e..cf2e1bf0d4 100644
--- a/bin/tests/Makefile.in
+++ b/bin/tests/Makefile.in
@@ -33,7 +33,7 @@ ISCCFGDEPLIBS = ../../lib/isccfg/libisccfg.@A@
 LIBS =		@LIBS@
 
 SUBDIRS =	system @PKCS11_TOOLS@
-TESTDIRS =
+TESTDIRS =	system
 
 # Test programs that are built by default:
 # cfg_test is needed for regenerating doc/misc/options
diff --git a/make/rules.in b/make/rules.in
index a1886d14f9..26bd0103ef 100644
--- a/make/rules.in
+++ b/make/rules.in
@@ -81,7 +81,7 @@ install:: all
 
 install uninstall clean distclean maintainer-clean doc docclean man manclean::
 	@for i in ${ALL_SUBDIRS} ${ALL_TESTDIRS}; do \
-		if [ "$$i" != "nulldir" -a -d $$i ]; then \
+		if [ "$$i" != "nulldir" -a -d $$i -a -f $$i/Makefile ]; then \
 			echo "making $@ in `pwd`/$$i"; \
 			(cd $$i; ${MAKE} ${MAKEDEFS} DESTDIR="${DESTDIR}" $@) || exit 1; \
 		fi; \