diff --git a/tests/end-2-end/test_scan_control_e2e.py b/tests/end-2-end/test_scan_control_e2e.py
index 12bef7c6..c0519f67 100644
--- a/tests/end-2-end/test_scan_control_e2e.py
+++ b/tests/end-2-end/test_scan_control_e2e.py
@@ -12,7 +12,6 @@ def scan_control(qtbot, bec_client_lib):  # , mock_dev):
     qtbot.addWidget(widget)
     qtbot.waitExposed(widget)
     yield widget
-    widget.close()
 
 
 def test_scan_control_populate_scans_e2e(scan_control):
diff --git a/tests/unit_tests/test_bec_dock.py b/tests/unit_tests/test_bec_dock.py
index 0d0215c0..675d35d6 100644
--- a/tests/unit_tests/test_bec_dock.py
+++ b/tests/unit_tests/test_bec_dock.py
@@ -14,7 +14,6 @@ def bec_dock_area(qtbot, mocked_client):
     qtbot.addWidget(widget)
     qtbot.waitExposed(widget)
     yield widget
-    widget.close()
 
 
 def test_bec_dock_area_init(bec_dock_area):
diff --git a/tests/unit_tests/test_bec_image_widget.py b/tests/unit_tests/test_bec_image_widget.py
index 336e8d6b..1e795423 100644
--- a/tests/unit_tests/test_bec_image_widget.py
+++ b/tests/unit_tests/test_bec_image_widget.py
@@ -15,7 +15,6 @@ def image_widget(qtbot, mocked_client):
     qtbot.addWidget(widget)
     qtbot.waitExposed(widget)
     yield widget
-    widget.close()
 
 
 @pytest.fixture
diff --git a/tests/unit_tests/test_bec_queue.py b/tests/unit_tests/test_bec_queue.py
index e213acb4..f5f24268 100644
--- a/tests/unit_tests/test_bec_queue.py
+++ b/tests/unit_tests/test_bec_queue.py
@@ -93,7 +93,6 @@ def bec_queue(qtbot, mocked_client):
     qtbot.addWidget(widget)
     qtbot.waitExposed(widget)
     yield widget
-    widget.close()
 
 
 def test_bec_queue(bec_queue, bec_queue_msg_full):
diff --git a/tests/unit_tests/test_bec_status_box.py b/tests/unit_tests/test_bec_status_box.py
index 95ebc1ab..164b83c7 100644
--- a/tests/unit_tests/test_bec_status_box.py
+++ b/tests/unit_tests/test_bec_status_box.py
@@ -20,7 +20,6 @@ def status_box(qtbot, mocked_client, service_status_fixture):
     qtbot.addWidget(widget)
     qtbot.waitExposed(widget)
     yield widget
-    widget.close()
 
 
 def test_update_top_item(status_box):
diff --git a/tests/unit_tests/test_color_map_selector.py b/tests/unit_tests/test_color_map_selector.py
index 3035bf2f..31f6c797 100644
--- a/tests/unit_tests/test_color_map_selector.py
+++ b/tests/unit_tests/test_color_map_selector.py
@@ -10,7 +10,6 @@ def color_map_selector(qtbot):
     qtbot.addWidget(widget)
     qtbot.waitExposed(widget)
     yield widget
-    widget.close()
 
 
 def test_color_map_selector_init(color_map_selector):
diff --git a/tests/unit_tests/test_device_input_base.py b/tests/unit_tests/test_device_input_base.py
index 969caf1a..70ccfc69 100644
--- a/tests/unit_tests/test_device_input_base.py
+++ b/tests/unit_tests/test_device_input_base.py
@@ -19,7 +19,6 @@ def device_input_base(qtbot, mocked_client):
     qtbot.addWidget(widget)
     qtbot.waitExposed(widget)
     yield widget
-    widget.close()
 
 
 def test_device_input_base_init(device_input_base):
diff --git a/tests/unit_tests/test_device_input_widgets.py b/tests/unit_tests/test_device_input_widgets.py
index eb4ad9dc..165b2e18 100644
--- a/tests/unit_tests/test_device_input_widgets.py
+++ b/tests/unit_tests/test_device_input_widgets.py
@@ -12,7 +12,6 @@ def device_input_combobox(qtbot, mocked_client):
     qtbot.addWidget(widget)
     qtbot.waitExposed(widget)
     yield widget
-    widget.close()
 
 
 @pytest.fixture
@@ -28,7 +27,6 @@ def device_input_combobox_with_config(qtbot, mocked_client):
     qtbot.addWidget(widget)
     qtbot.waitExposed(widget)
     yield widget
-    widget.close()
 
 
 @pytest.fixture
@@ -43,7 +41,6 @@ def device_input_combobox_with_kwargs(qtbot, mocked_client):
     qtbot.addWidget(widget)
     qtbot.waitExposed(widget)
     yield widget
-    widget.close()
 
 
 def test_device_input_combobox_init(device_input_combobox):
@@ -101,7 +98,6 @@ def device_input_line_edit(qtbot, mocked_client):
     qtbot.addWidget(widget)
     qtbot.waitExposed(widget)
     yield widget
-    widget.close()
 
 
 @pytest.fixture
@@ -117,7 +113,6 @@ def device_input_line_edit_with_config(qtbot, mocked_client):
     qtbot.addWidget(widget)
     qtbot.waitExposed(widget)
     yield widget
