diff --git a/docs/requirements.txt b/docs/requirements.txt
index 7981d3bb..c79deda9 100644
--- a/docs/requirements.txt
+++ b/docs/requirements.txt
@@ -4,3 +4,8 @@
 sphinx>=1.6.2 # BSD
 sphinx_rtd_theme==0.2.4
 reno>=2.5.0 # Apache-2.0
+
+# NOTE(fmontei): The requirement below is only included because readthedocs
+# depends on it to work, since it only takes in one requirements file.
+oslo.config!=4.3.0,!=4.4.0,>=5.2.0 # Apache-2.0
+oslo.policy>=1.33.1 # Apache-2.0
diff --git a/setup.cfg b/setup.cfg
index 109eea28..7e270701 100644
--- a/setup.cfg
+++ b/setup.cfg
@@ -26,12 +26,3 @@ oslo.config.opts =
 
 oslo.policy.policies =
     deckhand = deckhand.policies:list_rules
-
-[build_sphinx]
-source-dir = docs/source
-build-dir = docs/build
-all_files = 1
-warning-is-error = 1
-
-[upload_sphinx]
-upload-dir = doc/build/html
diff --git a/test-requirements.txt b/test-requirements.txt
index 1a198796..f3a37438 100644
--- a/test-requirements.txt
+++ b/test-requirements.txt
@@ -17,7 +17,3 @@ bandit>=1.4.0 # Apache-2.0
 gabbi==1.35.1
 pytest-html==1.16.1
 pifpaf==2.0.5
-
-# NOTE(fmontei): The requirement below is only included because readthedocs
-# depends on it to work, since it runs pip install -rtest-requirements.txt.
-oslo.policy>=1.33.1 # Apache-2.0
diff --git a/tox.ini b/tox.ini
index d2f0d12b..86537009 100644
--- a/tox.ini
+++ b/tox.ini
@@ -67,10 +67,6 @@ whitelist_externals = bandit
 commands =
     bandit -r deckhand -x deckhand/tests -n 5
 
-[testenv:releasenotes]
-deps = -r{toxinidir}/docs/requirements.txt
-commands = sphinx-build -a -E -W -d releasenotes/build/doctrees -b html releasenotes/source releasenotes/build/html
-
 [testenv:genconfig]
 commands = oslo-config-generator --config-file=etc/deckhand/config-generator.conf
 
@@ -92,7 +88,22 @@ ignore = E127,E128,E129,E131,H405
 exclude =  .venv,.git,.tox,dist,*lib/python*,*egg,build,releasenotes,docs,alembic/versions
 
 [testenv:docs]
-deps = -r{toxinidir}/docs/requirements.txt
+deps =
+  -r{toxinidir}/requirements.txt
+  -r{toxinidir}/docs/requirements.txt
 commands =
-    rm -rf docs/build
-    python setup.py build_sphinx {posargs}
+  rm -rf docs/build
+  rm -rf releasenotes/build
+  sphinx-build -W -b html docs/source docs/build/html
+whitelist_externals =
+  rm
+
+[testenv:releasenotes]
+deps =
+  -r{toxinidir}/requirements.txt
+  -r{toxinidir}/docs/requirements.txt
+commands =
+  rm -rf releasenotes/build
+  sphinx-build -a -E -W -d releasenotes/build/doctrees -b html releasenotes/source releasenotes/build/html
+whitelist_externals =
+  rm