diff --git a/cms/djangoapps/contentstore/features/transcripts.py b/cms/djangoapps/contentstore/features/transcripts.py
index 00f898fbb6..f6413cb924 100644
--- a/cms/djangoapps/contentstore/features/transcripts.py
+++ b/cms/djangoapps/contentstore/features/transcripts.py
@@ -201,7 +201,7 @@ def upload_file(_step, file_name):
 
 @step('I see "([^"]*)" text in the captions')
 def check_text_in_the_captions(_step, text):
-    world.wait_for(lambda _: world.css_text('.subtitles'))
+    world.wait_for(lambda _: world.css_text('.subtitles'), 30)
     actual_text = world.css_text('.subtitles')
     assert (text in actual_text)
 
diff --git a/cms/djangoapps/contentstore/features/video-editor.feature b/cms/djangoapps/contentstore/features/video-editor.feature
index 8151784bc9..872ace45e8 100644
--- a/cms/djangoapps/contentstore/features/video-editor.feature
+++ b/cms/djangoapps/contentstore/features/video-editor.feature
@@ -59,7 +59,6 @@ Feature: CMS Video Component Editor
     And I open tab "Advanced"
     And I upload transcript file "1mb_transcripts.srt" for "uk" language code
     And I save changes
-    And I wait for "10" seconds
     Then when I view the video it does show the captions
     And I see "Привіт, edX вітає вас." text in the captions