diff --git a/problem_builder/instructor_tool.py b/problem_builder/instructor_tool.py
index b4e0b7f3..c58e9c0b 100644
--- a/problem_builder/instructor_tool.py
+++ b/problem_builder/instructor_tool.py
@@ -159,7 +159,7 @@ def download_url_for_last_report(self):
         # Unfortunately this is a bit inefficient due to the ReportStore API
         if not self.last_export_result or self.last_export_result['error'] is not None:
             return None
-        from lms.djangoapps.instructor_task.models import ReportStore
+        from instructor_task.models import ReportStore
         report_store = ReportStore.from_config(config_name='GRADES_DOWNLOAD')
         course_key = getattr(self.scope_ids.usage_id, 'course_key', None)
         return dict(report_store.links_for(course_key)).get(self.last_export_result['report_filename'])
diff --git a/problem_builder/tasks.py b/problem_builder/tasks.py
index df03c028..7032d5db 100644
--- a/problem_builder/tasks.py
+++ b/problem_builder/tasks.py
@@ -5,7 +5,7 @@
 
 from celery.task import task
 from celery.utils.log import get_task_logger
-from lms.djangoapps.instructor_task.models import ReportStore
+from instructor_task.models import ReportStore
 from opaque_keys.edx.keys import CourseKey
 from student.models import user_by_anonymous_id
 from xmodule.modulestore.django import modulestore
diff --git a/problem_builder/tests/integration/test_instructor_tool.py b/problem_builder/tests/integration/test_instructor_tool.py
index 46c23228..d18aeb40 100644
--- a/problem_builder/tests/integration/test_instructor_tool.py
+++ b/problem_builder/tests/integration/test_instructor_tool.py
@@ -62,10 +62,8 @@ def test_students_dont_see_interface(self):
 
     @patch.dict('sys.modules', {
         'problem_builder.tasks': MockTasksModule(successful=True),
-        'lms': True,
-        'lms.djangoapps': True,
-        'lms.djangoapps.instructor_task': True,
-        'lms.djangoapps.instructor_task.models': MockInstructorTaskModelsModule(),
+        'instructor_task': True,
+        'instructor_task.models': MockInstructorTaskModelsModule(),
     })
     @patch.object(InstructorToolBlock, 'user_is_staff', Mock(return_value=True))
     def test_export_field_container_width(self):
@@ -81,10 +79,8 @@ def test_export_field_container_width(self):
 
     @patch.dict('sys.modules', {
         'problem_builder.tasks': MockTasksModule(successful=True),
-        'lms': True,
-        'lms.djangoapps': True,
-        'lms.djangoapps.instructor_task': True,
-        'lms.djangoapps.instructor_task.models': MockInstructorTaskModelsModule(),
+        'instructor_task': True,
+        'instructor_task.models': MockInstructorTaskModelsModule(),
     })
     @patch.object(InstructorToolBlock, 'user_is_staff', Mock(return_value=True))
     def test_root_block_select_width(self):
@@ -100,10 +96,8 @@ def test_root_block_select_width(self):
 
     @patch.dict('sys.modules', {
         'problem_builder.tasks': MockTasksModule(successful=True),
-        'lms': True,
-        'lms.djangoapps': True,
-        'lms.djangoapps.instructor_task': True,
-        'lms.djangoapps.instructor_task.models': MockInstructorTaskModelsModule(),
+        'instructor_task': True,
+        'instructor_task.models': MockInstructorTaskModelsModule(),
     })
     @patch.object(InstructorToolBlock, 'user_is_staff', Mock(return_value=True))
     def test_data_export_delete(self):
@@ -132,10 +126,8 @@ def test_data_export_delete(self):
 
     @patch.dict('sys.modules', {
         'problem_builder.tasks': MockTasksModule(successful=True),
-        'lms': True,
-        'lms.djangoapps': True,
-        'lms.djangoapps.instructor_task': True,
-        'lms.djangoapps.instructor_task.models': MockInstructorTaskModelsModule(),
+        'instructor_task': True,
+        'instructor_task.models': MockInstructorTaskModelsModule(),
     })
     @patch.object(InstructorToolBlock, 'user_is_staff', Mock(return_value=True))
     def test_data_export_success(self):
@@ -172,10 +164,8 @@ def test_data_export_success(self):
 
     @patch.dict('sys.modules', {
         'problem_builder.tasks': MockTasksModule(successful=False),
-        'lms': True,
-        'lms.djangoapps': True,
-        'lms.djangoapps.instructor_task': True,
-        'lms.djangoapps.instructor_task.models': MockInstructorTaskModelsModule(),
+        'instructor_task': True,
+        'instructor_task.models': MockInstructorTaskModelsModule(),
     })
     @patch.object(InstructorToolBlock, 'user_is_staff', Mock(return_value=True))
     def test_data_export_error(self):
@@ -206,10 +196,8 @@ def test_data_export_error(self):
 
     @patch.dict('sys.modules', {
         'problem_builder.tasks': MockTasksModule(successful=True),
-        'lms': True,
-        'lms.djangoapps': True,
-        'lms.djangoapps.instructor_task': True,
-        'lms.djangoapps.instructor_task.models': MockInstructorTaskModelsModule(),
+        'instructor_task': True,
+        'instructor_task.models': MockInstructorTaskModelsModule(),
     })
     @patch.object(InstructorToolBlock, 'user_is_staff', Mock(return_value=True))
     def test_pagination_no_results(self):
@@ -242,10 +230,8 @@ def test_pagination_no_results(self):
                 'Test section', 'Test subsection', 'Test unit',
                 'Test type', 'Test question', 'Test answer', 'Test username'
             ]]),
-        'lms': True,
-        'lms.djangoapps': True,
-        'lms.djangoapps.instructor_task': True,
-        'lms.djangoapps.instructor_task.models': MockInstructorTaskModelsModule(),
+        'instructor_task': True,
+        'instructor_task.models': MockInstructorTaskModelsModule(),
     })
     @patch.object(InstructorToolBlock, 'user_is_staff', Mock(return_value=True))
     def test_pagination_single_result(self):
@@ -284,10 +270,8 @@ def test_pagination_single_result(self):
                 'Test section', 'Test subsection', 'Test unit',
                 'Test type', 'Test question', 'Test answer', 'Test username'
             ] for _ in range(PAGE_SIZE*3)]),
-        'lms': True,
-        'lms.djangoapps': True,
-        'lms.djangoapps.instructor_task': True,
-        'lms.djangoapps.instructor_task.models': MockInstructorTaskModelsModule(),
+        'instructor_task': True,
+        'instructor_task.models': MockInstructorTaskModelsModule(),
     })
     @patch.object(InstructorToolBlock, 'user_is_staff', Mock(return_value=True))
     def test_pagination_multiple_results(self):