-    widget.close()
 
 
 @pytest.fixture
@@ -132,7 +127,6 @@ def device_input_line_edit_with_kwargs(qtbot, mocked_client):
     qtbot.addWidget(widget)
     qtbot.waitExposed(widget)
     yield widget
-    widget.close()
 
 
 def test_device_input_line_edit_init(device_input_line_edit):
diff --git a/tests/unit_tests/test_motor_map_widget.py b/tests/unit_tests/test_motor_map_widget.py
index f450399a..f66e4c65 100644
--- a/tests/unit_tests/test_motor_map_widget.py
+++ b/tests/unit_tests/test_motor_map_widget.py
@@ -16,7 +16,6 @@ def motor_map_widget(qtbot, mocked_client):
     qtbot.addWidget(widget)
     qtbot.waitExposed(widget)
     yield widget
-    widget.close()
 
 
 @pytest.fixture
@@ -139,7 +138,6 @@ def motor_map_settings(qtbot):
     qtbot.addWidget(widget)
     qtbot.waitExposed(widget)
     yield widget
-    widget.close()
 
 
 def test_display_current_settings(motor_map_settings):
diff --git a/tests/unit_tests/test_ring_progress_bar.py b/tests/unit_tests/test_ring_progress_bar.py
index 602bb62b..d76e2bf8 100644
--- a/tests/unit_tests/test_ring_progress_bar.py
+++ b/tests/unit_tests/test_ring_progress_bar.py
@@ -18,7 +18,6 @@ def ring_progress_bar(qtbot, mocked_client):
     qtbot.addWidget(widget)
     qtbot.waitExposed(widget)
     yield widget
-    widget.close()
 
 
 def test_bar_init(ring_progress_bar):
diff --git a/tests/unit_tests/test_scan_control.py b/tests/unit_tests/test_scan_control.py
index dde7c826..0a3024c5 100644
--- a/tests/unit_tests/test_scan_control.py
+++ b/tests/unit_tests/test_scan_control.py
@@ -220,7 +220,6 @@ def scan_control(qtbot, mocked_client):  # , mock_dev):
     qtbot.addWidget(widget)
     qtbot.waitExposed(widget)
     yield widget
-    widget.close()
 
 
 def test_populate_scans(scan_control, mocked_client):
diff --git a/tests/unit_tests/test_setting_dialog.py b/tests/unit_tests/test_setting_dialog.py
index 91d2fb11..cd0d5280 100644
--- a/tests/unit_tests/test_setting_dialog.py
+++ b/tests/unit_tests/test_setting_dialog.py
@@ -16,7 +16,6 @@ def setting_widget(qtbot):
     qtbot.addWidget(widget)
     qtbot.waitExposed(widget)
     yield widget
-    widget.close()
 
 
 def test_setting_widget_initialization(setting_widget):
@@ -61,8 +60,8 @@ def settings_dialog(qtbot, setting_widget):
     qtbot.addWidget(dialog)
     qtbot.waitExposed(dialog)
     yield dialog, parent_widget, setting_widget
-    dialog.close()
     parent_widget.close()
+    parent_widget.deleteLater()
 
 
 def test_settings_dialog_initialization(settings_dialog):
diff --git a/tests/unit_tests/test_stop_button.py b/tests/unit_tests/test_stop_button.py
index 27654071..a91f0497 100644
--- a/tests/unit_tests/test_stop_button.py
+++ b/tests/unit_tests/test_stop_button.py
@@ -13,7 +13,6 @@ def stop_button(qtbot, mocked_client):
     qtbot.addWidget(widget)
     qtbot.waitExposed(widget)
     yield widget
-    widget.close()
 
 
 def test_stop_button(stop_button):
diff --git a/tests/unit_tests/test_text_box_widget.py b/tests/unit_tests/test_text_box_widget.py
index 51af87a4..fa95970c 100644
--- a/tests/unit_tests/test_text_box_widget.py
+++ b/tests/unit_tests/test_text_box_widget.py
@@ -14,7 +14,6 @@ def text_box_widget(qtbot, mocked_client):
     qtbot.addWidget(widget)
     qtbot.waitExposed(widget)
     yield widget
-    widget.close()
 
 
 def test_textbox_widget(text_box_widget):
diff --git a/tests/unit_tests/test_toggle.py b/tests/unit_tests/test_toggle.py
index facc9e45..d840a6d3 100644
--- a/tests/unit_tests/test_toggle.py
+++ b/tests/unit_tests/test_toggle.py
@@ -10,7 +10,6 @@ def toggle(qtbot):
     qtbot.addWidget(widget)
     qtbot.waitExposed(widget)
     yield widget
-    widget.close()
 
 
 def test_toggle(toggle):
diff --git a/tests/unit_tests/test_waveform_widget.py b/tests/unit_tests/test_waveform_widget.py
index 134925d0..2c6eed8b 100644
--- a/tests/unit_tests/test_waveform_widget.py
+++ b/tests/unit_tests/test_waveform_widget.py
@@ -14,7 +14,6 @@ def waveform_widget(qtbot, mocked_client):
     qtbot.addWidget(widget)
     qtbot.waitExposed(widget)
     yield widget
-    widget.close()
 
 
 @pytest.fixture