diff --git a/doc/source/index.rst b/doc/source/index.rst
index 454f8abf..17242399 100644
--- a/doc/source/index.rst
+++ b/doc/source/index.rst
@@ -15,13 +15,11 @@
    :start-line: 0
    :end-line: 22
 
+.. toctree::
+   :maxdepth: 2
 
-.. contents:: Contents
-   :local:
-
-.. include:: ./usage.rst
-
-.. include:: ./pydocs.rst
+   usage
+   pydocs
 
 Indices and tables
 ==================
diff --git a/doc/source/pydocs.rst b/doc/source/pydocs.rst
index a38c86e7..a18b3388 100644
--- a/doc/source/pydocs.rst
+++ b/doc/source/pydocs.rst
@@ -10,7 +10,7 @@ troveclient
     :undoc-members:
     :show-inheritance:
 
-.. autoclass:: troveclient.client.Dbaas
+.. autoclass:: troveclient.compat.client.Dbaas
     :members:
     :undoc-members:
     :show-inheritance:
diff --git a/tox.ini b/tox.ini
index 5efc421f..140362ed 100644
--- a/tox.ini
+++ b/tox.ini
@@ -28,12 +28,9 @@ commands = {posargs}
 commands = python setup.py testr --coverage --testr-args='{posargs}'
 
 [testenv:docs]
--deps =
-    coverage
-    httplib2
-    sphinx
--commands =
-    sphinx-build -b html {toxinidir}/docs/source {envtmpdir}/html
+commands =
+    rm -rf doc/html doc/build
+    python setup.py build_sphinx
 
 [flake8]
 ignore = F821,H202,H306,H402,H404