diff --git a/setup.cfg b/setup.cfg
index 346c2d6193..381d592b74 100644
--- a/setup.cfg
+++ b/setup.cfg
@@ -43,11 +43,6 @@ setup-hooks =
 
 [pbr]
 
-[build_sphinx]
-all_files = 1
-build-dir = doc/build
-source-dir = doc/source
-warning-is-error = 1
 
 [build_releasenotes]
 all_files = 1
diff --git a/tox.ini b/tox.ini
index 7452156117..9d57db8e98 100644
--- a/tox.ini
+++ b/tox.ini
@@ -7,8 +7,9 @@ envlist = py35,py27,pep8,pypy
 usedevelop=True
 whitelist_externals = find
                       rm
-install_command = pip install -c{env:UPPER_CONSTRAINTS_FILE:https://git.openstack.org/cgit/openstack/requirements/plain/upper-constraints.txt} {opts} {packages}
-deps = -r{toxinidir}/requirements.txt
+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
 passenv = http_proxy HTTP_PROXY https_proxy HTTPS_PROXY no_proxy NO_PROXY
           OS_STDOUT_CAPTURE OS_STDERR_CAPTURE OS_LOG_CAPTURE OS_TEST_TIMEOUT
@@ -49,7 +50,11 @@ commands = bandit -r docker kolla tests tools
 commands = {posargs}
 
 [testenv:docs]
-deps = -r{toxinidir}/doc/requirements.txt
+deps =
+    -c{env:UPPER_CONSTRAINTS_FILE:https://git.openstack.org/cgit/openstack/requirements/plain/upper-constraints.txt}
+    -r{toxinidir}/requirements.txt
+    -r{toxinidir}/doc/requirements.txt
+
 commands =
   rm -rf doc/build
   doc8 doc