diff --git a/lower-constraints.txt b/lower-constraints.txt
index 0827bff6..45ec38d2 100644
--- a/lower-constraints.txt
+++ b/lower-constraints.txt
@@ -40,7 +40,7 @@ gabbi==1.26.1 # Apache-2.0
 testscenarios==0.4 # Apache-2.0/BSD
 stestr==2.0.0 # Apache-2.0
 mock==1.2 # BSD
-sphinx==1.6.2 # BSD
+sphinx==1.8.0 # BSD
 openstackdocstheme==1.30.0 # Apache-2.0
 oslotest==1.10.0 # Apache-2.0
 sphinxcontrib-pecanwsme==0.8 # Apache-2.0
diff --git a/test-requirements.txt b/test-requirements.txt
index 56443211..e44c6d1b 100644
--- a/test-requirements.txt
+++ b/test-requirements.txt
@@ -12,7 +12,7 @@ gabbi>=1.26.1 # Apache-2.0
 testscenarios>=0.4 # Apache-2.0/BSD
 stestr>=2.0.0 # Apache-2.0
 mock>=1.2 # BSD
-sphinx!=1.6.6,!=1.6.7,!=2.1.0,>=1.6.2;python_version>='3.4' # BSD
+sphinx>=1.8.0,!=2.1.0;python_version>='3.4' # BSD
 openstackdocstheme>=1.30.0 # Apache-2.0
 oslotest>=1.10.0 # Apache-2.0
 sphinxcontrib-httpdomain>=1.6.0 # BSD
diff --git a/tox.ini b/tox.ini
index 63797432..d3e850c9 100644
--- a/tox.ini
+++ b/tox.ini
@@ -49,14 +49,14 @@ commands =
 commands = oslopolicy-sample-generator --config-file=etc/oslo-policy-generator/cloudkitty.conf
 
 [testenv:docs]
-commands = sphinx-build -W -b html doc/source doc/build/html
+commands = sphinx-build -W --keep-going -b html doc/source doc/build/html
 
 [testenv:pdf-docs]
 envdir = {toxworkdir}/docs
 whitelist_externals =
   make
 commands =
-  sphinx-build -W -b latex doc/source doc/build/pdf
+  sphinx-build -W --keep-going -b latex doc/source doc/build/pdf
   make -C doc/build/pdf
 
 [testenv:venv]
@@ -74,7 +74,7 @@ import_exceptions = cloudkitty.i18n
 local-check-factory = cloudkitty.hacking.checks.factory
 
 [testenv:releasenotes]
-commands = sphinx-build -a -E -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:lower-constraints]
 deps =