diff --git a/common/lib/xmodule/xmodule/tests/test_conditional.py b/common/lib/xmodule/xmodule/tests/test_conditional.py
index b3b18cc78d..e40bddebcb 100644
--- a/common/lib/xmodule/xmodule/tests/test_conditional.py
+++ b/common/lib/xmodule/xmodule/tests/test_conditional.py
@@ -107,11 +107,7 @@ class ConditionalModuleBasicTest(unittest.TestCase):
 
     def test_icon_class(self):
         '''verify that get_icon_class works independent of condition satisfaction'''
-<<<<<<< HEAD
         modules = ConditionalFactory.create(self.get_test_system)
-=======
-        modules = ConditionalFactory.create(self.test_system)
->>>>>>> master
         for attempted in ["false", "true"]:
             for icon_class in [ 'other', 'problem', 'video']:
                 modules['source_module'].is_attempted = attempted
diff --git a/common/lib/xmodule/xmodule/tests/test_logic.py b/common/lib/xmodule/xmodule/tests/test_logic.py
index 6fb331b3cf..e62b9a1cee 100644
--- a/common/lib/xmodule/xmodule/tests/test_logic.py
+++ b/common/lib/xmodule/xmodule/tests/test_logic.py
@@ -8,7 +8,7 @@ import unittest
 from xmodule.poll_module import PollDescriptor
 from xmodule.conditional_module import ConditionalDescriptor
 from xmodule.word_cloud_module import WordCloudDescriptor
-from xmodule.tests import test_system
+from xmodule.tests import get_test_system
 
 class PostData:
     """Class which emulate postdata."""
@@ -30,7 +30,7 @@ class LogicTest(unittest.TestCase):
             """Empty object."""
             pass
 
-        self.system = test_system()
+        self.system = get_test_system()
         self.descriptor = EmptyClass()
 
         self.xmodule_class = self.descriptor_class.module_class
diff --git a/lms/djangoapps/courseware/tests/test_videoalpha_xml.py b/lms/djangoapps/courseware/tests/test_videoalpha_xml.py
index 44e0a7811a..a14fc6cac6 100644
--- a/lms/djangoapps/courseware/tests/test_videoalpha_xml.py
+++ b/lms/djangoapps/courseware/tests/test_videoalpha_xml.py
@@ -22,7 +22,7 @@ from django.conf import settings
 
 from xmodule.videoalpha_module import VideoAlphaDescriptor, VideoAlphaModule
 from xmodule.modulestore import Location
-from xmodule.tests import test_system
+from xmodule.tests import get_test_system
 from xmodule.tests.test_logic import LogicTest
 
 
@@ -58,7 +58,7 @@ class VideoAlphaFactory(object):
 
         descriptor = Mock(weight="1")
 
-        system = test_system()
+        system = get_test_system()
         system.render_template = lambda template, context: context
         VideoAlphaModule.location = location
         module = VideoAlphaModule(system, descriptor, model_data)