diff --git a/components/bootloader_support/.build-test-rules.yml b/components/bootloader_support/.build-test-rules.yml
index 5c4483fd70..1b03e69bf1 100644
--- a/components/bootloader_support/.build-test-rules.yml
+++ b/components/bootloader_support/.build-test-rules.yml
@@ -6,6 +6,6 @@ components/bootloader_support/test_apps/rtc_custom_section:
       temporary: false
       reason: esp32c2 does not have RTC memory
   disable_test:
-    - if: IDF_TARGET == "esp32c6" or IDF_TARGET == "esp32h2"
+    - if: IDF_TARGET == "esp32h2"
       temporary: true
-      reason: target esp32c6/esp32h2 is not supported yet
+      reason: target esp32h2 is not supported yet
diff --git a/components/bootloader_support/test_apps/bootloader_support/CMakeLists.txt b/components/bootloader_support/test_apps/bootloader_support/CMakeLists.txt
index 07ef465a67..c7032d6984 100644
--- a/components/bootloader_support/test_apps/bootloader_support/CMakeLists.txt
+++ b/components/bootloader_support/test_apps/bootloader_support/CMakeLists.txt
@@ -3,4 +3,11 @@
 cmake_minimum_required(VERSION 3.16)
 
 include($ENV{IDF_PATH}/tools/cmake/project.cmake)
+
+set(SDKCONFIG_DEFAULTS "$ENV{IDF_PATH}/tools/test_apps/configs/sdkconfig.debug_helpers")
+list(APPEND SDKCONFIG_DEFAULTS "sdkconfig.defaults")
+
+# "Trim" the build. Include the minimal set of components, main, and anything it depends on.
+set(COMPONENTS main)
+
 project(test_bootloader_support)
diff --git a/components/bootloader_support/test_apps/bootloader_support/main/CMakeLists.txt b/components/bootloader_support/test_apps/bootloader_support/main/CMakeLists.txt
index 1d67beb656..af5ce7f25d 100644
--- a/components/bootloader_support/test_apps/bootloader_support/main/CMakeLists.txt
+++ b/components/bootloader_support/test_apps/bootloader_support/main/CMakeLists.txt
@@ -1,3 +1,4 @@
 idf_component_register(SRCS "test_app_main.c" "test_verify_image.c"
                        INCLUDE_DIRS "."
+                       REQUIRES unity bootloader_support esp_partition app_update
                        WHOLE_ARCHIVE)
diff --git a/components/bootloader_support/test_apps/bootloader_support/main/test_app_main.c b/components/bootloader_support/test_apps/bootloader_support/main/test_app_main.c
index 52a9e14b82..b920de7e30 100644
--- a/components/bootloader_support/test_apps/bootloader_support/main/test_app_main.c
+++ b/components/bootloader_support/test_apps/bootloader_support/main/test_app_main.c
@@ -1,5 +1,5 @@
 /*
- * SPDX-FileCopyrightText: 2022 Espressif Systems (Shanghai) CO LTD
+ * SPDX-FileCopyrightText: 2022-2023 Espressif Systems (Shanghai) CO LTD
  *
  * SPDX-License-Identifier: Apache-2.0
  */
@@ -10,7 +10,7 @@
 
 
 // Some resources are lazy allocated (newlib locks) in the bootloader support code, the threshold is left for that case
-#define TEST_MEMORY_LEAK_THRESHOLD (-550)
+#define TEST_MEMORY_LEAK_THRESHOLD (-650)
 
 static size_t before_free_8bit;
 static size_t before_free_32bit;
diff --git a/components/bootloader_support/test_apps/bootloader_support/pytest_bootloader_support.py b/components/bootloader_support/test_apps/bootloader_support/pytest_bootloader_support.py
index ab6afdc475..af40daf8c7 100644
--- a/components/bootloader_support/test_apps/bootloader_support/pytest_bootloader_support.py
+++ b/components/bootloader_support/test_apps/bootloader_support/pytest_bootloader_support.py
@@ -1,4 +1,4 @@
-# SPDX-FileCopyrightText: 2022 Espressif Systems (Shanghai) CO LTD
+# SPDX-FileCopyrightText: 2022-2023 Espressif Systems (Shanghai) CO LTD
 # SPDX-License-Identifier: CC0-1.0
 
 import pytest
@@ -8,6 +8,4 @@ from pytest_embedded import Dut
 @pytest.mark.generic
 @pytest.mark.supported_targets
 def test_bootloader_support(dut: Dut) -> None:
