2 files changed, 8 insertions, 3 deletions

diff --git a/regress/dynamic-forward.sh b/regress/dynamic-forward.sh
index 3a6e5c1ef..392fc1978 100644
--- a/regress/dynamic-forward.sh
+++ b/regress/dynamic-forward.sh
@@ -3,8 +3,8 @@
 
 tid="dynamic forwarding"
 
-PORT=4242
-FWDPORT=4243
+FWDPORT=`expr $PORT + 1`
+
 DATA=/bin/ls${EXEEXT}
 
 if have_prog nc && nc -h 2>&1 | grep "proxy address" >/dev/null; then
diff --git a/regress/test-exec.sh b/regress/test-exec.sh
index a184c16d1..b0ac64e9e 100644
--- a/regress/test-exec.sh
+++ b/regress/test-exec.sh
@@ -1,9 +1,14 @@
 #       $OpenBSD: test-exec.sh,v 1.20 2004/06/22 22:45:52 dtucker Exp $
 #       Placed in the Public Domain.
 
-PORT=4242
 #SUDO=sudo
 
+if [ ! -z "$TEST_SSH_PORT" ]; then
+        PORT="$TEST_SSH_PORT"
+else
+        PORT=4242
+fi
+
 if [ -x /usr/ucb/whoami ]; then
         USER=`/usr/ucb/whoami`
 elif whoami >/dev/null 2>&1; then