diff --git a/Makefile b/Makefile
index 4d4c462..d776bbb 100644
--- a/Makefile
+++ b/Makefile
@@ -5,20 +5,18 @@ lint:
 	@flake8 --exclude hooks/charmhelpers hooks unit_tests tests
 	@charm proof
 
-unit_test:
+test:
+	@# Bundletester expects unit tests here.
 	@echo Starting unit tests...
 	@$(PYTHON) /usr/bin/nosetests --nologcapture --with-coverage  unit_tests
 
-test:
+functional_test:
 	@echo Starting Amulet tests...
-ifndef OS_CHARMS_AMULET_VIP
-	@echo "WARNING: HA tests require OS_CHARMS_AMULET_VIP set to usable vip address"
+ifndef AMULET_OS_VIP
+	@echo "ERROR: HA tests require AMULET_OS_VIP set to usable vip address"
+	@exit 1
 endif
-	# 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,OS_CHARMS_AMULET_VIP --timeout 900 \
-		00-setup 15-basic-trusty-icehouse
+	@juju test -v -p AMULET_HTTP_PROXY,AMULET_OS_VIP --timeout 2700
 
 bin/charm_helpers_sync.py:
 	@mkdir -p bin
diff --git a/metadata.yaml b/metadata.yaml
index 8609915..a4d5ede 100644
--- a/metadata.yaml
+++ b/metadata.yaml
@@ -4,7 +4,7 @@ maintainer: Andres Rodriguez <andres.rodriguez@canonical.com>
 subordinate: true
 description: |
  Corosync/Pacemaker
-categories:
+tags:
  - misc
 requires:
   juju-info:
diff --git a/tests/15-basic-trusty-icehouse b/tests/015-basic-trusty-icehouse
similarity index 100%
rename from tests/15-basic-trusty-icehouse
rename to tests/015-basic-trusty-icehouse
diff --git a/tests/basic_deployment.py b/tests/basic_deployment.py
index 617d600..91d8e2d 100644
--- a/tests/basic_deployment.py
+++ b/tests/basic_deployment.py
@@ -24,7 +24,7 @@ class HAClusterBasicDeployment(OpenStackAmuletDeployment):
         """Deploy the entire test environment."""
         super(HAClusterBasicDeployment, self).__init__(series, openstack,
                                                        source, stable)
-        env_var = 'OS_CHARMS_AMULET_VIP'
+        env_var = 'AMULET_OS_VIP'
         self._vip = os.getenv(env_var, None)
         if not self._vip:
             amulet.raise_status(amulet.SKIP, msg="No vip provided with '%s' - "