diff --git a/metadata.yaml b/metadata.yaml
index a337a7c..f7f5576 100644
--- a/metadata.yaml
+++ b/metadata.yaml
@@ -18,8 +18,8 @@ tags:
   - misc
 series:
   - xenial
+  - bionic
   - artful
-  - zesty
   - trusty
 provides:
   nrpe-external-master:
diff --git a/tests/gate-basic-zesty-ocata b/tests/dev-basic-bionic-queens
similarity index 83%
rename from tests/gate-basic-zesty-ocata
rename to tests/dev-basic-bionic-queens
index b8cb843..137cbe2 100755
--- a/tests/gate-basic-zesty-ocata
+++ b/tests/dev-basic-bionic-queens
@@ -14,10 +14,10 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-"""Amulet tests on a basic ceilometer-agent deployment on zesty-ocata."""
+"""Amulet tests on a basic ceilometer-agent deployment on bionic-queens."""
 
 from basic_deployment import CeiloAgentBasicDeployment
 
 if __name__ == '__main__':
-    deployment = CeiloAgentBasicDeployment(series='zesty')
+    deployment = CeiloAgentBasicDeployment(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..9f8a51f
--- /dev/null
+++ b/tests/dev-basic-xenial-queens
@@ -0,0 +1,24 @@
+#!/usr/bin/env python
+#
+# Copyright 2016 Canonical Ltd
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#  http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+"""Amulet tests on a basic ceilometer-agent deployment on xenial-queens."""
+
+from basic_deployment import CeiloAgentBasicDeployment
+
+if __name__ == '__main__':
+    deployment = CeiloAgentBasicDeployment(series='xenial',
+                                           openstack='cloud:xenial-queens')
+    deployment.run_tests()