diff --git a/common/djangoapps/terrain/factories.py b/common/djangoapps/terrain/factories.py
index 88aa94ef00..1dedff133b 100644
--- a/common/djangoapps/terrain/factories.py
+++ b/common/djangoapps/terrain/factories.py
@@ -1,6 +1,6 @@
 from student.tests.factories import (UserFactory, UserProfileFactory,
                                     RegistrationFactory, GroupFactory, 
-                                    CourseEnrollmentAllowed, CourseEnrollment,
+                                    CourseEnrollmentAllowed,
                                     CourseFactory, ItemFactory)
 from lettuce import world
 
@@ -37,14 +37,6 @@ class GroupFactory(GroupFactory):
     pass
 
 
-@world.absorb
-class CourseEnrollmentFactory(CourseEnrollment):
-    """
-    Courses that the user is enrolled in
-    """ 
-    pass
-
-
 @world.absorb
 class CourseEnrollmentAllowedFactory(CourseEnrollmentAllowed):
     """
diff --git a/lms/djangoapps/django_comment_client/tests/test_utils.py b/lms/djangoapps/django_comment_client/tests/test_utils.py
index fe580f1ebe..cec006e630 100644
--- a/lms/djangoapps/django_comment_client/tests/test_utils.py
+++ b/lms/djangoapps/django_comment_client/tests/test_utils.py
@@ -8,7 +8,6 @@ import factory
 from django.contrib.auth.models import User
 from student.models import UserProfile, CourseEnrollment
 from django_comment_client.models import Role, Permission
-from student.tests.factories import UserFactory, CourseEnrollmentFactory
 
 import django_comment_client.models as models
 import django_comment_client.utils as utils
@@ -16,6 +15,21 @@ import django_comment_client.utils as utils
 import xmodule.modulestore.django as django
 
 
+class UserFactory(factory.Factory):
+    FACTORY_FOR = User
+    username = 'robot'
+    password = '123456'
+    email = 'robot@edx.org'
+    is_active = True
+    is_staff = False
+
+
+class CourseEnrollmentFactory(factory.Factory):
+    FACTORY_FOR = CourseEnrollment
+    user = factory.SubFactory(UserFactory)
+    course_id = 'edX/toy/2012_Fall'
+
+
 class RoleFactory(factory.Factory):
     FACTORY_FOR = Role
     name = 'Student'