diff --git a/contrib/pg_upgrade/test.sh b/contrib/pg_upgrade/test.sh
index 8bc6a00b53..e1db376155 100644
--- a/contrib/pg_upgrade/test.sh
+++ b/contrib/pg_upgrade/test.sh
@@ -103,6 +103,10 @@ do
 	export PGPORT
 done
 
+# buildfarm may try to override port via EXTRA_REGRESS_OPTS ...
+EXTRA_REGRESS_OPTS="$EXTRA_REGRESS_OPTS --port=$PGPORT"
+export EXTRA_REGRESS_OPTS
+
 # enable echo so the user can see what is being executed
 set -x