diff --git a/.zuul.yaml b/.zuul.yaml
index 76d26e108..ac084a61a 100644
--- a/.zuul.yaml
+++ b/.zuul.yaml
@@ -120,6 +120,8 @@
         NODEPOOL_PAUSE_DEBIAN_STRETCH_DIB: false
 
 - project:
+    templates:
+      - build-tox-docs
     check:
       jobs:
         - tox-cover
@@ -131,9 +133,6 @@
             voting: false
         - nodepool-functional-py35-src:
             voting: false
-        - build-sphinx-docs:
-            vars:
-              sphinx_python: python3
         - pbrx-build-container-images:
             vars:
               pbrx_prefix: zuul
@@ -141,9 +140,6 @@
       jobs:
         - tox-pep8
         - tox-py35
-        - build-sphinx-docs:
-            vars:
-              sphinx_python: python3
         - pbrx-build-container-images:
             vars:
               pbrx_prefix: zuul
diff --git a/tox.ini b/tox.ini
index cce41df63..8595bd438 100644
--- a/tox.ini
+++ b/tox.ini
@@ -46,7 +46,7 @@ commands =
 [testenv:docs]
 basepython = python3
 commands =
-  sphinx-build -W -d doc/build/doctrees -b html doc/source/ doc/build/html
+  sphinx-build -E -W -d doc/build/doctrees -b html doc/source/ doc/build/html
 
 [testenv:venv]
 basepython = python3