diff --git a/test-requirements.txt b/test-requirements.txt
index b677f57..22980a3 100644
--- a/test-requirements.txt
+++ b/test-requirements.txt
@@ -5,8 +5,7 @@
 hacking>=1.1.0,<1.2.0 # Apache-2.0
 
 coverage!=4.4,>=4.0 # Apache-2.0
-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.1.0 # BSD
 openstackdocstheme>=1.20.0 # Apache-2.0
 
 # releasenotes
diff --git a/tox.ini b/tox.ini
index b4f369d..f391fa4 100644
--- a/tox.ini
+++ b/tox.ini
@@ -41,7 +41,7 @@ commands = python setup.py build_sphinx
 [testenv:releasenotes]
 basepython = python3
 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]
 basepython = python3