diff --git a/.zuul.yaml b/.zuul.yaml
index f4cfc73c4cd..4f155e12692 100644
--- a/.zuul.yaml
+++ b/.zuul.yaml
@@ -237,12 +237,26 @@
     irrelevant-files: *tempest-irrelevant-files
     vars:
       devstack_services:
-        c-bak: false
         etcd: false
+        br-ex-tcpdump: true
+        br-int-flows: true
+        # Cinder services
+        c-api: false
+        c-bak: false
+        c-sch: false
+        c-vol: false
+        cinder: false
+        # Swift services
         s-account: false
         s-container: false
         s-object: false
         s-proxy: false
+    group-vars:
+      subnode:
+        devstack_services:
+          # Cinder services
+          c-bak: false
+          c-vol: false
 
 - job:
     name: neutron-grenade-dvr-multinode
@@ -256,8 +270,16 @@
     irrelevant-files: *tempest-irrelevant-files
     vars:
       devstack_services:
-        c-bak: false
         etcd: false
+        br-ex-tcpdump: true
+        br-int-flows: true
+        # Cinder services
+        c-api: false
+        c-bak: false
+        c-sch: false
+        c-vol: false
+        cinder: false
+        # Swift services
         s-account: false
         s-container: false
         s-object: false
@@ -295,6 +317,9 @@
           q-agt: true
           q-l3: true
           q-meta: true
+          # Cinder services
+          c-bak: false
+          c-vol: false
         devstack_local_conf:
           post-config:
             $NEUTRON_CONF: