diff --git a/docs/source/conf.py b/docs/source/conf.py
index 2c398c1b9a..aa62613370 100644
--- a/docs/source/conf.py
+++ b/docs/source/conf.py
@@ -1,18 +1,11 @@
 # -*- coding: utf-8 -*-
+"""
+EdX documentation build configuration file
+"""
 #pylint: disable=C0103
 #pylint: disable=W0622
 #pylint: disable=W0212
 #pylint: disable=W0613
-""" EdX documentation build configuration file, created by
- sphinx-quickstart on Fri Nov  2 15:43:00 2012.
-
-  This file is execfile()d with the current directory set to its containing dir.
-
-  Note that not all possible configuration values are present in this
-  autogenerated file.
-
-  All configuration values have a default; values that are commented out
-  serve to show the default."""
 
 import sys
 import os
@@ -21,7 +14,17 @@ import os
 # add these directories to sys.path here. If the directory is relative to the
 # documentation root, use os.path.abspath to make it absolute, like shown here.
 # sys.path.insert(0, os.path.abspath('.'))
-sys.path.insert(0, os.path.abspath('../..'))  # mitx folder
+
+root = os.path.abspath('../..')
+
+sys.path.append(root)
+sys.path.append(os.path.join(root, "common/djangoapps"))
+sys.path.append(os.path.join(root, "common/lib"))
+sys.path.append(os.path.join(root, "common/lib/sandbox-packages"))
+sys.path.append(os.path.join(root, "lms/djangoapps"))
+sys.path.append(os.path.join(root, "lms/lib"))
+sys.path.append(os.path.join(root, "cms/djangoapps"))
+sys.path.append(os.path.join(root, "cms/lib"))
 
 #  django configuration  - careful here
 os.environ['DJANGO_SETTINGS_MODULE'] = 'lms.envs.test'
diff --git a/docs/source/lms.rst b/docs/source/lms.rst
index 6548cd71a0..c7ba7dde62 100644
--- a/docs/source/lms.rst
+++ b/docs/source/lms.rst
@@ -39,13 +39,6 @@ Views
     :members:
     :show-inheritance:
 
-Tests
------
-
-.. automodule:: certificates.tests
-    :members:
-    :show-inheritance:
-
 Circuit
 =======
 
@@ -67,13 +60,6 @@ Views
     :members:
     :show-inheritance:
 
-Tests
------
-
-.. automodule:: circuit.tests
-    :members:
-    :show-inheritance:
-
 
 Course_wiki
 ===========
@@ -181,12 +167,6 @@ Views
     :members:
     :show-inheritance:
 
-Tests
------
-
-.. automodule:: dashboard.tests
-    :members:
-    :show-inheritance:
 
 Django comment client
 =====================
@@ -202,12 +182,6 @@ Models
     :members:
     :show-inheritance:
 
-Tests
------
-
-.. automodule:: django_comment_client.tests
-    :members:
-    :show-inheritance:
 
 Heartbeat
 =========
@@ -230,12 +204,6 @@ Views
     :members:
     :show-inheritance:
 
-Tests
------
-
-.. .. automodule:: instructor.tests
-..     :members:
-..     :show-inheritance:
 
 Lisenses
 ========
@@ -258,12 +226,6 @@ Views
     :members:
     :show-inheritance:
 
-Tests
------
-
-.. automodule:: licenses.tests
-    :members:
-    :show-inheritance:
 
 LMS migration
 =============
@@ -322,13 +284,6 @@ Static template view
     :members:
     :show-inheritance:
 
-Models
-------
-
-.. automodule:: static_template_view.models
-    :members:
-    :show-inheritance:
-
 Views
 -----
 
@@ -336,13 +291,6 @@ Views
     :members:
     :show-inheritance:
 
-Tests
------
-
-.. automodule:: static_template_view.tests
-    :members:
-    :show-inheritance:
-
 
 Static book
 ===========
@@ -364,10 +312,3 @@ Views
 .. automodule:: staticbook.views
     :members:
     :show-inheritance:
-
-Tests
------
-
-.. automodule:: staticbook.tests
-    :members:
-    :show-inheritance: