diff --git a/.zuul.yaml b/.zuul.yaml
index ef7f574b8a..adfa706c24 100644
--- a/.zuul.yaml
+++ b/.zuul.yaml
@@ -65,14 +65,10 @@
       javascript_copy_links: false
 
 - project:
+    templates:
+      - build-tox-docs
     check:
       jobs:
-        - build-sphinx-docs:
-            irrelevant-files:
-              - zuul/cmd/migrate.py
-              - playbooks/zuul-migrate/.*
-            vars:
-              sphinx_python: python3
         - tox-pep8
         - tox-py35:
             irrelevant-files:
@@ -105,12 +101,6 @@
             voting: false
     gate:
       jobs:
-        - build-sphinx-docs:
-            irrelevant-files:
-              - zuul/cmd/migrate.py
-              - playbooks/zuul-migrate/.*
-            vars:
-              sphinx_python: python3
         - tox-pep8
         - tox-py35:
             irrelevant-files:
diff --git a/tox.ini b/tox.ini
index 1ea2117472..ddb811fcba 100644
--- a/tox.ini
+++ b/tox.ini
@@ -65,7 +65,7 @@ commands =
 
 [testenv:docs]
 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]
 commands = {posargs}