diff --git a/Makefile b/Makefile
index 058f45b..a0c0486 100644
--- a/Makefile
+++ b/Makefile
@@ -45,7 +45,7 @@ BUILDAPP_OPTS = --require sb-posix                      \
 CL_OPTS    = --noinform --no-sysinit --no-userinit
 else
 BUILDAPP   = $(BUILDAPP_CCL)
-CL_OPTS    = --no-init --batch
+CL_OPTS    = --no-init
 endif
 
 ifeq ($(CL),sbcl)
diff --git a/test/Makefile b/test/Makefile
index 6161c6b..a8a2f45 100644
--- a/test/Makefile
+++ b/test/Makefile
@@ -35,6 +35,11 @@ REGRESS= allcols.load 		    \
 
 PGLOADER ?= ../build/bin/pgloader
 
+EXTRA_OPTS =
+ifneq (,$(findstring ccl,$(CL)))
+EXTRA_OPTS = --batch --heap-reserve 150g
+endif
+
 regress: clean-out $(addprefix regress/out/, $(REGRESS:.load=.out)) ;
 
 clean-out: