diff --git a/gdb/testsuite/ChangeLog b/gdb/testsuite/ChangeLog
index ef43995305..20c39b1200 100644
--- a/gdb/testsuite/ChangeLog
+++ b/gdb/testsuite/ChangeLog
@@ -1,3 +1,7 @@
+2020-02-10  Tom de Vries  <tdevries@suse.de>
+
+	* gdb.multi/multi-target.exp: Skip if skip_gdbserver_tests.
+
 2020-02-10  Maciej W. Rozycki  <macro@wdc.com>
 
 	* gdb.base/step-over-no-symbols.exp: Verify that $before_addr
diff --git a/gdb/testsuite/gdb.multi/multi-target.exp b/gdb/testsuite/gdb.multi/multi-target.exp
index 3588eb4d76..6c727b5e3b 100644
--- a/gdb/testsuite/gdb.multi/multi-target.exp
+++ b/gdb/testsuite/gdb.multi/multi-target.exp
@@ -17,6 +17,10 @@
 
 load_lib gdbserver-support.exp
 
+if { [skip_gdbserver_tests] } {
+    return 0
+}
+
 standard_testfile
 
 # The plain remote target can't do multiple inferiors.