diff --git a/metadata.yaml b/metadata.yaml
index bd159d0..f6a2342 100644
--- a/metadata.yaml
+++ b/metadata.yaml
@@ -11,8 +11,8 @@ tags:
   - misc
 series:
   - xenial
+  - bionic
   - artful
-  - zesty
   - trusty
 extra-bindings:
   public:
diff --git a/tests/gate-basic-zesty-ocata b/tests/dev-basic-bionic-queens
similarity index 52%
rename from tests/gate-basic-zesty-ocata
rename to tests/dev-basic-bionic-queens
index 4d54057..7179b93 100755
--- a/tests/gate-basic-zesty-ocata
+++ b/tests/dev-basic-bionic-queens
@@ -1,9 +1,9 @@
 #!/usr/bin/env python
 
-"""Amulet tests on a basic ceph deployment on zesty-ocata."""
+"""Amulet tests on a basic ceph deployment on bionic-queens."""
 
 from basic_deployment import CephBasicDeployment
 
 if __name__ == '__main__':
-    deployment = CephBasicDeployment(series='zesty')
+    deployment = CephBasicDeployment(series='bionic')
     deployment.run_tests()
diff --git a/tests/dev-basic-xenial-queens b/tests/dev-basic-xenial-queens
new file mode 100755
index 0000000..829ce93
--- /dev/null
+++ b/tests/dev-basic-xenial-queens
@@ -0,0 +1,11 @@
+#!/usr/bin/env python
+
+"""Amulet tests on a basic ceph deployment on xenial-queens."""
+
+from basic_deployment import CephBasicDeployment
+
+if __name__ == '__main__':
+    deployment = CephBasicDeployment(series='xenial',
+                                     openstack='cloud:xenial-queens',
+                                     source='cloud:xenial-updates/queens')
+    deployment.run_tests()