diff --git a/gdb/testsuite/ChangeLog b/gdb/testsuite/ChangeLog
index d89ef4a00cf..dc921257de1 100644
--- a/gdb/testsuite/ChangeLog
+++ b/gdb/testsuite/ChangeLog
@@ -1,3 +1,8 @@
+2021-06-08  Tom de Vries  <tdevries@suse.de>
+
+	* gdb.threads/multi-create-ns-info-thr.exp: Limit breakpoint regexp to
+	one line.
+
 2021-06-08  Tom de Vries  <tdevries@suse.de>
 
 	* gdb.base/sect-cmd.exp: Use gdb_test.  Use -wrap "".  Fix
diff --git a/gdb/testsuite/gdb.threads/multi-create-ns-info-thr.exp b/gdb/testsuite/gdb.threads/multi-create-ns-info-thr.exp
index 2fb52238798..1b32637e877 100644
--- a/gdb/testsuite/gdb.threads/multi-create-ns-info-thr.exp
+++ b/gdb/testsuite/gdb.threads/multi-create-ns-info-thr.exp
@@ -45,7 +45,7 @@ gdb_test_multiple $test $test {
 for {set i 0} {$i < 32} {incr i} {
     set test "continue to breakpoint $i"
     gdb_test_multiple "" $test {
-	-re "Breakpoint $decimal,.*$srcfile:$bp_location1" {
+	-re "Breakpoint $decimal,\[^\r\n\]*$srcfile:$bp_location1" {
 	    pass $test
 	}
     }