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 50e5fed..777e49c 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -6,5 +6,5 @@ pbr!=2.1.0,>=2.0.0 # Apache-2.0
 six>=1.10.0 # MIT
 monotonic>=0.6 # Apache-2.0
 futures>=3.0.0;python_version=='2.7' or python_version=='2.6' # BSD
-contextlib2>=0.4.0 # PSF License
+contextlib2>=0.4.0;python_version<'3.0' # PSF License
 PrettyTable<0.8,>=0.7.1 # BSD
diff --git a/setup.cfg b/setup.cfg
index 373880b..17a8d04 100644
--- a/setup.cfg
+++ b/setup.cfg
@@ -22,15 +22,6 @@ classifier =
 packages =
     futurist
 
-[build_sphinx]
-source-dir = doc/source
-build-dir = doc/build
-all_files = 1
-warning-is-error = 1
-
-[upload_sphinx]
-upload-dir = doc/build/html
-
 [compile_catalog]
 directory = futurist/locale
 domain = futurist
diff --git a/test-requirements.txt b/test-requirements.txt
index 6e1bd22..bb1aad7 100644
--- a/test-requirements.txt
+++ b/test-requirements.txt
@@ -10,10 +10,7 @@ eventlet!=0.18.3,!=0.20.1,>=0.18.2 # MIT
 doc8>=0.6.0 # Apache-2.0
 coverage!=4.4,>=4.0 # Apache-2.0
 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
 oslotest>=3.2.0 # Apache-2.0
 testrepository>=0.0.18 # Apache-2.0/BSD
 testscenarios>=0.4 # Apache-2.0/BSD
 testtools>=2.2.0 # MIT
-reno>=2.5.0 # Apache-2.0
diff --git a/tox.ini b/tox.ini
index 9d72f3e..0e84739 100644
--- a/tox.ini
+++ b/tox.ini
@@ -12,7 +12,6 @@ deps =
        -r{toxinidir}/test-requirements.txt
 commands =
     python setup.py testr --slowest --testr-args='{posargs}'
-    sphinx-build -E -W -b doctest doc/source doc/build/doctest
 
 [testenv:pep8]
 basepython = python3
@@ -37,6 +36,7 @@ basepython = python2.7
 
 [testenv:docs]
 basepython = python3
+deps = -r{toxinidir}/doc/requirements.txt
 commands =
     rm -rf doc/build
     sphinx-build -E -W -b html doc/source doc/build/html