diff --git a/gdb/testsuite/ChangeLog b/gdb/testsuite/ChangeLog
index eb4388031b..793a0af630 100644
--- a/gdb/testsuite/ChangeLog
+++ b/gdb/testsuite/ChangeLog
@@ -1,3 +1,8 @@
+2020-02-06  Andrew Burgess  <andrew.burgess@embecosm.com>
+
+	* gdb.server/multi-ui-errors.exp: Give a test a real name to avoid
+	including a port number in the output.
+
 2020-02-04  Alok Kumar Sharma  <alokkumar.sharma@amd.com>
 
 	* lib/fortran.exp (fortran_int4): Handle clang.
diff --git a/gdb/testsuite/gdb.server/multi-ui-errors.exp b/gdb/testsuite/gdb.server/multi-ui-errors.exp
index c2a05b0fb6..9d64a9a245 100644
--- a/gdb/testsuite/gdb.server/multi-ui-errors.exp
+++ b/gdb/testsuite/gdb.server/multi-ui-errors.exp
@@ -65,7 +65,8 @@ with_spawn_id $extra_spawn_id {
 
 # Connect to the remote and continue its execution from the other UI.
 with_spawn_id $extra_spawn_id {
-    gdb_test "target $gdbserver_protocol $gdbserver_gdbport" ".*"
+    gdb_test "target $gdbserver_protocol $gdbserver_gdbport" ".*" \
+	"connect to gdbserver"
     send_gdb "continue\n"
 }