diff --git a/.gitignore b/.gitignore
index ba95f56b..8f7c95b1 100644
--- a/.gitignore
+++ b/.gitignore
@@ -13,10 +13,10 @@ ChangeLog
 cover/*
 dist/*
 doc/build
-doc/source/api/
 doc/source/_static/
 etc/aodh/aodh.conf
 subunit.log
 
 # Files created by releasenotes build
 releasenotes/build
+/doc/source/contributor/api/
diff --git a/doc/source/contributor/api b/doc/source/contributor/api
deleted file mode 100644
index 0e6b2a80..00000000
--- a/doc/source/contributor/api
+++ /dev/null
@@ -1,8 +0,0 @@
-===================
- Source Code Index
-===================
-
-.. toctree::
-   :maxdepth: 1
-
-   autoindex
diff --git a/doc/source/contributor/index.rst b/doc/source/contributor/index.rst
index f9f54bfc..d7f8685b 100644
--- a/doc/source/contributor/index.rst
+++ b/doc/source/contributor/index.rst
@@ -45,6 +45,7 @@ Developer Documentation
    testing
    contributing
    event-alarm
+   api/autoindex
 
 Appendix
 ========
@@ -53,7 +54,6 @@ Appendix
    :maxdepth: 1
 
    releasenotes/index
-   api/index
 
 .. update index
 
diff --git a/setup.cfg b/setup.cfg
index 85c61d7a..3b0556a8 100644
--- a/setup.cfg
+++ b/setup.cfg
@@ -130,7 +130,10 @@ source-dir = doc/source
 [pbr]
 warnerrors = true
 autodoc_index_modules = true
-autodoc_exclude_modules = aodh.storage.sqlalchemy.alembic.*
+autodoc_exclude_modules = 
+    aodh.storage.sqlalchemy.alembic.*
+    aodh.tests.*
+api_doc_dir = contributor/api
 
 [extract_messages]
 keywords = _ gettext ngettext l_ lazy_gettext