diff --git a/tools/test_apps/system/bootloader_sections/CMakeLists.txt b/tools/test_apps/system/bootloader_sections/CMakeLists.txt
index df25dbfb161..afc29574dc4 100644
--- a/tools/test_apps/system/bootloader_sections/CMakeLists.txt
+++ b/tools/test_apps/system/bootloader_sections/CMakeLists.txt
@@ -3,6 +3,7 @@
 cmake_minimum_required(VERSION 3.16)
 
 include($ENV{IDF_PATH}/tools/cmake/project.cmake)
+set(COMPONENTS main)
 project(test_build)
 
 add_custom_target(check_bootloader_sections ALL
diff --git a/tools/test_apps/system/cxx_no_except/CMakeLists.txt b/tools/test_apps/system/cxx_no_except/CMakeLists.txt
index 95526cf1a47..52816356622 100644
--- a/tools/test_apps/system/cxx_no_except/CMakeLists.txt
+++ b/tools/test_apps/system/cxx_no_except/CMakeLists.txt
@@ -3,4 +3,5 @@
 cmake_minimum_required(VERSION 3.16)
 
 include($ENV{IDF_PATH}/tools/cmake/project.cmake)
+set(COMPONENTS main)
 project(cxx_no_except)
diff --git a/tools/test_apps/system/cxx_pthread_bluetooth/CMakeLists.txt b/tools/test_apps/system/cxx_pthread_bluetooth/CMakeLists.txt
index a99b69ffc37..cd85707a092 100644
--- a/tools/test_apps/system/cxx_pthread_bluetooth/CMakeLists.txt
+++ b/tools/test_apps/system/cxx_pthread_bluetooth/CMakeLists.txt
@@ -3,4 +3,5 @@
 cmake_minimum_required(VERSION 3.16)
 
 include($ENV{IDF_PATH}/tools/cmake/project.cmake)
+set(COMPONENTS main)
 project(cpp_pthread)
diff --git a/tools/test_apps/system/cxx_pthread_bluetooth/main/CMakeLists.txt b/tools/test_apps/system/cxx_pthread_bluetooth/main/CMakeLists.txt
index 3be8a73643f..a544dc4fed4 100644
--- a/tools/test_apps/system/cxx_pthread_bluetooth/main/CMakeLists.txt
+++ b/tools/test_apps/system/cxx_pthread_bluetooth/main/CMakeLists.txt
@@ -1,2 +1,3 @@
 idf_component_register(SRCS "cpp_pthread.cpp"
-                    INCLUDE_DIRS ".")
+                    INCLUDE_DIRS "."
+                    PRIV_REQUIRES pthread bt)
diff --git a/tools/test_apps/system/eh_frame/CMakeLists.txt b/tools/test_apps/system/eh_frame/CMakeLists.txt
index 51e1dc8ca50..d6864816d48 100644
--- a/tools/test_apps/system/eh_frame/CMakeLists.txt
+++ b/tools/test_apps/system/eh_frame/CMakeLists.txt
@@ -3,4 +3,5 @@
 cmake_minimum_required(VERSION 3.16)
 
 include($ENV{IDF_PATH}/tools/cmake/project.cmake)
+set(COMPONENTS main)
 project(eh_frame)
diff --git a/tools/test_apps/system/gdb/CMakeLists.txt b/tools/test_apps/system/gdb/CMakeLists.txt
index 1c0bd709037..312893908e3 100644
--- a/tools/test_apps/system/gdb/CMakeLists.txt
+++ b/tools/test_apps/system/gdb/CMakeLists.txt
@@ -3,4 +3,5 @@
 cmake_minimum_required(VERSION 3.16)
 
 include($ENV{IDF_PATH}/tools/cmake/project.cmake)
+set(COMPONENTS main)
 project(gdb)
