diff --git a/.gitignore b/.gitignore
index 064fe5f..d99f287 100644
--- a/.gitignore
+++ b/.gitignore
@@ -194,5 +194,7 @@ build/*
 
 # Test report & coverage
 test-report.xml
+.phpunit.result.cache
 clover.xml
 composer.lock
+docker-compose.yml
diff --git a/Makefile b/Makefile
index 8ced0dc..36a3f95 100644
--- a/Makefile
+++ b/Makefile
@@ -1,15 +1,16 @@
-ROOT_DIR=$(shell dirname $(realpath $(lastword $(MAKEFILE_LIST))))
-SRC_DIR=$(ROOT_DIR)/src
-BIN_DIR=$(ROOT_DIR)/vendor/bin
+ifneq ("$(wildcard docker-compose.yml)","")
+	PHP=docker-compose run --rm --no-deps php php
+else
+	PHP=php
+endif
 
 test:
 	@echo "==> Running tests"
-	@cd $(ROOT_DIR)
 	@cp .env.dist .env
-	@php -d memory_limit=-1 $(BIN_DIR)/phpunit -c phpunit.xml.dist
+	@$(PHP) -d memory_limit=-1 vendor/bin/phpunit -c phpunit.xml.dist
 	@echo "==> Testing  complete"
 
 stan:
 	@echo "==> Running analysis"
-	@php $(BIN_DIR)/phpstan analyse
+	@$(PHP) vendor/bin/phpstan analyse
 	@echo "==> Analysis complete"