diff --git a/zuul.d/layout.yaml b/zuul.d/layout.yaml
index 5b53f172e..f0f070ef3 100644
--- a/zuul.d/layout.yaml
+++ b/zuul.d/layout.yaml
@@ -3,7 +3,6 @@
       - check-requirements
       - openstack-lower-constraints-jobs
       - openstackclient-plugin-jobs
-      - openstack-python-jobs
       - openstack-python36-jobs
       - openstack-python37-jobs
       - openstack-python3-train-jobs
@@ -17,13 +16,13 @@
     check:
       jobs:
         - openstack-tox-pep8
-        - openstack-tox-py27
+        - openstack-tox-py27:
+            voting: false
         - openstack-tox-py36
         - openstack-tox-py37
         - tripleo-ci-centos-7-containers-multinode:
             dependencies: &deps_unit_lint
               - openstack-tox-pep8
-              - openstack-tox-py27
               - openstack-tox-py36
               - openstack-tox-py37
         - tripleo-ci-centos-7-scenario000-multinode-oooq-container-upgrades:
@@ -57,3 +56,5 @@
               - ^tripleoclient/v1/tripleo_deploy.py$
     gate:
       queue: tripleo
+      jobs:
+        - openstack-tox-pep8