diff --git a/doc/requirements.txt b/doc/requirements.txt
index 880f44c4..5d7ece7b 100644
--- a/doc/requirements.txt
+++ b/doc/requirements.txt
@@ -2,8 +2,8 @@
 # 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
 sphinxcontrib-apidoc>=0.2.0  # BSD
 openstackdocstheme>=1.20.0 # Apache-2.0
 reno>=2.5.0 # Apache-2.0
diff --git a/lower-constraints.txt b/lower-constraints.txt
index 0174b10c..68686859 100644
--- a/lower-constraints.txt
+++ b/lower-constraints.txt
@@ -44,7 +44,7 @@ rfc3986==1.2.0
 six==1.10.0
 smmap==0.9.0
 snowballstemmer==1.2.1
-Sphinx==1.6.2
+Sphinx==1.8.0
 sphinxcontrib-websupport==1.0.1
 stestr==2.1.0
 stevedore==1.20.0
diff --git a/tox.ini b/tox.ini
index d7e63715..87b9cce8 100644
--- a/tox.ini
+++ b/tox.ini
@@ -61,7 +61,7 @@ whitelist_externals = rm
 deps = -r{toxinidir}/doc/requirements.txt
 commands =
   rm -fr doc/build
-  sphinx-build -W -b html doc/source doc/build/html {posargs}
+  sphinx-build -W --keep-going -b html doc/source doc/build/html {posargs}
 
 [testenv:bandit]
 basepython = python3
@@ -75,7 +75,8 @@ exclude = .tox,dist,doc,*.egg,build
 [testenv:releasenotes]
 basepython = python3
 deps = -r{toxinidir}/doc/requirements.txt
-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
 
 [hacking]
 import_exceptions = oslo_config._i18n