diff --git a/components/bootloader_support/test_apps/bootloader_support/CMakeLists.txt b/components/bootloader_support/test_apps/bootloader_support/CMakeLists.txt
index c7032d6984..d3ffaaeb9f 100644
--- a/components/bootloader_support/test_apps/bootloader_support/CMakeLists.txt
+++ b/components/bootloader_support/test_apps/bootloader_support/CMakeLists.txt
@@ -4,8 +4,7 @@ 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")
+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/bootloader_support/test_apps/rtc_custom_section/CMakeLists.txt b/components/bootloader_support/test_apps/rtc_custom_section/CMakeLists.txt
index c56be3f5e7..9ee1da748f 100644
--- a/components/bootloader_support/test_apps/rtc_custom_section/CMakeLists.txt
+++ b/components/bootloader_support/test_apps/rtc_custom_section/CMakeLists.txt
@@ -4,8 +4,7 @@ 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")
+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/console/test_apps/console/CMakeLists.txt b/components/console/test_apps/console/CMakeLists.txt
index 592b202ce8..12837206f8 100644
--- a/components/console/test_apps/console/CMakeLists.txt
+++ b/components/console/test_apps/console/CMakeLists.txt
@@ -4,8 +4,7 @@ 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")
+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/esp_common/test_apps/esp_common/CMakeLists.txt b/components/esp_common/test_apps/esp_common/CMakeLists.txt
index 5175d340d1..53d1167cdf 100644
--- a/components/esp_common/test_apps/esp_common/CMakeLists.txt
+++ b/components/esp_common/test_apps/esp_common/CMakeLists.txt
@@ -4,8 +4,7 @@ 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")
+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/esp_event/test_apps/CMakeLists.txt b/components/esp_event/test_apps/CMakeLists.txt
index e9db1cddb0..320d15895c 100644
--- a/components/esp_event/test_apps/CMakeLists.txt
+++ b/components/esp_event/test_apps/CMakeLists.txt
@@ -5,8 +5,7 @@ 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")
+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/esp_hw_support/test_apps/esp_hw_support_unity_tests/CMakeLists.txt b/components/esp_hw_support/test_apps/esp_hw_support_unity_tests/CMakeLists.txt
index 2a66fa335e..fb724b12bb 100644
--- a/components/esp_hw_support/test_apps/esp_hw_support_unity_tests/CMakeLists.txt
+++ b/components/esp_hw_support/test_apps/esp_hw_support_unity_tests/CMakeLists.txt
@@ -4,8 +4,7 @@ cmake_minimum_required(VERSION 3.16)
 set(COMPONENTS main)
 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")
+list(PREPEND SDKCONFIG_DEFAULTS "$ENV{IDF_PATH}/tools/test_apps/configs/sdkconfig.debug_helpers" "sdkconfig.defaults")
 
 include($ENV{IDF_PATH}/tools/cmake/project.cmake)
 project(esp_hw_support_unity)
diff --git a/components/esp_hw_support/test_apps/rtc_clk/CMakeLists.txt b/components/esp_hw_support/test_apps/rtc_clk/CMakeLists.txt
index 9ced12d554..d259ce59bb 100644
--- a/components/esp_hw_support/test_apps/rtc_clk/CMakeLists.txt
+++ b/components/esp_hw_support/test_apps/rtc_clk/CMakeLists.txt
@@ -4,8 +4,7 @@ cmake_minimum_required(VERSION 3.16)
 set(COMPONENTS main)
 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")
+list(PREPEND SDKCONFIG_DEFAULTS "$ENV{IDF_PATH}/tools/test_apps/configs/sdkconfig.debug_helpers" "sdkconfig.defaults")
 
 include($ENV{IDF_PATH}/tools/cmake/project.cmake)
 project(rtc_clk)
diff --git a/components/esp_hw_support/test_apps/security_support/esp_hw_support_unity_tests/CMakeLists.txt b/components/esp_hw_support/test_apps/security_support/esp_hw_support_unity_tests/CMakeLists.txt
index 963a775cae..64fba88871 100644
--- a/components/esp_hw_support/test_apps/security_support/esp_hw_support_unity_tests/CMakeLists.txt
+++ b/components/esp_hw_support/test_apps/security_support/esp_hw_support_unity_tests/CMakeLists.txt
@@ -4,8 +4,7 @@ cmake_minimum_required(VERSION 3.16)
 set(COMPONENTS main)
 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")
+list(PREPEND SDKCONFIG_DEFAULTS "$ENV{IDF_PATH}/tools/test_apps/configs/sdkconfig.debug_helpers" "sdkconfig.defaults")
 
 include($ENV{IDF_PATH}/tools/cmake/project.cmake)
 project(test_app_security_support)
