diff --git a/tests/020-basic-trusty-liberty b/tests/018-basic-trusty-liberty
similarity index 100%
rename from tests/020-basic-trusty-liberty
rename to tests/018-basic-trusty-liberty
diff --git a/tests/019-basic-trusty-mitaka b/tests/019-basic-trusty-mitaka
new file mode 100644
index 00000000..556fcd08
--- /dev/null
+++ b/tests/019-basic-trusty-mitaka
@@ -0,0 +1,11 @@
+#!/usr/bin/python
+
+"""Amulet tests on a basic quantum-gateway deployment on trusty-liberty."""
+
+from basic_deployment import NeutronGatewayBasicDeployment
+
+if __name__ == '__main__':
+    deployment = NeutronGatewayBasicDeployment(series='trusty',
+                                        openstack='cloud:trusty-liberty',
+                                        source='cloud:trusty-updates/liberty')
+    deployment.run_tests()
diff --git a/tests/021-basic-wily-liberty b/tests/020-basic-wily-liberty
similarity index 100%
rename from tests/021-basic-wily-liberty
rename to tests/020-basic-wily-liberty
diff --git a/tests/021-basic-xenial-mitaka b/tests/021-basic-xenial-mitaka
new file mode 100644
index 00000000..36ab0baf
--- /dev/null
+++ b/tests/021-basic-xenial-mitaka
@@ -0,0 +1,9 @@
+#!/usr/bin/python
+
+"""Amulet tests on a basic quantum-gateway deployment on xenial-mitaka."""
+
+from basic_deployment import NeutronGatewayBasicDeployment
+
+if __name__ == '__main__':
+    deployment = NeutronGatewayBasicDeployment(series='xenial')
+    deployment.run_tests()