diff --git a/tests/integration/conftest.py b/tests/integration/conftest.py
index 78f5fb026..fee29049c 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
diff --git a/tests/integration/quteprocess.py b/tests/integration/quteprocess.py
index 84c50c58e..ad01b2404 100644
--- a/tests/integration/quteprocess.py
+++ b/tests/integration/quteprocess.py
@@ -151,17 +151,11 @@ class QuteProc(testprocess.Process):
                 self.send_cmd(':open ' + url)
 
 
-@pytest.yield_fixture(scope='session', autouse=True)
+@pytest.yield_fixture
 def quteproc(qapp, httpbin):
     """Fixture for qutebrowser process."""
     proc = QuteProc(httpbin)
     proc.start()
     yield proc
+    proc.after_test()
     proc.cleanup()
-
-
-@pytest.yield_fixture(autouse=True)
-def quteproc_after_test(quteproc):
-    """Fixture to check the status of and restart the qutebrowser process."""
-    yield
-    quteproc.after_test()