diff --git a/.zuul.yaml b/.zuul.yaml
index dbb56fcc1..16b6ced8b 100644
--- a/.zuul.yaml
+++ b/.zuul.yaml
@@ -6,46 +6,45 @@
         - watcher-tempest-actuator
         - watcher-tempest-basic_optim
         - watcher-tempest-workload_balancing
-        - watcherclient-tempest-functional
+        - watcherclient-tempest-functional:
+            voting: false
         - openstack-tox-lower-constraints
     gate:
       jobs:
         - watcher-tempest-functional
-        - watcher-tempest-dummy_optim
-        - watcher-tempest-actuator
-        - watcher-tempest-basic_optim
-        - watcher-tempest-workload_balancing
-        - watcherclient-tempest-functional
         - openstack-tox-lower-constraints
 
 - job:
     name: watcher-tempest-dummy_optim
     parent: watcher-tempest-multinode
+    voting: false
     vars:
       tempest_test_regex: 'watcher_tempest_plugin.tests.scenario.test_execute_dummy_optim'
 
 - job:
     name: watcher-tempest-actuator
     parent: watcher-tempest-multinode
+    voting: false
     vars:
       tempest_test_regex: 'watcher_tempest_plugin.tests.scenario.test_execute_actuator'
 
 - job:
     name: watcher-tempest-basic_optim
     parent: watcher-tempest-multinode
+    voting: false
     vars:
       tempest_test_regex: 'watcher_tempest_plugin.tests.scenario.test_execute_basic_optim'
 
 - job:
     name: watcher-tempest-workload_balancing
     parent: watcher-tempest-multinode
+    voting: false
     vars:
       tempest_test_regex: 'watcher_tempest_plugin.tests.scenario.test_execute_workload_balancing'
 
 - job:
     name: watcher-tempest-multinode
     parent: watcher-tempest-functional
-    voting: false
     nodeset: openstack-two-node
     pre-run: playbooks/pre.yaml
     run: playbooks/orchestrate-tempest.yaml
@@ -128,7 +127,6 @@
     # This job is used in python-watcherclient repo
     name: watcherclient-tempest-functional
     parent: watcher-tempest-functional
-    voting: false
     timeout: 4200
     vars:
       tempest_concurrency: 1