diff --git a/doc/requirements.txt b/doc/requirements.txt
index bd71b24..af5d87b 100644
--- a/doc/requirements.txt
+++ b/doc/requirements.txt
@@ -3,6 +3,7 @@
 # process, which may cause wedges in the gate later.
 
 # this is required for the docs build jobs
-sphinx!=1.6.6,!=1.6.7,!=2.1.0,>=1.6.2 # BSD
+sphinx>=1.8.0,<2.0.0;python_version=='2.7' # BSD
+sphinx>=1.8.0,!=2.1.0;python_version>='3.4' # BSD
 openstackdocstheme==1.18.1 # Apache-2.0
 reno>=2.5.0 # Apache-2.0
diff --git a/tox.ini b/tox.ini
index 304004a..5d7e99c 100644
--- a/tox.ini
+++ b/tox.ini
@@ -15,12 +15,15 @@ commands = {posargs}
 [testenv:docs]
 basepython = python3
 deps = -r{toxinidir}/doc/requirements.txt
-commands = sphinx-build -b html doc/source doc/build/html
+whitelist_externals = rm
+commands =
+  rm -fr doc/build
+  sphinx-build --keep-going -b html doc/source doc/build/html
 
 [testenv:deploy-guide]
 basepython = python3
 deps = -r{toxinidir}/doc/requirements.txt
 whitelist_externals = rm
 commands =
-        rm -rf deploy-guide/build
-        sphinx-build -a -E -W -d deploy-guide/build/doctrees -b html deploy-guide/source deploy-guide/build/html
+  rm -rf deploy-guide/build
+  sphinx-build -a -E -W -d deploy-guide/build/doctrees --keep-going -b html deploy-guide/source deploy-guide/build/html