-    dut.expect_exact('Press ENTER to see the list of tests')
-    dut.write('*')
-    dut.expect_unity_test_output(timeout=300)
+    dut.run_all_single_board_cases()
diff --git a/components/bootloader_support/test_apps/bootloader_support/sdkconfig.defaults b/components/bootloader_support/test_apps/bootloader_support/sdkconfig.defaults
new file mode 100644
index 0000000000..ba19fc5604
--- /dev/null
+++ b/components/bootloader_support/test_apps/bootloader_support/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/bootloader_support/test_apps/rtc_custom_section/CMakeLists.txt b/components/bootloader_support/test_apps/rtc_custom_section/CMakeLists.txt
index 1950e50346..c56be3f5e7 100644
--- a/components/bootloader_support/test_apps/rtc_custom_section/CMakeLists.txt
+++ b/components/bootloader_support/test_apps/rtc_custom_section/CMakeLists.txt
@@ -3,4 +3,11 @@
 cmake_minimum_required(VERSION 3.16)
 
 include($ENV{IDF_PATH}/tools/cmake/project.cmake)
+
+set(SDKCONFIG_DEFAULTS "$ENV{IDF_PATH}/tools/test_apps/configs/sdkconfig.debug_helpers")
+list(APPEND SDKCONFIG_DEFAULTS "sdkconfig.defaults")
+
+# "Trim" the build. Include the minimal set of components, main, and anything it depends on.
+set(COMPONENTS main)
+
 project(test_rtc_custom_section)
diff --git a/components/bootloader_support/test_apps/rtc_custom_section/pytest_rtc_mem.py b/components/bootloader_support/test_apps/rtc_custom_section/pytest_rtc_mem.py
index e00fa596ff..709b4c0e3f 100644
--- a/components/bootloader_support/test_apps/rtc_custom_section/pytest_rtc_mem.py
+++ b/components/bootloader_support/test_apps/rtc_custom_section/pytest_rtc_mem.py
@@ -1,4 +1,4 @@
-# SPDX-FileCopyrightText: 2022 Espressif Systems (Shanghai) CO LTD
+# SPDX-FileCopyrightText: 2022-2023 Espressif Systems (Shanghai) CO LTD
 # SPDX-License-Identifier: CC0-1.0
 
 import pytest
@@ -8,6 +8,7 @@ from pytest_embedded import Dut
 @pytest.mark.generic
 @pytest.mark.esp32
 @pytest.mark.esp32c3
+@pytest.mark.esp32c6
 @pytest.mark.esp32s2
 @pytest.mark.esp32s3
 def test_rtc_reserved_memory(dut: Dut) -> None:
diff --git a/components/bootloader_support/test_apps/rtc_custom_section/sdkconfig.defaults b/components/bootloader_support/test_apps/rtc_custom_section/sdkconfig.defaults
index e10fa74582..9f253b3c4f 100644
--- a/components/bootloader_support/test_apps/rtc_custom_section/sdkconfig.defaults
+++ b/components/bootloader_support/test_apps/rtc_custom_section/sdkconfig.defaults
@@ -1,3 +1,6 @@
+# The contents of "sdkconfig.debug_helpers" is also appended to all other configurations (see CMakeLists.txt)
+CONFIG_ESP_TASK_WDT_INIT=n
+
 CONFIG_BOOTLOADER_RESERVE_RTC_SIZE=0x10
 CONFIG_BOOTLOADER_CUSTOM_RESERVE_RTC=y
 CONFIG_BOOTLOADER_CUSTOM_RESERVE_RTC_SIZE=0x200
diff --git a/components/console/test_apps/console/CMakeLists.txt b/components/console/test_apps/console/CMakeLists.txt
index a2cde6ec34..592b202ce8 100644
--- a/components/console/test_apps/console/CMakeLists.txt
+++ b/components/console/test_apps/console/CMakeLists.txt
@@ -2,7 +2,12 @@
 # CMakeLists in this exact order for cmake to work correctly
 cmake_minimum_required(VERSION 3.16)
 
-set(EXTRA_COMPONENT_DIRS "$ENV{IDF_PATH}/tools/unit-test-app/components")
-
 include($ENV{IDF_PATH}/tools/cmake/project.cmake)
+
+set(SDKCONFIG_DEFAULTS "$ENV{IDF_PATH}/tools/test_apps/configs/sdkconfig.debug_helpers")
+list(APPEND SDKCONFIG_DEFAULTS "sdkconfig.defaults")
+
+# "Trim" the build. Include the minimal set of components, main, and anything it depends on.
+set(COMPONENTS main)
+
 project(test_console)
diff --git a/components/console/test_apps/console/pytest_console.py b/components/console/test_apps/console/pytest_console.py
index 937a80cd67..ee69b43f8f 100644
--- a/components/console/test_apps/console/pytest_console.py
+++ b/components/console/test_apps/console/pytest_console.py
@@ -1,4 +1,4 @@
-# SPDX-FileCopyrightText: 2022 Espressif Systems (Shanghai) CO LTD
+# SPDX-FileCopyrightText: 2022-2023 Espressif Systems (Shanghai) CO LTD
 # SPDX-License-Identifier: CC0-1.0
 
 import pytest
@@ -8,6 +8,4 @@ from pytest_embedded import Dut
 @pytest.mark.generic
 @pytest.mark.supported_targets
 def test_console(dut: Dut) -> None:
