diff --git a/gdb/testsuite/ChangeLog b/gdb/testsuite/ChangeLog
index 4639f3bc73..fccceb723f 100644
--- a/gdb/testsuite/ChangeLog
+++ b/gdb/testsuite/ChangeLog
@@ -1,3 +1,8 @@
+2014-05-21  Maciej W. Rozycki  <macro@codesourcery.com>
+
+	* lib/gdb.exp (default_gdb_init): Bump `match_max' up from
+	30000 to 65536.
+
 2014-05-21  Pedro Alves  <palves@redhat.com>
 
 	* boards/gdbserver-base.exp (GDBFLAGS): Set to "set
diff --git a/gdb/testsuite/lib/gdb.exp b/gdb/testsuite/lib/gdb.exp
index 0fe6c31d77..c22162d10b 100644
--- a/gdb/testsuite/lib/gdb.exp
+++ b/gdb/testsuite/lib/gdb.exp
@@ -3540,8 +3540,9 @@ proc default_gdb_init { test_file_name } {
     
     # Unlike most tests, we have a small number of tests that generate
     # a very large amount of output.  We therefore increase the expect
-    # buffer size to be able to contain the entire test output.
-    match_max -d 30000
+    # buffer size to be able to contain the entire test output.  This
+    # is especially needed by gdb.base/info-macros.exp.
+    match_max -d 65536
     # Also set this value for the currently running GDB. 
     match_max [match_max -d]