diff --git a/tests/integration/features/prompts.feature b/tests/integration/features/prompts.feature
index b87b57f54..2e45702f1 100644
--- a/tests/integration/features/prompts.feature
+++ b/tests/integration/features/prompts.feature
@@ -9,32 +9,34 @@ Feature: Prompts
     Scenario: Javascript alert
         When I open data/prompt/jsalert.html
         And I click the button
+        And I wait for a prompt
         And I run :prompt-accept
         Then the javascript message "Alert done" should be logged
 
     Scenario: Using content -> ignore-javascript-alert
         When I set content -> ignore-javascript-alert to true
         And I open data/prompt/jsalert.html
-        # Can't use "I click the button" as it waits for a key mode change
-        And I run :hint
-        And I run :follow-hint a
+        And I click the button
         Then the javascript message "Alert done" should be logged
 
     Scenario: Javascript confirm - yes
         When I open data/prompt/jsconfirm.html
         And I click the button
+        And I wait for a prompt
         And I run :prompt-yes
         Then the javascript message "confirm reply: true" should be logged
 
     Scenario: Javascript confirm - no
         When I open data/prompt/jsconfirm.html
         And I click the button
+        And I wait for a prompt
         And I run :prompt-no
         Then the javascript message "confirm reply: false" should be logged
 
     Scenario: Javascript confirm - aborted
         When I open data/prompt/jsconfirm.html
         And I click the button
+        And I wait for a prompt
         And I run :leave-mode
         Then the javascript message "confirm reply: false" should be logged
 
@@ -42,6 +44,7 @@ Feature: Prompts
     Scenario: Javascript prompt
         When I open data/prompt/jsprompt.html
         And I click the button
+        And I wait for a prompt
         And I press the keys "prompt test"
         And I run :prompt-accept
         Then the javascript message "Prompt reply: prompt test" should be logged
@@ -50,6 +53,7 @@ Feature: Prompts
     Scenario: Rejected javascript prompt
         When I open data/prompt/jsprompt.html
         And I click the button
+        And I wait for a prompt
         And I press the keys "prompt test"
         And I run :leave-mode
         Then the javascript message "Prompt reply: null" should be logged
@@ -58,9 +62,7 @@ Feature: Prompts
     Scenario: Using content -> ignore-javascript-prompt
         When I set content -> ignore-javascript-prompt to true
         And I open data/prompt/jsprompt.html
-        # Can't use "I click the button" as it waits for a key mode change
-        And I run :hint
-        And I run :follow-hint a
+        And I click the button
         Then the javascript message "Prompt reply: null" should be logged
 
     # SSL
diff --git a/tests/integration/features/test_prompts.py b/tests/integration/features/test_prompts.py
index 39bd58c43..9126597fb 100644
--- a/tests/integration/features/test_prompts.py
+++ b/tests/integration/features/test_prompts.py
@@ -37,7 +37,6 @@ def wait_ssl_page_finished_loading(quteproc, ssl_server):
 def click_button(quteproc):
     quteproc.send_cmd(':hint')
     quteproc.send_cmd(':follow-hint a')
-    wait_for_prompt(quteproc)
 
 
 @bdd.when("I wait for a prompt")