diff --git a/doc/source/index.rst b/doc/source/index.rst
index f012097708..00c4e9a2c0 100644
--- a/doc/source/index.rst
+++ b/doc/source/index.rst
@@ -33,6 +33,13 @@ where your test contributions should go.
    field_guide/thirdparty
    field_guide/whitebox
 
+------------------
+API and test cases
+------------------
+.. toctree::
+   :maxdepth: 1
+
+   api/modules
 
 ==================
 Indices and tables
diff --git a/setup.cfg b/setup.cfg
index 3b13b603dc..7cfc4ce013 100644
--- a/setup.cfg
+++ b/setup.cfg
@@ -35,3 +35,6 @@ source-dir = doc/source
 #                coverage http://pypi.python.org/pypi/coverage
 #                openstack-nose https://github.com/openstack-dev/openstack-nose
 verbosity=2
+
+[pbr]
+autodoc_tree_index_modules=true