diff --git a/tools/test_apps/system/gdb_loadable_elf/CMakeLists.txt b/tools/test_apps/system/gdb_loadable_elf/CMakeLists.txt
index cfed7b13e2e..429ba2dec7e 100644
--- a/tools/test_apps/system/gdb_loadable_elf/CMakeLists.txt
+++ b/tools/test_apps/system/gdb_loadable_elf/CMakeLists.txt
@@ -3,4 +3,5 @@
 cmake_minimum_required(VERSION 3.16)
 
 include($ENV{IDF_PATH}/tools/cmake/project.cmake)
+set(COMPONENTS main)
 project(gdb_loadable_elf)
diff --git a/tools/test_apps/system/gdb_loadable_elf/main/CMakeLists.txt b/tools/test_apps/system/gdb_loadable_elf/main/CMakeLists.txt
index 69def7bc1d8..21b95f284b5 100644
--- a/tools/test_apps/system/gdb_loadable_elf/main/CMakeLists.txt
+++ b/tools/test_apps/system/gdb_loadable_elf/main/CMakeLists.txt
@@ -1,3 +1,4 @@
 idf_component_register(SRCS "hello_world_main.c"
-                    INCLUDE_DIRS "")
+                    INCLUDE_DIRS ""
+                    PRIV_REQUIRES vfs spi_flash)
 target_compile_options(${COMPONENT_LIB} PRIVATE "-Wno-format")
diff --git a/tools/test_apps/system/longjmp_test/CMakeLists.txt b/tools/test_apps/system/longjmp_test/CMakeLists.txt
index 18d382fae12..21991dc0ab7 100644
--- a/tools/test_apps/system/longjmp_test/CMakeLists.txt
+++ b/tools/test_apps/system/longjmp_test/CMakeLists.txt
@@ -3,4 +3,5 @@
 cmake_minimum_required(VERSION 3.16)
 
 include($ENV{IDF_PATH}/tools/cmake/project.cmake)
+set(COMPONENTS main)
 project(longjmp_test)
diff --git a/tools/test_apps/system/longjmp_test/main/CMakeLists.txt b/tools/test_apps/system/longjmp_test/main/CMakeLists.txt
index 69def7bc1d8..d2811d0fb79 100644
--- a/tools/test_apps/system/longjmp_test/main/CMakeLists.txt
+++ b/tools/test_apps/system/longjmp_test/main/CMakeLists.txt
@@ -1,3 +1,4 @@
 idf_component_register(SRCS "hello_world_main.c"
-                    INCLUDE_DIRS "")
+                    INCLUDE_DIRS ""
+                    PRIV_REQUIRES esp_timer spi_flash)
 target_compile_options(${COMPONENT_LIB} PRIVATE "-Wno-format")
diff --git a/tools/test_apps/system/memprot/CMakeLists.txt b/tools/test_apps/system/memprot/CMakeLists.txt
index 786665248b3..faf4e999447 100644
--- a/tools/test_apps/system/memprot/CMakeLists.txt
+++ b/tools/test_apps/system/memprot/CMakeLists.txt
@@ -2,11 +2,11 @@ cmake_minimum_required(VERSION 3.16)
 
 if((IDF_TARGET STREQUAL "esp32s2") OR (IDF_TARGET STREQUAL "esp32c3") OR (IDF_TARGET STREQUAL "esp32s3"))
     include($ENV{IDF_PATH}/tools/cmake/project.cmake)
+    set(COMPONENTS main)
     project(test_memprot)
 
     target_link_libraries(${project_elf} PRIVATE
             "-Wl,--wrap=esp_panic_handler"
             "-Wl,--wrap=esp_panic_handler_reconfigure_wdts"
             "-Wl,--wrap=esp_cpu_stall")
-
 endif()
diff --git a/tools/test_apps/system/monitor_addr_lookup/CMakeLists.txt b/tools/test_apps/system/monitor_addr_lookup/CMakeLists.txt
index ce8f5f33987..f3832d97d0c 100644
--- a/tools/test_apps/system/monitor_addr_lookup/CMakeLists.txt
+++ b/tools/test_apps/system/monitor_addr_lookup/CMakeLists.txt
@@ -1,4 +1,5 @@
 cmake_minimum_required(VERSION 3.16)
 
 include($ENV{IDF_PATH}/tools/cmake/project.cmake)
