diff --git a/src/Makefile.global.in b/src/Makefile.global.in
index 371cd7eba2c..c6f0e1eb5e1 100644
--- a/src/Makefile.global.in
+++ b/src/Makefile.global.in
@@ -671,18 +671,8 @@ endif
 
 ifneq ($(USE_MODULE_DB),)
   PL_TESTDB = pl_regression_$(NAME)
-  ifneq ($(MODULE_big),)
-    CONTRIB_TESTDB=contrib_regression_$(MODULE_big)
-    ISOLATION_TESTDB=isolation_regression_$(MODULE_big)
-  else
-    ifneq ($(MODULES),)
-      CONTRIB_TESTDB=contrib_regression_$(word 1,$(MODULES))
-      ISOLATION_TESTDB=isolation_regression_$(word 1,$(MODULES))
-    else
-      CONTRIB_TESTDB=contrib_regression_$(word 1,$(REGRESS))
-      ISOLATION_TESTDB=isolation_regression_$(word 1,$(ISOLATION))
-    endif
-  endif
+  CONTRIB_TESTDB=contrib_regression_$(notdir $(subdir))
+  ISOLATION_TESTDB=isolation_regression_$(notdir $(subdir))
 else
   PL_TESTDB = pl_regression
   CONTRIB_TESTDB = contrib_regression