diff --git a/zuul.d/jobs.yaml b/zuul.d/jobs.yaml
index c0f834cf..5c99fab8 100644
--- a/zuul.d/jobs.yaml
+++ b/zuul.d/jobs.yaml
@@ -3,186 +3,6 @@
 #    https://git.openstack.org/cgit/openstack-infra/project-config
 #    https://git.openstack.org/cgit/openstack-infra/zuul-jobs
 
-- job:
-    name: base-integration
-    description: |
-      Runs roles that are included by default in the 'base' job in order to
-      prevent regressions.
-    parent: base-minimal
-    required-projects:
-      - openstack-infra/project-config
-    roles:
-      - zuul: openstack-infra/zuul-jobs
-    run: tests/base.yaml
-    files:
-      - ^roles/configure-mirror/.*
-      - ^roles/configure-unbound/.*
-      - ^roles/emit-job-header/.*
-      - ^roles/fetch-zuul-cloner/.*
-      - ^roles/mirror-info/.*
-      - ^roles/set-zuul-log-path-fact/.*
-      - ^roles/use-cached-repos/.*
-      - ^tests/.*
-
-- job:
-    name: base-integration-centos-7
-    parent: base-integration
-    nodeset: centos-7
-
-- job:
-    name: base-integration-debian-jessie
-    parent: base-integration
-    nodeset: debian-jessie
-
-- job:
-    name: base-integration-fedora-26
-    parent: base-integration
-    nodeset: fedora-26
-
-- job:
-    name: base-integration-opensuse423
-    parent: base-integration
-    nodeset: opensuse-423
-
-- job:
-    name: base-integration-ubuntu-trusty
-    parent: base-integration
-    nodeset: ubuntu-trusty
-
-- job:
-    name: base-integration-ubuntu-xenial
-    parent: base-integration
-    nodeset: ubuntu-xenial
-
-- job:
-    name: multinode-integration
-    description: |
-      Runs roles that are included by default in the 'multinode' job in order
-      to prevent regressions.
-    parent: base-minimal
-    vars:
-      ara_generate_html: true
-    required-projects:
-      - openstack-infra/project-config
-    roles:
-      - zuul: openstack-infra/zuul-jobs
-    run: tests/multinode.yaml
-    files:
-      - ^roles/configure-mirror/.*
-      - ^roles/configure-unbound/.*
-      - ^roles/emit-job-header/.*
-      - ^roles/fetch-zuul-cloner/.*
-      - ^roles/mirror-info/.*
-      - ^roles/set-zuul-log-path-fact/.*
-      - ^roles/use-cached-repos/.*
-      - ^roles/multi-node-bridge/.*
-      - ^roles/multi-node-firewall/.*
-      - ^roles/multi-node-hosts-file/.*
-      - ^roles/multi-node-known-hosts/.*
-      - ^tests/.*
-
-- job:
-    name: multinode-integration-centos-7
-    parent: multinode-integration
-    nodeset:
-      nodes:
-        - name: primary
-          label: centos-7
-        - name: secondary
-          label: centos-7
-      groups:
-        - name: switch
-          nodes:
-            - primary
-        - name: peers
-          nodes:
-            - secondary
-
-- job:
-    name: multinode-integration-debian-jessie
-    parent: multinode-integration
-    nodeset:
-      nodes:
-        - name: primary
-          label: debian-jessie
-        - name: secondary
-          label: debian-jessie
-      groups:
-        - name: switch
-          nodes:
-            - primary
-        - name: peers
-          nodes:
-            - secondary
-
-- job:
-    name: multinode-integration-fedora-26
-    parent: multinode-integration
-    nodeset:
-      nodes:
-        - name: primary
-          label: fedora-26
-        - name: secondary
-          label: fedora-26
-      groups:
-        - name: switch
-          nodes:
-            - primary
-        - name: peers
-          nodes:
-            - secondary
-
-- job:
-    name: multinode-integration-opensuse423
-    parent: multinode-integration
-    nodeset:
-      nodes:
-        - name: primary
-          label: opensuse-423
-        - name: secondary
-          label: opensuse-423
-      groups:
-        - name: switch
-          nodes:
-            - primary
-        - name: peers
-          nodes:
-            - secondary
-
-- job:
-    name: multinode-integration-ubuntu-trusty
-    parent: multinode-integration
-    nodeset:
-      nodes:
-        - name: primary
-          label: ubuntu-trusty
-        - name: secondary
-          label: ubuntu-trusty
-      groups:
-        - name: switch
-          nodes:
-            - primary
-        - name: peers
-          nodes:
-            - secondary
-
-- job:
-    name: multinode-integration-ubuntu-xenial
-    parent: multinode-integration
-    nodeset:
-      nodes:
-        - name: primary
-          label: ubuntu-xenial
-        - name: secondary
-          label: ubuntu-xenial
-      groups:
-        - name: switch
-          nodes:
-            - primary
-        - name: peers
-          nodes:
-            - secondary
-
 - job:
     name: openstack-infra-base-integration
     description: |