diff --git a/Makefile b/Makefile
index 30e1f6ad0d44a349017eb3b39aa569226bb03f3c..624dc4704c2927c861ff2781fa84fb91ba9a02e9 100644
--- a/Makefile
+++ b/Makefile
@@ -15,8 +15,8 @@ test:
 	poetry run pytest -vv --cov=semantic_router --cov-report=term-missing --cov-report=xml
 
 test_functional:
-	poetry run pytest -vv -n 20 tests/functional
+	poetry run pytest -vv --exitfirst --maxfail=1 --max-parallel=20 tests/functional
 test_unit:
-	poetry run pytest -vv -n 20 tests/unit
+	poetry run pytest -vv --exitfirst --maxfail=1 --max-parallel=20 tests/unit
 test_integration:
-	poetry run pytest -vv -n 20 tests/integration
\ No newline at end of file
+	poetry run pytest -vv --exitfirst --maxfail=1 --max-parallel=20 tests/integration