diff --git a/src/test/regress/pg_regress.sh b/src/test/regress/pg_regress.sh
index e758383ebae43d9139e427c2183cb5d2ff77a7f3..a229fa46ee955e77666f492957fade69d612b7d8 100644
--- a/src/test/regress/pg_regress.sh
+++ b/src/test/regress/pg_regress.sh
@@ -1,5 +1,5 @@
 #! /bin/sh
-# $Header: /cvsroot/pgsql/src/test/regress/Attic/pg_regress.sh,v 1.33 2003/07/30 17:08:47 tgl Exp $
+# $Header: /cvsroot/pgsql/src/test/regress/Attic/pg_regress.sh,v 1.34 2003/07/31 19:20:41 tgl Exp $
 
 me=`basename $0`
 : ${TMPDIR=/tmp}
@@ -288,6 +288,10 @@ then
     PGPORT=65432
     export PGPORT
 
+    # Get rid of environment stuff that might cause psql to misbehave
+    # while contacting our temp installation
+    unset PGDATABASE PGUSER PGSERVICE PGSSLMODE PGREQUIRESSL PGCONNECT_TIMEOUT
+
     # ----------
     # Set up shared library paths, needed by psql and pg_encoding
     # (if you run multibyte).  LD_LIBRARY_PATH covers many platforms,