-    dut.expect_exact('Press ENTER to see the list of tests')
-    dut.write('![ignore]')
-    dut.expect_unity_test_output()
+    dut.run_all_single_board_cases()
diff --git a/components/console/test_apps/console/sdkconfig.defaults b/components/console/test_apps/console/sdkconfig.defaults
new file mode 100644
index 0000000000..ba19fc5604
--- /dev/null
+++ b/components/console/test_apps/console/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/efuse/test_apps/pytest_efuse.py b/components/efuse/test_apps/pytest_efuse.py
index e44d4263cb..692452b4d0 100644
--- a/components/efuse/test_apps/pytest_efuse.py
+++ b/components/efuse/test_apps/pytest_efuse.py
@@ -14,9 +14,7 @@ from pytest_embedded import Dut
 @pytest.mark.esp32h2
 @pytest.mark.generic
 def test_efuse(dut: Dut) -> None:
-    dut.expect_exact('Press ENTER to see the list of tests')
-    dut.write('*')
-    dut.expect_unity_test_output(timeout=200)
+    dut.run_all_single_board_cases()
 
 
 @pytest.mark.qemu
diff --git a/components/esp_common/test_apps/esp_common/CMakeLists.txt b/components/esp_common/test_apps/esp_common/CMakeLists.txt
index e8324aa92e..5175d340d1 100644
--- a/components/esp_common/test_apps/esp_common/CMakeLists.txt
+++ b/components/esp_common/test_apps/esp_common/CMakeLists.txt
@@ -2,7 +2,12 @@
 # CMakeLists in this exact order for cmake to work correctly
 cmake_minimum_required(VERSION 3.16)
 
-set(EXTRA_COMPONENT_DIRS "$ENV{IDF_PATH}/tools/unit-test-app/components")
-
 include($ENV{IDF_PATH}/tools/cmake/project.cmake)
+
+set(SDKCONFIG_DEFAULTS "$ENV{IDF_PATH}/tools/test_apps/configs/sdkconfig.debug_helpers")
+list(APPEND SDKCONFIG_DEFAULTS "sdkconfig.defaults")
+
+# "Trim" the build. Include the minimal set of components, main, and anything it depends on.
+set(COMPONENTS main)
+
 project(test_esp_common)
diff --git a/components/esp_common/test_apps/esp_common/main/CMakeLists.txt b/components/esp_common/test_apps/esp_common/main/CMakeLists.txt
index 165974c96e..44a5ed32a2 100644
--- a/components/esp_common/test_apps/esp_common/main/CMakeLists.txt
+++ b/components/esp_common/test_apps/esp_common/main/CMakeLists.txt
@@ -1,4 +1,4 @@
 idf_component_register(SRCS "test_app_main.c" "test_attr.c"
                        INCLUDE_DIRS "."
-                       PRIV_REQUIRES test_utils esp_psram
+                       PRIV_REQUIRES unity esp_psram
                        WHOLE_ARCHIVE)
diff --git a/components/esp_common/test_apps/esp_common/main/test_attr.c b/components/esp_common/test_apps/esp_common/main/test_attr.c
index b2c37d2d2c..71057478e7 100644
--- a/components/esp_common/test_apps/esp_common/main/test_attr.c
+++ b/components/esp_common/test_apps/esp_common/main/test_attr.c
@@ -13,7 +13,6 @@
 #if CONFIG_IDF_TARGET_ESP32
 #include "esp_private/esp_psram_extram.h"
 #endif
-#include "test_utils.h"
 
 extern int _rtc_noinit_start;
 extern int _rtc_noinit_end;
diff --git a/components/esp_common/test_apps/esp_common/pytest_esp_common.py b/components/esp_common/test_apps/esp_common/pytest_esp_common.py
index 2aebfe99df..6f3488e0bb 100644
--- a/components/esp_common/test_apps/esp_common/pytest_esp_common.py
+++ b/components/esp_common/test_apps/esp_common/pytest_esp_common.py
@@ -1,14 +1,9 @@
-# SPDX-FileCopyrightText: 2022 Espressif Systems (Shanghai) CO LTD
+# SPDX-FileCopyrightText: 2022-2023 Espressif Systems (Shanghai) CO LTD
 # SPDX-License-Identifier: CC0-1.0
 
-import re
-
 import pytest
 from pytest_embedded import Dut
 
-DEFAULT_TIMEOUT = 20
-TEST_SUBMENU_PATTERN_PYTEST = re.compile(rb'\s+\((\d+)\)\s+"([^"]+)"\r?\n')
-
 
 @pytest.mark.generic
 @pytest.mark.supported_targets
@@ -19,18 +14,11 @@ TEST_SUBMENU_PATTERN_PYTEST = re.compile(rb'\s+\((\d+)\)\s+"([^"]+)"\r?\n')
     ]
 )
 def test_esp_common(dut: Dut) -> None:
-    dut.expect_exact('Press ENTER to see the list of tests')
-    dut.write('*')
-    dut.expect_unity_test_output(timeout=300)
+    dut.run_all_single_board_cases()
 
 
 def run_multiple_stages(dut: Dut, test_case_num: int, stages: int) -> None:
