diff --git a/doc/source/contributor/index.rst b/doc/source/contributor/index.rst
index 73ba42c45..205471f44 100644
--- a/doc/source/contributor/index.rst
+++ b/doc/source/contributor/index.rst
@@ -40,7 +40,6 @@ Developer Documentation
    testing
    contributing
    event-alarm
-   api/autoindex
 
 Appendix
 ========
diff --git a/setup.cfg b/setup.cfg
index b63a73ac6..e28707a57 100644
--- a/setup.cfg
+++ b/setup.cfg
@@ -111,19 +111,6 @@ oslo.config.opts.defaults =
 oslo.policy.policies =
     aodh = aodh.api.policies:list_rules
 
-[build_sphinx]
-all_files = 1
-build-dir = doc/build
-source-dir = doc/source
-warning-is-error = 1
-
-[pbr]
-autodoc_index_modules = true
-autodoc_exclude_modules = 
-    aodh.storage.sqlalchemy.alembic.*
-    aodh.tests.*
-api_doc_dir = contributor/api
-
 [extract_messages]
 keywords = _ gettext ngettext l_ lazy_gettext
 mapping_file = babel.cfg
diff --git a/tox.ini b/tox.ini
index a7b88adec..b89bf76d5 100644
--- a/tox.ini
+++ b/tox.ini
@@ -44,7 +44,7 @@ commands = sphinx-build -a -E -W -d releasenotes/build/doctrees -b html releasen
 [testenv:docs]
 basepython = python3
 deps = -r{toxinidir}/doc/requirements.txt
-commands = python setup.py build_sphinx
+commands = sphinx-build -W -b html doc/source doc/build/html
 setenv = PYTHONHASHSEED=0
 
 [testenv:venv]