diff --git a/modules/openstack_project/files/zuul/layout.yaml b/modules/openstack_project/files/zuul/layout.yaml
index 68cef2d9f1..77dfa237b5 100644
--- a/modules/openstack_project/files/zuul/layout.yaml
+++ b/modules/openstack_project/files/zuul/layout.yaml
@@ -257,6 +257,21 @@ project-templates:
       - 'gate-grenade-dsvm'
       - 'gate-grenade-dsvm-neutron'
 
+  - name: integrated-gate-neutron
+    check:
+      - 'check-tempest-dsvm-neutron'
+      - 'check-tempest-dsvm-neutron-pg'
+      - 'check-tempest-dsvm-neutron-heat-slow'
+      - 'check-tempest-dsvm-neutron-full'
+      - 'gate-tempest-dsvm-neutron-large-ops'
+      - 'check-grenade-dsvm-neutron'
+    gate:
+      - 'gate-tempest-dsvm-neutron'
+      - 'gate-tempest-dsvm-neutron-pg'
+      - 'gate-tempest-dsvm-neutron-heat-slow'
+      - 'gate-tempest-dsvm-neutron-large-ops'
+      - 'gate-grenade-dsvm-neutron'
+
   - name: python3-jobs
     check:
       - 'gate-{name}-python33'
@@ -854,19 +869,14 @@ projects:
       - name: openstack-server-publish-jobs
       - name: periodic-havana
       - name: check-requirements
-      - name: integrated-gate
+      - name: integrated-gate-neutron
     check:
       - check-neutron-dsvm-functional
-      - check-tempest-dsvm-neutron-full
       - check-tempest-dsvm-neutron
       - check-tempest-dsvm-neutron-pg
-      - check-tempest-dsvm-neutron-pg
-      - gate-tempest-dsvm-neutron-large-ops
     gate:
       - gate-tempest-dsvm-neutron
       - gate-tempest-dsvm-neutron-pg
-      - gate-tempest-dsvm-neutron-pg
-      - gate-tempest-dsvm-neutron-large-ops
     experimental:
       - check-neutron-dsvm-api
       - gate-grenade-dsvm-neutron-forward
@@ -1360,21 +1370,12 @@ projects:
       - name: python-jobs
       - name: openstack-client-publish-jobs
       - name: check-requirements
-      - name: integrated-gate
+      - name: integrated-gate-neutron
     check:
       - gate-python-neutronclient-python33
       - gate-python-neutronclient-pypy
-      - check-devstack-dsvm-cells
-      - check-tempest-dsvm-postgres-full
-      - check-tempest-dsvm-neutron-full
-      - check-tempest-dsvm-neutron-pg
-      - gate-tempest-dsvm-neutron-large-ops
     gate:
       - gate-python-neutronclient-pypy
-      - gate-devstack-dsvm-cells
-      - gate-tempest-dsvm-postgres-full
-      - gate-tempest-dsvm-neutron-pg
-      - gate-tempest-dsvm-neutron-large-ops
     experimental:
       - gate-grenade-dsvm-forward
     experimental-tripleo: