diff --git a/doc/requirements.txt b/doc/requirements.txt
index 2397bef..801e848 100644
--- a/doc/requirements.txt
+++ b/doc/requirements.txt
@@ -2,6 +2,6 @@
 # of appearance. Changing the order has an impact on the overall integration
 # process, which may cause wedges in the gate later.
 
-sphinx!=1.6.6,!=1.6.7,>=1.6.2,<2.0.0;python_version=='2.7'  # BSD
-sphinx!=1.6.6,!=1.6.7,!=2.1.0,>=1.6.2;python_version>='3.4'  # 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.20.0 # Apache-2.0
diff --git a/tox.ini b/tox.ini
index 57c1cca..38f661f 100644
--- a/tox.ini
+++ b/tox.ini
@@ -41,13 +41,13 @@ commands =
    coverage report
 
 [testenv:releasenotes]
-commands = sphinx-build -a -E -W -d releasenotes/build/doctrees -b html releasenotes/source releasenotes/build/html
+commands = sphinx-build -a -E -W -d releasenotes/build/doctrees --keep-going -b html releasenotes/source releasenotes/build/html
 
 [testenv:docs]
 deps = -r{toxinidir}/doc/requirements.txt
 commands =
    rm -rf doc/build
-   sphinx-build -W -b html doc/source doc/build/html
+   sphinx-build -W --keep-going -b html doc/source doc/build/html
 whitelist_externals = rm
 
 [testenv:debug]