diff --git a/zuul.d/layout.yaml b/zuul.d/layout.yaml
index 575856eaf..5fb499410 100644
--- a/zuul.d/layout.yaml
+++ b/zuul.d/layout.yaml
@@ -14,7 +14,22 @@
       - tripleo-standalone-scenarios-full
     check:
       jobs:
+        - openstack-tox-pep8
+        - openstack-tox-py27
+        - openstack-tox-py35
+        - openstack-tox-py36
+        - openstack-tox-py37
+        - tripleo-ci-centos-7-containers-multinode:
+            dependencies: &deps_unit_lint
+              - openstack-tox-pep8
+              - openstack-tox-py27
+              - openstack-tox-py35
+              - openstack-tox-py36
+              - openstack-tox-py37
+        - 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:
               - workbooks/package_update.yaml
               - workbooks/baremetal.yaml
@@ -24,17 +39,34 @@
               - tripleo_common/image/kolla_builder.py
               - scripts/.*$
         - tripleo-ci-centos-7-scenario007-multinode-oooq-container:
+            dependencies: *deps_unit_lint
             files:
               - ^container-images/.*$
               - tripleo_common/image/kolla_builder.py
         - tripleo-ci-centos-7-scenario008-multinode-oooq-container:
+            dependencies: *deps_unit_lint
             files:
               - ^container-images/.*$
               - tripleo_common/image/kolla_builder.py
         - tripleo-ci-centos-7-scenario009-multinode-oooq-container:
+            dependencies: *deps_unit_lint
             files:
               - ^container-images/.*$
               - tripleo_common/image/kolla_builder.py
               - scripts/tripleo-deploy-openshift
+        - 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