diff --git a/tests/end2end/features/conftest.py b/tests/end2end/features/conftest.py
index ea6b96bbf..789fda108 100644
--- a/tests/end2end/features/conftest.py
+++ b/tests/end2end/features/conftest.py
@@ -196,6 +196,9 @@ def open_path(quteproc, path):
         if path.endswith(new_tab_suffix):
             path = path[:-len(new_tab_suffix)]
             new_tab = True
+        elif path.endswith(new_bg_tab_suffix):
+            path = path[:-len(new_bg_tab_suffix)]
+            new_bg_tab = True
         elif path.endswith(new_window_suffix):
             path = path[:-len(new_window_suffix)]
             new_window = True
@@ -208,20 +211,6 @@ def open_path(quteproc, path):
         else:
             break
 
-    if path.endswith(new_tab_suffix):
-        path = path[:-len(new_tab_suffix)]
-        new_tab = True
-    elif path.endswith(new_bg_tab_suffix):
-        path = path[:-len(new_bg_tab_suffix)]
-        new_bg_tab = True
-    elif path.endswith(new_window_suffix):
-        path = path[:-len(new_window_suffix)]
-        new_window = True
-
-    if path.endswith(do_not_wait_suffix):
-        path = path[:-len(do_not_wait_suffix)]
-        wait = False
-
     quteproc.open_path(path, new_tab=new_tab, new_bg_tab=new_bg_tab,
                        new_window=new_window, as_url=as_url, wait=wait)
 
diff --git a/tests/end2end/fixtures/quteprocess.py b/tests/end2end/fixtures/quteprocess.py
index cabc16954..8b2134769 100644
--- a/tests/end2end/fixtures/quteprocess.py
+++ b/tests/end2end/fixtures/quteprocess.py
@@ -481,7 +481,7 @@ class QuteProc(testprocess.Process):
         """Open the given path on the local webserver in qutebrowser."""
         url = self.path_to_url(path, port=port, https=https)
         self.open_url(url, new_tab=new_tab, new_bg_tab=new_bg_tab,
-                      new_window=new_window, wait=wait)
+                      new_window=new_window, as_url=as_url, wait=wait)
 
     def open_url(self, url, *, new_tab=False, new_bg_tab=False,
                  new_window=False, as_url=False, wait=True):