diff --git a/Makefile b/Makefile
index e94bd344..31a6980e 100644
--- a/Makefile
+++ b/Makefile
@@ -13,6 +13,7 @@ test:
 
 functional_test:
 	@echo Starting Amulet tests...
+	@tests/setup/00-setup
 	@juju test -v -p AMULET_HTTP_PROXY,AMULET_OS_VIP --timeout 2700
 
 bin/charm_helpers_sync.py:
diff --git a/tests/00-setup b/tests/setup/00-setup
similarity index 100%
rename from tests/00-setup
rename to tests/setup/00-setup