diff --git a/gdb/testsuite/boards/remote-stdio-gdbserver.exp b/gdb/testsuite/boards/remote-stdio-gdbserver.exp
index 101f1ee8098..e1a2d0ed007 100644
--- a/gdb/testsuite/boards/remote-stdio-gdbserver.exp
+++ b/gdb/testsuite/boards/remote-stdio-gdbserver.exp
@@ -21,7 +21,7 @@
 # To use this file:
 # bash$ cd ${build_dir}/gdb
 # bash$ make check RUNTESTFLAGS="--target_board=remote-stdio-gdbserver \
-#    REMOTE_USERNAME=... REMOTE_HOSTNAME=... REMOTE_PORTNUM=... \
+#    REMOTE_USERNAME=... REMOTE_HOSTNAME=... \
 #    [REMOTE_TMPDIR=${remote_dir}] [GDBSERVER=${remote_gdbserver}]"
 
 load_board_description "stdio-gdbserver-base"
@@ -39,17 +39,8 @@ if [info exists REMOTE_HOSTNAME] {
     set_board_info hostname unspecified_hostname
 }
 
-# The two programs have different syntax to set the remote port, so
-# set it as part of the program name rather than in get_remote_login.
-
-if [info exists REMOTE_PORTNUM] {
-    set_board_info portnum $REMOTE_PORTNUM
-    set_board_info rsh_prog "/usr/bin/ssh -p$REMOTE_PORTNUM"
-    set_board_info rcp_prog "/usr/bin/scp -P$REMOTE_PORTNUM"
-} else {
-    set_board_info rsh_prog /usr/bin/ssh
-    set_board_info rcp_prog /usr/bin/scp
-}
+set_board_info rsh_prog /usr/bin/ssh
+set_board_info rcp_prog /usr/bin/scp
 
 # Some remote machines don't have writable home directories.
 if [info exists REMOTE_TMPDIR] {