diff --git a/tests/end-2-end/conftest.py b/tests/end-2-end/conftest.py
index 214e44b8..3ba2e5c5 100644
--- a/tests/end-2-end/conftest.py
+++ b/tests/end-2-end/conftest.py
@@ -40,13 +40,23 @@ def plot_server(gui_id, klass, client_lib):
 
 
 @pytest.fixture
-def rpc_server_figure(gui_id, bec_client_lib):
+def connected_client_figure(gui_id, bec_client_lib):
     with plot_server(gui_id, BECFigure, bec_client_lib) as server:
         yield server
 
 
 @pytest.fixture
-def rpc_server_dock(gui_id, bec_client_lib):
+def connected_client_gui_obj(gui_id, bec_client_lib):
+    gui = BECGuiClient(gui_id=gui_id)
+    try:
+        gui.start_server(wait=True)
+        yield gui
+    finally:
+        gui.close()
+
+
+@pytest.fixture
+def connected_client_dock(gui_id, bec_client_lib):
     gui = BECGuiClient(gui_id=gui_id)
     gui._auto_updates_enabled = False
     try:
@@ -57,7 +67,7 @@ def rpc_server_dock(gui_id, bec_client_lib):
 
 
 @pytest.fixture
-def rpc_server_dock_w_auto_updates(gui_id, bec_client_lib):
+def connected_client_dock_w_auto_updates(gui_id, bec_client_lib):
     gui = BECGuiClient(gui_id=gui_id)
     try:
         gui.start_server(wait=True)
diff --git a/tests/end-2-end/test_bec_dock_rpc_e2e.py b/tests/end-2-end/test_bec_dock_rpc_e2e.py
index 04809977..e70b60a6 100644
--- a/tests/end-2-end/test_bec_dock_rpc_e2e.py
+++ b/tests/end-2-end/test_bec_dock_rpc_e2e.py
@@ -12,9 +12,9 @@ from bec_widgets.utils import Colors
 # pylint: disable=too-many-locals
 
 
-def test_rpc_add_dock_with_figure_e2e(bec_client_lib, rpc_server_dock):
+def test_rpc_add_dock_with_figure_e2e(bec_client_lib, connected_client_dock):
     # BEC client shortcuts
-    dock = rpc_server_dock
+    dock = connected_client_dock
     client = bec_client_lib
     dev = client.device_manager.devices
     scans = client.scans
@@ -123,8 +123,8 @@ def test_rpc_add_dock_with_figure_e2e(bec_client_lib, rpc_server_dock):
     )
 
 
-def test_dock_manipulations_e2e(rpc_server_dock):
-    dock = rpc_server_dock
+def test_dock_manipulations_e2e(connected_client_dock):
+    dock = connected_client_dock
 
     d0 = dock.add_dock("dock_0")
     d1 = dock.add_dock("dock_1")
@@ -155,8 +155,8 @@ def test_dock_manipulations_e2e(rpc_server_dock):
     assert len(dock.temp_areas) == 0
 
 
-def test_ring_bar(rpc_server_dock):
-    dock = rpc_server_dock
+def test_ring_bar(connected_client_dock):
+    dock = connected_client_dock
 
     d0 = dock.add_dock(name="dock_0")
 
@@ -182,8 +182,8 @@ def test_ring_bar(rpc_server_dock):
     assert bar_colors == expected_colors_light or bar_colors == expected_colors_dark
 
 
-def test_ring_bar_scan_update(bec_client_lib, rpc_server_dock):
-    dock = rpc_server_dock
+def test_ring_bar_scan_update(bec_client_lib, connected_client_dock):
+    dock = connected_client_dock
 
     d0 = dock.add_dock("dock_0")
 
@@ -234,12 +234,12 @@ def test_ring_bar_scan_update(bec_client_lib, rpc_server_dock):
     assert bar_config["rings"][1]["max_value"] == final_samy
 
 
-def test_auto_update(bec_client_lib, rpc_server_dock_w_auto_updates, qtbot):
+def test_auto_update(bec_client_lib, connected_client_dock_w_auto_updates, qtbot):
     client = bec_client_lib
     dev = client.device_manager.devices
     scans = client.scans
     queue = client.queue
-    gui, dock = rpc_server_dock_w_auto_updates
+    gui, dock = connected_client_dock_w_auto_updates
     auto_updates = gui.auto_updates
 
     def get_default_figure():
diff --git a/tests/end-2-end/test_bec_figure_rpc_e2e.py b/tests/end-2-end/test_bec_figure_rpc_e2e.py
index fd6b27fa..5d666a6e 100644
--- a/tests/end-2-end/test_bec_figure_rpc_e2e.py
+++ b/tests/end-2-end/test_bec_figure_rpc_e2e.py
@@ -7,8 +7,8 @@ from bec_lib.endpoints import MessageEndpoints
 from bec_widgets.cli.client import BECFigure, BECImageShow, BECMotorMap, BECWaveform
 
 
