diff --git a/zuul.d/rocky_jobs.yaml b/zuul.d/rocky_jobs.yaml
index 9915575..62e57bf 100644
--- a/zuul.d/rocky_jobs.yaml
+++ b/zuul.d/rocky_jobs.yaml
@@ -1,7 +1,7 @@
 - job:
     name: neutron-tempest-plugin-api-rocky
     nodeset: openstack-single-node-xenial
-    parent: neutron-tempest-plugin-api
+    parent: neutron-tempest-plugin-base
     description: |
       This job run on py2 for stable/rocky gate.
     override-checkout: stable/rocky
@@ -27,6 +27,7 @@
         q-meta: true
         q-metering: true
       branch_override: stable/rocky
+      tempest_test_regex: ^neutron_tempest_plugin\.api
       # TODO(slaweq): find a way to put this list of extensions in
       # neutron repository and keep it different per branch,
       # then it could be removed from here
@@ -119,7 +120,7 @@
 - job:
     name: neutron-tempest-plugin-api-rocky
     nodeset: openstack-single-node-xenial
-    parent: neutron-tempest-plugin-api
+    parent: neutron-tempest-plugin-base
     description: |
       This job run on py3 for other than stable/rocky gate
       which is nothing but neutron-tempest-pluign master gate.
@@ -133,7 +134,7 @@
 
 - job:
     name: neutron-tempest-plugin-scenario-openvswitch-rocky
-    parent: neutron-tempest-plugin-scenario
+    parent: neutron-tempest-plugin-base
     description: |
       This job run on py2 for stable/rocky gate.
     nodeset: openstack-single-node-xenial
@@ -141,6 +142,10 @@
     override-checkout: stable/rocky
     required-projects: *required-projects-rocky
     vars: &scenario_vars_rocky
+      tempest_test_regex: "\
+          (^neutron_tempest_plugin.scenario)|\
+          (^tempest.api.compute.servers.test_attach_interfaces)|\
+          (^tempest.api.compute.servers.test_multiple_create)"
       devstack_services:
         # Disable OVN services
         br-ex-tcpdump: false
@@ -236,7 +241,7 @@
 
 - job:
     name: neutron-tempest-plugin-scenario-openvswitch-rocky
-    parent: neutron-tempest-plugin-scenario-openvswitch
+    parent: neutron-tempest-plugin-openvswitch
     nodeset: openstack-single-node-xenial
     description: |
       This job run on py3 for other than stable/rocky gate
@@ -253,7 +258,7 @@
 
 - job:
     name: neutron-tempest-plugin-scenario-openvswitch-iptables_hybrid-rocky
-    parent: neutron-tempest-plugin-scenario
+    parent: neutron-tempest-plugin-base
     nodeset: openstack-single-node-xenial
     timeout: 10000
     description: |
@@ -343,7 +348,7 @@
 
 - job:
     name: neutron-tempest-plugin-scenario-openvswitch-iptables_hybrid-rocky
-    parent: neutron-tempest-plugin-scenario
+    parent: neutron-tempest-plugin-base
     nodeset: openstack-single-node-xenial
     timeout: 10000
     description: |
@@ -361,7 +366,7 @@
 
 - job:
     name: neutron-tempest-plugin-scenario-linuxbridge-rocky
-    parent: neutron-tempest-plugin-scenario
+    parent: neutron-tempest-plugin-base
     timeout: 10000
     description: |
       This job run on py2 for stable/rocky gate.
@@ -372,6 +377,10 @@
     required-projects: *required-projects-rocky
     vars: &linuxbridge_vars_rocky
       branch_override: stable/rocky
+      tempest_test_regex: "\
+          (^neutron_tempest_plugin.scenario)|\
+          (^tempest.api.compute.servers.test_attach_interfaces)|\
+          (^tempest.api.compute.servers.test_multiple_create)"
       network_api_extensions: *api_extensions
       devstack_localrc:
         USE_PYTHON3: false
@@ -416,7 +425,7 @@
 
 - job:
     name: neutron-tempest-plugin-scenario-linuxbridge-rocky
-    parent: neutron-tempest-plugin-scenario
+    parent: neutron-tempest-plugin-base
     nodeset: openstack-single-node-xenial
     timeout: 10000
     description: |