diff --git a/src/metadata.yaml b/src/metadata.yaml
index 2177758..0a593c8 100644
--- a/src/metadata.yaml
+++ b/src/metadata.yaml
@@ -11,8 +11,8 @@ series:
 # Trusty disabled pending https://bugs.launchpad.net/bugs/1609498
 # - trusty
   - xenial
+  - bionic
   - artful
-  - zesty
 subordinate: false
 requires:
   shared-db:
diff --git a/src/tests/dev-basic-bionic-queens b/src/tests/dev-basic-bionic-queens
new file mode 100755
index 0000000..bd940bc
--- /dev/null
+++ b/src/tests/dev-basic-bionic-queens
@@ -0,0 +1,10 @@
+#!/usr/bin/env python
+
+"""Amulet tests on a basic barbican deployment on bionic-queens for keystone v2.
+"""
+
+from basic_deployment import BarbicanBasicDeployment
+
+if __name__ == '__main__':
+    deployment = BarbicanBasicDeployment(series='bionic', keystone_version=2)
+    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..4439851
--- /dev/null
+++ b/src/tests/dev-basic-xenial-queens
@@ -0,0 +1,12 @@
+#!/usr/bin/env python
+
+"""Amulet tests on a basic barbican deploy on xenial-queens for keystone v3.
+"""
+
+from basic_deployment import BarbicanBasicDeployment
+
+if __name__ == '__main__':
+    deployment = BarbicanBasicDeployment(series='xenial', keystone_version=3,
+                                         openstack='cloud:xenial-queens',
+                                         source='cloud:xenial-updates/queens')
+    deployment.run_tests()
diff --git a/src/tests/gate-basic-zesty-ocata b/src/tests/gate-basic-zesty-ocata
deleted file mode 100755
index 601110b..0000000
--- a/src/tests/gate-basic-zesty-ocata
+++ /dev/null
@@ -1,10 +0,0 @@
-#!/usr/bin/env python
-
-"""Amulet tests on a basic barbican deployment on zesty-ocata for keystone v2.
-"""
-
-from basic_deployment import BarbicanBasicDeployment
-
-if __name__ == '__main__':
-    deployment = BarbicanBasicDeployment(series='zesty', keystone_version=2)
-    deployment.run_tests()