diff --git a/gdb/testsuite/ChangeLog b/gdb/testsuite/ChangeLog
index 4fc974e7e8..ddedefac69 100644
--- a/gdb/testsuite/ChangeLog
+++ b/gdb/testsuite/ChangeLog
@@ -1,3 +1,8 @@
+2011-10-10  Joseph Myers  <joseph@codesourcery.com>
+
+	* gdb.cp/gdb2495.exp: Do not include directories in filename in
+	expected message.
+
 2011-10-09  Doug Evans  <dje@google.com>
 
 	* gdb.base/alias.exp: Add tests for alias command.
diff --git a/gdb/testsuite/gdb.cp/gdb2495.exp b/gdb/testsuite/gdb.cp/gdb2495.exp
index c857d8b234..acb8a701ee 100644
--- a/gdb/testsuite/gdb.cp/gdb2495.exp
+++ b/gdb/testsuite/gdb.cp/gdb2495.exp
@@ -104,7 +104,7 @@ gdb_test "bt" \
 # call and that the std::terminate breakpoint has evaporated and
 # cleaned-up.
 gdb_test "info breakpoints" \
-    "gdb.cp/gdb2495\.cc.*"
+    "gdb2495\.cc.*"
 
 # Turn off this new behaviour.
 gdb_test_multiple "set unwind-on-terminating-exception off" \