diff --git a/oslo.{{cookiecutter.module_name}}/test-requirements.txt b/oslo.{{cookiecutter.module_name}}/test-requirements.txt
index 15f08a0..88ac441 100644
--- a/oslo.{{cookiecutter.module_name}}/test-requirements.txt
+++ b/oslo.{{cookiecutter.module_name}}/test-requirements.txt
@@ -7,4 +7,4 @@ oslotest>=1.5.1
 
 # These are needed for docs generation
 oslosphinx>=2.5.0
-sphinx!=1.2.0,!=1.3b1,<1.3,>=1.1.2
+sphinx!=1.6.6,!=1.6.7,>=1.6.2 # BSD
diff --git a/oslo.{{cookiecutter.module_name}}/tox.ini b/oslo.{{cookiecutter.module_name}}/tox.ini
index 6e832eb..500b7da 100644
--- a/oslo.{{cookiecutter.module_name}}/tox.ini
+++ b/oslo.{{cookiecutter.module_name}}/tox.ini
@@ -38,7 +38,7 @@ install_command = {[testenv:common-constraints]install_command}
 commands = python setup.py test --coverage --testr-args='{posargs}'
 
 [testenv:docs]
-commands = python setup.py build_sphinx
+commands = sphinx-build -W -b html doc/source doc/build/html
 
 [testenv:docs-constraints]
 install_command = {[testenv:common-constraints]install_command}