diff --git a/setup.cfg b/setup.cfg
index 1a07c8e..f7ea713 100644
--- a/setup.cfg
+++ b/setup.cfg
@@ -11,11 +11,6 @@ classifier =
     License :: OSI Approved :: Apache Software License
     Operating System :: POSIX :: Linux
 
-[build_sphinx]
-all_files = 1
-build-dir = doc/build
-source-dir = doc/source
-
 [pbr]
 warnerrors = True
 
diff --git a/tox.ini b/tox.ini
index d587f74..137eb4d 100644
--- a/tox.ini
+++ b/tox.ini
@@ -14,7 +14,10 @@ commands = python setup.py testr --slowest --testr-args='{posargs}'
 commands = {posargs}
 
 [testenv:docs]
-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}/requirements.txt
+commands = sphinx-build -b html doc/source doc/build/html
 
 [testenv:doc8]
 deps = -r{toxinidir}/requirements.txt doc8