diff --git a/gdb/testsuite/gdb.base/call-signal-resume.exp b/gdb/testsuite/gdb.base/call-signal-resume.exp
index 011ca85a418..5b3f10504a2 100644
--- a/gdb/testsuite/gdb.base/call-signal-resume.exp
+++ b/gdb/testsuite/gdb.base/call-signal-resume.exp
@@ -116,18 +116,17 @@ gdb_test "call null_hand_call ()" "Breakpoint \[0-9\]*, null_hand_call.*" \
 
 set frame_number [get_dummy_frame_number]
 if { "$frame_number" == "" } {
-    fail "dummy stack frame number"
+    fail "dummy stack frame number, two"
     setup_xfail "*-*-*"
     # Need something.
     set frame_number 0
 } else {
-    pass "dummy stack frame number"
+    pass "dummy stack frame number, two"
 }
 
 # Pop the dummy frame.
 gdb_test "frame $frame_number" ".*"
-gdb_test_no_output "set confirm off"
-gdb_test "return" ""
+gdb_test "return" "" "return, two"
 
 # Continue again, this time we should get to the signal handler.