diff --git a/cms/djangoapps/contentstore/features/common.py b/cms/djangoapps/contentstore/features/common.py
index 58980fe06e..a54a421de3 100644
--- a/cms/djangoapps/contentstore/features/common.py
+++ b/cms/djangoapps/contentstore/features/common.py
@@ -252,6 +252,7 @@ def create_course_with_unit():
     log_into_studio()
     world.css_click('a.course-link')
 
+    world.wait_for_js_to_load()
     css_selectors = [
         'div.section-item a.expand-collapse-icon', 'a.new-unit-item'
     ]
diff --git a/cms/djangoapps/contentstore/features/video.feature b/cms/djangoapps/contentstore/features/video.feature
index a926302fac..521b4f4403 100644
--- a/cms/djangoapps/contentstore/features/video.feature
+++ b/cms/djangoapps/contentstore/features/video.feature
@@ -79,18 +79,19 @@ Feature: CMS.Video Component
     And I see caption line with data-index 0 has class "focused"
 
   # 11
-  Scenario: When start end end times are specified, a range on slider is shown
-    Given I have created a Video component
-    And Make sure captions are closed
-    And I edit the component
-    And I open tab "Advanced"
-    And I set value "12" to the field "Start Time"
-    And I set value "24" to the field "End Time"
-    And I save changes
-    And I click video button "Play"
+  # Disabled until we come up with a more solid test, as this one is brittle.
+  # Scenario: When start end end times are specified, a range on slider is shown
+  #   Given I have created a Video component
+  #   And Make sure captions are closed
+  #   And I edit the component
+  #   And I open tab "Advanced"
+  #   And I set value "12" to the field "Start Time"
+  #   And I set value "24" to the field "End Time"
+  #   And I save changes
+  #   And I click video button "Play"
 
     # The below line is a bit flaky. Numbers 73 and 73 were determined rather
     # accidentally. They might change in the future as Video player gets CSS
     # updates. If this test starts failing, 99.9% cause of failure is the line
     # below.
-    Then I see a range on slider with styles "left" set to 73 px and "width" set to 73 px
+    # Then I see a range on slider with styles "left" set to 73 px and "width" set to 73 px
diff --git a/common/djangoapps/terrain/ui_helpers.py b/common/djangoapps/terrain/ui_helpers.py
index 14ce2d7a58..b97af9c1e2 100644
--- a/common/djangoapps/terrain/ui_helpers.py
+++ b/common/djangoapps/terrain/ui_helpers.py
@@ -21,23 +21,23 @@ from nose.tools import assert_true  # pylint: disable=E0611
 REQUIREJS_WAIT = {
     # Settings - Schedule & Details
     re.compile('^Schedule & Details Settings \|'): [
-        "jquery", "js/models/course",
+        "jquery", "js/base", "js/models/course",
         "js/models/settings/course_details", "js/views/settings/main"],
 
     # Settings - Advanced Settings
     re.compile('^Advanced Settings \|'): [
-        "jquery", "js/models/course", "js/models/settings/advanced",
+        "jquery", "js/base", "js/models/course", "js/models/settings/advanced",
         "js/views/settings/advanced", "codemirror"],
 
     # Individual Unit (editing)
     re.compile('^Individual Unit \|'): [
-        "coffee/src/models/module", "coffee/src/views/unit",
+        "js/base", "coffee/src/models/module", "coffee/src/views/unit",
         "coffee/src/views/module_edit"],
 
     # Content - Outline
     # Note that calling your org, course number, or display name, 'course' will mess this up
     re.compile('^Course Outline \|'): [
-        "js/models/course", "js/models/location", "js/models/section",
+        "js/base", "js/models/course", "js/models/location", "js/models/section",
         "js/views/overview", "js/views/section_edit"],
 
     # Dashboard