7 files changed, 15 insertions, 2 deletions
diff --git a/tests/end2end/features/conftest.py b/tests/end2end/features/conftest.py
index 082b999b1..b7f112182 100644
--- a/tests/end2end/features/conftest.py
+++ b/tests/end2end/features/conftest.py
@@ -759,3 +759,9 @@ def set_up_fileselector(quteproc, py_proc, tmpdir, kind, files, output_type):
     fileselect_cmd = json.dumps([cmd, *args])
     quteproc.set_setting('fileselect.handler', 'external')
     quteproc.set_setting(f'fileselect.{kind}.command', fileselect_cmd)
+
+
+@bdd.then(bdd.parsers.parse("I run {command}"))
+def run_command_then(quteproc, command):
+    """Run a qutebrowser command."""
+    quteproc.send_cmd(command)
diff --git a/tests/end2end/features/downloads.feature b/tests/end2end/features/downloads.feature
index c2f359f14..a1bbee870 100644
--- a/tests/end2end/features/downloads.feature
+++ b/tests/end2end/features/downloads.feature
@@ -712,3 +712,4 @@ Feature: Downloading things from a website.
         And I wait for "Asking question *" in the log
         And I run :prompt-fileselect-external
         Then the error "Can only launch external fileselect for FilenamePrompt, not LineEditPrompt" should be shown
+        And I run :mode-leave
diff --git a/tests/end2end/features/editor.feature b/tests/end2end/features/editor.feature
index 9ca855d27..018d65b9f 100644
--- a/tests/end2end/features/editor.feature
+++ b/tests/end2end/features/editor.feature
@@ -188,6 +188,8 @@ Feature: Opening external editors
         And I run :cmd-edit
         Then the error "command must start with one of :/?" should be shown
         And "Leaving mode KeyMode.command *" should not be logged
+        And I run :mode-leave
+        And "Leaving mode KeyMode.command *" should be logged
 
     ## select single file
 
diff --git a/tests/end2end/features/hints.feature b/tests/end2end/features/hints.feature
index ddf42132f..b2a549fb5 100644
--- a/tests/end2end/features/hints.feature
+++ b/tests/end2end/features/hints.feature
@@ -279,6 +279,7 @@ Feature: Using hints
         When I open data/hints/iframe_scroll.html
         And I wait for "* simple loaded" in the log
         And I hint with args "all normal" and follow a
+        And I wait for "Clicked non-editable element!" in the log
         And I run :scroll bottom
         And I hint with args "links normal" and follow a
         Then "navigation request: url http://localhost:*/data/hello2.txt (current http://localhost:*/data/hints/iframe_scroll.html), type link_clicked, *" should be logged
diff --git a/tests/end2end/features/keyinput.feature b/tests/end2end/features/keyinput.feature
index 3ab5d2434..f7f354def 100644
--- a/tests/end2end/features/keyinput.feature
+++ b/tests/end2end/features/keyinput.feature
@@ -32,6 +32,7 @@ Feature: Keyboard input
 
     Scenario: :fake-key sending key to the website
         When I open data/keyinput/log.html
+        And I wait 0.01s
         And I run :fake-key x
         Then the javascript message "key press: 88" should be logged
         And the javascript message "key release: 88" should be logged
@@ -48,12 +49,14 @@ Feature: Keyboard input
 
     Scenario: :fake-key sending special key to the website
         When I open data/keyinput/log.html
+        And I wait 0.01s
         And I run :fake-key <Escape>
         Then the javascript message "key press: 27" should be logged
         And the javascript message "key release: 27" should be logged
 
     Scenario: :fake-key sending keychain to the website
         When I open data/keyinput/log.html
+        And I wait 0.01s
         And I run :fake-key x<greater>y<less>" "
         Then the javascript message "key press: 88" should be logged
         And the javascript message "key release: 88" should be logged
diff --git a/tests/end2end/features/misc.feature b/tests/end2end/features/misc.feature
index 90ce5334a..6e606a195 100644
--- a/tests/end2end/features/misc.feature
+++ b/tests/end2end/features/misc.feature
@@ -507,7 +507,7 @@ Feature: Various utility commands.
 
     Scenario: Clicking on focused element
         When I open data/click_element.html
-        And I run :fake-key <Tab>
+        And I run :jseval document.getElementById("qute-input").focus()
         And I wait for the javascript message "qute-input focused"
         And I run :click-element focused
         Then "Entering mode KeyMode.insert (reason: clicking input)" should be logged
diff --git a/tests/end2end/features/prompts.feature b/tests/end2end/features/prompts.feature
index 32bdd29e7..43199fa3b 100644
--- a/tests/end2end/features/prompts.feature
+++ b/tests/end2end/features/prompts.feature
@@ -413,7 +413,7 @@ Feature: Prompts
             }
 
     @qtwebengine_skip
-    Scenario: Cancellling webpage authentication with QtWebKit
+    Scenario: Cancelling webpage authentication with QtWebKit
         When I open basic-auth/user6/password6 without waiting
         And I wait for a prompt
         And I run :mode-leave