diff --git a/Makefile b/Makefile
index 978097529..e818e4f98 100644
--- a/Makefile
+++ b/Makefile
@@ -173,13 +173,17 @@ testclean: bats-clean
 .PHONY: test
 test: export AWS_ENDPOINT_FORCE=http://localhost:4566
 test: goversion
-	@echo NOTE: You need Docker, docker-compose and run \"make localstack\" in a separate shell
+	@echo 'NOTE: You need Docker, docker-compose and run "make localstack" in a separate shell ("make localstack-stop" to terminate it)'
 	$(GOTEST) $(LD_OPTS) ./...
 
 .PHONY: localstack
 localstack:
 	docker-compose -f tests/localstack/docker-compose.yml up
 
+.PHONY: localstack-stop
+localstack-stop:
+	docker-compose -f tests/localstack/docker-compose.yml down
+
 package-common:
 	@echo "Building Release to dir $(RELDIR)"
 	@$(MKDIR) $(RELDIR)/cmd/crowdsec