-    for stage in range(1, stages + 1):
-        dut.write(str(test_case_num))
-        dut.expect(TEST_SUBMENU_PATTERN_PYTEST, timeout=DEFAULT_TIMEOUT)
-        dut.write(str(stage))
-        if stage != stages:
-            dut.expect_exact('Press ENTER to see the list of tests.')
+    dut.run_all_single_board_cases()
 
 
 @pytest.mark.generic
@@ -42,14 +30,7 @@ def run_multiple_stages(dut: Dut, test_case_num: int, stages: int) -> None:
     ]
 )
 def test_esp_common_psram_esp32(dut: Dut) -> None:
-    extra_data = dut.parse_test_menu()
-    for test_case in extra_data:
-        if test_case.type != 'multi_stage':
-            dut.write(str(test_case.index))
-        else:
-            run_multiple_stages(dut, test_case.index, len(test_case.subcases))
-        dut.expect_unity_test_output(timeout=90)
-        dut.expect_exact("Enter next test, or 'enter' to see menu")
+    dut.run_all_single_board_cases()
 
 
 @pytest.mark.generic
@@ -61,11 +42,4 @@ def test_esp_common_psram_esp32(dut: Dut) -> None:
     ]
 )
 def test_esp_common_psram_esp32s2(dut: Dut) -> None:
-    extra_data = dut.parse_test_menu()
-    for test_case in extra_data:
-        if test_case.type != 'multi_stage':
-            dut.write(str(test_case.index))
-        else:
-            run_multiple_stages(dut, test_case.index, len(test_case.subcases))
-        dut.expect_unity_test_output(timeout=90)
-        dut.expect_exact("Enter next test, or 'enter' to see menu")
+    dut.run_all_single_board_cases()
diff --git a/components/esp_event/test_apps/CMakeLists.txt b/components/esp_event/test_apps/CMakeLists.txt
index df59affa11..e9db1cddb0 100644
--- a/components/esp_event/test_apps/CMakeLists.txt
+++ b/components/esp_event/test_apps/CMakeLists.txt
@@ -3,8 +3,13 @@
 # CMakeLists in this exact order for cmake to work correctly
 cmake_minimum_required(VERSION 3.16)
 
+include($ENV{IDF_PATH}/tools/cmake/project.cmake)
+
+set(SDKCONFIG_DEFAULTS "$ENV{IDF_PATH}/tools/test_apps/configs/sdkconfig.debug_helpers")
+list(APPEND SDKCONFIG_DEFAULTS "sdkconfig.defaults")
+
+# "Trim" the build. Include the minimal set of components, main, and anything it depends on.
 set(COMPONENTS main)
 set(EXTRA_COMPONENT_DIRS "$ENV{IDF_PATH}/tools/unit-test-app/components")
 
-include($ENV{IDF_PATH}/tools/cmake/project.cmake)
 project(test_esp_event)
diff --git a/components/esp_event/test_apps/main/test_event.c b/components/esp_event/test_apps/main/test_event.c
index 6d921dc1c7..1221bfab66 100644
--- a/components/esp_event/test_apps/main/test_event.c
+++ b/components/esp_event/test_apps/main/test_event.c
@@ -1,5 +1,5 @@
 /*
- * SPDX-FileCopyrightText: 2022 Espressif Systems (Shanghai) CO LTD
+ * SPDX-FileCopyrightText: 2022-2023 Espressif Systems (Shanghai) CO LTD
  *
  * SPDX-License-Identifier: Unlicense OR CC0-1.0
  */
