diff --git a/zuul.d/jobs.yaml b/zuul.d/jobs.yaml
index 23611d6489..dda5ae8cd0 100644
--- a/zuul.d/jobs.yaml
+++ b/zuul.d/jobs.yaml
@@ -1,8 +1,6 @@
 - job:
-    name: octavia-v1-dsvm-scenario
+    name: octavia-legacy-dsvm-base
     parent: legacy-dsvm-base
-    run: playbooks/legacy/octavia-v1-dsvm-scenario/run.yaml
-    post-run: playbooks/legacy/octavia-v1-dsvm-scenario/post.yaml
     timeout: 7800
     required-projects:
       - openstack-infra/devstack-gate
@@ -13,88 +11,68 @@
       - openstack/python-barbicanclient
       - openstack/python-octaviaclient
       - openstack/tripleo-image-elements
+    irrelevant-files:
+      - ^.*\.rst$
+      - ^api-ref/.*$
+      - ^doc/.*$
+      - ^etc/.*$
+      - ^releasenotes/.*$
+
+- job:
+    name: octavia-legacy-dsvm-base-multinode
+    parent: legacy-dsvm-base-multinode
+    timeout: 7800
+    required-projects:
+      - openstack-infra/devstack-gate
+      - openstack/barbican
+      - openstack/diskimage-builder
+      - openstack/neutron-lbaas
+      - openstack/octavia
+      - openstack/python-barbicanclient
+      - openstack/python-octaviaclient
+      - openstack/tripleo-image-elements
+    irrelevant-files:
+      - ^.*\.rst$
+      - ^api-ref/.*$
+      - ^doc/.*$
+      - ^etc/.*$
+      - ^releasenotes/.*$
+    nodeset: legacy-ubuntu-xenial-2-node
+
+- job:
+    name: octavia-v1-dsvm-scenario
+    parent: octavia-legacy-dsvm-base
+    run: playbooks/legacy/octavia-v1-dsvm-scenario/run.yaml
+    post-run: playbooks/legacy/octavia-v1-dsvm-scenario/post.yaml
 
 - job:
     name: octavia-v1-dsvm-py3x-scenario
-    parent: legacy-dsvm-base
+    parent: octavia-legacy-dsvm-base
     run: playbooks/legacy/octavia-v1-dsvm-py3x-scenario/run.yaml
     post-run: playbooks/legacy/octavia-v1-dsvm-py3x-scenario/post.yaml
-    timeout: 7800
-    required-projects:
-      - openstack-infra/devstack-gate
-      - openstack/barbican
-      - openstack/diskimage-builder
-      - openstack/neutron-lbaas
-      - openstack/octavia
-      - openstack/python-barbicanclient
-      - openstack/python-octaviaclient
-      - openstack/tripleo-image-elements
 
 - job:
     name: octavia-v1-dsvm-scenario-multinode
-    parent: legacy-dsvm-base-multinode
+    parent: octavia-legacy-dsvm-base-multinode
     run: playbooks/legacy/octavia-v1-dsvm-scenario-multinode/run.yaml
     post-run: playbooks/legacy/octavia-v1-dsvm-scenario-multinode/post.yaml
-    timeout: 7800
-    required-projects:
-      - openstack-infra/devstack-gate
-      - openstack/barbican
-      - openstack/diskimage-builder
-      - openstack/neutron-lbaas
-      - openstack/octavia
-      - openstack/python-barbicanclient
-      - openstack/python-octaviaclient
-      - openstack/tripleo-image-elements
-    nodeset: legacy-ubuntu-xenial-2-node
 
 - job:
     name: octavia-v1-dsvm-py3x-scenario-multinode
-    parent: legacy-dsvm-base-multinode
+    parent: octavia-legacy-dsvm-base-multinode
     run: playbooks/legacy/octavia-v1-dsvm-py3x-scenario-multinode/run.yaml
     post-run: playbooks/legacy/octavia-v1-dsvm-py3x-scenario-multinode/post.yaml
