diff --git a/components/esp_event/test_apps/pytest_esp_event.py b/components/esp_event/test_apps/pytest_esp_event.py
index 8e9cbd5538..22dd4e7ea0 100644
--- a/components/esp_event/test_apps/pytest_esp_event.py
+++ b/components/esp_event/test_apps/pytest_esp_event.py
@@ -14,24 +14,10 @@ def test_esp_event(dut: Dut) -> None:
 
 
 @pytest.mark.esp32
-@pytest.mark.host_test
-@pytest.mark.qemu
-@pytest.mark.parametrize('qemu_extra_args', [
-    '-global driver=timer.esp32.timg,property=wdt_disable,value=true',
-], indirect=True)  # need to disable wdt since it is not synchronized with target cpu clock on QEMU for ESP32
-def test_esp_event_qemu_esp32(dut: Dut) -> None:
-    for case in dut.test_menu:
-        if 'qemu-ignore' not in case.groups and not case.is_ignored and case.type == 'normal':
-            dut._run_normal_case(case)
-
-
 @pytest.mark.esp32c3
 @pytest.mark.host_test
 @pytest.mark.qemu
-@pytest.mark.parametrize('qemu_extra_args', [
-    '-icount 3',
-], indirect=True)  # need to add -icount 3 to make WDT accurate on QEMU for ESP32-C3
-def test_esp_event_qemu_esp32c3(dut: Dut) -> None:
+def test_esp_event_qemu(dut: Dut) -> None:
     for case in dut.test_menu:
         if 'qemu-ignore' not in case.groups and not case.is_ignored and case.type == 'normal':
             dut._run_normal_case(case)
diff --git a/components/esp_event/test_apps/sdkconfig.defaults b/components/esp_event/test_apps/sdkconfig.defaults
index e69de29bb2..ba19fc5604 100644
--- a/components/esp_event/test_apps/sdkconfig.defaults
+++ b/components/esp_event/test_apps/sdkconfig.defaults
@@ -0,0 +1,3 @@
+# This "default" configuration is appended to all other configurations
+# The contents of "sdkconfig.debug_helpers" is also appended to all other configurations (see CMakeLists.txt)
+CONFIG_ESP_TASK_WDT_INIT=n
diff --git a/components/esp_ringbuf/test_apps/CMakeLists.txt b/components/esp_ringbuf/test_apps/CMakeLists.txt
index 18338d23a2..2a88829ff2 100644
--- a/components/esp_ringbuf/test_apps/CMakeLists.txt
+++ b/components/esp_ringbuf/test_apps/CMakeLists.txt
@@ -2,7 +2,7 @@
 # CMakeLists in this exact order for cmake to work correctly
 cmake_minimum_required(VERSION 3.16)
 
-list(PREPEND SDKCONFIG_DEFAULTS "$ENV{IDF_PATH}/tools/test_apps/configs/sdkconfig.debug_helpers")
+list(PREPEND SDKCONFIG_DEFAULTS "$ENV{IDF_PATH}/tools/test_apps/configs/sdkconfig.debug_helpers" "sdkconfig.defaults")
 
 # "Trim" the build. Include the minimal set of components, main, and anything it depends on.
 set(COMPONENTS main)
diff --git a/components/pthread/test_apps/pthread_unity_tests/main/test_pthread_cxx.cpp b/components/pthread/test_apps/pthread_unity_tests/main/test_pthread_cxx.cpp
index 58e33f87ed..27dabd5e00 100644
--- a/components/pthread/test_apps/pthread_unity_tests/main/test_pthread_cxx.cpp
+++ b/components/pthread/test_apps/pthread_unity_tests/main/test_pthread_cxx.cpp
@@ -72,8 +72,7 @@ static void thread_main()
     }
 }
 
-// IDF-6423 - assert and crash when running this testcase on QEMU
-TEST_CASE("pthread C++", "[pthread][qemu-ignore]")
+TEST_CASE("pthread C++", "[pthread]")
 {
     global_sp_mtx.reset(new int(1));
     global_sp_recur_mtx.reset(new int(-1000));
diff --git a/components/pthread/test_apps/pthread_unity_tests/pytest_pthread_unity_tests.py b/components/pthread/test_apps/pthread_unity_tests/pytest_pthread_unity_tests.py
index 17f9a4cd90..1ee39baa72 100644
--- a/components/pthread/test_apps/pthread_unity_tests/pytest_pthread_unity_tests.py
+++ b/components/pthread/test_apps/pthread_unity_tests/pytest_pthread_unity_tests.py
@@ -45,9 +45,7 @@ def test_pthread_single_core(dut: Dut) -> None:
     indirect=True,
 )
 def test_pthread_tls(dut: Dut) -> None:
-    dut.expect_exact('Press ENTER to see the list of tests')
-    dut.write('[thread-specific]')
-    dut.expect_unity_test_output(timeout=300)
+    dut.run_all_single_board_cases(group='thread-specific', timeout=300)
 
 
 @pytest.mark.generic
@@ -59,9 +57,7 @@ def test_pthread_tls(dut: Dut) -> None:
     indirect=True,
 )
 def test_pthread_single_core_tls(dut: Dut) -> None:
-    dut.expect_exact('Press ENTER to see the list of tests')
-    dut.write('[thread-specific]')
-    dut.expect_unity_test_output(timeout=300)
+    dut.run_all_single_board_cases(group='thread-specific', timeout=300)
 
 
 @pytest.mark.host_test