diff --git a/zuul.d/layout.yaml b/zuul.d/layout.yaml
index 2dd782f100..9622b133eb 100644
--- a/zuul.d/layout.yaml
+++ b/zuul.d/layout.yaml
@@ -5,11 +5,19 @@
       - check-requirements
       - release-notes-jobs-python3
       - openstack-python35-jobs-no-constraints
+      - openstack-python-jobs
       - tripleo-standalone-scenarios-full
     check:
       jobs:
+        - openstack-tox-pep8
         - openstack-tox-lower-constraints
+        - tripleo-ci-centos-7-containers-multinode:
+            dependencies: &deps_unit_lint
+              - openstack-tox-pep8
+        - tripleo-ci-centos-7-scenario000-multinode-oooq-container-upgrades:
+            dependencies: *deps_unit_lint
         - tripleo-ci-centos-7-scenario000-multinode-oooq-container-updates:
+            dependencies: *deps_unit_lint
             files:
               - ci/environments/scenario000-multinode-containers.yaml
               - ^deployed-server/.*$
@@ -34,6 +42,7 @@
               - ^network/endpoints/.*$
               - zuul.d/*
         - tripleo-ci-centos-7-scenario006-multinode-oooq-container:
+            dependencies: *deps_unit_lint
             files:
               - ^coe/kubernetes.*$
               - ^environments/kubernetes.*$
@@ -44,6 +53,7 @@
               - ^common/.*$
               - zuul.d/*
         - tripleo-ci-centos-7-scenario007-multinode-oooq-container:
+            dependencies: *deps_unit_lint
             files:
               - ci/environments/scenario007-multinode-containers.yaml
               - ^(docker|puppet)/services/neutron-plugin-ml2.yaml #LP1765975
@@ -55,6 +65,7 @@
               - ^common/.*$
               - zuul.d/*
         - tripleo-ci-centos-7-scenario008-multinode-oooq-container:
+            dependencies: *deps_unit_lint
             files:
               - ci/environments/scenario008-multinode-containers.yaml
               - ^(docker|puppet)/services/(odl|opendaylight).*$
@@ -64,6 +75,7 @@
               - ^common/.*$
               - zuul.d/*
         - tripleo-ci-centos-7-scenario009-multinode-oooq-container:
+            dependencies: *deps_unit_lint
             files:
               - ^coe/openshift.*$
               - ^environments/openshift.*$
@@ -78,6 +90,7 @@
               - ^common/.*$
               - zuul.d/*
         - tripleo-ci-centos-7-scenario010-multinode-oooq-container:
+            dependencies: *deps_unit_lint
             files:
               - ^(docker|puppet)/services/.*octavia.*$
               - ^docker/services/ceph-ansible.*$
@@ -87,7 +100,20 @@
               - ^network/endpoints/.*$
               - ^common/.*$
               - zuul.d/*
-        - openstack-tox-pep8
+        - tripleo-ci-centos-7-standalone-upgrade:
+            dependencies: *deps_unit_lint
+        - tripleo-ci-centos-7-scenario001-standalone:
+            dependencies: *deps_unit_lint
+        - tripleo-ci-centos-7-scenario002-standalone:
+            dependencies: *deps_unit_lint
+        - tripleo-ci-centos-7-scenario003-standalone:
+            dependencies: *deps_unit_lint
+        - tripleo-ci-centos-7-scenario004-standalone:
+            dependencies: *deps_unit_lint
+        - tripleo-ci-centos-7-scenario012-standalone:
+            dependencies: *deps_unit_lint
+        - tripleo-ci-centos-7-containerized-undercloud-upgrades:
+            dependencies: *deps_unit_lint
     gate:
       queue: tripleo
       jobs: