diff --git a/common/djangoapps/terrain/steps.py b/common/djangoapps/terrain/steps.py
index b58c9fa7f2..52eeb23c4a 100644
--- a/common/djangoapps/terrain/steps.py
+++ b/common/djangoapps/terrain/steps.py
@@ -10,8 +10,6 @@ import time
 import re
 import os.path
 
-from .xqueue_setup import *
-
 from logging import getLogger
 logger = getLogger(__name__)
 
diff --git a/common/djangoapps/terrain/mock_xqueue_server.py b/lms/djangoapps/courseware/features/mock_xqueue_server.py
similarity index 100%
rename from common/djangoapps/terrain/mock_xqueue_server.py
rename to lms/djangoapps/courseware/features/mock_xqueue_server.py
diff --git a/common/djangoapps/terrain/xqueue_setup.py b/lms/djangoapps/courseware/features/xqueue_setup.py
similarity index 100%
rename from common/djangoapps/terrain/xqueue_setup.py
rename to lms/djangoapps/courseware/features/xqueue_setup.py