diff --git a/Makefile b/Makefile
index f10fc89c..52b6dfbf 100644
--- a/Makefile
+++ b/Makefile
@@ -23,10 +23,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 --timeout 900 \
-        00-setup 14-basic-precise-icehouse 15-basic-trusty-icehouse \
-        16-basic-trusty-icehouse-git 17-basic-trusty-juno \
-        18-basic-trusty-juno-git
+	@juju test -v -p AMULET_HTTP_PROXY,AMULET_OS_VIP --timeout 2700
 
 publish: lint test
 	bzr push lp:charms/openstack-dashboard
diff --git a/hooks/charmhelpers/contrib/openstack/context.py b/hooks/charmhelpers/contrib/openstack/context.py
index c9914d0d..400eaf8e 100644
--- a/hooks/charmhelpers/contrib/openstack/context.py
+++ b/hooks/charmhelpers/contrib/openstack/context.py
@@ -459,6 +459,11 @@ class AMQPContext(OSContextGenerator):
 
                 ctxt['rabbitmq_hosts'] = ','.join(sorted(rabbitmq_hosts))
 
+        oslo_messaging_flags = conf.get('oslo-messaging-flags', None)
+        if oslo_messaging_flags:
+            ctxt['oslo_messaging_flags'] = config_flags_parser(
+                oslo_messaging_flags)
+
         if not context_complete(ctxt):
             return {}
 
diff --git a/tests/14-basic-precise-icehouse b/tests/014-basic-precise-icehouse
similarity index 100%
rename from tests/14-basic-precise-icehouse
rename to tests/014-basic-precise-icehouse
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/17-basic-trusty-juno b/tests/016-basic-trusty-juno
similarity index 100%
rename from tests/17-basic-trusty-juno
rename to tests/016-basic-trusty-juno
diff --git a/tests/017-basic-trusty-kilo b/tests/017-basic-trusty-kilo
new file mode 100644
index 00000000..a0d84e2d
--- /dev/null
+++ b/tests/017-basic-trusty-kilo
@@ -0,0 +1,11 @@
+#!/usr/bin/python
+
+"""Amulet tests on a basic openstack-dashboard deployment on trusty-kilo."""
+
+from basic_deployment import OpenstackDashboardBasicDeployment
+
+if __name__ == '__main__':
+    deployment = OpenstackDashboardBasicDeployment(series='trusty',
+                                                   openstack='cloud:trusty-kilo',
+                                                   source='cloud:trusty-updates/kilo')
+    deployment.run_tests()
diff --git a/tests/018-basic-utopic-juno b/tests/018-basic-utopic-juno
new file mode 100755
index 00000000..d9fe3852
--- /dev/null
+++ b/tests/018-basic-utopic-juno
@@ -0,0 +1,9 @@
+#!/usr/bin/python
+
+"""Amulet tests on a basic openstack-dashboard deployment on utopic-juno."""
+
+from basic_deployment import OpenstackDashboardBasicDeployment
+
+if __name__ == '__main__':
+    deployment = OpenstackDashboardBasicDeployment(series='utopic')
+    deployment.run_tests()
diff --git a/tests/019-basic-vivid-kilo b/tests/019-basic-vivid-kilo
new file mode 100644
index 00000000..6e78a33a
--- /dev/null
+++ b/tests/019-basic-vivid-kilo
@@ -0,0 +1,9 @@
+#!/usr/bin/python
+
+"""Amulet tests on a basic openstack-dashboard deployment on vivid-kilo."""
+
+from basic_deployment import OpenstackDashboardBasicDeployment
+
+if __name__ == '__main__':
+    deployment = OpenstackDashboardBasicDeployment(series='vivid')
+    deployment.run_tests()
diff --git a/tests/16-basic-trusty-icehouse-git b/tests/050-basic-trusty-icehouse-git
similarity index 100%
rename from tests/16-basic-trusty-icehouse-git
rename to tests/050-basic-trusty-icehouse-git
diff --git a/tests/18-basic-trusty-juno-git b/tests/051-basic-trusty-juno-git
similarity index 100%
rename from tests/18-basic-trusty-juno-git
rename to tests/051-basic-trusty-juno-git