diff --git a/gdb/ChangeLog b/gdb/ChangeLog
index abd6dd9368..92f5b2294d 100644
--- a/gdb/ChangeLog
+++ b/gdb/ChangeLog
@@ -1,3 +1,8 @@
+2017-04-05  Yao Qi  <yao.qi@linaro.org>
+
+	* gdb.threads/thread-specific-bp.exp (check_thread_specific_breakpoint):
+	Use gdb_test_multiple, and don't match anchor.
+
 2017-04-05  Pedro Alves  <palves@redhat.com>
 
 	* MAINTAINERS (Global Maintainers): Add Simon Marchi.
diff --git a/gdb/testsuite/gdb.threads/thread-specific-bp.exp b/gdb/testsuite/gdb.threads/thread-specific-bp.exp
index bdf12f8fd7..0c7e9fd628 100644
--- a/gdb/testsuite/gdb.threads/thread-specific-bp.exp
+++ b/gdb/testsuite/gdb.threads/thread-specific-bp.exp
@@ -87,9 +87,12 @@ proc check_thread_specific_breakpoint {mode} {
 	} else {
 	    set cmd "continue"
 	}
-	gdb_test "$cmd" \
-	    "Breakpoint .* end .* at .*" \
-	    "continue to end"
+	set test "continue to end"
+	gdb_test_multiple "$cmd" $test {
+	    -re "Breakpoint .* end .* at .*\r\n$gdb_prompt " {
+		pass $test
+	    }
+	}
 
 	set test "thread-specific breakpoint was deleted"
 	gdb_test_multiple "info breakpoint" $test {