diff --git a/gdb/testsuite/gdb.base/step-over-syscall.exp b/gdb/testsuite/gdb.base/step-over-syscall.exp
index 6dab76dfa1f..dc73def9906 100644
--- a/gdb/testsuite/gdb.base/step-over-syscall.exp
+++ b/gdb/testsuite/gdb.base/step-over-syscall.exp
@@ -62,14 +62,18 @@ proc_with_prefix check_pc_after_cross_syscall { displaced syscall syscall_insn_n
 # Verify the syscall number is the correct one.
 
 proc syscall_number_matches { syscall } {
-  global syscall_register syscall_number
+    global syscall_register syscall_number
 
-  if {[gdb_test "p \$$syscall_register" ".*= $syscall_number($syscall)" \
-    "syscall number matches"] != 0} {
-      return 0
-  }
+    set res 0
+    gdb_test_multiple "p \$$syscall_register" "syscall number matches" {
+	-re -wrap ".*= $syscall_number($syscall)" {
+	    set res 1
+	}
+	-re -wrap "" {
+	}
+    }
 
-  return 1
+    return $res
 }
 
 # Restart GDB and set up the test.  Return a list in which the first one
@@ -139,7 +143,13 @@ proc setup { syscall } {
 		if {[syscall_number_matches $syscall]} {
 		    pass $gdb_test_name
 		} else {
-		    exp_continue
+		    incr steps
+		    if {$steps == $max_steps} {
+			fail $gdb_test_name
+		    } else {
+			send_gdb "stepi\n"
+			exp_continue
+		    }
 		}
 	    }
 	    -re "x/i .*=>.*\r\n$gdb_prompt $" {