diff --git a/Makefile b/Makefile
index 9332b706d37c46a4094d733c9c79aa3ab1381700..b661a71655fa4e17851f4faf7e95d9b514fdbe63 100644
--- a/Makefile
+++ b/Makefile
@@ -5,11 +5,12 @@ clean_prod:
 	docker-compose -f docker-compose.yml down
 
 test:
-	docker-compose -f docker-compose.test.yml up --build
+	docker-compose -f docker-compose.test.yml up --build --abort-on-container-exit --exit-code-from test_bot_service
 
 clean_test:
 	docker-compose -f docker-compose.test.yml down -v
 
 _test:
-	pre-commit run -a
+	cp .env.example .env
+	pre-commit run -a || exit 1
 	pytest