diff --git a/.zuul.yaml b/.zuul.yaml
index 3776deff4..79383e6d4 100644
--- a/.zuul.yaml
+++ b/.zuul.yaml
@@ -84,8 +84,8 @@
       - openstack-python-jobs
       - periodic-stable-jobs
       - check-requirements
-      - publish-openstack-sphinx-docs
-      - release-notes-jobs
+      - publish-openstack-docs-pti
+      - release-notes-jobs-python3
       - install-guide-jobs
     check:
       jobs:
diff --git a/tox.ini b/tox.ini
index 625324909..d3150e53a 100644
--- a/tox.ini
+++ b/tox.ini
@@ -26,7 +26,9 @@ commands = ostestr --concurrency 1 {posargs}
 
 [testenv:pep8]
 basepython = python3
-commands = flake8
+commands =
+  doc8 doc/source
+  flake8
 
 [testenv:genconfig]
 basepython = python3
@@ -53,11 +55,8 @@ commands = {posargs}
 basepython = python3
 deps =
   -r{toxinidir}/doc/requirements.txt
-  -r{toxinidir}/test-requirements.txt
-
 commands =
-  doc8 doc/source
-  sphinx-build -W -b html api-ref/source api-ref/build/html
+  sphinx-build -W -b html doc/source doc/build/html
 
 [testenv:api-ref]
 basepython = python3