diff --git a/gdb/testsuite/ChangeLog b/gdb/testsuite/ChangeLog
index 690126c66d3..5e47767e4d5 100644
--- a/gdb/testsuite/ChangeLog
+++ b/gdb/testsuite/ChangeLog
@@ -1,3 +1,8 @@
+2013-03-21  Pedro Alves  <palves@redhat.com>
+
+	* gdb.trace/trace-buffer-size.exp (get default buffer size):
+	Expect $gdb_prompt in gdb_test_multiple.
+
 2013-03-21  Doug Evans  <dje@google.com>
 
 	* gdb.base/maint.exp: Update tests for per-command stats.
diff --git a/gdb/testsuite/gdb.trace/trace-buffer-size.exp b/gdb/testsuite/gdb.trace/trace-buffer-size.exp
index e85fbc62adb..e8c6a95da64 100644
--- a/gdb/testsuite/gdb.trace/trace-buffer-size.exp
+++ b/gdb/testsuite/gdb.trace/trace-buffer-size.exp
@@ -39,7 +39,7 @@ set test "get default buffer size"
 
 # Save default trace buffer size in 'default_size'.
 gdb_test_multiple "tstatus" $test {
-    -re ".*Trace buffer has ($decimal) bytes of ($decimal) bytes free.*" {
+    -re ".*Trace buffer has ($decimal) bytes of ($decimal) bytes free.*$gdb_prompt $" {
         set default_size $expect_out(2,string)
         pass $test
     }