diff --git a/bec_widgets/widgets/control/buttons/button_abort/button_abort.py b/bec_widgets/widgets/control/buttons/button_abort/button_abort.py
index 7adc8d4c..4a9585dc 100644
--- a/bec_widgets/widgets/control/buttons/button_abort/button_abort.py
+++ b/bec_widgets/widgets/control/buttons/button_abort/button_abort.py
@@ -11,7 +11,7 @@ class AbortButton(BECWidget, QWidget):
 
     PLUGIN = True
     ICON_NAME = "cancel"
-    RPC = True
+    RPC = False
 
     def __init__(
         self,
diff --git a/bec_widgets/widgets/control/buttons/button_reset/button_reset.py b/bec_widgets/widgets/control/buttons/button_reset/button_reset.py
index caea1cc7..dc468a31 100644
--- a/bec_widgets/widgets/control/buttons/button_reset/button_reset.py
+++ b/bec_widgets/widgets/control/buttons/button_reset/button_reset.py
@@ -11,7 +11,7 @@ class ResetButton(BECWidget, QWidget):
 
     PLUGIN = True
     ICON_NAME = "restart_alt"
-    RPC = True
+    RPC = False
 
     def __init__(self, parent=None, client=None, config=None, gui_id=None, toolbar=False, **kwargs):
         super().__init__(parent=parent, client=client, gui_id=gui_id, config=config, **kwargs)
diff --git a/bec_widgets/widgets/control/buttons/stop_button/stop_button.py b/bec_widgets/widgets/control/buttons/stop_button/stop_button.py
index fdedf4f1..218fa2e9 100644
--- a/bec_widgets/widgets/control/buttons/stop_button/stop_button.py
+++ b/bec_widgets/widgets/control/buttons/stop_button/stop_button.py
@@ -11,7 +11,7 @@ class StopButton(BECWidget, QWidget):
 
     PLUGIN = True
     ICON_NAME = "dangerous"
-    RPC = True
+    RPC = False
 
     def __init__(self, parent=None, client=None, config=None, gui_id=None, toolbar=False, **kwargs):
         super().__init__(parent=parent, client=client, gui_id=gui_id, config=config, **kwargs)
diff --git a/tests/end-2-end/user_interaction/test_user_interaction_e2e.py b/tests/end-2-end/user_interaction/test_user_interaction_e2e.py
index 98fb26c8..2ae82b98 100644
--- a/tests/end-2-end/user_interaction/test_user_interaction_e2e.py
+++ b/tests/end-2-end/user_interaction/test_user_interaction_e2e.py
@@ -139,25 +139,6 @@ def maybe_remove_dock_area(qtbot, gui: BECGuiClient, random_int_gen: random.Rand
         )
 
 
-@pytest.mark.timeout(PYTEST_TIMEOUT)
-def test_widgets_e2e_abort_button(qtbot, connected_client_gui_obj, random_generator_from_seed):
-    """Test the AbortButton widget."""
-    gui: BECGuiClient = connected_client_gui_obj
-    bec = gui._client
-    # Create dock_area, dock, widget
-    dock, widget = create_widget(qtbot, gui, gui.available_widgets.AbortButton)
-    dock: client.BECDock
-    widget: client.AbortButton
-
-    # No rpc calls to check so far
-
-    # Try detaching the dock
-    dock.detach()
-
-    # Test removing the widget, or leaving it open for the next test
-    maybe_remove_dock_area(qtbot, gui=gui, random_int_gen=random_generator_from_seed)
-
-
 @pytest.mark.timeout(PYTEST_TIMEOUT)
 def test_widgets_e2e_bec_progress_bar(qtbot, connected_client_gui_obj, random_generator_from_seed):
     """Test the BECProgressBar widget."""
@@ -637,53 +618,6 @@ def test_widgets_e2e_scatter_waveform(qtbot, connected_client_gui_obj, random_ge
     maybe_remove_dock_area(qtbot, gui=gui, random_int_gen=random_generator_from_seed)
 
 
-@pytest.mark.timeout(PYTEST_TIMEOUT)
-def test_widgets_e2e_stop_button(qtbot, connected_client_gui_obj, random_generator_from_seed):
-    """Test the StopButton widget"""
-    gui = connected_client_gui_obj
-    bec = gui._client
-    # Create dock_area, dock, widget
-    dock, widget = create_widget(qtbot, gui, gui.available_widgets.StopButton)
-    dock: client.BECDock
-    widget: client.StopButton
-
-    # No rpc calls to check so far
-
-    # Test removing the widget, or leaving it open for the next test
-    maybe_remove_dock_area(qtbot, gui=gui, random_int_gen=random_generator_from_seed)
-
-
-@pytest.mark.timeout(PYTEST_TIMEOUT)
-def test_widgets_e2e_resume_button(qtbot, connected_client_gui_obj, random_generator_from_seed):
-    """Test the StopButton widget"""
-    gui = connected_client_gui_obj
-    bec = gui._client
-    # Create dock_area, dock, widget
-    dock, widget = create_widget(qtbot, gui, gui.available_widgets.ResumeButton)
-    dock: client.BECDock
-    widget: client.ResumeButton
-
-    # No rpc calls to check so far
-
-    # Test removing the widget, or leaving it open for the next test
-    maybe_remove_dock_area(qtbot, gui=gui, random_int_gen=random_generator_from_seed)
-
-
-@pytest.mark.timeout(PYTEST_TIMEOUT)
-def test_widgets_e2e_reset_button(qtbot, connected_client_gui_obj, random_generator_from_seed):
-    """Test the StopButton widget"""
-    gui = connected_client_gui_obj
-    bec = gui._client
-    # Create dock_area, dock, widget
-    dock, widget = create_widget(qtbot, gui, gui.available_widgets.ResetButton)
-    dock: client.BECDock
-    widget: client.ResetButton
-    # No rpc calls to check so far
-
-    # Test removing the widget, or leaving it open for the next test
-    maybe_remove_dock_area(qtbot, gui=gui, random_int_gen=random_generator_from_seed)
-
-
 @pytest.mark.timeout(PYTEST_TIMEOUT)
 def test_widgets_e2e_text_box(qtbot, connected_client_gui_obj, random_generator_from_seed):
     """Test the TextBox widget"""