diff --git a/.zuul.yaml b/.zuul.yaml
index c57d79609..90c230081 100644
--- a/.zuul.yaml
+++ b/.zuul.yaml
@@ -13,7 +13,9 @@
         - watcher-grenade
         - watcher-tempest-strategies
         - watcher-tempest-actuator
-        - watcherclient-tempest-functional
+        - python-watcherclient-functional:
+            files:
+              - ^watcher/api/*
         - watcher-tempest-functional-ipv6-only
         - watcher-prometheus-integration
     gate:
@@ -158,15 +160,6 @@
       - ^tools/.*$
       - ^tox.ini$
 
-- job:
-    # This job is used in python-watcherclient repo
-    name: watcherclient-tempest-functional
-    parent: watcher-tempest-functional
-    timeout: 4200
-    vars:
-      tempest_concurrency: 1
-      tempest_test_regex: watcher_tempest_plugin.tests.client_functional
-
 - job:
     name: watcher-sg-core-tempest-base
     parent: devstack-tempest