diff --git a/common/djangoapps/terrain/steps.py b/common/djangoapps/terrain/steps.py
index 6e54b71aa6..8356b5446d 100644
--- a/common/djangoapps/terrain/steps.py
+++ b/common/djangoapps/terrain/steps.py
@@ -72,6 +72,9 @@ def the_page_title_should_be(step, title):
 def the_page_title_should_contain(step, title):
     assert(title in world.browser.title)
 
+@step('I log in$')
+def i_log_in(step):
+    world.log_in('robot', 'test')
 
 @step('I am a logged in user$')
 def i_am_logged_in_user(step):
@@ -89,11 +92,42 @@ def i_am_staff_for_course_by_id(step, course_id):
     world.register_by_course_id(course_id, True)
 
 
-@step('I log in$')
-def i_log_in(step):
+@step(r'click (?:the|a) link (?:called|with the text) "([^"]*)"$')
+def click_the_link_called(step, text):
+    world.browser.find_link_by_text(text).click()
+
+
+@step(r'should see that the url is "([^"]*)"$')
+def should_have_the_url(step, url):
+    assert_equals(world.browser.url, url)
+
+@step(r'should see (?:the|a) link (?:called|with the text) "([^"]*)"$')
+def should_see_a_link_called(step, text):
+    assert len(world.browser.find_link_by_text(text)) > 0
+
+@step(r'should see "(.*)" (?:somewhere|anywhere) in (?:the|this) page')
+def should_see_in_the_page(step, text):
+    assert_in(text, world.browser.html)
+
+
+@step('I am logged in$')
+def i_am_logged_in(step):
+    world.create_user('robot')
     world.log_in('robot', 'test')
+    world.browser.visit(django_url('/'))
+
+
+@step('I am not logged in$')
+def i_am_not_logged_in(step):
+    world.browser.cookies.delete()
 
 
 @step(u'I am an edX user$')
 def i_am_an_edx_user(step):
     world.create_user('robot')
+
+
+@step(u'User "([^"]*)" is an edX user$')
+def registered_edx_user(step, uname):
+    world.create_user(uname)
+
diff --git a/lms/djangoapps/courseware/features/common.py b/lms/djangoapps/courseware/features/common.py
index 7d41637c8e..8477347580 100644
--- a/lms/djangoapps/courseware/features/common.py
+++ b/lms/djangoapps/courseware/features/common.py
@@ -6,83 +6,10 @@ from student.models import CourseEnrollment
 from xmodule.modulestore import Location
 from xmodule.modulestore.django import _MODULESTORES, modulestore
 from xmodule.templates import update_templates
-import time
 
 from logging import getLogger
 logger = getLogger(__name__)
 
-
-@step(u'I wait (?:for )?"(\d+)" seconds?$')
-def wait(step, seconds):
-    time.sleep(float(seconds))
-
-
-@step('I (?:visit|access|open) the homepage$')
-def i_visit_the_homepage(step):
-    world.browser.visit(django_url('/'))
-    assert world.browser.is_element_present_by_css('header.global', 10)
-
-
-@step(u'I (?:visit|access|open) the dashboard$')
-def i_visit_the_dashboard(step):
-    world.browser.visit(django_url('/dashboard'))
-    assert world.browser.is_element_present_by_css('section.container.dashboard', 5)
-
-
-@step(r'click (?:the|a) link (?:called|with the text) "([^"]*)"$')
-def click_the_link_called(step, text):
-    world.browser.find_link_by_text(text).click()
-
-
-@step('I should be on the dashboard page$')
-def i_should_be_on_the_dashboard(step):
-    assert world.browser.is_element_present_by_css('section.container.dashboard', 5)
-    assert world.browser.title == 'Dashboard'
-
-
-@step(u'I (?:visit|access|open) the courses page$')
-def i_am_on_the_courses_page(step):
-    world.browser.visit(django_url('/courses'))
-    assert world.browser.is_element_present_by_css('section.courses')
-
-
-@step('I should see that the path is "([^"]*)"$')
-def i_should_see_that_the_path_is(step, path):
-    assert world.browser.url == django_url(path)
-
-
-@step(u'the page title should be "([^"]*)"$')
-def the_page_title_should_be(step, title):
-    assert world.browser.title == title
-
-
-@step(r'should see that the url is "([^"]*)"$')
-def should_have_the_url(step, url):
-    assert_equals(world.browser.url, url)
-
-
-@step(r'should see (?:the|a) link (?:called|with the text) "([^"]*)"$')
-def should_see_a_link_called(step, text):
-    assert len(world.browser.find_link_by_text(text)) > 0
-
-
-@step(r'should see "(.*)" (?:somewhere|anywhere) in (?:the|this) page')
-def should_see_in_the_page(step, text):
-    assert_in(text, world.browser.html)
-
-
-@step('I am logged in$')
-def i_am_logged_in(step):
-    world.create_user('robot')
-    world.log_in('robot', 'test')
-    world.browser.visit(django_url('/'))
-
-
-@step('I am not logged in$')
-def i_am_not_logged_in(step):
-    world.browser.cookies.delete()
-
-
 TEST_COURSE_ORG = 'edx'
 TEST_COURSE_NAME = 'Test Course'
 TEST_SECTION_NAME = "Problem"
@@ -135,16 +62,6 @@ def add_tab_to_course(step, course, extra_tab_name):
                                             display_name=str(extra_tab_name))
 
 
-@step(u'I am an edX user$')
-def i_am_an_edx_user(step):
-    world.create_user('robot')
-
-
-@step(u'User "([^"]*)" is an edX user$')
-def registered_edx_user(step, uname):
-    world.create_user(uname)
-
-
 def flush_xmodule_store():
     # Flush and initialize the module store
     # It needs the templates because it creates new records