diff --git a/gdb/testsuite/ChangeLog b/gdb/testsuite/ChangeLog
index 861438017e0..d4d0813fa3d 100644
--- a/gdb/testsuite/ChangeLog
+++ b/gdb/testsuite/ChangeLog
@@ -1,3 +1,8 @@
+2020-07-29  Tom de Vries  <tdevries@suse.de>
+
+	* gdb.dwarf2/dw2-line-number-zero.exp: Set breakpoints on lines
+	rather than function name.
+
 2020-07-28  Andrew Burgess  <andrew.burgess@embecosm.com>
 
 	PR symtab/26270:
diff --git a/gdb/testsuite/gdb.dwarf2/dw2-line-number-zero.exp b/gdb/testsuite/gdb.dwarf2/dw2-line-number-zero.exp
index a39256c171a..12011b5f9c0 100644
--- a/gdb/testsuite/gdb.dwarf2/dw2-line-number-zero.exp
+++ b/gdb/testsuite/gdb.dwarf2/dw2-line-number-zero.exp
@@ -115,13 +115,13 @@ if ![runto_main] {
     return -1
 }
 
-gdb_breakpoint "bar1"
+gdb_breakpoint "$srcfile:27"
 gdb_continue_to_breakpoint "bar1" "\[^\r\n\]*:27\r\n.*"
 
 gdb_test "n" "foo \\(2\\);" "bar1, 1st next"
 gdb_test "n" "foo \\(4\\);" "bar1, 2nd next"
 
-gdb_breakpoint "bar2"
+gdb_breakpoint "$srcfile:41"
 gdb_continue_to_breakpoint "bar2" "\[^\r\n\]*:41\r\n.*"
 
 gdb_test "n" "foo \\(2\\);" "bar2, 1st next"