diff --git a/test/run-tests.sh b/test/run-tests.sh
index d64c5d6e63a6e1dbe511bb79b97fdb98627d4bf8..b53caa11e635de810f6e0376a0d67fa6de8c191e 100755
--- a/test/run-tests.sh
+++ b/test/run-tests.sh
@@ -201,12 +201,8 @@ case "$lisp" in
   gcl)
     GCL_ANSI=t
     command="${GCL:-gcl}"
-    flags="-batch"
-    eval="-eval" ;;
-  gclcvs)
-    GCL_ANSI=t
-    command="${GCLCVS:-gclcvs}"
-    flags="-batch"
+    flags=""
+    nodebug="-batch"
     eval="-eval" ;;
   lispworks)
     command="${LISPWORKS:-lispworks}"
diff --git a/test/script-support.lisp b/test/script-support.lisp
index 3bd6098d9d42c91316efe0382322505385354f6c..1a369efbf1e55ce0f10204f3aac4b5eb323d79f6 100644
--- a/test/script-support.lisp
+++ b/test/script-support.lisp
@@ -35,7 +35,7 @@ Some constraints:
 
 (declaim (optimize (speed 2) (safety #-gcl 3 #+gcl 0) #-(or allegro gcl genera) (debug 3)
                    #+(or cmu scl) (c::brevity 2)))
-(proclaim '(optimize (speed #-gcl 2 #+gcl 0) (safety #-gcl 3 #+gcl 0) #-(or allegro gcl genera) (debug 3)
+(proclaim '(optimize (speed #-gcl 2 #+gcl 1) (safety #-gcl 3 #+gcl 0) #-(or allegro gcl genera) (debug 3)
                      #+(or cmu scl) (c::brevity 2)))
 
 (defvar *trace-symbols*