diff --git a/gdb/testsuite/ChangeLog b/gdb/testsuite/ChangeLog
index 010be969794..5b0a2dc77c9 100644
--- a/gdb/testsuite/ChangeLog
+++ b/gdb/testsuite/ChangeLog
@@ -1,3 +1,7 @@
+2020-07-20  Tom de Vries  <tdevries@suse.de>
+
+	* gdb.threads/attach-slow-waitpid.exp: Bail out if gdb_start fails.
+
 2020-07-17  Tom de Vries  <tdevries@suse.de>
 
 	* gdb.base/valgrind-infcall-2.c: New test.
diff --git a/gdb/testsuite/gdb.threads/attach-slow-waitpid.exp b/gdb/testsuite/gdb.threads/attach-slow-waitpid.exp
index a7005a0f9bd..a294f7158f3 100644
--- a/gdb/testsuite/gdb.threads/attach-slow-waitpid.exp
+++ b/gdb/testsuite/gdb.threads/attach-slow-waitpid.exp
@@ -88,7 +88,12 @@ set test_spawn_id [spawn_wait_for_attach $binfile]
 set testpid [spawn_id_get_pid $test_spawn_id]
 
 # Start GDB with preload library in place.
-gdb_spawn_with_ld_preload $libobj
+if { [gdb_spawn_with_ld_preload $libobj] == -1 } {
+    # Make sure we get UNTESTED rather than UNRESOLVED.
+    set errcnt 0
+    untested "Couldn't start GDB with preloaded lib"
+    return -1
+}
 
 # Load binary, and attach to running program.
 gdb_load ${binfile}