diff --git a/bindep.txt b/bindep.txt
index 6e1e3e68e9..268d293eea 100644
--- a/bindep.txt
+++ b/bindep.txt
@@ -72,6 +72,14 @@ graphviz [!platform:gentoo test doc]
 # libsrvg2 is needed for sphinxcontrib-svg2pdfconverter in docs builds.
 librsvg2-tools [doc platform:rpm]
 librsvg2-bin [doc platform:dpkg]
+latexmk [doc]
+texlive-collection-fontsrecommended [doc platform:rpm]
+tex-gyre [doc platform:dpkg]
+texlive-latex-extra [doc platform:dpkg]
+texlive-collection-latexextra [doc platform:rpm]
+texlive-fonts-extra-links [doc platform:dpkg]
+texlive-collection-fontsextra [doc platform:rpm]
+
 
 # these are needed to build images
 
diff --git a/tox.ini b/tox.ini
index 7a85d9312f..e85c2e28e5 100644
--- a/tox.ini
+++ b/tox.ini
@@ -88,7 +88,7 @@ deps =
   -c{env:TOX_CONSTRAINTS_FILE:https://releases.openstack.org/constraints/upper/master}
   -r{toxinidir}/requirements.txt
   -r{toxinidir}/doc/requirements.txt
-commands = sphinx-build -b html doc/source doc/build/html
+commands = sphinx-build -E -b html doc/source doc/build/html
 
 [testenv:pdf-docs]
 allowlist_externals =
@@ -96,7 +96,7 @@ allowlist_externals =
   dot
 deps = {[testenv:docs]deps}
 commands =
-  sphinx-build -b latex doc/source doc/build/pdf
+  sphinx-build -E -b latex doc/source doc/build/pdf
   make -C doc/build/pdf
 
 [testenv:api-ref]
@@ -109,7 +109,7 @@ deps =
 allowlist_externals = bash
 commands =
   bash -c 'rm -rf api-ref/build'
-  sphinx-build -W -b html -d api-ref/build/doctrees api-ref/source api-ref/build/html
+  sphinx-build -E -W -b html -d api-ref/build/doctrees api-ref/source api-ref/build/html
 
 [testenv:releasenotes]
 usedevelop = False