diff --git a/zuul.d/jobs.yaml b/zuul.d/jobs.yaml
index 411b6dc4..33923dec 100644
--- a/zuul.d/jobs.yaml
+++ b/zuul.d/jobs.yaml
@@ -57,6 +57,8 @@
     override-checkout: stable/wallaby
     vars:
       branch: stable/wallaby
+      devstack_localrc:
+        MANILA_INSTALL_TEMPEST_PLUGIN_SYSTEMWIDE: false
 
 - job:
     name: interop-next-refstack-client-victoria
@@ -66,21 +68,5 @@
     override-checkout: stable/victoria
     vars:
       branch: stable/victoria
-
-- job:
-    name: interop-next-refstack-client-ussuri
-    parent: interop-next-refstack-client-master
-    description: |
-      A job running refstack-client on a devstack ussuri environment with the next guideline.
-    override-checkout: stable/ussuri
-    vars:
-      branch: stable/ussuri
-
-- job:
-    name: interop-next-refstack-client-train
-    parent: interop-next-refstack-client-master
-    description: |
-      A job running refstack-client on a devstack train environment with the next guideline.
-    override-checkout: stable/train
-    vars:
-      branch: stable/train
+      devstack_localrc:
+        MANILA_INSTALL_TEMPEST_PLUGIN_SYSTEMWIDE: false
diff --git a/zuul.d/projects.yaml b/zuul.d/projects.yaml
index eda894e5..4f0912a3 100644
--- a/zuul.d/projects.yaml
+++ b/zuul.d/projects.yaml
@@ -10,20 +10,16 @@
               - ^doc/.*$
               - ^.gitignore$
               - ^.gitreview$
-        #- interop-next-refstack-client-master:
-        #    irrelevant-files: *interop-irrelevant-files
-        #- interop-next-refstack-client-yoga:
-        #    irrelevant-files: *interop-irrelevant-files
-        #- interop-next-refstack-client-xena:
-        #    irrelevant-files: *interop-irrelevant-files
-        #- interop-next-refstack-client-wallaby:
-        #    irrelevant-files: *interop-irrelevant-files
-        #- interop-next-refstack-client-victoria:
-        #    irrelevant-files: *interop-irrelevant-files
-        #- interop-next-refstack-client-ussuri:
-        #    irrelevant-files: *interop-irrelevant-files
-        #- interop-next-refstack-client-train:
-        #    irrelevant-files: *interop-irrelevant-files
+        - interop-next-refstack-client-master:
+            irrelevant-files: *interop-irrelevant-files
+        - interop-next-refstack-client-yoga:
+            irrelevant-files: *interop-irrelevant-files
+        - interop-next-refstack-client-xena:
+            irrelevant-files: *interop-irrelevant-files
+        - interop-next-refstack-client-wallaby:
+            irrelevant-files: *interop-irrelevant-files
+        - interop-next-refstack-client-victoria:
+            irrelevant-files: *interop-irrelevant-files
     gate:
       jobs:
         - opendev-tox-docs