diff --git a/tox.ini b/tox.ini
index f146601ff..bd277ef48 100644
--- a/tox.ini
+++ b/tox.ini
@@ -93,6 +93,7 @@ deps =
     -r {toxinidir}/molecule-requirements.txt
 commands =
     python '{toxinidir}/tools/validate-files.py' .
+    {[testenv:pep8]commands}
     {[testenv:ansible-lint]commands}
     {[testenv:yamllint]commands}
     {[testenv:bashate]commands}
diff --git a/zuul.d/layout.yaml b/zuul.d/layout.yaml
index 3e5eb6adc..c88f1cc7f 100644
--- a/zuul.d/layout.yaml
+++ b/zuul.d/layout.yaml
@@ -2,7 +2,6 @@
 - project:
     templates:
       - tripleo-multinode-container-minimal-pipeline
-      - openstack-python3-wallaby-jobs
       - tripleo-validations-molecule-jobs
       - release-notes-jobs-python3
     check:
@@ -26,12 +25,14 @@
               - tripleo-ci-centos-8-content-provider
             files:
               - ^roles/ceph.*$
+        - openstack-tox-py36
     gate:
       jobs:
         - openstack-tox-linters
         - openstack-tox-docs: *tripleo-docs
         - tripleo-ci-centos-8-content-provider
         - tripleo-ci-centos-8-scenario004-standalone: *scenario004
+        - openstack-tox-py36
 
     promote:
       jobs: