diff --git a/gdb/testsuite/gdb.base/eh_return.exp b/gdb/testsuite/gdb.base/eh_return.exp
index b055058066b..9fefc890b28 100644
--- a/gdb/testsuite/gdb.base/eh_return.exp
+++ b/gdb/testsuite/gdb.base/eh_return.exp
@@ -79,4 +79,18 @@ gdb_assert [gdb_breakpoint "*$address" no-message] "set breakpoint on address"
 # breakpoint, so instead, run to the breakpoint.
 gdb_run_cmd
 
-gdb_test "" "Breakpoint .*" "hit breakpoint"
+set test "hit breakpoint"
+gdb_expect {
+    -re "Breakpoint .*\r\n$gdb_prompt $" {
+	pass $test
+    }
+    -re "$inferior_exited_re normally.*\r\n$gdb_prompt $" {
+	unsupported $test
+    }
+    -re "\r\n$gdb_prompt $" {
+	fail $test
+    }
+    default {
+	fail $test
+    }
+}