diff --git a/gdb/testsuite/ChangeLog b/gdb/testsuite/ChangeLog
index d4d0813fa3d..656e59d54b4 100644
--- a/gdb/testsuite/ChangeLog
+++ b/gdb/testsuite/ChangeLog
@@ -1,3 +1,8 @@
+2020-07-29  Tom de Vries  <tdevries@suse.de>
+
+	* lib/selftest-support.exp (selftest_setup): Allow breakpoint at
+	multiple locations.
+
 2020-07-29  Tom de Vries  <tdevries@suse.de>
 
 	* gdb.dwarf2/dw2-line-number-zero.exp: Set breakpoints on lines
diff --git a/gdb/testsuite/lib/selftest-support.exp b/gdb/testsuite/lib/selftest-support.exp
index 61647d655e3..450fee1b1e0 100644
--- a/gdb/testsuite/lib/selftest-support.exp
+++ b/gdb/testsuite/lib/selftest-support.exp
@@ -76,9 +76,10 @@ proc selftest_setup { executable function } {
 	return -1
     }
 
-    # Set a breakpoint at main
+    # Set a breakpoint at main.  Allow more than one location, as
+    # workaround for PR26096 - "gdb sets breakpoint at cold clone".
     gdb_test "break $function" \
-            "Breakpoint.*at.* file.*, line.*" \
+            "Breakpoint.*at.* (file.*, line|locations).*" \
             "breakpoint in $function"
 
     # run yourself