@@ -2014,7 +2014,7 @@ bool test_event_on_timer_alarm(gptimer_handle_t timer, const gptimer_alarm_event
 TEST_CASE("can post events from interrupt handler", "[event]")
 {
     /* Lazy allocated resources in gptimer/intr_alloc */
-    set_leak_threshold(-120);
+    set_leak_threshold(-150);
 
     SemaphoreHandle_t sem = xSemaphoreCreateBinary();
     gptimer_handle_t gptimer = NULL;
diff --git a/components/esp_event/test_apps/pytest_esp_event.py b/components/esp_event/test_apps/pytest_esp_event.py
index c0e9ebc2dc..207b00b686 100644
--- a/components/esp_event/test_apps/pytest_esp_event.py
+++ b/components/esp_event/test_apps/pytest_esp_event.py
@@ -1,4 +1,4 @@
-# SPDX-FileCopyrightText: 2022 Espressif Systems (Shanghai) CO LTD
+# SPDX-FileCopyrightText: 2022-2023 Espressif Systems (Shanghai) CO LTD
 # SPDX-License-Identifier: CC0-1.0
 
 import pytest
@@ -10,6 +10,4 @@ from pytest_embedded import Dut
 @pytest.mark.esp32c3
 @pytest.mark.generic
 def test_esp_event(dut: Dut) -> None:
-    dut.expect('Press ENTER to see the list of tests')
-    dut.write('*')
-    dut.expect_unity_test_output(timeout=120)
+    dut.run_all_single_board_cases()
diff --git a/components/esp_ringbuf/test_apps/CMakeLists.txt b/components/esp_ringbuf/test_apps/CMakeLists.txt
index 9fbc23324e..0329886708 100644
--- a/components/esp_ringbuf/test_apps/CMakeLists.txt
+++ b/components/esp_ringbuf/test_apps/CMakeLists.txt
@@ -2,6 +2,10 @@
 # CMakeLists in this exact order for cmake to work correctly
 cmake_minimum_required(VERSION 3.16)
 
+set(SDKCONFIG_DEFAULTS "$ENV{IDF_PATH}/tools/test_apps/configs/sdkconfig.debug_helpers")
+list(APPEND SDKCONFIG_DEFAULTS "sdkconfig.defaults")
+
+# "Trim" the build. Include the minimal set of components, main, and anything it depends on.
 set(COMPONENTS main)
 
 include($ENV{IDF_PATH}/tools/cmake/project.cmake)
diff --git a/components/esp_ringbuf/test_apps/pytest_esp_ringbuf.py b/components/esp_ringbuf/test_apps/pytest_esp_ringbuf.py
index db867d764c..89c70ed267 100644
--- a/components/esp_ringbuf/test_apps/pytest_esp_ringbuf.py
+++ b/components/esp_ringbuf/test_apps/pytest_esp_ringbuf.py
@@ -1,4 +1,4 @@
-# SPDX-FileCopyrightText: 2022 Espressif Systems (Shanghai) CO LTD
+# SPDX-FileCopyrightText: 2022-2023 Espressif Systems (Shanghai) CO LTD
 # SPDX-License-Identifier: CC0-1.0
 
 import pytest
@@ -17,6 +17,4 @@ from pytest_embedded import Dut
     ]
 )
 def test_esp_ringbuf(dut: Dut) -> None:
-    dut.expect('Press ENTER to see the list of tests')
-    dut.write('*')
-    dut.expect_unity_test_output()
+    dut.run_all_single_board_cases()
diff --git a/components/esp_ringbuf/test_apps/sdkconfig.defaults b/components/esp_ringbuf/test_apps/sdkconfig.defaults
new file mode 100644
index 0000000000..ba19fc5604
--- /dev/null
+++ b/components/esp_ringbuf/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_rom/test_apps/pytest_esp_rom.py b/components/esp_rom/test_apps/pytest_esp_rom.py
index 48f01d1163..469a3c7da3 100644
--- a/components/esp_rom/test_apps/pytest_esp_rom.py
+++ b/components/esp_rom/test_apps/pytest_esp_rom.py
@@ -13,6 +13,4 @@ from pytest_embedded import Dut
 @pytest.mark.generic
 @pytest.mark.nightly_run
 def test_esp_rom(dut: Dut) -> None:
-    dut.expect('Press ENTER to see the list of tests')
-    dut.write('*')
-    dut.expect_unity_test_output()
+    dut.run_all_single_board_cases()
diff --git a/components/esp_system/test/test_reset_reason.c b/components/esp_system/test/test_reset_reason.c
index 1c196e65a9..4f0333a3bc 100644
--- a/components/esp_system/test/test_reset_reason.c
+++ b/components/esp_system/test/test_reset_reason.c
@@ -70,7 +70,7 @@ TEST_CASE("reset reason ESP_RST_POWERON", "[reset][ignore]")
 }
 
 
-#if !TEMPORARY_DISABLED_FOR_TARGETS(ESP32C2, ESP32C6)
+#if !TEMPORARY_DISABLED_FOR_TARGETS(ESP32C2)
 //IDF-5059
 static __NOINIT_ATTR uint32_t s_noinit_val;
 static RTC_NOINIT_ATTR uint32_t s_rtc_noinit_val;
diff --git a/components/esp_timer/.build-test-rules.yml b/components/esp_timer/.build-test-rules.yml
index b7026465c9..0ac02f949c 100644
--- a/components/esp_timer/.build-test-rules.yml
+++ b/components/esp_timer/.build-test-rules.yml
@@ -2,6 +2,6 @@
 
 components/esp_timer/test_apps:
   disable:
-    - if: IDF_TARGET in ["esp32c6", "esp32h2"] # Sleep support IDF-6267
+    - if: IDF_TARGET in ["esp32h2"] # Sleep support IDF-6267
       temporary: true
       reason: Not supported yet
diff --git a/components/esp_timer/test_apps/CMakeLists.txt b/components/esp_timer/test_apps/CMakeLists.txt
index 094a98cd7c..751ac01aa4 100644
--- a/components/esp_timer/test_apps/CMakeLists.txt
+++ b/components/esp_timer/test_apps/CMakeLists.txt
@@ -1,8 +1,12 @@
 #This is the project CMakeLists.txt file for the test subproject
 cmake_minimum_required(VERSION 3.16)
 
