diff --git a/Makefile b/Makefile
index bd801215..1dc09f78 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 unit tests...
-	@$(PYTHON) /usr/bin/nosetests -v --nologcapture --with-coverage unit_tests
+	@tox -e py27
 
 functional_test:
 	@echo Starting Amulet tests...
diff --git a/tox.ini b/tox.ini
index 75fbf463..8278f3dc 100644
--- a/tox.ini
+++ b/tox.ini
@@ -8,7 +8,6 @@ setenv = VIRTUAL_ENV={envdir}
 install_command =
   pip install --allow-unverified python-apt {opts} {packages}
 commands = ostestr {posargs}
-sitepackages = True
 
 [testenv:py27]
 basepython = python2.7