diff --git a/gdb/testsuite/gdb.debuginfod/fetch_src_and_symbols.exp b/gdb/testsuite/gdb.debuginfod/fetch_src_and_symbols.exp
index 93490fce41e..f8fcbbae8a4 100644
--- a/gdb/testsuite/gdb.debuginfod/fetch_src_and_symbols.exp
+++ b/gdb/testsuite/gdb.debuginfod/fetch_src_and_symbols.exp
@@ -180,12 +180,17 @@ proc local_url { } {
 	spawn debuginfod -vvvv -d $db -p $port -F $debugdir
 	expect {
 	    "started http server on IPv4 IPv6 port=$port" { set found 1 }
-	    "failed to bind to port" { kill_wait_spawned_process $spawn_id }
+	    "started http server on IPv4 port=$port" { set found 1 }
+	    "started http server on IPv6 port=$port" {}
+	    "failed to bind to port" {}
 	    timeout {
 		fail "find port timeout"
 		return -1
 	    }
 	}
+	if { ! $found } {
+	    kill_wait_spawned_process $spawn_id
+	}
     }
 
     set metrics [list "ready 1" \