diff --git a/doc/requirements.txt b/doc/requirements.txt
new file mode 100644
index 00000000..9e9e821a
--- /dev/null
+++ b/doc/requirements.txt
@@ -0,0 +1,2 @@
+sphinx>=1.2.1,!=1.3b1,<1.4 # BSD
+oslosphinx>=4.7.0 # Apache-2.0
diff --git a/test-requirements.txt b/test-requirements.txt
index 4a7d2041..e5ef58c7 100644
--- a/test-requirements.txt
+++ b/test-requirements.txt
@@ -6,8 +6,6 @@ hacking>=0.12.0,<0.13 # Apache-2.0
 
 coverage>=4.0 # Apache-2.0
 python-subunit>=0.0.18 # Apache-2.0/BSD
-sphinx>=1.2.1,!=1.3b1,<1.4 # BSD
-oslosphinx>=4.7.0 # Apache-2.0
 oslotest>=1.10.0 # Apache-2.0
 testrepository>=0.0.18  # Apache-2.0/BSD
 testscenarios>=0.4  # Apache-2.0/BSD
diff --git a/tox.ini b/tox.ini
index 9df0e3d9..f8646f90 100644
--- a/tox.ini
+++ b/tox.ini
@@ -37,7 +37,8 @@ commands =
     coverage report
 
 [testenv:docs]
-commands = python setup.py build_sphinx
+deps = -r{toxinidir}/doc/requirements.txt
+commands = sphinx-build -b html doc/source doc/build/html
 
 [testenv:releasenotes]
 commands =