diff --git a/.zuul.yaml b/.zuul.yaml
index 7b9deea46..be5676860 100644
--- a/.zuul.yaml
+++ b/.zuul.yaml
@@ -66,7 +66,6 @@
 - project:
     check:
       jobs:
-        - tox-docs
         - tox-cover
         - tox-pep8
         - tox-py35
@@ -74,10 +73,19 @@
             voting: false
         - nodepool-functional-py35-src:
             voting: false
+        - build-sphinx-docs:
+            vars:
+              sphinx_python: python3
     gate:
       jobs:
         - tox-pep8
         - tox-py35
+        - build-sphinx-docs:
+            vars:
+              sphinx_python: python3
+    post:
+      jobs:
+        - publish-openstack-sphinx-docs-infra-python3
     experimental:
       jobs:
         - nodepool-zuul-functional
diff --git a/tox.ini b/tox.ini
index 91133dca1..6638ca5a2 100644
--- a/tox.ini
+++ b/tox.ini
@@ -36,7 +36,7 @@ commands =
 [testenv:docs]
 basepython = python3
 commands =
-  python setup.py build_sphinx
+  sphinx-build -W -d doc/build/doctrees -b html doc/source/ doc/build/html
 
 [testenv:venv]
 basepython = python3