diff --git a/Makefile b/Makefile
--- a/Makefile
+++ b/Makefile
@@ -54,7 +54,7 @@ clean:
 # test: run test-clean and tests
 test:
 	make test-clean
-	unset RC_SQLALCHEMY_DB1_URL && unset RC_DB_URL && make test-only
+	make test-only
 
 
 .PHONY: test-clean
@@ -71,7 +71,18 @@ test-only:
 	PYTHONHASHSEED=random \
 	py.test -x -vv -r xw -p no:sugar \
 	--cov-report=term-missing --cov-report=html \
-	--cov=rhodecode rhodecode
+	--cov=rhodecode rhodecode \
+	--ignore=rhodecode/tests/vcs_operations \
+	--ignore=rhodecode/tests/database
+
+	PYTHONHASHSEED=random \
+		py.test -x -vv -r xw -p no:sugar \
+		rhodecode/tests/vcs_operations
+
+	PYTHONHASHSEED=random \
+		py.test -x -vv -r xw -p no:sugar \
+		rhodecode/tests/database
+
 
 # >>> Docs commands