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 2923da9e..2523a1b0 100644
--- a/tests/end-2-end/test_bec_dock_rpc_e2e.py
+++ b/tests/end-2-end/test_bec_dock_rpc_e2e.py
@@ -94,7 +94,7 @@ def test_rpc_add_dock_with_figure_e2e(qtbot, bec_client_lib, connected_client_do
     # plot
     item = queue.scan_storage.storage[-1]
     plt_last_scan_data = item.live_data if hasattr(item, "live_data") else item.data
-    num_elements = len(plt_last_scan_data["samx"]["samx"].val)
+    num_elements = 10
 
     plot_name = "bpm4i-bpm4i"
 
@@ -263,7 +263,7 @@ def test_auto_update(bec_client_lib, connected_client_dock_w_auto_updates, qtbot
     item = queue.scan_storage.storage[-1]
     last_scan_data = item.live_data if hasattr(item, "live_data") else item.data
 
-    num_elements = len(last_scan_data["samx"]["samx"].val)
+    num_elements = 10
 
     plot_name = f"Scan {status.scan.scan_number} - {dock.selected_device}"
 
@@ -295,7 +295,7 @@ def test_auto_update(bec_client_lib, connected_client_dock_w_auto_updates, qtbot
 
     plot_name = f"Scan {status.scan.scan_number} - bpm4i"
 
-    num_elements_bec = len(last_scan_data["samx"]["samx"].val)
+    num_elements_bec = 25
     qtbot.waitUntil(lambda: check_remote_data_size(widgets[0], plot_name, num_elements_bec))
     plt_data = widgets[0].get_all_data()
 
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 0985cafd..7cd00bfe 100644
--- a/tests/end-2-end/test_bec_figure_rpc_e2e.py
+++ b/tests/end-2-end/test_bec_figure_rpc_e2e.py
@@ -97,7 +97,7 @@ def test_rpc_waveform_scan(qtbot, connected_client_figure, bec_client_lib):
     item = queue.scan_storage.storage[-1]
     last_scan_data = item.live_data if hasattr(item, "live_data") else item.data
 
-    num_elements = len(last_scan_data["samx"]["samx"].val)
+    num_elements = 10
 
     for plot_name in ["bpm4i-bpm4i", "bpm3a-bpm3a", "bpm4d-bpm4d"]:
         qtbot.waitUntil(lambda: check_remote_data_size(plt, plot_name, num_elements))