diff --git a/lms/djangoapps/courseware/features/change_enrollment.feature b/lms/djangoapps/courseware/features/change_enrollment.feature
index 7ffefd7cf0..1c45ae9028 100644
--- a/lms/djangoapps/courseware/features/change_enrollment.feature
+++ b/lms/djangoapps/courseware/features/change_enrollment.feature
@@ -10,7 +10,7 @@ And I am logged in
 And I visit the courses page
 When I register to audit the course
 And a "edx.course.enrollment.activated" server event is emitted
-And a "edx.course.enrollment.mode_changed" server events is emitted
+#And a "edx.course.enrollment.mode_changed" server events is emitted
 
 And I visit the dashboard
 And I click on Challenge Yourself
diff --git a/lms/djangoapps/courseware/features/lti.feature b/lms/djangoapps/courseware/features/lti.feature
index dc754fdfae..3ac9564f7a 100644
--- a/lms/djangoapps/courseware/features/lti.feature
+++ b/lms/djangoapps/courseware/features/lti.feature
@@ -65,6 +65,7 @@ Feature: LMS.LTI component
   And I view the LTI and it is rendered in iframe
   And I see in iframe that LTI role is Instructor
   And I switch to student
+  And I view the LTI and it is rendered in iframe
   Then I see in iframe that LTI role is Student
 
   #8
diff --git a/lms/djangoapps/courseware/features/lti.py b/lms/djangoapps/courseware/features/lti.py
index 8110067820..a539177bdd 100644
--- a/lms/djangoapps/courseware/features/lti.py
+++ b/lms/djangoapps/courseware/features/lti.py
@@ -16,6 +16,7 @@ from student.tests.factories import UserFactory
 
 from common import visit_scenario_item
 
+TEST_COURSE_NAME="test_course_a"
 
 @step('I view the LTI and error is shown$')
 def lti_is_not_rendered(_step):
@@ -45,6 +46,7 @@ def check_lti_iframe_content(text):
 @step('I view the LTI and it is rendered in (.*)$')
 def lti_is_rendered(_step, rendered_in):
     if rendered_in.strip() == 'iframe':
+        world.wait_for_present('iframe')
         assert world.is_css_present('iframe', wait_time=2)
         assert not world.is_css_present('.link_lti_new_window', wait_time=0)
         assert not world.is_css_present('.error_message', wait_time=0)
@@ -58,7 +60,7 @@ def lti_is_rendered(_step, rendered_in):
         assert world.is_css_present('.link_lti_new_window', wait_time=0)
         assert not world.is_css_present('.error_message', wait_time=0)
         click_and_check_lti_popup()
-    else:  # incorrent rendered_in parameter
+    else:  # incorrect rendered_in parameter
         assert False
 
 
@@ -129,7 +131,7 @@ def incorrect_lti_is_rendered(_step):
 
 @step('the course has correct LTI credentials with registered (.*)$')
 def set_correct_lti_passport(_step, user='Instructor'):
-    coursenum = 'test_course'
+    coursenum = TEST_COURSE_NAME
     metadata = {
         'lti_passports': ["correct_lti_id:test_client_key:test_client_secret"]
     }
@@ -139,7 +141,7 @@ def set_correct_lti_passport(_step, user='Instructor'):
 
 @step('the course has incorrect LTI credentials$')
 def set_incorrect_lti_passport(_step):
-    coursenum = 'test_course'
+    coursenum = TEST_COURSE_NAME
     metadata = {
         'lti_passports': ["test_lti_id:test_client_key:incorrect_lti_secret_key"]
     }
@@ -272,7 +274,7 @@ def check_lti_popup(parent_window):
     for window in windows:
         world.browser.switch_to_window(window)
         tabs.append(world.browser.title)
-    assert_equal(tabs, [u'LTI | Test Section | test_course Courseware | edX', u'TEST TITLE'])
+    assert_equal(tabs, [u'LTI | Test Section | test_course_a Courseware | edX', u'TEST TITLE'])
 
     # Now verify the contents of the LTI window (which is the 2nd window/tab)
     # Note: The LTI opens in a new browser window, but Selenium sticks with the
@@ -372,7 +374,7 @@ def get_lti_frame_name():
 
 @step('I see in iframe that LTI role is (.*)$')
 def check_role(_step, role):
-    world.is_css_present('iframe')
+    world.wait_for_present('iframe')
     location = world.scenario_dict['LTI'].location.html_id()
     iframe_name = 'ltiFrame-' + location
     with world.browser.get_iframe(iframe_name) as iframe:
@@ -391,6 +393,7 @@ def switch_view(_step, view):
     if staff_status != view:
         world.browser.select("select", view)
         world.wait_for_ajax_complete()
+        assert_equal(world.css_find('#action-preview-select').first.value, view)
 
 
 @step("in the LTI component I do not see (.*)$")
diff --git a/lms/djangoapps/courseware/features/registration.py b/lms/djangoapps/courseware/features/registration.py
index 5b8f3c6250..85f2c1f5e3 100644
--- a/lms/djangoapps/courseware/features/registration.py
+++ b/lms/djangoapps/courseware/features/registration.py
@@ -19,12 +19,13 @@ def i_register_to_audit_the_course(_step):
     url = django_url('courses/%s/about' % world.scenario_dict['COURSE'].id.to_deprecated_string())
     world.browser.visit(url)
     world.css_click('section.intro a.register')
-    # the below button has a race condition. When the page first loads
-    # some animation needs to complete before this button is in a stable
-    # position. TODO: implement this without a sleep.
-    time.sleep(2)
-    audit_button = world.browser.find_by_name("audit_mode")
-    audit_button.click()
+    # When the page first loads some animation needs to
+    # complete before this button is in a stable location
+    world.retry_on_exception(
+        lambda: world.browser.find_by_name("honor_mode").click(),
+        max_attempts=10,
+        ignored_exceptions=AttributeError
+    )
     time.sleep(1)
     assert world.is_css_present('section.container.dashboard')