diff --git a/doc/source/contributor/index.rst b/doc/source/contributor/index.rst
index 8cec9d76ac..88af7d0981 100644
--- a/doc/source/contributor/index.rst
+++ b/doc/source/contributor/index.rst
@@ -30,7 +30,7 @@ Developer reference
    database_migrations
    domain_model
    domain_implementation
-   api/modules
+   api/autoindex
 
 Policies
 --------
diff --git a/setup.cfg b/setup.cfg
index 859431e70b..8c55b4f523 100644
--- a/setup.cfg
+++ b/setup.cfg
@@ -85,5 +85,8 @@ mapping_file = babel.cfg
 output_file = glance/locale/glance.pot
 
 [pbr]
-autodoc_tree_index_modules = True
+autodoc_index_modules = True
+autodoc_exclude_modules =
+  glance.tests.*
+  glance.db.sqlalchemy.*
 api_doc_dir = contributor/api