diff --git a/gdb/testsuite/ChangeLog b/gdb/testsuite/ChangeLog
index 82cd0878c3..02c36048f8 100644
--- a/gdb/testsuite/ChangeLog
+++ b/gdb/testsuite/ChangeLog
@@ -1,3 +1,8 @@
+2002-07-10  Andrew Cagney  <ac131313@redhat.com>
+
+	* gdb.base/page.exp: Rewrite to handle problems with very long
+	`info set' output.  Update copyright.
+
 2002-06-26  Andrew Cagney  <ac131313@redhat.com>
 
 	* gdb.hp/configure.in (AC_CONFIG_SUBDIRS): Do not try to configure
diff --git a/gdb/testsuite/gdb.base/page.exp b/gdb/testsuite/gdb.base/page.exp
index 9791a60759..c757ca2b56 100644
--- a/gdb/testsuite/gdb.base/page.exp
+++ b/gdb/testsuite/gdb.base/page.exp
@@ -1,4 +1,5 @@
-# Copyright 1992, 1994, 1995, 1999 Free Software Foundation, Inc.
+# Copyright 1992, 1994, 1995, 1999, 2002 Free Software Foundation,
+# Inc.
 
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
@@ -30,10 +31,50 @@ set timeout 200
 
 gdb_exit
 gdb_start
+
 gdb_test "set pagination off" ""
-gdb_test "info set" ".*pagination:  State of pagination is off.*"
+gdb_test "show pagination" "State of pagination is off.*" "pagination is off"
+send_gdb "help\n"
+gdb_expect_list "unpaged help" ".*$gdb_prompt $" {
+    "List of classes of commands:"
+    ""
+    "aliases -- Aliases of other commands"
+    "breakpoints -- Making program stop at certain points"
+    "data -- Examining data"
+    "files -- Specifying and examining files"
+    "internals -- Maintenance commands"
+    "obscure -- Obscure features"
+    "running -- Running the program"
+    "stack -- Examining the stack"
+    "status -- Status inquiries"
+    "support -- Support facilities"
+    "tracepoints -- Tracing of program execution without stopping the program"
+    "user-defined -- User-defined commands"
+    ""
+    "Type .help. followed by a class name for a list of commands in that class."
+    "Type .help. followed by command name for full documentation."
+    "Command name abbreviations are allowed if unambiguous."
+}
+
+
 gdb_test "set pagination on" ""
-gdb_test "info set" ".*pagination:  State of pagination is on.*"
+gdb_test "show pagination" "State of pagination is on.*" "pagination is on"
+gdb_test "set height 10" ""
+send_gdb "help\n"
+gdb_expect_list "paged help" \
+	".*---Type <return> to continue, or q <return> to quit---" {
+    "List of classes of commands:"
+    ""
+    "aliases -- Aliases of other commands"
+    "breakpoints -- Making program stop at certain points"
+    "data -- Examining data"
+    "files -- Specifying and examining files"
+    "internals -- Maintenance commands"
+    "obscure -- Obscure features"
+    "running -- Running the program"
+}
+gdb_test "q"
+
 
 gdb_exit
 return 0