diff --git a/.zuul.yaml b/.zuul.yaml
index 190385d..9143833 100644
--- a/.zuul.yaml
+++ b/.zuul.yaml
@@ -5,19 +5,23 @@
       - publish-openstack-docs-pti
     check:
       jobs:
-        - vitrage-tempest-plugin-api
-        - vitrage-tempest-plugin-datasources
+        - vitrage-tempest-plugin-api:
+            voting: false
+        - vitrage-tempest-plugin-datasources:
+            voting: false
+        - vitrage-tempest-plugin-datasources-xena
+        - vitrage-tempest-plugin-api-xena
+        - vitrage-tempest-plugin-datasources-wallaby
+        - vitrage-tempest-plugin-api-wallaby
         - vitrage-tempest-plugin-datasources-victoria
         - vitrage-tempest-plugin-api-victoria
-        - vitrage-tempest-plugin-datasources-ussuri
-        - vitrage-tempest-plugin-api-ussuri
-        - vitrage-tempest-plugin-datasources-train
-        - vitrage-tempest-plugin-api-train
     gate:
       queue: vitrage
       jobs:
-        - vitrage-tempest-plugin-api
-        - vitrage-tempest-plugin-datasources
+        - vitrage-tempest-plugin-api:
+            voting: false
+        - vitrage-tempest-plugin-datasources:
+            voting: false
 
 - job:
     name: vitrage-tempest-plugin-base
@@ -231,41 +235,30 @@
 - job:
     name: vitrage-tempest-plugin-api-victoria
     parent: vitrage-tempest-plugin-api
-    nodeset: openstack-single-node-bionic
     override-checkout: stable/victoria
 
 - job:
     name: vitrage-tempest-plugin-datasources-victoria
     parent: vitrage-tempest-plugin-datasources
-    nodeset: openstack-single-node-bionic
     override-checkout: stable/victoria
 
 - job:
-    name: vitrage-tempest-plugin-api-ussuri
+    name: vitrage-tempest-plugin-api-xena
     parent: vitrage-tempest-plugin-api
-    nodeset: openstack-single-node-bionic
-    override-checkout: stable/ussuri
+    override-checkout: stable/xena
 
 - job:
-    name: vitrage-tempest-plugin-datasources-ussuri
+    name: vitrage-tempest-plugin-datasources-xena
     parent: vitrage-tempest-plugin-datasources
-    nodeset: openstack-single-node-bionic
-    override-checkout: stable/ussuri
+    override-checkout: stable/xena
 
 - job:
-    name: vitrage-tempest-plugin-api-train
+    name: vitrage-tempest-plugin-api-wallaby
     parent: vitrage-tempest-plugin-api
-    nodeset: openstack-single-node-bionic
-    override-checkout: stable/train
-    vars:
-      devstack_localrc:
-        USE_PYTHON3: True
+    override-checkout: stable/wallaby
 
 - job:
-    name: vitrage-tempest-plugin-datasources-train
+    name: vitrage-tempest-plugin-datasources-wallaby
     parent: vitrage-tempest-plugin-datasources
-    nodeset: openstack-single-node-bionic
-    override-checkout: stable/train
-    vars:
-      devstack_localrc:
-        USE_PYTHON3: True
+    override-checkout: stable/wallaby
+
diff --git a/requirements.txt b/requirements.txt
index 62848dc..efe287d 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -8,7 +8,6 @@ aodhclient>=1.0.0 # Apache-2.0
 gnocchiclient>=3.3.1 # Apache-2.0
 PyYAML>=3.12 # MIT
 python-heatclient>=1.14.0 # Apache-2.0
-python-ceilometerclient>=2.9.0 # Apache-2.0
 python-cinderclient>=3.3.0 # Apache-2.0
 python-dateutil>=2.5.3 # BSD
 python-keystoneclient>=3.15.0 # Apache-2.0