+set(COMPONENTS main)
 project(monitor_addr_lookup)
diff --git a/tools/test_apps/system/monitor_ide_integration/CMakeLists.txt b/tools/test_apps/system/monitor_ide_integration/CMakeLists.txt
index c5e3c8798d7..ae472ee1a60 100644
--- a/tools/test_apps/system/monitor_ide_integration/CMakeLists.txt
+++ b/tools/test_apps/system/monitor_ide_integration/CMakeLists.txt
@@ -1,4 +1,5 @@
 cmake_minimum_required(VERSION 3.16)
 
 include($ENV{IDF_PATH}/tools/cmake/project.cmake)
+set(COMPONENTS main esp_gdbstub espcoredump)
 project(panic)
diff --git a/tools/test_apps/system/no_embedded_paths/CMakeLists.txt b/tools/test_apps/system/no_embedded_paths/CMakeLists.txt
index b4c6cfcef42..3e84ee3ba4d 100644
--- a/tools/test_apps/system/no_embedded_paths/CMakeLists.txt
+++ b/tools/test_apps/system/no_embedded_paths/CMakeLists.txt
@@ -3,6 +3,7 @@
 cmake_minimum_required(VERSION 3.16)
 
 include($ENV{IDF_PATH}/tools/cmake/project.cmake)
+set(COMPONENTS main)
 project(no_embedded_paths)
 
 idf_build_get_property(idf_path IDF_PATH)
diff --git a/tools/test_apps/system/no_embedded_paths/main/CMakeLists.txt b/tools/test_apps/system/no_embedded_paths/main/CMakeLists.txt
index 5121b33045c..155ae19caeb 100644
--- a/tools/test_apps/system/no_embedded_paths/main/CMakeLists.txt
+++ b/tools/test_apps/system/no_embedded_paths/main/CMakeLists.txt
@@ -1,2 +1,3 @@
 idf_component_register(SRCS "test_no_embedded_paths_main.c"
-                       INCLUDE_DIRS ".")
+                       INCLUDE_DIRS "."
+                       PRIV_REQUIRES bt)
diff --git a/tools/test_apps/system/panic/main/CMakeLists.txt b/tools/test_apps/system/panic/main/CMakeLists.txt
index fbc916d8f39..786768666cd 100644
--- a/tools/test_apps/system/panic/main/CMakeLists.txt
+++ b/tools/test_apps/system/panic/main/CMakeLists.txt
@@ -13,4 +13,5 @@ endif()
 
 idf_component_register(SRCS "${srcs}"
                         INCLUDE_DIRS "include"
-                        REQUIRES spi_flash esp_psram esp_system esp_partition)
+                        REQUIRES spi_flash esp_psram esp_system esp_partition
+                        PRIV_REQUIRES esp_gdbstub)
diff --git a/tools/test_apps/system/ram_loadable_app/CMakeLists.txt b/tools/test_apps/system/ram_loadable_app/CMakeLists.txt
index 32cc85adf55..c8d265a4367 100644
--- a/tools/test_apps/system/ram_loadable_app/CMakeLists.txt
+++ b/tools/test_apps/system/ram_loadable_app/CMakeLists.txt
@@ -3,4 +3,5 @@
 cmake_minimum_required(VERSION 3.16)
 
 include($ENV{IDF_PATH}/tools/cmake/project.cmake)
+set(COMPONENTS main)
 project(ram_loadable_app)
