diff --git a/Makefile b/Makefile
index 464a10cf..bfb9f603 100644
--- a/Makefile
+++ b/Makefile
@@ -2,14 +2,11 @@
 PYTHON := /usr/bin/env python
 
 lint:
-	@flake8 --exclude hooks/charmhelpers,tests/charmhelpers \
-        actions hooks unit_tests tests
-	@charm proof
+	@tox -e pep8
 
 test:
-	@# Bundletester expects unit tests here
 	@echo Starting tests...
-	@$(PYTHON) /usr/bin/nosetests -v --nologcapture --with-coverage unit_tests
+	@tox -e py27
 
 functional_test:
 	@echo Starting Amulet tests...