diff --git a/Makefile b/Makefile
index 0187cebc..e3d141e1 100644
--- a/Makefile
+++ b/Makefile
@@ -19,11 +19,17 @@ client:
 	tox -r --notest -e lint,py3
 	$(PY) -m juju.client.facade -s "juju/client/schemas*" -o juju/client/
 
-.PHONY: test
-test: lint
+.PHONY: run-unit-tests
+run-unit-tests: lint .tox
 	tox -e py3
+
+.PHONY: run-integration-tests
+run-unit-tests: lint .tox
 	tox -e integration
 
+.PHONY: run-all-tests
+test: run-unit-tests run-integration-tests
+
 .PHONY: lint
 lint:
 	@./scripts/copyright.sh