diff --git a/doc/source/index.rst b/doc/source/index.rst
index 30e5eb0..7074c7d 100644
--- a/doc/source/index.rst
+++ b/doc/source/index.rst
@@ -27,7 +27,8 @@ Aodh API.
     __ https://docs.openstack.org/aodh/latest/
 
 
-Contents:
+Contents
+--------
 
 .. toctree::
    :maxdepth: 2
@@ -38,7 +39,7 @@ Contents:
    contributing
 
 Indices and tables
-==================
+------------------
 
 * :ref:`genindex`
 * :ref:`modindex`
diff --git a/setup.cfg b/setup.cfg
index 0778ff1..9df3dcd 100644
--- a/setup.cfg
+++ b/setup.cfg
@@ -56,14 +56,6 @@ openstack.alarming.v2 =
     alarm-history show = aodhclient.v2.alarm_history_cli:CliAlarmHistoryShow
     alarming capabilities list = aodhclient.v2.capabilities_cli:CliCapabilitiesList
 
-[build_sphinx]
-source-dir = doc/source
-build-dir = doc/build
-all_files = 1
-
-[upload_sphinx]
-upload-dir = doc/build/html
-
 [compile_catalog]
 directory = aodhclient/locale
 domain = aodhclient
diff --git a/tox.ini b/tox.ini
index 70327e0..e0fb012 100644
--- a/tox.ini
+++ b/tox.ini
@@ -38,8 +38,9 @@ commands = sphinx-build -a -E -W -d releasenotes/build/doctrees -b html releasen
 [testenv:docs]
 deps = -r{toxinidir}/doc/requirements.txt
 commands =
-   rm -rf doc/source/ref
-   python setup.py build_sphinx
+   rm -rf doc/build
+   sphinx-build -b html doc/source doc/build/html
+whitelist_externals = rm
 
 [testenv:debug]
 commands = pifpaf --debug run aodh -- oslo_debug_helper {posargs}