diff --git a/tests/end-2-end/conftest.py b/tests/end-2-end/conftest.py
index d628dec5..afe024ce 100644
--- a/tests/end-2-end/conftest.py
+++ b/tests/end-2-end/conftest.py
@@ -33,7 +33,7 @@ def threads_check_fixture(threads_check):
 @pytest.fixture
 def gui_id():
     """New gui id each time, to ensure no 'gui is alive' zombie key can perturb"""
-    return f"figure_{random.randint(0,100)}"  # make a new gui id each time, to ensure no 'gui is alive' zombie key can perturb
+    return f"figure_{random.randint(0, 100)}"  # make a new gui id each time, to ensure no 'gui is alive' zombie key can perturb
 
 
 @pytest.fixture(scope="function")
@@ -51,6 +51,7 @@ def connected_client_gui_obj(qtbot, gui_id, bec_client_lib):
         qtbot.waitUntil(lambda: len(gui.bec.widget_list()) == 0, timeout=10000)
         yield gui
     finally:
-        gui.bec.delete_all()  # ensure clean state
-        qtbot.waitUntil(lambda: len(gui.bec.widget_list()) == 0, timeout=10000)
+        if (bec := getattr(gui, "bec", None)) is not None:
+            bec.delete_all()  # ensure clean state
+            qtbot.waitUntil(lambda: len(bec.widget_list()) == 0, timeout=10000)
         gui.kill_server()