diff --git a/Makefile b/Makefile
index bc316708..5dddedfc 100644
--- a/Makefile
+++ b/Makefile
@@ -24,7 +24,8 @@ test:
 	# 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
+        00-setup 14-basic-precise-icehouse 15-basic-trusty-icehouse \
+	16-basic-trusty-juno
 
 publish: lint test
 	bzr push lp:charms/openstack-dashboard
diff --git a/tests/15-basic-trusty-icehouse b/tests/15-basic-trusty-icehouse
new file mode 100755
index 00000000..4ea41a57
--- /dev/null
+++ b/tests/15-basic-trusty-icehouse
@@ -0,0 +1,9 @@
+#!/usr/bin/python
+
+"""Amulet tests on a basic quantum-gateway deployment on trusty-icehouse."""
+
+from basic_deployment import OpenstackDashboardBasicDeployment
+
+if __name__ == '__main__':
+    deployment = OpenstackDashboardBasicDeployment(series='trusty')
+    deployment.run_tests()
diff --git a/tests/16-basic-trusty-juno b/tests/16-basic-trusty-juno
new file mode 100755
index 00000000..8839d5f8
--- /dev/null
+++ b/tests/16-basic-trusty-juno
@@ -0,0 +1,11 @@
+#!/usr/bin/python
+
+"""Amulet tests on a basic quantum-gateway deployment on trusty-juno."""
+
+from basic_deployment import OpenstackDashboardBasicDeployment
+
+if __name__ == '__main__':
+    deployment = OpenstackDashboardBasicDeployment(series='trusty',
+                                                   openstack='cloud:trusty-juno',
+                                                   source='cloud:trusty-updates/juno')
+    deployment.run_tests()