diff --git a/Makefile b/Makefile
index f347f6b2..46fbe2c3 100644
--- a/Makefile
+++ b/Makefile
@@ -120,30 +120,8 @@ test-changed:
 # test-fast: Fastest possible test execution for development using pytest-xdist parallelism
 test-fast:
 	make test-clean
-	PYTHONHASHSEED=0 PYTHONWARNINGS=ignore py.test -n 4 --maxfail=30 -q -p no:sugar --tb=short \
-	rhodecode/tests/functional \
-	rhodecode/tests/lib \
-	rhodecode/tests/models \
-	rhodecode/tests/other \
-	rhodecode/tests/events \
-	rhodecode/tests/integrations \
-	rhodecode/tests/config \
-	rhodecode/tests/vcs \
-	rhodecode/api/tests \
-	rhodecode/apps/admin/tests \
-	rhodecode/apps/gist/tests \
-	rhodecode/apps/home/tests \
-	rhodecode/apps/journal/tests \
-	rhodecode/apps/login/tests \
-	rhodecode/apps/my_account/tests \
-	rhodecode/apps/ops/tests \
-	rhodecode/apps/repo_group/tests \
-	rhodecode/apps/repository/tests \
-	rhodecode/apps/ssh_support/tests \
-	rhodecode/apps/svn_support/tests \
-	rhodecode/apps/user_group/tests \
-	rhodecode/apps/user_group_profile/tests \
-	rhodecode/apps/user_profile/tests \
+	PYTHONHASHSEED=0 PYTHONWARNINGS=ignore py.test -n 4 -q -p no:sugar --tb=short \
+	--ignore=rhodecode/apps/file_store/tests \
 	--ignore=rhodecode/tests/vcs_operations \
 	--ignore=rhodecode/tests/database