diff --git a/doc/requirements.txt b/doc/requirements.txt
new file mode 100644
index 0000000..b9c5e1f
--- /dev/null
+++ b/doc/requirements.txt
@@ -0,0 +1,3 @@
+sphinx!=1.6.6,!=1.6.7,>=1.6.2 # BSD
+openstackdocstheme>=1.18.1 # Apache-2.0
+reno>=2.5.0 # Apache-2.0
diff --git a/requirements.txt b/requirements.txt
index 93ee93b..b1c52bb 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -1,7 +1,7 @@
 # The order of packages is significant, because pip processes them in the order
 # of appearance. Changing the order has an impact on the overall integration
 # process, which may cause wedges in the gate later.
-pbr!=2.1.0,>=2.0.0 # Apache-2.0
+pbr # Apache-2.0
 
 flake8<2.7.0,>=2.6.0 # MIT
 six>=1.10.0 # MIT
diff --git a/test-requirements.txt b/test-requirements.txt
index 92470b4..3028635 100644
--- a/test-requirements.txt
+++ b/test-requirements.txt
@@ -5,8 +5,6 @@ coverage!=4.4,>=4.0 # Apache-2.0
 fixtures>=3.0.0 # Apache-2.0/BSD
 mock>=2.0.0 # BSD
 python-subunit>=1.0.0 # Apache-2.0/BSD
-sphinx!=1.6.6,!=1.6.7,>=1.6.2 # BSD
-openstackdocstheme>=1.18.1 # Apache-2.0
 stestr>=2.0.0 # Apache-2.0
 testscenarios>=0.4 # Apache-2.0/BSD
 testtools>=2.2.0 # MIT
@@ -17,5 +15,3 @@ testtools>=2.2.0 # MIT
 # work.
 # See https://bugs.launchpad.net/hacking/+bug/1403270
 eventlet!=0.18.3,!=0.20.1,>=0.18.2 # MIT
-
-reno>=2.5.0 # Apache-2.0
diff --git a/tox.ini b/tox.ini
index f8892aa..7063b87 100644
--- a/tox.ini
+++ b/tox.ini
@@ -7,19 +7,12 @@ envlist = py27,py36,py37,pep8,pypy
 usedevelop = True
 install_command = pip install {opts} {packages}
 deps =
-       -c{env:UPPER_CONSTRAINTS_FILE:https://git.openstack.org/cgit/openstack/requirements/plain/upper-constraints.txt}
-       -r{toxinidir}/requirements.txt
-       -r{toxinidir}/test-requirements.txt
+  -c{env:UPPER_CONSTRAINTS_FILE:https://git.openstack.org/cgit/openstack/requirements/plain/upper-constraints.txt}
+  -r{toxinidir}/requirements.txt
+  -r{toxinidir}/test-requirements.txt
 commands =
   stestr run --slowest {posargs}
 
-[tox:jenkins]
-sitepackages = True
-
-[testenv:pep8]
-basepython = python3
-commands = flake8 {posargs}
-
 [testenv:integration]
 basepython = python3
 whitelist_externals = bash
@@ -29,24 +22,35 @@ commands =
 [testenv:cover]
 basepython = python3
 setenv =
-    PYTHON=coverage run --source hacking --parallel-mode
+  PYTHON=coverage run --source hacking --parallel-mode
 commands =
-    stestr run {posargs}
-    coverage combine
-    coverage html -d cover
-    coverage xml -o cover/coverage.xml
-
-[testenv:venv]
-basepython = python3
-commands = {posargs}
+  stestr run {posargs}
+  coverage combine
+  coverage html -d cover
+  coverage xml -o cover/coverage.xml
 
 [testenv:docs]
 basepython = python3
-commands = python setup.py build_sphinx
+deps =
+  -c{env:UPPER_CONSTRAINTS_FILE:https://git.openstack.org/cgit/openstack/requirements/plain/upper-constraints.txt}
+  -r{toxinidir}/doc/requirements.txt
+commands =
+  sphinx-build -W -b html doc/source doc/build/html
 
 [testenv:releasenotes]
 basepython = python3
-commands = sphinx-build -a -E -W -d releasenotes/build/doctrees -b html releasenotes/source releasenotes/build/html
+deps =
+  {[testenv:docs]deps}
+commands =
+  sphinx-build -W -b html releasenotes/source releasenotes/build/html
+
+[testenv:venv]
+basepython = python3
+commands = {posargs}
+
+[testenv:pep8]
+basepython = python3
+commands = flake8 {posargs}
 
 [flake8]
 exclude = .venv,.tox,dist,doc,*.egg,build