diff --git a/GNUmakefile.in b/GNUmakefile.in
index 50fae4128a..5ebdb8b202 100644
--- a/GNUmakefile.in
+++ b/GNUmakefile.in
@@ -64,7 +64,7 @@ distclean maintainer-clean:
 check: all
 
 check installcheck installcheck-parallel:
-	$(MAKE) -C src/test $@
+	$(MAKE) -C src/test/regress $@
 
 $(call recurse,check-world,src/test src/pl src/interfaces/ecpg contrib,check)
 
diff --git a/src/test/Makefile b/src/test/Makefile
index e8cf7041b4..0fd7eabf08 100644
--- a/src/test/Makefile
+++ b/src/test/Makefile
@@ -1,15 +1,17 @@
 #-------------------------------------------------------------------------
 #
-# Makefile.inc--
-#    Makefile for test suites
+# Makefile for src/test
 #
 # Copyright (c) 1994, Regents of the University of California
 #
-#
-# IDENTIFICATION
-#    src/test/Makefile
+# src/test/Makefile
 #
 #-------------------------------------------------------------------------
 
-.DEFAULT:
-	$(MAKE) -C regress $@
+subdir = src/test
+top_builddir = ../..
+include $(top_builddir)/src/Makefile.global
+
+SUBDIRS = regress isolation
+
+$(recurse)