diff --git a/gdb/testsuite/ChangeLog b/gdb/testsuite/ChangeLog
index 11f49ea9a4d..de32b614c97 100644
--- a/gdb/testsuite/ChangeLog
+++ b/gdb/testsuite/ChangeLog
@@ -1,3 +1,8 @@
+2014-05-26  Yao Qi  <yao@codesourcery.com>
+
+	* gdb.server/no-thread-db.exp: Specify source file name
+	explicitly when setting a breakpoint.
+
 2014-05-23  Markus Metzger  <markus.t.metzger@intel.com>
 
 	* gdb.btrace/vdso.c: New.
diff --git a/gdb/testsuite/gdb.server/no-thread-db.exp b/gdb/testsuite/gdb.server/no-thread-db.exp
index 9246fa9bb57..8a9c2919c6f 100644
--- a/gdb/testsuite/gdb.server/no-thread-db.exp
+++ b/gdb/testsuite/gdb.server/no-thread-db.exp
@@ -47,7 +47,7 @@ gdb_test "monitor set libthread-db-search-path ${unresolvable_thread_db_path}" \
     "libthread-db is now unresolvable"
 
 # Continue past tls assignment to make sure tls storage is allocated.
-gdb_breakpoint [gdb_get_line_number "after tls assignment"]
+gdb_breakpoint ${srcfile}:[gdb_get_line_number "after tls assignment"]
 gdb_continue_to_breakpoint "after tls assignment"
 
 # Printing a tls variable should fail gracefully without a libthread_db.