-def test_rpc_waveform1d_custom_curve(rpc_server_figure):
-    fig = BECFigure(rpc_server_figure)
+def test_rpc_waveform1d_custom_curve(connected_client_figure):
+    fig = BECFigure(connected_client_figure)
 
     ax = fig.plot()
     curve = ax.plot(x=[1, 2, 3], y=[1, 2, 3])
@@ -20,8 +20,8 @@ def test_rpc_waveform1d_custom_curve(rpc_server_figure):
     assert len(fig.widgets[ax._rpc_id].curves) == 1
 
 
-def test_rpc_plotting_shortcuts_init_configs(rpc_server_figure, qtbot):
-    fig = BECFigure(rpc_server_figure)
+def test_rpc_plotting_shortcuts_init_configs(connected_client_figure, qtbot):
+    fig = BECFigure(connected_client_figure)
 
     plt = fig.plot(x_name="samx", y_name="bpm4i")
     im = fig.image("eiger")
@@ -78,8 +78,8 @@ def test_rpc_plotting_shortcuts_init_configs(rpc_server_figure, qtbot):
     }
 
 
-def test_rpc_waveform_scan(rpc_server_figure, bec_client_lib):
-    fig = BECFigure(rpc_server_figure)
+def test_rpc_waveform_scan(connected_client_figure, bec_client_lib):
+    fig = BECFigure(connected_client_figure)
 
     # add 3 different curves to track
     plt = fig.plot(x_name="samx", y_name="bpm4i")
@@ -109,8 +109,8 @@ def test_rpc_waveform_scan(rpc_server_figure, bec_client_lib):
     assert plt_data["bpm4d-bpm4d"]["y"] == last_scan_data["bpm4d"]["bpm4d"].val
 
 
-def test_rpc_image(rpc_server_figure, bec_client_lib):
-    fig = BECFigure(rpc_server_figure)
+def test_rpc_image(connected_client_figure, bec_client_lib):
+    fig = BECFigure(connected_client_figure)
 
     im = fig.image("eiger")
 
@@ -130,8 +130,8 @@ def test_rpc_image(rpc_server_figure, bec_client_lib):
     np.testing.assert_equal(last_image_device, last_image_plot)
 
 
-def test_rpc_motor_map(rpc_server_figure, bec_client_lib):
-    fig = BECFigure(rpc_server_figure)
+def test_rpc_motor_map(connected_client_figure, bec_client_lib):
+    fig = BECFigure(connected_client_figure)
 
     motor_map = fig.motor_map("samx", "samy")
 
@@ -159,9 +159,9 @@ def test_rpc_motor_map(rpc_server_figure, bec_client_lib):
     )
 
 
-def test_dap_rpc(rpc_server_figure, bec_client_lib, qtbot):
+def test_dap_rpc(connected_client_figure, bec_client_lib, qtbot):
 
-    fig = BECFigure(rpc_server_figure)
+    fig = BECFigure(connected_client_figure)
     plt = fig.plot(x_name="samx", y_name="bpm4i", dap="GaussianModel")
 
     client = bec_client_lib
@@ -199,8 +199,8 @@ def test_dap_rpc(rpc_server_figure, bec_client_lib, qtbot):
     qtbot.waitUntil(wait_for_fit, timeout=10000)
 
 
-def test_removing_subplots(rpc_server_figure, bec_client_lib):
-    fig = BECFigure(rpc_server_figure)
+def test_removing_subplots(connected_client_figure, bec_client_lib):
+    fig = BECFigure(connected_client_figure)
     plt = fig.plot(x_name="samx", y_name="bpm4i", dap="GaussianModel")
     im = fig.image(monitor="eiger")
     mm = fig.motor_map(motor_x="samx", motor_y="samy")
diff --git a/tests/end-2-end/test_rpc_register_e2e.py b/tests/end-2-end/test_rpc_register_e2e.py
index 17dfa0a8..86317b88 100644
--- a/tests/end-2-end/test_rpc_register_e2e.py
+++ b/tests/end-2-end/test_rpc_register_e2e.py
@@ -3,8 +3,8 @@ import pytest
 from bec_widgets.cli.client import BECFigure, BECImageShow, BECMotorMap, BECWaveform
 
 
-def test_rpc_register_list_connections(rpc_server_figure):
-    fig = BECFigure(rpc_server_figure)
+def test_rpc_register_list_connections(connected_client_figure):
+    fig = BECFigure(connected_client_figure)
 
     plt = fig.plot(x_name="samx", y_name="bpm4i")
     im = fig.image("eiger")