diff --git a/Makefile b/Makefile
index 6c479c25..be83082a 100644
--- a/Makefile
+++ b/Makefile
@@ -8,12 +8,15 @@ config/environments/test.js: config/environments/test.js.example
 	./configure
 
 check-local: config/environments/test.js
-	./run_tests.sh ${RUNTESTFLAGS} \
+	./run_tests.sh --nodrop ${RUNTESTFLAGS} \
     test/unit/cartodb/redis_pool.test.js \
     test/unit/cartodb/req2params.test.js \
     test/acceptance/cache_validator.js \
-    test/acceptance/server.js \
     test/acceptance/multilayer.js
+	# FIXME: LZMA module leaks a variable, waiting for new release
+	#        https://github.com/nmrugg/LZMA-JS/issues/8
+	MOCHA_OPTS="--ignore-leaks" ./run_tests.sh --nocreate ${RUNTESTFLAGS} \
+    test/acceptance/server.js \
 
 check-submodules:
 	for sub in windshaft grainstore mapnik; do \
diff --git a/run_tests.sh b/run_tests.sh
index 7b6385f1..1b93c8fd 100755
--- a/run_tests.sh
+++ b/run_tests.sh
@@ -76,7 +76,7 @@ fi
 PATH=node_modules/.bin/:$PATH
 
 echo "Running tests"
-mocha -u tdd ${TESTS}
+mocha -u tdd ${MOCHA_OPTS} ${TESTS}
 ret=$?
 
 cleanup