diff --git a/components/esp_pm/pm_trace.c b/components/esp_pm/pm_trace.c
index c23d10e099..98b8a663c1 100644
--- a/components/esp_pm/pm_trace.c
+++ b/components/esp_pm/pm_trace.c
@@ -15,7 +15,7 @@
  * Feel free to change when debugging.
  */
 static const int DRAM_ATTR s_trace_io[] = {
-#if !defined(CONFIG_IDF_TARGET_ESP32C3) && !defined(CONFIG_IDF_TARGET_ESP32C2)
+#if CONFIG_IDF_TARGET_ESP32 || CONFIG_IDF_TARGET_ESP32S2 || CONFIG_IDF_TARGET_ESP32S3
     BIT(4),  BIT(5),  // ESP_PM_TRACE_IDLE
     BIT(16), BIT(17), // ESP_PM_TRACE_TICK
     BIT(18), BIT(18), // ESP_PM_TRACE_FREQ_SWITCH
diff --git a/components/esp_pm/test_apps/esp_pm/CMakeLists.txt b/components/esp_pm/test_apps/esp_pm/CMakeLists.txt
index 78b5424a0c..5ffebff979 100644
--- a/components/esp_pm/test_apps/esp_pm/CMakeLists.txt
+++ b/components/esp_pm/test_apps/esp_pm/CMakeLists.txt
@@ -2,8 +2,7 @@
 # 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")
+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/esp_ringbuf/test_apps/CMakeLists.txt b/components/esp_ringbuf/test_apps/CMakeLists.txt
index 0329886708..18338d23a2 100644
--- a/components/esp_ringbuf/test_apps/CMakeLists.txt
+++ b/components/esp_ringbuf/test_apps/CMakeLists.txt
@@ -2,8 +2,7 @@
 # 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")
+list(PREPEND SDKCONFIG_DEFAULTS "$ENV{IDF_PATH}/tools/test_apps/configs/sdkconfig.debug_helpers")
 
 # "Trim" the build. Include the minimal set of components, main, and anything it depends on.
 set(COMPONENTS main)
diff --git a/components/esp_system/test_apps/esp_system_unity_tests/CMakeLists.txt b/components/esp_system/test_apps/esp_system_unity_tests/CMakeLists.txt
index 5b00be7c72..1dabba76a0 100644
--- a/components/esp_system/test_apps/esp_system_unity_tests/CMakeLists.txt
+++ b/components/esp_system/test_apps/esp_system_unity_tests/CMakeLists.txt
@@ -4,8 +4,7 @@ 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")
+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/esp_timer/test_apps/CMakeLists.txt b/components/esp_timer/test_apps/CMakeLists.txt
index 751ac01aa4..200a66a8d0 100644
--- a/components/esp_timer/test_apps/CMakeLists.txt
+++ b/components/esp_timer/test_apps/CMakeLists.txt
@@ -1,8 +1,7 @@
 #This is the project CMakeLists.txt file for the test subproject
 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")
+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/ulp/test_apps/lp_core/CMakeLists.txt b/components/ulp/test_apps/lp_core/CMakeLists.txt
index 276fd98fd8..f4ad6a09d6 100644
--- a/components/ulp/test_apps/lp_core/CMakeLists.txt
+++ b/components/ulp/test_apps/lp_core/CMakeLists.txt
@@ -1,8 +1,7 @@
 # This is the project CMakeLists.txt file for the test subproject
 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")
+list(PREPEND SDKCONFIG_DEFAULTS "$ENV{IDF_PATH}/tools/test_apps/configs/sdkconfig.debug_helpers" "sdkconfig.defaults")
 
 include($ENV{IDF_PATH}/tools/cmake/project.cmake)
 project(lp_core_test)
diff --git a/components/ulp/test_apps/ulp_fsm/CMakeLists.txt b/components/ulp/test_apps/ulp_fsm/CMakeLists.txt
index 3049168de6..e815481cb1 100644
--- a/components/ulp/test_apps/ulp_fsm/CMakeLists.txt
+++ b/components/ulp/test_apps/ulp_fsm/CMakeLists.txt
@@ -1,8 +1,7 @@
 # This is the project CMakeLists.txt file for the test subproject
 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")
+list(PREPEND SDKCONFIG_DEFAULTS "$ENV{IDF_PATH}/tools/test_apps/configs/sdkconfig.debug_helpers" "sdkconfig.defaults")
 
 include($ENV{IDF_PATH}/tools/cmake/project.cmake)
 project(ulp_fsm_test)
diff --git a/components/ulp/test_apps/ulp_riscv/CMakeLists.txt b/components/ulp/test_apps/ulp_riscv/CMakeLists.txt
index dd825eab2b..eba0bce558 100644
--- a/components/ulp/test_apps/ulp_riscv/CMakeLists.txt
+++ b/components/ulp/test_apps/ulp_riscv/CMakeLists.txt
@@ -1,8 +1,7 @@
 # This is the project CMakeLists.txt file for the test subproject
 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")
+list(PREPEND SDKCONFIG_DEFAULTS "$ENV{IDF_PATH}/tools/test_apps/configs/sdkconfig.debug_helpers" "sdkconfig.defaults")
 
 include($ENV{IDF_PATH}/tools/cmake/project.cmake)
 project(ulp_riscv_test)
diff --git a/tools/test_apps/configs/README.md b/tools/test_apps/configs/README.md
index a2cbbd9e96..3e3c63e97b 100644
--- a/tools/test_apps/configs/README.md
+++ b/tools/test_apps/configs/README.md
@@ -7,8 +7,7 @@ To facilitiate re-use, this folder contains some of the most common ones.
 These can then be added to the list of default configs in test apps:
 
 ```
-set(SDKCONFIG_DEFAULTS "$ENV{IDF_PATH}/tools/test_apps/configs/sdkconfig.debug_helpers")
-list(APPEND SDKCONFIG_DEFAULTS "sdkconfig.defaults")
+list(PREPEND SDKCONFIG_DEFAULTS "$ENV{IDF_PATH}/tools/test_apps/configs/sdkconfig.debug_helpers" "sdkconfig.defaults")
 ```
 
 Note that this must be set in the top-level project `CMakelist.txt`.