diff --git a/Makefile b/Makefile
index 449fdd5..1401aa7 100644
--- a/Makefile
+++ b/Makefile
@@ -4,14 +4,11 @@ CHARM_DIR := $(pwd)
 export CHARM_DIR
 
 lint:
-	@flake8 --exclude hooks/charmhelpers,tests/charmhelpers \
-        hooks unit_tests tests
-	@charm proof
+	@tox -e pep8
 
 test:
-	@# Bundletester expects unit tests here.
 	@echo Starting unit tests...
-	@$(PYTHON) /usr/bin/nosetests -v --nologcapture --with-coverage unit_tests
+	@tox -e py27
 
 functional_test:
 	@echo Starting Amulet tests...