diff --git a/src/test/regress/bin/diff b/src/test/regress/bin/diff
index 0bbbe92ae..583748610 100755
--- a/src/test/regress/bin/diff
+++ b/src/test/regress/bin/diff
@@ -30,8 +30,13 @@ fi
 if test -z "${VANILLATEST:-}"
 then
 	touch "$file1"  # when adding a new test the expected file does not exist
-	sed -Ef "$BASEDIR/normalize.sed" < "$file1" > "$file1.modified"
-	sed -Ef "$BASEDIR/normalize.sed" < "$file2" > "$file2.modified"
+	normalize_file="$BASEDIR/normalize.sed"
+	if [[ -f "$BASEDIR/normalize_modified.sed" ]]
+	then
+		normalize_file="$BASEDIR/normalize_modified.sed"
+	fi
+	sed -Ef "$normalize_file" < "$file1" > "$file1.modified"
+	sed -Ef "$normalize_file" < "$file2" > "$file2.modified"
 	"$DIFF" -w $args "$file1.modified" "$file2.modified" | LC_CTYPE=C.UTF-8 diff-filter "$BASEDIR/normalize.sed"
 	exit ${PIPESTATUS[0]}
 else
diff --git a/src/test/regress/bin/normalize.sed b/src/test/regress/bin/normalize.sed
index 234dab801..a595d3c26 100644
--- a/src/test/regress/bin/normalize.sed
+++ b/src/test/regress/bin/normalize.sed
@@ -91,3 +91,8 @@ s/read_intermediate_result\('insert_select_[0-9]+_/read_intermediate_result('ins
 
 # ignore job id in repartitioned insert/select
 s/repartitioned_results_[0-9]+/repartitioned_results_xxxxx/g
+
+s/dbname=regression/dbname=<db>/g
+s/\b576[0-9][0-9]\b/xxxxx/g
+s/\blocalhost\b/<host>/g
+s/\bpostgres\b/<user>/g
diff --git a/src/test/regress/pg_regress_multi.pl b/src/test/regress/pg_regress_multi.pl
index ddd381d9d..c07f4569e 100755
--- a/src/test/regress/pg_regress_multi.pl
+++ b/src/test/regress/pg_regress_multi.pl
@@ -300,6 +300,24 @@ if ( $constr )
         $dbname = $convals{dbname};
     }
 
+    open my $in, '<', "bin/normalize.sed" or die "Cannot open normalize.sed file\n";
+    open my $out, '>', "bin/normalize_modified.sed" or die "Cannot open normalize_modified.sed file\n";
+
+    while ( <$in> )
+    {
+        print $out $_;
+    }
+
+    close $in;
+
+
+    print $out "\n";
+    print $out "s/dbname=$dbname/dbname=<db>/g\n";
+    print $out "s/$user/<user>/g\n";
+    print $out "s/$host/<host>/g\n";
+    print $out "s/", substr("$masterPort", 0, length("$masterPort")-2), "[0-9][0-9]/xxxxx/g\n";
+
+
     my $worker1port = `psql "$constr" -t -c "SELECT nodeport FROM pg_dist_node ORDER BY nodeid LIMIT 1;"`;
     my $worker2port = `psql "$constr" -t -c "SELECT nodeport FROM pg_dist_node ORDER BY nodeid OFFSET 1 LIMIT 1;"`;