diff --git a/tests/integration/features/conftest.py b/tests/integration/features/conftest.py
index a0507c619..da3df0f62 100644
--- a/tests/integration/features/conftest.py
+++ b/tests/integration/features/conftest.py
@@ -73,6 +73,7 @@ def open_path_given(quteproc, path):
     It always opens a new tab, unlike "When I open ..."
     """
     quteproc.open_path(path, new_tab=True)
+    quteproc.wait_for_load_finished(path)
 
 
 @bdd.given(bdd.parsers.parse("I run {command}"))
@@ -116,6 +117,7 @@ def open_path(quteproc, path):
         new_window = False
 
     quteproc.open_path(path, new_tab=new_tab, new_window=new_window)
+    quteproc.wait_for_load_finished(path)
 
 
 @bdd.when(bdd.parsers.parse("I set {sect} -> {opt} to {value}"))
diff --git a/tests/integration/quteprocess.py b/tests/integration/quteprocess.py
index f095713a0..f1937faaf 100644
--- a/tests/integration/quteprocess.py
+++ b/tests/integration/quteprocess.py
@@ -278,7 +278,6 @@ class QuteProc(testprocess.Process):
             self.send_cmd(':open -w ' + url)
         else:
             self.send_cmd(':open ' + url)
-        self.wait_for_load_finished(path)
 
     def mark_expected(self, category=None, loglevel=None, message=None):
         """Mark a given logging message as expected."""