diff --git a/test-requirements.txt b/test-requirements.txt
index 1c88f5c..3657c2c 100644
--- a/test-requirements.txt
+++ b/test-requirements.txt
@@ -7,8 +7,8 @@ hacking>=0.12.0,!=0.13.0,<0.14  # Apache-2.0
 coverage>=4.0,!=4.4  # Apache-2.0
 ddt>=1.0.1 # MIT
 python-subunit>=0.0.18 # Apache-2.0/BSD
-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
 oslosphinx>=4.7.0 # Apache-2.0
 oslotest>=1.10.0 # Apache-2.0
 testrepository>=0.0.18  # Apache-2.0/BSD
diff --git a/tox.ini b/tox.ini
index 19b8986..3f501a8 100644
--- a/tox.ini
+++ b/tox.ini
@@ -17,7 +17,11 @@ commands = {posargs}
 
 [testenv:docs]
 basepython = python3
-commands = python setup.py build_sphinx
+whitelist_externals =
+  rm
+commands =
+  rm -rf doc/build
+  sphinx-build -W --keep-going -b html doc/source doc/build/html
 
 [testenv:pep8]
 basepython = python3