diff --git a/components/esp_rom/test_apps/rom_tests/CMakeLists.txt b/components/esp_rom/test_apps/rom_tests/CMakeLists.txt
index 5df555b801..a7941adf6a 100644
--- a/components/esp_rom/test_apps/rom_tests/CMakeLists.txt
+++ b/components/esp_rom/test_apps/rom_tests/CMakeLists.txt
@@ -2,4 +2,8 @@
 cmake_minimum_required(VERSION 3.16)
 
 include($ENV{IDF_PATH}/tools/cmake/project.cmake)
+
+#"Trim" the build. Include the minimal set of components, main, and anything it depends on.
+set(COMPONENTS main)
+
 project(esp_rom_test)
diff --git a/components/esp_rom/test_apps/rom_tests/main/CMakeLists.txt b/components/esp_rom/test_apps/rom_tests/main/CMakeLists.txt
index d5210ce411..f03fc2d4f6 100644
--- a/components/esp_rom/test_apps/rom_tests/main/CMakeLists.txt
+++ b/components/esp_rom/test_apps/rom_tests/main/CMakeLists.txt
@@ -8,4 +8,5 @@ endif()
 # In order for the cases defined by `TEST_CASE` to be linked into the final elf,
 # the component can be registered as WHOLE_ARCHIVE
 idf_component_register(SRCS ${srcs}
+                       PRIV_REQUIRES unity
                        WHOLE_ARCHIVE)
diff --git a/components/esp_system/test_apps/rtc_8md256/CMakeLists.txt b/components/esp_system/test_apps/rtc_8md256/CMakeLists.txt
index 4abd8b6941..372aa73140 100644
--- a/components/esp_system/test_apps/rtc_8md256/CMakeLists.txt
+++ b/components/esp_system/test_apps/rtc_8md256/CMakeLists.txt
@@ -2,4 +2,8 @@
 cmake_minimum_required(VERSION 3.16)
 
 include($ENV{IDF_PATH}/tools/cmake/project.cmake)
+
+#"Trim" the build. Include the minimal set of components, main, and anything it depends on.
+set(COMPONENTS main)
+
 project(rtc_8md256)
