diff --git a/contrib/contrib-global.mk b/contrib/contrib-global.mk
index 7ac757609d..13c76b82b6 100644
--- a/contrib/contrib-global.mk
+++ b/contrib/contrib-global.mk
@@ -1,5 +1,4 @@
-# $PostgreSQL: pgsql/contrib/contrib-global.mk,v 1.9 2005/05/17 18:26:22 tgl Exp $
+# $PostgreSQL: pgsql/contrib/contrib-global.mk,v 1.10 2005/09/27 17:43:31 tgl Exp $
 
 NO_PGXS = 1
-REGRESS_OPTS = --dbname=$(CONTRIB_TESTDB)
 include $(top_srcdir)/src/makefiles/pgxs.mk
diff --git a/src/makefiles/pgxs.mk b/src/makefiles/pgxs.mk
index b12deb7d58..b18b4589c8 100644
--- a/src/makefiles/pgxs.mk
+++ b/src/makefiles/pgxs.mk
@@ -1,6 +1,6 @@
 # PGXS: PostgreSQL extensions makefile
 
-# $PostgreSQL: pgsql/src/makefiles/pgxs.mk,v 1.5 2005/08/12 21:02:25 momjian Exp $ 
+# $PostgreSQL: pgsql/src/makefiles/pgxs.mk,v 1.6 2005/09/27 17:43:31 tgl Exp $ 
 
 # This file contains generic rules to build many kinds of simple
 # extension modules.  You only need to set a few variables and include
@@ -205,6 +205,11 @@ distclean maintainer-clean: clean
 
 ifdef REGRESS
 
+# Calling makefile can set REGRESS_OPTS, but this is the default:
+ifndef REGRESS_OPTS
+REGRESS_OPTS = --dbname=$(CONTRIB_TESTDB)
+endif
+
 # When doing a VPATH build, must copy over the test .sql and .out
 # files so that the driver script can find them.  We have to use an
 # absolute path for the targets, because otherwise make will try to
@@ -224,7 +229,9 @@ endif # VPATH
 
 .PHONY: submake
 submake:
+ifndef PGXS
 	$(MAKE) -C $(top_builddir)/src/test/regress pg_regress
+endif
 
 # against installed postmaster
 installcheck: submake