diff --git a/tests/end2end/conftest.py b/tests/end2end/conftest.py
index d680a8d98..c236f819a 100644
--- a/tests/end2end/conftest.py
+++ b/tests/end2end/conftest.py
@@ -36,7 +36,7 @@ from PyQt5.QtCore import PYQT_VERSION
 
 pytest.register_assert_rewrite('end2end.fixtures')
 
-from end2end.fixtures.webserver import server, server_after_test, ssl_server
+from end2end.fixtures.webserver import server, server_per_test, ssl_server
 from end2end.fixtures.quteprocess import (quteproc_process, quteproc,
                                           quteproc_new)
 from end2end.fixtures.testprocess import pytest_runtest_makereport
diff --git a/tests/end2end/fixtures/webserver.py b/tests/end2end/fixtures/webserver.py
index 7060e30b9..85a6af070 100644
--- a/tests/end2end/fixtures/webserver.py
+++ b/tests/end2end/fixtures/webserver.py
@@ -188,9 +188,10 @@ def server(qapp):
 
 
 @pytest.fixture(autouse=True)
-def server_after_test(server, request):
+def server_per_test(server, request):
     """Fixture to clean server request list after each test."""
     request.node._server_log = server.captured_log
+    server.before_test()
     yield
     server.after_test()