diff --git a/cms/djangoapps/contentstore/features/component_settings_editor_helpers.py b/cms/djangoapps/contentstore/features/component_settings_editor_helpers.py
index 9ed0427730..85bffed9d9 100644
--- a/cms/djangoapps/contentstore/features/component_settings_editor_helpers.py
+++ b/cms/djangoapps/contentstore/features/component_settings_editor_helpers.py
@@ -55,11 +55,6 @@ def click_new_component_button(step, component_button_css):
 
     world.css_click(component_button_css)
 
-    if FEATURES['USE_CONTAINER_PAGE_FOR_TESTING']:
-        unit_url = world.browser.url
-        container_url = unit_url.replace('/unit/', '/container/')
-        world.visit(container_url)
-
 
 def _click_advanced():
     css = 'ul.problem-type-tabs a[href="#tab2"]'
diff --git a/cms/envs/common.py b/cms/envs/common.py
index a4b3a9ae62..022e9dd94b 100644
--- a/cms/envs/common.py
+++ b/cms/envs/common.py
@@ -99,9 +99,6 @@ FEATURES = {
 
     # Turn off Advanced Security by default
     'ADVANCED_SECURITY': False,
-
-    # Switch acceptance tests to use the container page instead of the unit page
-    'USE_CONTAINER_PAGE_FOR_TESTING': False,
 }
 ENABLE_JASMINE = False