diff --git a/src/test/regress/gpstringsubs.pl b/src/test/regress/gpstringsubs.pl
index a05f9ec686ad19998511c95479bc317bef06b996..5af6f128ae02f32fc526aa812fe588a78c5d6ef4 100755
--- a/src/test/regress/gpstringsubs.pl
+++ b/src/test/regress/gpstringsubs.pl
@@ -72,11 +72,6 @@ The tokens are:
  from the gp_configuration table and replaces all 
  instances of the token @hostname@.
 
-=item gp_glob_connect
-
- a compound psql connect string, equivalent to the "-connect" option
- for this tool.
-
 =item gpwhich_(executable)
 
  Find the full path for the executable and substitute.  For example, 
@@ -263,14 +258,13 @@ if (1)
 
     my $hostexp = '\\@hostname\\@';
 	my $unexp = '\\@gpcurusername\\@';
-	my $gpglobconn = '\\@gp_glob_connect\\@';
 
     my $gpwhich_all  = `grep gpwhich_ $filnam`;
 	my $curdir = `pwd`;
 	chomp $curdir;
 
 #    print "$filnam\n";
-    system "perl -i -ple \' s/$hostexp/$hostname/gm; s/$unexp/$username/gm; s/$gpglobconn/$glob_connect/gm; s/$syslocaleexp/$syslocale/gm; \' $filnam\n";
+    system "perl -i -ple \' s/$hostexp/$hostname/gm; s/$unexp/$username/gm; s/$syslocaleexp/$syslocale/gm; \' $filnam\n";
 
     # replace all "which" expressions with binary
     if (defined($gpwhich_all) && length($gpwhich_all))
diff --git a/src/test/regress/input/gptokencheck.source b/src/test/regress/input/gptokencheck.source
index 5e8cf019d13612202ccf6119317781442aae5c42..eb405cfea5e51d5dbe7dd95f42be7b900e0a95ea 100755
--- a/src/test/regress/input/gptokencheck.source
+++ b/src/test/regress/input/gptokencheck.source
@@ -6,13 +6,8 @@
 -- DLSUFFIX       #is_transformed_to# @DLSUFFIX@
 -- hostname       #is_transformed_to# @hostname@
 -- syslocale      #is_transformed_to# @syslocale@
--- gpwhich_gpfdist #is_transformed_to# @gpwhich_gpfdist@
--- gpwhich_curl    #is_transformed_to# @gpwhich_curl@
--- gpwhich_gunzip  #is_transformed_to# @gpwhich_gunzip@
 -- gpwhich_gpmapreduce  #is_transformed_to# @gpwhich_gpmapreduce@
--- gpwhich_get_ereport.pl  #is_transformed_to# @gpwhich_get_ereport.pl@
 -- gpcurusername #is_transformed_to# @gpcurusername@
--- gp_glob_connect  #is_transformed_to# @gp_glob_connect@
 --
 -- 
 -- end
diff --git a/src/test/regress/output/gptokencheck.source b/src/test/regress/output/gptokencheck.source
index 5e8cf019d13612202ccf6119317781442aae5c42..eb405cfea5e51d5dbe7dd95f42be7b900e0a95ea 100755
--- a/src/test/regress/output/gptokencheck.source
+++ b/src/test/regress/output/gptokencheck.source
@@ -6,13 +6,8 @@
 -- DLSUFFIX       #is_transformed_to# @DLSUFFIX@
 -- hostname       #is_transformed_to# @hostname@
 -- syslocale      #is_transformed_to# @syslocale@
--- gpwhich_gpfdist #is_transformed_to# @gpwhich_gpfdist@
--- gpwhich_curl    #is_transformed_to# @gpwhich_curl@
--- gpwhich_gunzip  #is_transformed_to# @gpwhich_gunzip@
 -- gpwhich_gpmapreduce  #is_transformed_to# @gpwhich_gpmapreduce@
--- gpwhich_get_ereport.pl  #is_transformed_to# @gpwhich_get_ereport.pl@
 -- gpcurusername #is_transformed_to# @gpcurusername@
--- gp_glob_connect  #is_transformed_to# @gp_glob_connect@
 --
 -- 
 -- end