diff --git a/lms/djangoapps/django_comment_client/tests/mock_cs_server/test_mock_cs_server.py b/lms/djangoapps/django_comment_client/tests/mock_cs_server/test_mock_cs_server.py
index 985c8a41dc..7518bd6895 100644
--- a/lms/djangoapps/django_comment_client/tests/mock_cs_server/test_mock_cs_server.py
+++ b/lms/djangoapps/django_comment_client/tests/mock_cs_server/test_mock_cs_server.py
@@ -2,7 +2,7 @@ import unittest
 import threading
 import json
 import urllib2
-from mock_cs_server import MockCommentServiceServer
+from django_comment_client.tests.mock_cs_server.mock_cs_server import MockCommentServiceServer
 from nose.plugins.skip import SkipTest
 
 
diff --git a/lms/djangoapps/open_ended_grading/views.py b/lms/djangoapps/open_ended_grading/views.py
index 1fe0d82e39..487e9ecb1d 100644
--- a/lms/djangoapps/open_ended_grading/views.py
+++ b/lms/djangoapps/open_ended_grading/views.py
@@ -10,7 +10,7 @@ from xmodule.open_ended_grading_classes.grading_service_module import GradingSer
 import json
 from student.models import unique_id_for_user
 
-import open_ended_notifications
+from open_ended_grading import open_ended_notifications
 
 from xmodule.modulestore.django import modulestore
 from xmodule.modulestore import search
diff --git a/lms/envs/dev_with_worker.py b/lms/envs/dev_with_worker.py
index 40f6ed4e1f..fe151c291a 100644
--- a/lms/envs/dev_with_worker.py
+++ b/lms/envs/dev_with_worker.py
@@ -12,7 +12,7 @@ django_admin.py celery worker
 # want to import all variables from base settings files
 # pylint: disable=wildcard-import, unused-wildcard-import
 
-from dev import *
+from lms.envs.dev import *
 
 ################################# CELERY ######################################
 
diff --git a/lms/envs/devgroups/portal.py b/lms/envs/devgroups/portal.py
index e972d9f36c..c570e555f3 100644
--- a/lms/envs/devgroups/portal.py
+++ b/lms/envs/devgroups/portal.py
@@ -7,7 +7,7 @@ get shared sessions)
 # want to import all variables from base settings files
 # pylint: disable=wildcard-import, unused-wildcard-import
 
-from courses import *
+from lms.envs.devgroups.courses import *
 
 # Move this to a shared file later:
 for class_id, db_name in CLASSES_TO_DBS.items():
diff --git a/lms/lib/comment_client/comment.py b/lms/lib/comment_client/comment.py
index febb533b33..fce94e784c 100644
--- a/lms/lib/comment_client/comment.py
+++ b/lms/lib/comment_client/comment.py
@@ -1,8 +1,8 @@
 from .utils import CommentClientRequestError, perform_request
 
 from .thread import Thread, _url_for_flag_abuse_thread, _url_for_unflag_abuse_thread
-import models
-import settings
+from lms.lib.comment_client import models
+from lms.lib.comment_client import settings
 
 
 class Comment(models.Model):
diff --git a/lms/lib/comment_client/commentable.py b/lms/lib/comment_client/commentable.py
index d18a7ccfb7..9ce3b20053 100644
--- a/lms/lib/comment_client/commentable.py
+++ b/lms/lib/comment_client/commentable.py
@@ -1,6 +1,6 @@
 """Provides base Commentable model class"""
-import models
-import settings
+from lms.lib.comment_client import models
+from lms.lib.comment_client import settings
 
 
 class Commentable(models.Model):