diff --git a/Makefile b/Makefile
index 7c51f09..c907f32 100755
--- a/Makefile
+++ b/Makefile
@@ -6,11 +6,11 @@ lint:
 
 test:
 	@echo Starting unit tests...
-	@tox -e py27
+	@tox -e py3
 
 functional_test:
-	@echo Starting Amulet tests...
-	@tox -e func27
+	@echo Starting Zaza tests...
+	@tox -e func
 
 bin/charm_helpers_sync.py:
 	@mkdir -p bin