diff --git a/tests/end2end/features/marks.feature b/tests/end2end/features/marks.feature
index 3a35791b8..6491a67e1 100644
--- a/tests/end2end/features/marks.feature
+++ b/tests/end2end/features/marks.feature
@@ -67,6 +67,7 @@ Feature: Setting positional marks
     Scenario: Jumping back after following a link
         When I run :hint links normal
         And I run :follow-hint s
+        And I wait until data/marks.html#bottom is loaded
         And I run :jump-mark "'"
         Then the page should be scrolled to 0 0
 
diff --git a/tests/end2end/features/yankpaste.feature b/tests/end2end/features/yankpaste.feature
index fe5697ef9..86c7c27e2 100644
--- a/tests/end2end/features/yankpaste.feature
+++ b/tests/end2end/features/yankpaste.feature
@@ -236,6 +236,7 @@ Feature: Yanking and pasting.
         # Click the text field
         And I run :hint all
         And I run :follow-hint a
+        And I wait for "Clicked editable element!" in the log
         And I run :paste-primary
         # Compare
         Then the text field should contain "Hello world"
@@ -248,6 +249,7 @@ Feature: Yanking and pasting.
         # Click the text field
         And I run :hint all
         And I run :follow-hint a
+        And I wait for "Clicked editable element!" in the log
         # Move to the beginning and two words to the right
         And I press the keys "<Home>"
         And I press the key "<Ctrl+Right>"
@@ -262,6 +264,7 @@ Feature: Yanking and pasting.
         # Click the text field
         And I run :hint all
         And I run :follow-hint a
+        And I wait for "Clicked editable element!" in the log
         # Paste and undo
         And I put "This text should be undone" into the primary selection
         And I run :paste-primary
@@ -286,6 +289,7 @@ Feature: Yanking and pasting.
         # Click the text field
         And I run :hint all
         And I run :follow-hint s
+        And I wait for "Clicked non-editable element!" in the log
         And I put "test" into the primary selection
         And I run :enter-mode insert
         And I run :paste-primary
@@ -298,6 +302,7 @@ Feature: Yanking and pasting.
         # Click the text field
         And I run :hint all
         And I run :follow-hint a
+        And I wait for "Clicked editable element!" in the log
         And I run :paste-primary
         # Compare
         Then the text field should contain "Hello world"
diff --git a/tests/end2end/test_dirbrowser.py b/tests/end2end/test_dirbrowser.py
index 6615e8112..d95eef6bc 100644
--- a/tests/end2end/test_dirbrowser.py
+++ b/tests/end2end/test_dirbrowser.py
@@ -170,6 +170,8 @@ def test_enter_folder_smoke(dir_layout, quteproc):
     quteproc.send_cmd(':hint all normal')
     # a is the parent link, s is the first listed folder/file
     quteproc.send_cmd(':follow-hint s')
+    expected_url = urlutils.file_url(dir_layout.path('folder0'))
+    quteproc.wait_for_load_finished_url(expected_url)
     page = parse(quteproc)
     assert page.path == dir_layout.path('folder0')
 
diff --git a/tests/end2end/test_insert_mode.py b/tests/end2end/test_insert_mode.py
index 4825b2654..23a66b110 100644
--- a/tests/end2end/test_insert_mode.py
+++ b/tests/end2end/test_insert_mode.py
@@ -39,6 +39,7 @@ def test_insert_mode(file_name, source, input_text, auto_insert, quteproc):
     quteproc.set_setting('input', 'auto-insert-mode', auto_insert)
     quteproc.send_cmd(':hint all')
     quteproc.send_cmd(':follow-hint a')
+    quteproc.wait_for(message='Clicked editable element!')
     quteproc.send_cmd(':debug-set-fake-clipboard')
 
     if source == 'keypress':
@@ -49,6 +50,7 @@ def test_insert_mode(file_name, source, input_text, auto_insert, quteproc):
 
     quteproc.send_cmd(':hint all')
     quteproc.send_cmd(':follow-hint a')
+    quteproc.wait_for(message='Clicked editable element!')
     quteproc.send_cmd(':enter-mode caret')
     quteproc.send_cmd(':toggle-selection')
     quteproc.send_cmd(':move-to-prev-word')
@@ -74,6 +76,7 @@ def test_auto_leave_insert_mode(quteproc):
 
     # Select the disabled input box to leave insert mode
     quteproc.send_cmd(':follow-hint s')
+    quteproc.wait_for(message='Clicked non-editable element!')
     quteproc.send_cmd(':enter-mode caret')
     quteproc.send_cmd(':paste-primary')