diff --git a/.zuul.yaml b/.zuul.yaml
index 76371582..75e6d22a 100644
--- a/.zuul.yaml
+++ b/.zuul.yaml
@@ -27,9 +27,9 @@
 - project:
     templates:
       - check-requirements
-      - openstack-python3-victoria-jobs
     check:
       jobs:
+        - openstack-tox-py36
         - openstack-tox-linters
         - openstack-tox-cover
         - tripleo-ci-centos-8-content-provider:
@@ -48,6 +48,7 @@
         - validations-libs-functional
     gate:
       jobs:
+        - openstack-tox-py36
         - openstack-tox-linters
         - openstack-tox-docs: *tripleo-docs
         - validations-libs-functional
diff --git a/tox.ini b/tox.ini
index b32b8f0c..b2d324e6 100644
--- a/tox.ini
+++ b/tox.ini
@@ -64,6 +64,7 @@ deps =
     -r {toxinidir}/requirements.txt
     -r {toxinidir}/test-requirements.txt
 commands =
+    {[testenv:pep8]commands}
     {[testenv:whitespace]commands}
     {[testenv:shebangs]commands}