diff --git a/tools/test_apps/system/ram_loadable_app/main/CMakeLists.txt b/tools/test_apps/system/ram_loadable_app/main/CMakeLists.txt
index 5d72a371fca..9da2cfe77dc 100644
--- a/tools/test_apps/system/ram_loadable_app/main/CMakeLists.txt
+++ b/tools/test_apps/system/ram_loadable_app/main/CMakeLists.txt
@@ -1,2 +1,3 @@
 idf_component_register(SRCS "ram_loadable_app_test.c"
-                    INCLUDE_DIRS "")
+                    INCLUDE_DIRS ""
+                    PRIV_REQUIRES unity spi_flash)
diff --git a/tools/test_apps/system/ram_loadable_app/sdkconfig.defaults b/tools/test_apps/system/ram_loadable_app/sdkconfig.defaults
index 6c0ad38fadf..ffa7983c0fd 100644
--- a/tools/test_apps/system/ram_loadable_app/sdkconfig.defaults
+++ b/tools/test_apps/system/ram_loadable_app/sdkconfig.defaults
@@ -1,8 +1,5 @@
 CONFIG_APP_BUILD_TYPE_RAM=y
 
-# Save size
-CONFIG_VFS_SUPPORT_IO=n
-
 # Reset is meaningless to ram_app
 CONFIG_ESP_SYSTEM_PANIC_PRINT_HALT=y
 
diff --git a/tools/test_apps/system/ram_loadable_app/sdkconfig.defaults.esp32 b/tools/test_apps/system/ram_loadable_app/sdkconfig.defaults.esp32
index 8feb070c3aa..d2816a3ebd6 100644
--- a/tools/test_apps/system/ram_loadable_app/sdkconfig.defaults.esp32
+++ b/tools/test_apps/system/ram_loadable_app/sdkconfig.defaults.esp32
@@ -1,8 +1,5 @@
 CONFIG_APP_BUILD_TYPE_RAM=y
 
-# Save size
-CONFIG_VFS_SUPPORT_TERMIOS=n
-
 # Reset is meaningless to ram_app
 CONFIG_ESP_SYSTEM_PANIC_PRINT_HALT=y
 
diff --git a/tools/test_apps/system/startup/CMakeLists.txt b/tools/test_apps/system/startup/CMakeLists.txt
index 4029f389fb6..5eb6af10065 100644
--- a/tools/test_apps/system/startup/CMakeLists.txt
+++ b/tools/test_apps/system/startup/CMakeLists.txt
@@ -3,4 +3,5 @@
 cmake_minimum_required(VERSION 3.16)
 
 include($ENV{IDF_PATH}/tools/cmake/project.cmake)
+set(COMPONENTS main)
 project(test_startup)
diff --git a/tools/test_apps/system/startup/main/CMakeLists.txt b/tools/test_apps/system/startup/main/CMakeLists.txt
index 2ba0fd3b3f1..d8cafa870c4 100644
--- a/tools/test_apps/system/startup/main/CMakeLists.txt
+++ b/tools/test_apps/system/startup/main/CMakeLists.txt
@@ -1,5 +1,6 @@
 idf_component_register(SRCS "test_startup_main.c"
-                       INCLUDE_DIRS ".")
+                       INCLUDE_DIRS "."
+                       PRIV_REQUIRES vfs)
 
 if(CONFIG_SINGLE_CORE_VARIANT)
     target_sources(${COMPONENT_LIB} PRIVATE "${CMAKE_CURRENT_LIST_DIR}/chip_info_patch.c")
diff --git a/tools/test_apps/system/unicore_bootloader/CMakeLists.txt b/tools/test_apps/system/unicore_bootloader/CMakeLists.txt
index 7031a761987..4b2055a9ab6 100644
--- a/tools/test_apps/system/unicore_bootloader/CMakeLists.txt
+++ b/tools/test_apps/system/unicore_bootloader/CMakeLists.txt
@@ -3,4 +3,5 @@
 cmake_minimum_required(VERSION 3.16)
 
 include($ENV{IDF_PATH}/tools/cmake/project.cmake)
+set(COMPONENTS main)
 project(test_unicore_bootloader)