diff --git a/components/esp_system/test_apps/rtc_8md256/main/CMakeLists.txt b/components/esp_system/test_apps/rtc_8md256/main/CMakeLists.txt
index ab9076fd2d..3e8fc6861e 100644
--- a/components/esp_system/test_apps/rtc_8md256/main/CMakeLists.txt
+++ b/components/esp_system/test_apps/rtc_8md256/main/CMakeLists.txt
@@ -4,4 +4,5 @@ set(srcs "test_app_main.c"
 # In order for the cases defined by `TEST_CASE` to be linked into the final elf,
 # the component can be registered as WHOLE_ARCHIVE
 idf_component_register(SRCS ${srcs}
+                       PRIV_REQUIRES unity driver
                        WHOLE_ARCHIVE)
diff --git a/components/esp_system/test_apps/rtc_power_modes/CMakeLists.txt b/components/esp_system/test_apps/rtc_power_modes/CMakeLists.txt
index 30955fc750..c5bb799bbd 100644
--- a/components/esp_system/test_apps/rtc_power_modes/CMakeLists.txt
+++ b/components/esp_system/test_apps/rtc_power_modes/CMakeLists.txt
@@ -2,4 +2,8 @@
 cmake_minimum_required(VERSION 3.5)
 
 include($ENV{IDF_PATH}/tools/cmake/project.cmake)
+
+#"Trim" the build. Include the minimal set of components, main, and anything it depends on.
+set(COMPONENTS main)
+
 project(rtc_power_modes)
diff --git a/components/esp_system/test_apps/rtc_power_modes/main/CMakeLists.txt b/components/esp_system/test_apps/rtc_power_modes/main/CMakeLists.txt
index 858da47b58..802123e798 100644
--- a/components/esp_system/test_apps/rtc_power_modes/main/CMakeLists.txt
+++ b/components/esp_system/test_apps/rtc_power_modes/main/CMakeLists.txt
@@ -4,4 +4,5 @@ set(srcs "test_app_main.c"
 # In order for the cases defined by `TEST_CASE` to be linked into the final elf,
 # the component can be registered as WHOLE_ARCHIVE
 idf_component_register(SRCS ${srcs}
+                       PRIV_REQUIRES unity driver
                        WHOLE_ARCHIVE)
diff --git a/components/freertos/test_apps/freertos/CMakeLists.txt b/components/freertos/test_apps/freertos/CMakeLists.txt
index d3ff742e10..3d41d57ac1 100644
--- a/components/freertos/test_apps/freertos/CMakeLists.txt
+++ b/components/freertos/test_apps/freertos/CMakeLists.txt
@@ -15,10 +15,7 @@ list(APPEND EXTRA_COMPONENT_DIRS
      "$ENV{IDF_PATH}/tools/unit-test-app/components")   # For test_utils component
 
 #"Trim" the build. Include the minimal set of components, main, and anything it depends on.
-# Note: This is commented out for now due to pthread depending on vPortCleanUpTCB provided by "test_freertos_hooks.c".
-# pthread is no used in FreeRTOS unit tests, but is pulled in by esp_system due to another dependency.
-# Todo: Resolve this by either moving the "test_freertos_hooks.c" out, or solving the component dependencies.
-#set(COMPONENTS main)
+set(COMPONENTS main esp_psram ${test_types})
 
 include($ENV{IDF_PATH}/tools/cmake/project.cmake)
 project(freertos_test)
diff --git a/components/freertos/test_apps/freertos/sdkconfig.defaults b/components/freertos/test_apps/freertos/sdkconfig.defaults
index 8905783d27..fc55992c99 100644
--- a/components/freertos/test_apps/freertos/sdkconfig.defaults
+++ b/components/freertos/test_apps/freertos/sdkconfig.defaults
@@ -1,5 +1,5 @@
 CONFIG_ESP_MAIN_TASK_STACK_SIZE=8192
-CONFIG_ESP_TASK_WDT=n
+CONFIG_ESP_TASK_WDT_INIT=n
 CONFIG_FREERTOS_HZ=1000
 CONFIG_FREERTOS_THREAD_LOCAL_STORAGE_POINTERS=3
 CONFIG_FREERTOS_QUEUE_REGISTRY_SIZE=7
diff --git a/components/freertos/test_apps/orig_inc_path/CMakeLists.txt b/components/freertos/test_apps/orig_inc_path/CMakeLists.txt
index 1ddfb866ad..32cd29c21f 100644
--- a/components/freertos/test_apps/orig_inc_path/CMakeLists.txt
+++ b/components/freertos/test_apps/orig_inc_path/CMakeLists.txt
@@ -3,4 +3,8 @@
 cmake_minimum_required(VERSION 3.16)
 
 include($ENV{IDF_PATH}/tools/cmake/project.cmake)
+
+#"Trim" the build. Include the minimal set of components, main, and anything it depends on.
+set(COMPONENTS main)
+
 project(test_freertos_orig_inc_path)
diff --git a/components/heap/test_apps/heap_tests/CMakeLists.txt b/components/heap/test_apps/heap_tests/CMakeLists.txt
index b6174bb30a..6decbb7ca2 100644
--- a/components/heap/test_apps/heap_tests/CMakeLists.txt
+++ b/components/heap/test_apps/heap_tests/CMakeLists.txt
@@ -3,6 +3,10 @@
 cmake_minimum_required(VERSION 3.16)
 
 include($ENV{IDF_PATH}/tools/cmake/project.cmake)
+
+#"Trim" the build. Include the minimal set of components, main, and anything it depends on.
+set(COMPONENTS main)
+
 project(test_heap)
 
 if(CONFIG_COMPILER_DUMP_RTL_FILES)
diff --git a/components/heap/test_apps/heap_tests/main/CMakeLists.txt b/components/heap/test_apps/heap_tests/main/CMakeLists.txt
index d823d12c98..9e9d865371 100644
--- a/components/heap/test_apps/heap_tests/main/CMakeLists.txt
+++ b/components/heap/test_apps/heap_tests/main/CMakeLists.txt
@@ -11,4 +11,5 @@ set(src_test "test_heap_main.c"
 
 idf_component_register(SRCS ${src_test}
                        INCLUDE_DIRS "."
+                       REQUIRES unity esp_psram spi_flash
                        WHOLE_ARCHIVE)
diff --git a/components/mbedtls/test_apps/CMakeLists.txt b/components/mbedtls/test_apps/CMakeLists.txt
index 16481610bb..813f3a6946 100644
--- a/components/mbedtls/test_apps/CMakeLists.txt
+++ b/components/mbedtls/test_apps/CMakeLists.txt
@@ -3,5 +3,8 @@ cmake_minimum_required(VERSION 3.16)
 
 set(EXTRA_COMPONENT_DIRS "$ENV{IDF_PATH}/tools/unit-test-app/components")
 
+#"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)
 project(mbedtls_test)
diff --git a/components/mbedtls/test_apps/main/CMakeLists.txt b/components/mbedtls/test_apps/main/CMakeLists.txt
index 1017c93a5b..931e39b189 100644
--- a/components/mbedtls/test_apps/main/CMakeLists.txt
+++ b/components/mbedtls/test_apps/main/CMakeLists.txt
@@ -7,7 +7,7 @@ set(TEST_CRTS "crts/server_cert_chain.pem"
 
 idf_component_register(SRC_DIRS "."
                     PRIV_INCLUDE_DIRS "."
-                    PRIV_REQUIRES cmock test_utils mbedtls esp_timer unity spi_flash
+                    PRIV_REQUIRES cmock test_utils mbedtls esp_timer unity spi_flash esp_psram
                     EMBED_TXTFILES ${TEST_CRTS}
                     WHOLE_ARCHIVE)
 
diff --git a/tools/test_apps/build_system/embed_test/CMakeLists.txt b/tools/test_apps/build_system/embed_test/CMakeLists.txt
index f1989fb9a5..8459c78d7f 100644
--- a/tools/test_apps/build_system/embed_test/CMakeLists.txt
+++ b/tools/test_apps/build_system/embed_test/CMakeLists.txt
@@ -3,4 +3,8 @@
 cmake_minimum_required(VERSION 3.16)
 
 include($ENV{IDF_PATH}/tools/cmake/project.cmake)
+
+#"Trim" the build. Include the minimal set of components, main, and anything it depends on.
+set(COMPONENTS main)
+
 project(file_embed_test)
diff --git a/tools/test_apps/build_system/ldalign_test/CMakeLists.txt b/tools/test_apps/build_system/ldalign_test/CMakeLists.txt
index 94adb3a585..4a269001e1 100644
--- a/tools/test_apps/build_system/ldalign_test/CMakeLists.txt
+++ b/tools/test_apps/build_system/ldalign_test/CMakeLists.txt
@@ -3,6 +3,10 @@
 cmake_minimum_required(VERSION 3.16)
 
 include($ENV{IDF_PATH}/tools/cmake/project.cmake)
+
+#"Trim" the build. Include the minimal set of components, main, and anything it depends on.
+set(COMPONENTS main)
+
 project(ldalign_test)
 
 idf_build_get_property(python PYTHON)
diff --git a/tools/test_apps/build_system/ldgen_test/CMakeLists.txt b/tools/test_apps/build_system/ldgen_test/CMakeLists.txt
index bf6fc1bd6a..0cc92d4b72 100644
--- a/tools/test_apps/build_system/ldgen_test/CMakeLists.txt
+++ b/tools/test_apps/build_system/ldgen_test/CMakeLists.txt
@@ -3,6 +3,10 @@
 cmake_minimum_required(VERSION 3.16)
 
 include($ENV{IDF_PATH}/tools/cmake/project.cmake)
+
+#"Trim" the build. Include the minimal set of components, main, and anything it depends on.
+set(COMPONENTS main)
+
 project(ldgen_test)
 
 idf_build_get_property(python PYTHON)
diff --git a/tools/test_apps/system/build_test/CMakeLists.txt b/tools/test_apps/system/build_test/CMakeLists.txt
index 30f1440b4f..c475ac0440 100644
--- a/tools/test_apps/system/build_test/CMakeLists.txt
+++ b/tools/test_apps/system/build_test/CMakeLists.txt
@@ -3,4 +3,5 @@
 cmake_minimum_required(VERSION 3.16)
 
 include($ENV{IDF_PATH}/tools/cmake/project.cmake)
+
 project(test_build)