diff --git a/gdb/testsuite/ChangeLog b/gdb/testsuite/ChangeLog
index 4ead639aa9..0d773b67ee 100644
--- a/gdb/testsuite/ChangeLog
+++ b/gdb/testsuite/ChangeLog
@@ -1,3 +1,8 @@
+2014-04-15  Pedro Alves <palves@redhat.com>
+
+	* gdb.base/sym-file.exp: Remove regex characters from test
+	message.  Don't refer to breakpoint numbers in test messages.
+
 2014-04-14  Keith Seitz  <keiths@redhat.com>
 
 	PR c++/16253
diff --git a/gdb/testsuite/gdb.base/sym-file.exp b/gdb/testsuite/gdb.base/sym-file.exp
index 5d19f3b5d6..9ee12e5534 100644
--- a/gdb/testsuite/gdb.base/sym-file.exp
+++ b/gdb/testsuite/gdb.base/sym-file.exp
@@ -89,7 +89,7 @@ if {!$result} then {
 # 3) Add $shlib_name using 'add-symbol-file'.
 set result [gdb_test "add-symbol-file ${shlib_name} addr" \
 		     "Reading symbols from .*${lib_basename}\\.so\\.\\.\\.done\\." \
-		     "add-symbol-file .*${lib_basename}\\.so addr" \
+		     "add-symbol-file ${lib_basename}.so addr" \
 		     "add symbol table from file \".*${lib_basename}\\.so\"\
  at.*\\(y or n\\) " \
 		     "y"]
@@ -148,11 +148,11 @@ gdb_test "info files" \
 #     $shlib_name.
 gdb_test "info breakpoints 2" \
 	 ".*PENDING.*" \
-	 "check if Breakpoint 2 is pending."
+	 "breakpoint at foo is pending"
 
 gdb_test "info breakpoints 3" \
 	 ".*PENDING.*" \
-	 "check if Breakpoint 3 is pending."
+	 "breakpoint at bar is pending"
 
 # 13) Check that the execution can continue without error.
 gdb_continue_to_end