diff --git a/gdb/testsuite/ChangeLog b/gdb/testsuite/ChangeLog
index 9d9c086446..f066b8af80 100644
--- a/gdb/testsuite/ChangeLog
+++ b/gdb/testsuite/ChangeLog
@@ -1,3 +1,7 @@
+2015-03-25  Markus Metzger  <markus.t.metzger@intel.com>
+
+	* gdb.btrace/exception.exp: Increase BTS buffer size.
+
 2015-03-24  Pedro Alves  <palves@redhat.com>
 
 	* gdb.threads/no-unwaited-for-left.exp: Test "thread apply all".
diff --git a/gdb/testsuite/gdb.btrace/exception.exp b/gdb/testsuite/gdb.btrace/exception.exp
index 9148eb1789..0c432736ca 100755
--- a/gdb/testsuite/gdb.btrace/exception.exp
+++ b/gdb/testsuite/gdb.btrace/exception.exp
@@ -40,6 +40,8 @@ gdb_breakpoint $bp_2
 
 # trace the code between the two breakpoints
 gdb_continue_to_breakpoint "cont to bp.1" ".*$srcfile:$bp_1\r\n.*"
+# increase the BTS buffer size - the trace can be quite big
+gdb_test_no_output "set record btrace bts buffer-size 128000"
 gdb_test_no_output "record btrace"
 gdb_continue_to_breakpoint "cont to bp.2" ".*$srcfile:$bp_2\r\n.*"