diff --git a/Makefile b/Makefile
index ab8082c9..eab0e2ea 100644
--- a/Makefile
+++ b/Makefile
@@ -13,8 +13,7 @@ test:
 	# coreycb note: The -v should only be temporary until Amulet sends
 	# raise_status() messages to stderr:
 	#   https://bugs.launchpad.net/amulet/+bug/1320357
-	@juju test -v -p AMULET_HTTP_PROXY,AMULET_OS_VIP --timeout 900 \
-        00-setup 14-basic-precise-icehouse 15-basic-trusty-icehouse
+	@juju test -v -p AMULET_HTTP_PROXY,AMULET_OS_VIP --timeout 2700
 
 bin/charm_helpers_sync.py:
 	@mkdir -p bin