diff --git a/src/modules/gdbmmod/testsuite.in b/src/modules/gdbmmod/testsuite.in
index 06f598934c079d45cc59af476eaa684f7cd1cf25..5f4f5151adc57d7f245a046062c9e766d078821f 100644
--- a/src/modules/gdbmmod/testsuite.in
+++ b/src/modules/gdbmmod/testsuite.in
@@ -15,17 +15,17 @@ cond( [[ master()->programs["/precompiled/gdbm"] ]],
     test_true(GDBMBASE->store("foo","bar"))
     GDBMNULLTEST
     test_equal(GDBMBASE->fetch("foo"),"bar")
-    test_do([[int e; for(e=0;e<1000;e++) GDBMBASE->store("x"+e,"y"+e)]])
+    test_do([[int e; for(e=0;e<100;e++) GDBMBASE->store("x"+e,"y"+e)]])
     GDBMNULLTEST
-    test_any(int e; for(e=0;e<1000;e++) if(GDBMBASE->fetch("x"+e)!="y"+e) return e; return -1,-1)
+    test_any(int e; for(e=0;e<100;e++) if(GDBMBASE->fetch("x"+e)!="y"+e) return e; return -1,-1)
     GDBMNULLTEST
     test_true(GDBMBASE->store(sprintf("%'23'100000s",""),sprintf("%'32'100000s","")))
     test_true(GDBMBASE->fetch(sprintf("%'23'100000s",""))==sprintf("%'32'100000s",""))
     GDBMNULLTEST
     test_equal(GDBMBASE->fetch("foo"),"bar")
-    test_any(int e; for(e=0;e<1000;e++) if(GDBMBASE->fetch("x"+e)!="y"+e) return e; return -1,-1)
+    test_any(int e; for(e=0;e<100;e++) if(GDBMBASE->fetch("x"+e)!="y"+e) return e; return -1,-1)
     test_true(GDBMBASE->fetch(sprintf("%'23'100000s",""))==sprintf("%'32'100000s",""))
-    test_any(int e; string k; for(k=GDBMBASE->firstkey();k;k=GDBMBASE->nextkey(k)) e++; return e,1002)
+    test_any(int e; string k; for(k=GDBMBASE->firstkey();k;k=GDBMBASE->nextkey(k)) e++; return e,102)
 
     test_do(GDBMBASE->sync())
     test_do(GDBMBASE->reorganize())
diff --git a/src/modules/readlinemod/configure.in b/src/modules/readlinemod/configure.in
index 04925e164520ade3c33fd9a8b27ca9271c85c837..27a2af217ec287c22d4a7b6e5941d5870a76c8ea 100644
--- a/src/modules/readlinemod/configure.in
+++ b/src/modules/readlinemod/configure.in
@@ -7,11 +7,8 @@ AC_SUBST(RANLIB)
 
 AC_CHECK_HEADERS(readline.h history.h readline/readline.h history/history.h readline/history.h)
 
-if test $ac_cv_header_readline_h = yes -o \
-        $ac_cv_header_readline_readline_h = yes ; then
-  if test $ac_cv_header_history_h = yes -o \ 
-          $ac_cv_header_history_history_h = yes -o \
-          $ac_cv_header_readline_history_h = yes ; then
+if test $ac_cv_header_readline_h = yes -o $ac_cv_header_readline_readline_h = yes ; then
+  if test $ac_cv_header_history_h = yes -o $ac_cv_header_history_history_h = yes -o $ac_cv_header_readline_history_h = yes ; then
     AC_CHECK_LIB(termcap, tputs)
     AC_CHECK_LIB(readline, readline)
   fi