-set(EXTRA_COMPONENT_DIRS "$ENV{IDF_PATH}/tools/unit-test-app/components")
+set(SDKCONFIG_DEFAULTS "$ENV{IDF_PATH}/tools/test_apps/configs/sdkconfig.debug_helpers")
+list(APPEND SDKCONFIG_DEFAULTS "sdkconfig.defaults")
+
+# "Trim" the build. Include the minimal set of components, main, and anything it depends on.
 set(COMPONENTS main)
+set(EXTRA_COMPONENT_DIRS "$ENV{IDF_PATH}/tools/unit-test-app/components")
 
 include($ENV{IDF_PATH}/tools/cmake/project.cmake)
 project(esp_timer_test)
diff --git a/components/esp_timer/test_apps/README.md b/components/esp_timer/test_apps/README.md
index 27995c13b2..cd9be654c0 100644
--- a/components/esp_timer/test_apps/README.md
+++ b/components/esp_timer/test_apps/README.md
@@ -1,3 +1,3 @@
-| Supported Targets | ESP32 | ESP32-C2 | ESP32-C3 | ESP32-S2 | ESP32-S3 |
-| ----------------- | ----- | -------- | -------- | -------- | -------- |
+| Supported Targets | ESP32 | ESP32-C2 | ESP32-C3 | ESP32-C6 | ESP32-S2 | ESP32-S3 |
+| ----------------- | ----- | -------- | -------- | -------- | -------- | -------- |
 
diff --git a/components/esp_timer/test_apps/main/test_esp_timer_light_sleep.c b/components/esp_timer/test_apps/main/test_esp_timer_light_sleep.c
index b95c0d25ad..41a1a8e381 100644
--- a/components/esp_timer/test_apps/main/test_esp_timer_light_sleep.c
+++ b/components/esp_timer/test_apps/main/test_esp_timer_light_sleep.c
@@ -1,5 +1,5 @@
 /*
- * SPDX-FileCopyrightText: 2022 Espressif Systems (Shanghai) CO LTD
+ * SPDX-FileCopyrightText: 2022-2023 Espressif Systems (Shanghai) CO LTD
  *
  * SPDX-License-Identifier: Apache-2.0
  */
@@ -13,6 +13,8 @@
 #include "esp_rom_sys.h"
 #include "esp_sleep.h"
 
+#if !TEMPORARY_DISABLED_FOR_TARGETS(ESP32C6) // TODO IDF-6770
+
 static void timer_cb1(void *arg)
 {
     ++*((int*) arg);
@@ -50,3 +52,5 @@ TEST_CASE("Test the periodic timer does not handle lost events during light slee
     TEST_ESP_OK(esp_timer_dump(stdout));
     TEST_ESP_OK(esp_timer_delete(periodic_timer));
 }
+
+#endif //#!TEMPORARY_DISABLED_FOR_TARGETS(ESP32C6)
diff --git a/components/esp_timer/test_apps/pytest_esp_timer_ut.py b/components/esp_timer/test_apps/pytest_esp_timer_ut.py
index aa5ceec39c..9a69efa9e1 100644
--- a/components/esp_timer/test_apps/pytest_esp_timer_ut.py
+++ b/components/esp_timer/test_apps/pytest_esp_timer_ut.py
@@ -1,12 +1,12 @@
-# SPDX-FileCopyrightText: 2022 Espressif Systems (Shanghai) CO LTD
+# SPDX-FileCopyrightText: 2022-2023 Espressif Systems (Shanghai) CO LTD
 # SPDX-License-Identifier: Unlicense OR CC0-1.0
 
 import pytest
 from pytest_embedded import Dut
 
 CONFIGS = [
-    pytest.param('general', marks=[pytest.mark.supported_targets, pytest.mark.temp_skip_ci(targets=['esp32c6'], reason='c6 support TBD')]),
-    pytest.param('release', marks=[pytest.mark.supported_targets, pytest.mark.temp_skip_ci(targets=['esp32c6'], reason='c6 support TBD')]),
+    pytest.param('general', marks=[pytest.mark.supported_targets]),
+    pytest.param('release', marks=[pytest.mark.supported_targets]),
     pytest.param('single_core', marks=[pytest.mark.esp32]),
     pytest.param('freertos_compliance', marks=[pytest.mark.esp32]),
     pytest.param('isr_dispatch_esp32', marks=[pytest.mark.esp32]),
@@ -16,9 +16,7 @@ CONFIGS = [
 @pytest.mark.generic
 @pytest.mark.parametrize('config', CONFIGS, indirect=True)
 def test_esp_timer(dut: Dut) -> None:
-    dut.expect_exact('Press ENTER to see the list of tests')
-    dut.write('*')
-    dut.expect_unity_test_output(timeout=240)
+    dut.run_all_single_board_cases(timeout=120)
 
 
 @pytest.mark.esp32
@@ -27,9 +25,7 @@ def test_esp_timer(dut: Dut) -> None:
     'psram',
 ], indirect=True)
 def test_esp_timer_psram(dut: Dut) -> None:
-    dut.expect_exact('Press ENTER to see the list of tests')
-    dut.write('*')
-    dut.expect_unity_test_output(timeout=240)
+    dut.run_all_single_board_cases(timeout=120)
 
 
 @pytest.mark.esp32c2
@@ -43,6 +39,4 @@ def test_esp_timer_psram(dut: Dut) -> None:
     indirect=True,
 )
 def test_esp_timer_esp32c2_xtal_26mhz(dut: Dut) -> None:
-    dut.expect_exact('Press ENTER to see the list of tests')
-    dut.write('*')
-    dut.expect_unity_test_output(timeout=240)
+    dut.run_all_single_board_cases(timeout=120)
diff --git a/components/esp_timer/test_apps/sdkconfig.ci.psram b/components/esp_timer/test_apps/sdkconfig.ci.psram
index 319863e526..7986747f5d 100644
--- a/components/esp_timer/test_apps/sdkconfig.ci.psram
+++ b/components/esp_timer/test_apps/sdkconfig.ci.psram
@@ -1,3 +1,4 @@
+CONFIG_IDF_TARGET="esp32"
 CONFIG_SPIRAM=y
 CONFIG_ESP_INT_WDT_TIMEOUT_MS=800
 CONFIG_SPIRAM_OCCUPY_NO_HOST=y
diff --git a/components/esp_timer/test_apps/sdkconfig.ci.single_core b/components/esp_timer/test_apps/sdkconfig.ci.single_core
index f0b0b5e03d..5262d9dafb 100644
--- a/components/esp_timer/test_apps/sdkconfig.ci.single_core
+++ b/components/esp_timer/test_apps/sdkconfig.ci.single_core
@@ -1 +1,2 @@
+CONFIG_IDF_TARGET="esp32"
 CONFIG_FREERTOS_UNICORE=y
diff --git a/components/freertos/test_apps/freertos/kernel/stream_buffer/test_stream_buffers.c b/components/freertos/test_apps/freertos/kernel/stream_buffer/test_stream_buffers.c
index ded5bc1799..a4cb806134 100644
--- a/components/freertos/test_apps/freertos/kernel/stream_buffer/test_stream_buffers.c
+++ b/components/freertos/test_apps/freertos/kernel/stream_buffer/test_stream_buffers.c
@@ -1,5 +1,5 @@
 /*
- * SPDX-FileCopyrightText: 2022 Espressif Systems (Shanghai) CO LTD
+ * SPDX-FileCopyrightText: 2022-2023 Espressif Systems (Shanghai) CO LTD
  *
  * SPDX-License-Identifier: Apache-2.0
  */
@@ -15,7 +15,7 @@
 #include "unity.h"
 #include "test_utils.h"
 
-#if !TEMPORARY_DISABLED_FOR_TARGETS(ESP32C2, ESP32C3)
+#if !TEMPORARY_DISABLED_FOR_TARGETS(ESP32C2, ESP32C3, ESP32C6)
 typedef struct {
     StreamBufferHandle_t sb;
     SemaphoreHandle_t end_test;
diff --git a/components/freertos/test_apps/freertos/pytest_freertos.py b/components/freertos/test_apps/freertos/pytest_freertos.py
index b6467965af..2847089950 100644
--- a/components/freertos/test_apps/freertos/pytest_freertos.py
+++ b/components/freertos/test_apps/freertos/pytest_freertos.py
@@ -5,22 +5,19 @@ import pytest
 from pytest_embedded import Dut
 
 CONFIGS = [
-    pytest.param('default', marks=[pytest.mark.supported_targets, pytest.mark.temp_skip_ci(targets=['esp32c6'], reason='test failed')]),
-    pytest.param('freertos_options', marks=[pytest.mark.supported_targets, pytest.mark.temp_skip_ci(targets=['esp32c6'], reason='test failed')]),
+    pytest.param('default', marks=[pytest.mark.supported_targets]),
+    pytest.param('freertos_options', marks=[pytest.mark.supported_targets]),
     pytest.param('psram', marks=[pytest.mark.esp32]),
     pytest.param('release', marks=[pytest.mark.supported_targets]),
     pytest.param('single_core', marks=[pytest.mark.esp32]),
-    pytest.param('smp', marks=[pytest.mark.supported_targets, pytest.mark.temp_skip_ci(targets=['esp32c6'], reason='test failed')]),
+    pytest.param('smp', marks=[pytest.mark.supported_targets]),
 ]
 
 
 @pytest.mark.generic
 @pytest.mark.parametrize('config', CONFIGS, indirect=True)
 def test_freertos(dut: Dut) -> None:
-    dut.expect_exact('Press ENTER to see the list of tests')
-    dut.write('![ignore]')
-    # All of the FreeRTOS tests combined take > 60s to run. So we use a 120s timeout
-    dut.expect_unity_test_output(timeout=120)
+    dut.run_all_single_board_cases()
 
 
 @pytest.mark.supported_targets
diff --git a/components/heap/test_apps/main/test_malloc_caps.c b/components/heap/test_apps/main/test_malloc_caps.c
index b4943e3d79..44370beefc 100644
--- a/components/heap/test_apps/main/test_malloc_caps.c
+++ b/components/heap/test_apps/main/test_malloc_caps.c
@@ -44,7 +44,7 @@ TEST_CASE("Capabilities allocator test", "[heap]")
     TEST_ASSERT(free8<=(free8start-10*1024));
     TEST_ASSERT(free32<=(free32start-10*1024));
     //Assume we got DRAM back
-    TEST_ASSERT((((int)m1)&0xFF000000)==0x3F000000);
+    TEST_ASSERT(esp_ptr_in_dram(m1));
     free(m1);
 
     //The goal here is to allocate from IRAM. Since there is no external IRAM (yet)
diff --git a/components/heap/test_apps/pytest_heap.py b/components/heap/test_apps/pytest_heap.py
index 9f7be28ca1..26405d6cfc 100644
--- a/components/heap/test_apps/pytest_heap.py
+++ b/components/heap/test_apps/pytest_heap.py
@@ -7,7 +7,6 @@ from pytest_embedded import Dut
 
 @pytest.mark.generic
 @pytest.mark.supported_targets
-@pytest.mark.temp_skip_ci(targets=['esp32c6'], reason='test failed')
 @pytest.mark.parametrize(
     'config',
     [
@@ -17,9 +16,7 @@ from pytest_embedded import Dut
     ]
 )
 def test_heap_poisoning(dut: Dut) -> None:
-    dut.expect_exact('Press ENTER to see the list of tests')
-    dut.write('*')
-    dut.expect_unity_test_output(timeout=300)
+    dut.run_all_single_board_cases()
 
 
 @pytest.mark.generic
@@ -34,9 +31,7 @@ def test_heap_poisoning(dut: Dut) -> None:
     ]
 )
 def test_heap(dut: Dut) -> None:
