diff --git a/contrib/dblink/Makefile b/contrib/dblink/Makefile
index 519c73b68f..5d92045bf8 100644
--- a/contrib/dblink/Makefile
+++ b/contrib/dblink/Makefile
@@ -10,6 +10,9 @@ DATA = uninstall_dblink.sql
 REGRESS = dblink
 
 
+# the db name is hard-coded in the tests
+override USE_MODULE_DB =
+
 ifdef USE_PGXS
 PG_CONFIG = pg_config
 PGXS := $(shell $(PG_CONFIG) --pgxs)
diff --git a/src/Makefile.global.in b/src/Makefile.global.in
index 280578a4c3..6fe87f33c3 100644
--- a/src/Makefile.global.in
+++ b/src/Makefile.global.in
@@ -284,6 +284,15 @@ BZIP2	= bzip2
 
 PL_TESTDB = pl_regression
 CONTRIB_TESTDB = contrib_regression
+ifneq ($(MODULE_big),)
+  CONTRIB_TESTDB_MODULE = contrib_regression_$(MODULE_big)
+else 
+  ifneq ($(MODULES),)
+    CONTRIB_TESTDB_MODULE = contrib_regression_$(MODULES)
+  else
+    CONTRIB_TESTDB_MODULE = contrib_regression
+  endif
+endif
 
 # Installation.
 
diff --git a/src/makefiles/pgxs.mk b/src/makefiles/pgxs.mk
index 4f1ae19101..2415038821 100644
--- a/src/makefiles/pgxs.mk
+++ b/src/makefiles/pgxs.mk
@@ -233,7 +233,11 @@ ifdef REGRESS
 
 # Calling makefile can set REGRESS_OPTS, but this is the default:
 ifndef REGRESS_OPTS
-REGRESS_OPTS = --dbname=$(CONTRIB_TESTDB)
+ifneq ($(USE_MODULE_DB),)
+  REGRESS_OPTS = --dbname=$(CONTRIB_TESTDB_MODULE)
+else
+  REGRESS_OPTS = --dbname=$(CONTRIB_TESTDB)
+endif
 endif
 
 # where to find psql for running the tests