diff --git a/src/metadata.yaml b/src/metadata.yaml
index e9839e7..34399e0 100644
--- a/src/metadata.yaml
+++ b/src/metadata.yaml
@@ -10,8 +10,8 @@ tags:
   - openstack
 series:
   - xenial
+  - bionic
   - artful
-  - zesty
   - trusty
 subordinate: false
 requires:
diff --git a/src/tests/gate-basic-zesty-ocata b/src/tests/dev-basic-bionic-queens
similarity index 51%
rename from src/tests/gate-basic-zesty-ocata
rename to src/tests/dev-basic-bionic-queens
index 3aa544a..c1877af 100755
--- a/src/tests/gate-basic-zesty-ocata
+++ b/src/tests/dev-basic-bionic-queens
@@ -1,10 +1,10 @@
 #!/usr/bin/env python
 
-"""Amulet tests on a basic tempest deployment on zesty-ocata."""
+"""Amulet tests on a basic tempest deployment on bionic-queens."""
 
 from basic_deployment import TempestBasicDeployment
 
 if __name__ == '__main__':
-    deployment = TempestBasicDeployment(series='zesty')
+    deployment = TempestBasicDeployment(series='bionic')
     deployment.run_tests()
 
diff --git a/src/tests/dev-basic-xenial-queens b/src/tests/dev-basic-xenial-queens
new file mode 100755
index 0000000..0178d26
--- /dev/null
+++ b/src/tests/dev-basic-xenial-queens
@@ -0,0 +1,12 @@
+#!/usr/bin/env python
+
+"""Amulet tests on a basic tempest deployment on xenial-queens."""
+
+from basic_deployment import TempestBasicDeployment
+
+if __name__ == '__main__':
+    # Tempest is installed through pip so cloud archive is not needed here
+    deployment = TempestBasicDeployment(series='xenial',
+                                        openstack='cloud:xenial-queens',
+                                        source='cloud:xenial-updates/queens')
+    deployment.run_tests()