-    dut.expect_exact('Press ENTER to see the list of tests')
-    dut.write('*')
-    dut.expect_unity_test_output(timeout=300)
+    dut.run_all_single_board_cases()
 
 
 @pytest.mark.generic
diff --git a/components/idf_test/include/esp32c6/idf_performance_target.h b/components/idf_test/include/esp32c6/idf_performance_target.h
index ee85593cde..3848d7a98e 100644
--- a/components/idf_test/include/esp32c6/idf_performance_target.h
+++ b/components/idf_test/include/esp32c6/idf_performance_target.h
@@ -6,6 +6,8 @@
 
 #pragma once
 
+#define IDF_PERFORMANCE_MAX_ESP_TIMER_GET_TIME_PER_CALL                         1200
+
 // ECC peripheral output at 160MHz
 #define IDF_PERFORMANCE_MAX_ECP_P192_POINT_MULTIPLY_OP                          5000
 #define IDF_PERFORMANCE_MAX_ECP_P192_POINT_VERIFY_OP                            60
diff --git a/components/newlib/.build-test-rules.yml b/components/newlib/.build-test-rules.yml
deleted file mode 100644
index 554a89aa6c..0000000000
--- a/components/newlib/.build-test-rules.yml
+++ /dev/null
@@ -1,7 +0,0 @@
-# Documentation: .gitlab/ci/README.md#manifest-file-to-control-the-buildtest-apps
-
-components/newlib/test_apps:
-  disable:
-    - if: IDF_TARGET == "esp32c6"
-      temporary: true
-      reason: target esp32c6 is not supported yet
diff --git a/components/newlib/test_apps/README.md b/components/newlib/test_apps/README.md
index f6be630bb4..a8b7833fa3 100644
--- a/components/newlib/test_apps/README.md
+++ b/components/newlib/test_apps/README.md
@@ -1,2 +1,2 @@
-| Supported Targets | ESP32 | ESP32-C2 | ESP32-C3 | ESP32-H2 | ESP32-S2 | ESP32-S3 |
-| ----------------- | ----- | -------- | -------- | -------- | -------- | -------- |
+| Supported Targets | ESP32 | ESP32-C2 | ESP32-C3 | ESP32-C6 | ESP32-H2 | ESP32-S2 | ESP32-S3 |
+| ----------------- | ----- | -------- | -------- | -------- | -------- | -------- | -------- |
diff --git a/components/newlib/test_apps/pytest_newlib.py b/components/newlib/test_apps/pytest_newlib.py
index 76b55367b8..0ad1a8bf81 100644
--- a/components/newlib/test_apps/pytest_newlib.py
+++ b/components/newlib/test_apps/pytest_newlib.py
@@ -1,4 +1,4 @@
-# SPDX-FileCopyrightText: 2022 Espressif Systems (Shanghai) CO LTD
+# SPDX-FileCopyrightText: 2022-2023 Espressif Systems (Shanghai) CO LTD
 # SPDX-License-Identifier: CC0-1.0
 
 import pytest
@@ -6,7 +6,6 @@ from pytest_embedded import Dut
 
 
 @pytest.mark.supported_targets
-@pytest.mark.temp_skip_ci(targets=['esp32c6'], reason='c6 support TBD')
 @pytest.mark.generic
 def test_newlib(dut: Dut) -> None:
     dut.expect_unity_test_output()