diff --git a/{{cookiecutter.repo_name}}/requirements.txt b/{{cookiecutter.repo_name}}/requirements.txt
index 152f742..e5567e9 100644
--- a/{{cookiecutter.repo_name}}/requirements.txt
+++ b/{{cookiecutter.repo_name}}/requirements.txt
@@ -1,4 +1,4 @@
-pbr>=0.11,<2.0
+pbr>=2.0.0
 oslosphinx
-sphinx>=1.1.2,!=1.2.0,!=1.3b1,<1.3
+sphinx!=1.6.6,!=1.6.7,>=1.6.2 # BSD
 yasfb>=0.5.1
diff --git a/{{cookiecutter.repo_name}}/tox.ini b/{{cookiecutter.repo_name}}/tox.ini
index be6cbbb..88f46ad 100644
--- a/{{cookiecutter.repo_name}}/tox.ini
+++ b/{{cookiecutter.repo_name}}/tox.ini
@@ -15,7 +15,7 @@ deps = -r{toxinidir}/requirements.txt
 commands = {posargs}
 
 [testenv:docs]
-commands = python setup.py build_sphinx
+commands = sphinx-build -W -b html doc/source doc/build/html
 
 [testenv:spelling]
 deps =