diff --git a/Makefile b/Makefile
index 83b42ff5..8533dec8 100644
--- a/Makefile
+++ b/Makefile
@@ -17,10 +17,11 @@ format: ## Format files to match style
 	poetry run black .
 
 lint: ## Check style with various tools
-	poetry run black --check --diff .
+	poetry check
 	poetry run pyflakes .
+	poetry run black --check --diff .
 
-test: ## Run behave tests
+test: lint ## Run behave tests
 	poetry run behave
 
 build: