diff --git a/cms/djangoapps/contentstore/features/component_settings_editor_helpers.py b/cms/djangoapps/contentstore/features/component_settings_editor_helpers.py
index f240386f26..5db979bfa2 100644
--- a/cms/djangoapps/contentstore/features/component_settings_editor_helpers.py
+++ b/cms/djangoapps/contentstore/features/component_settings_editor_helpers.py
@@ -68,7 +68,12 @@ def edit_component():
 @world.absorb
 def verify_setting_entry(setting, display_name, value, explicitly_set):
     assert_equal(display_name, setting.find_by_css('.setting-label')[0].value)
-    assert_equal(value, setting.find_by_css('.setting-input')[0].value)
+    # Check specifically for the list type; it has a different structure
+    if setting.has_class('metadata-list-enum'):
+        list_value = ', '.join(ele.value for ele in setting.find_by_css('.list-settings-item'))
+        assert_equal(value, list_value)
+    else:
+        assert_equal(value, setting.find_by_css('.setting-input')[0].value)
     settingClearButton = setting.find_by_css('.setting-clear')[0]
     assert_equal(explicitly_set, settingClearButton.has_class('active'))
     assert_equal(not explicitly_set, settingClearButton.has_class('inactive'))