diff --git a/tox.ini b/tox.ini
index 92dd850..32bd978 100644
--- a/tox.ini
+++ b/tox.ini
@@ -26,12 +26,13 @@ commands = python setup.py test --coverage --testr-args='{posargs}'
 
 [testenv:docs]
 commands =
-    doc8 --ignore D000 -e .rst doc/source/ CONTRIBUTING.rst HACKING.rst README.rst
-    sphinx-build -W -b html doc/source doc/build/html
+  rm -rf doc/build
+  sphinx-build -W --keep-going -b html doc/source doc/build/html
+  doc8 --ignore D000 -e .rst doc/source/ CONTRIBUTING.rst HACKING.rst README.rst
 
 [testenv:releasenotes]
 commands =
-  sphinx-build -a -E -W -d releasenotes/build/doctrees -b html releasenotes/source releasenotes/build/html
+  sphinx-build -a -E -W -d releasenotes/build/doctrees --keep-going -b html releasenotes/source releasenotes/build/html
 
 [testenv:debug]
 commands = oslo_debug_helper {posargs}