diff --git a/tests/integration/conftest.py b/tests/integration/conftest.py
index 78f5fb026..2cf649408 100644
--- a/tests/integration/conftest.py
+++ b/tests/integration/conftest.py
@@ -22,4 +22,4 @@
 """Things needed for integration testing."""
 
 from webserver import httpbin, httpbin_after_test
-from quteprocess import quteproc, quteproc_after_test
+from quteprocess import quteproc_process, quteproc
diff --git a/tests/integration/quteprocess.py b/tests/integration/quteprocess.py
index 007db0e23..390dc330c 100644
--- a/tests/integration/quteprocess.py
+++ b/tests/integration/quteprocess.py
@@ -287,8 +287,8 @@ class QuteProc(testprocess.Process):
 
 
 @pytest.yield_fixture(scope='module')
-def quteproc(qapp, httpbin, request):
-    """Fixture for qutebrowser process."""
+def quteproc_process(qapp, httpbin, request):
+    """Fixture for qutebrowser process which is started once per file."""
     delay = request.config.getoption('--qute-delay')
     proc = QuteProc(httpbin, delay)
     proc.start()
@@ -296,9 +296,9 @@ def quteproc(qapp, httpbin, request):
     proc.terminate()
 
 
-@pytest.yield_fixture(autouse=True)
-def quteproc_after_test(quteproc):
-    """Fixture to run cleanup tasks after each test."""
-    quteproc.before_test()
-    yield
-    quteproc.after_test()
+@pytest.yield_fixture
+def quteproc(quteproc_process, httpbin):
+    """Per-test qutebrowser fixture which uses the per-file process."""
+    quteproc_process.before_test()
+    yield quteproc_process
+    quteproc_process.after_test()