diff --git a/src/metadata.yaml b/src/metadata.yaml
index 1d170ad..b610f7d 100644
--- a/src/metadata.yaml
+++ b/src/metadata.yaml
@@ -16,8 +16,8 @@ tags:
   - openstack
 series:
   - xenial
+  - bionic
   - artful
-  - zesty
 subordinate: true
 provides:
   manila-plugin:
diff --git a/src/tests/dev-basic-bionic-queens b/src/tests/dev-basic-bionic-queens
new file mode 100755
index 0000000..29d1594
--- /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 ManilaGenericBasicDeployment
+
+if __name__ == '__main__':
+    deployment = ManilaGenericBasicDeployment(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..49ec6ec
--- /dev/null
+++ b/src/tests/dev-basic-xenial-queens
@@ -0,0 +1,10 @@
+#!/usr/bin/env python
+
+"""Amulet tests on a basic barbican deployment on xenial-queens for keystone v2.
+"""
+
+from basic_deployment import ManilaGenericBasicDeployment
+
+if __name__ == '__main__':
+    deployment = ManilaGenericBasicDeployment(series='xenial', keystone_version='2')
+    deployment.run_tests()
diff --git a/src/tests/gate-basic-zesty-ocata b/src/tests/gate-basic-zesty-ocata
deleted file mode 100755
index 55420e4..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 ManilaGenericBasicDeployment
-
-if __name__ == '__main__':
-    deployment = ManilaGenericBasicDeployment(series='zesty', keystone_version='2')
-    deployment.run_tests()