diff --git a/gdb/testsuite/ChangeLog b/gdb/testsuite/ChangeLog
index 09f2195af9..f6990f0678 100644
--- a/gdb/testsuite/ChangeLog
+++ b/gdb/testsuite/ChangeLog
@@ -1,3 +1,7 @@
+2007-04-16  Denis Pilat  <denis.pilat@st.com>
+
+	* gdb.base/setshow.exp: Reset height after having set it to 100.
+
 2007-04-16  Denis Pilat  <denis.pilat@st.com>
 
 	* gdb.mi/mi2-stack.exp: update from mi-stack.exp.
diff --git a/gdb/testsuite/gdb.base/setshow.exp b/gdb/testsuite/gdb.base/setshow.exp
index 113afae474..20a056b972 100644
--- a/gdb/testsuite/gdb.base/setshow.exp
+++ b/gdb/testsuite/gdb.base/setshow.exp
@@ -155,6 +155,8 @@ gdb_test "show environment FOOBARBAZ" "FOOBARBAZ = grbxgrbxgrbx.*"  "show enviro
 gdb_test "set height 100" "" "set height 100" 
 #test show height 100
 gdb_test "show height" "Number of lines gdb thinks are in a page is 100..*" "show height" 
+# back to infinite height to avoid pagers
+gdb_test "set height 0" "" "" 
 #test set history expansion on
 gdb_test "set history expansion on" "" "set history expansion on" 
 #test show history expansion on