diff --git a/src/metadata.yaml b/src/metadata.yaml
index f9858af..1aa05c2 100644
--- a/src/metadata.yaml
+++ b/src/metadata.yaml
@@ -12,8 +12,8 @@ tags:
   - openstack
 series:
   - xenial
+  - bionic
   - artful
-  - zesty
 subordinate: false
 requires:
   shared-db:
diff --git a/src/tests/gate-basic-zesty-ocata b/src/tests/dev-basic-bionic-queens
similarity index 52%
rename from src/tests/gate-basic-zesty-ocata
rename to src/tests/dev-basic-bionic-queens
index 8b6c387..b566dcf 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 manila deployment on zesty-ocata.
+"""Amulet tests on a basic manila deployment on bionic-queens.
 """
 
 from basic_deployment import ManilaBasicDeployment
 
 if __name__ == '__main__':
-    deployment = ManilaBasicDeployment(series='zesty')
+    deployment = ManilaBasicDeployment(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..0a7b536
--- /dev/null
+++ b/src/tests/dev-basic-xenial-queens
@@ -0,0 +1,10 @@
+#!/usr/bin/env python
+
+"""Amulet tests on a basic manila deployment on xenial-queens.
+"""
+
+from basic_deployment import ManilaBasicDeployment
+
+if __name__ == '__main__':
+    deployment = ManilaBasicDeployment(series='xenial')
+    deployment.run_tests()