-    timeout: 7800
-    required-projects:
-      - openstack-infra/devstack-gate
-      - openstack/barbican
-      - openstack/diskimage-builder
-      - openstack/neutron-lbaas
-      - openstack/octavia
-      - openstack/python-barbicanclient
-      - openstack/python-octaviaclient
-      - openstack/tripleo-image-elements
-    nodeset: legacy-ubuntu-xenial-2-node
 
 - job:
     name: octavia-v1-dsvm-scenario-kvm-centos.7
-    parent: legacy-dsvm-base
+    parent: octavia-legacy-dsvm-base
     run: playbooks/legacy/octavia-v1-dsvm-scenario-kvm-centos.7/run.yaml
     post-run: playbooks/legacy/octavia-v1-dsvm-scenario-kvm-centos.7/post.yaml
-    timeout: 7800
-    required-projects:
-      - openstack-infra/devstack-gate
-      - openstack/barbican
-      - openstack/barbican-tempest-plugin
-      - openstack/diskimage-builder
-      - openstack/neutron-lbaas
-      - openstack/octavia
-      - openstack/python-barbicanclient
-      - openstack/python-octaviaclient
-      - openstack/tripleo-image-elements
 
 - job:
     name: octavia-v1-dsvm-scenario-lxd
-    parent: legacy-dsvm-base
+    parent: octavia-legacy-dsvm-base
     run: playbooks/legacy/octavia-v1-dsvm-scenario-lxd/run.yaml
     post-run: playbooks/legacy/octavia-v1-dsvm-scenario-lxd/post.yaml
-    timeout: 7800
     required-projects:
-      - openstack-infra/devstack-gate
-      - openstack/barbican
-      - openstack/barbican-tempest-plugin
-      - openstack/diskimage-builder
-      - openstack/neutron-lbaas
       - openstack/nova-lxd
-      - openstack/octavia
-      - openstack/python-barbicanclient
-      - openstack/python-octaviaclient
-      - openstack/tripleo-image-elements
diff --git a/zuul.d/projects.yaml b/zuul.d/projects.yaml
index 0b8a32290b..9cebcd30ac 100644
--- a/zuul.d/projects.yaml
+++ b/zuul.d/projects.yaml
@@ -9,131 +9,59 @@
             branches: ^(?!stable/ocata).*$
         - neutron-lbaasv2-dsvm-scenario:
             voting: false
-            irrelevant-files:
-              - ^.*\.rst$
-              - ^api-ref/.*$
-              - ^doc/.*$
-              - ^etc/.*$
-              - ^releasenotes/.*$
-              - ^tempest/hacking/.*$
-              - ^tempest/tests/.*$
         - neutron-lbaasv2-dsvm-py3x-scenario:
             branches: ^(?!stable/ocata).*$
             voting: false
+        - octavia-tox-functional:
             irrelevant-files:
               - ^.*\.rst$
               - ^api-ref/.*$
               - ^doc/.*$
               - ^etc/.*$
               - ^releasenotes/.*$
-              - ^tempest/hacking/.*$
-              - ^tempest/tests/.*$
-        - openstack-tox-functional
-        - openstack-tox-functional-py35:
+        - octavia-tox-functional-py35:
             branches: ^(?!stable/ocata).*$
-        - octavia-v1-dsvm-scenario:
             irrelevant-files:
               - ^.*\.rst$
               - ^api-ref/.*$
               - ^doc/.*$
               - ^etc/.*$
               - ^releasenotes/.*$
-              - ^tempest/hacking/.*$
-              - ^tempest/tests/.*$
+        - octavia-v1-dsvm-scenario
         - octavia-v1-dsvm-py3x-scenario:
             branches: ^(?!stable/ocata).*$
-            irrelevant-files:
-              - ^.*\.rst$
-              - ^api-ref/.*$
-              - ^doc/.*$
-              - ^etc/.*$
-              - ^releasenotes/.*$
-              - ^tempest/hacking/.*$
-              - ^tempest/tests/.*$
-        - octavia-v1-dsvm-scenario-multinode:
-            irrelevant-files:
-              - ^.*\.rst$
-              - ^api-ref/.*$
-              - ^doc/.*$
-              - ^etc/.*$
-              - ^releasenotes/.*$
-              - ^tempest/hacking/.*$
-              - ^tempest/tests/.*$
+        - octavia-v1-dsvm-scenario-multinode
         - octavia-v1-dsvm-py3x-scenario-multinode:
             branches: ^(?!stable/ocata).*$
-            irrelevant-files:
-              - ^.*\.rst$
-              - ^api-ref/.*$
-              - ^doc/.*$
-              - ^etc/.*$
-              - ^releasenotes/.*$
-              - ^tempest/hacking/.*$
-              - ^tempest/tests/.*$
         - octavia-v1-dsvm-scenario-kvm-centos.7:
             voting: false
-            irrelevant-files:
-              - ^.*\.rst$
-              - ^api-ref/.*$
-              - ^doc/.*$
-              - ^etc/.*$
-              - ^releasenotes/.*$
-              - ^tempest/hacking/.*$
-              - ^tempest/tests/.*$
         - octavia-v1-dsvm-scenario-lxd:
             voting: false
             branches: ^(?!stable/ocata).*$
-            irrelevant-files:
-              - ^.*\.rst$
-              - ^api-ref/.*$
-              - ^doc/.*$
-              - ^etc/.*$
-              - ^releasenotes/.*$
-              - ^tempest/hacking/.*$
-              - ^tempest/tests/.*$
     gate:
       queue: octavia
       jobs:
-        - openstack-tox-functional
-        - openstack-tox-functional-py35:
-            branches: ^(?!stable/ocata).*$
-        - octavia-v1-dsvm-scenario:
+        - octavia-tox-functional:
             irrelevant-files:
               - ^.*\.rst$
               - ^api-ref/.*$
               - ^doc/.*$
               - ^etc/.*$
               - ^releasenotes/.*$
-              - ^tempest/hacking/.*$
-              - ^tempest/tests/.*$
+        - octavia-tox-functional-py35:
+            branches: ^(?!stable/ocata).*$
+            irrelevant-files:
+              - ^.*\.rst$
+              - ^api-ref/.*$
+              - ^doc/.*$
+              - ^etc/.*$
+              - ^releasenotes/.*$
+        - octavia-v1-dsvm-scenario
         - octavia-v1-dsvm-py3x-scenario:
             branches: ^(?!stable/ocata).*$
-            irrelevant-files:
-              - ^.*\.rst$
-              - ^api-ref/.*$
-              - ^doc/.*$
-              - ^etc/.*$
-              - ^releasenotes/.*$
-              - ^tempest/hacking/.*$
-              - ^tempest/tests/.*$
-        - octavia-v1-dsvm-scenario-multinode:
-            irrelevant-files:
-              - ^.*\.rst$
-              - ^api-ref/.*$
-              - ^doc/.*$
-              - ^etc/.*$
-              - ^releasenotes/.*$
-              - ^tempest/hacking/.*$
-              - ^tempest/tests/.*$
+        - octavia-v1-dsvm-scenario-multinode
         - octavia-v1-dsvm-py3x-scenario-multinode:
             branches: ^(?!stable/ocata).*$
-            irrelevant-files:
-              - ^.*\.rst$
-              - ^api-ref/.*$
-              - ^doc/.*$
-              - ^etc/.*$
-              - ^releasenotes/.*$
-              - ^tempest/hacking/.*$
-              - ^tempest/tests/.*$
         - neutron-lbaasv2-dsvm-api
         - neutron-lbaasv2-dsvm-py3x-api:
             branches: ^(?!stable/ocata).*$