diff --git a/components/app_update/test_apps/.build-test-rules.yml b/components/app_update/test_apps/test_app_update/.build-test-rules.yml
similarity index 100%
rename from components/app_update/test_apps/.build-test-rules.yml
rename to components/app_update/test_apps/test_app_update/.build-test-rules.yml
diff --git a/components/app_update/test_apps/CMakeLists.txt b/components/app_update/test_apps/test_app_update/CMakeLists.txt
similarity index 100%
rename from components/app_update/test_apps/CMakeLists.txt
rename to components/app_update/test_apps/test_app_update/CMakeLists.txt
diff --git a/components/app_update/test_apps/README.md b/components/app_update/test_apps/test_app_update/README.md
similarity index 100%
rename from components/app_update/test_apps/README.md
rename to components/app_update/test_apps/test_app_update/README.md
diff --git a/components/app_update/test_apps/main/CMakeLists.txt b/components/app_update/test_apps/test_app_update/main/CMakeLists.txt
similarity index 100%
rename from components/app_update/test_apps/main/CMakeLists.txt
rename to components/app_update/test_apps/test_app_update/main/CMakeLists.txt
diff --git a/components/app_update/test_apps/main/app_main.c b/components/app_update/test_apps/test_app_update/main/app_main.c
similarity index 100%
rename from components/app_update/test_apps/main/app_main.c
rename to components/app_update/test_apps/test_app_update/main/app_main.c
diff --git a/components/app_update/test_apps/main/test_ota_ops.c b/components/app_update/test_apps/test_app_update/main/test_ota_ops.c
similarity index 100%
rename from components/app_update/test_apps/main/test_ota_ops.c
rename to components/app_update/test_apps/test_app_update/main/test_ota_ops.c
diff --git a/components/app_update/test_apps/main/test_switch_ota.c b/components/app_update/test_apps/test_app_update/main/test_switch_ota.c
similarity index 100%
rename from components/app_update/test_apps/main/test_switch_ota.c
rename to components/app_update/test_apps/test_app_update/main/test_switch_ota.c
diff --git a/components/app_update/test_apps/partition_table_unit_test_two_ota.csv b/components/app_update/test_apps/test_app_update/partition_table_unit_test_two_ota.csv
similarity index 100%
rename from components/app_update/test_apps/partition_table_unit_test_two_ota.csv
rename to components/app_update/test_apps/test_app_update/partition_table_unit_test_two_ota.csv
diff --git a/components/app_update/test_apps/partition_table_unit_test_two_ota_2m.csv b/components/app_update/test_apps/test_app_update/partition_table_unit_test_two_ota_2m.csv
similarity index 100%
rename from components/app_update/test_apps/partition_table_unit_test_two_ota_2m.csv
rename to components/app_update/test_apps/test_app_update/partition_table_unit_test_two_ota_2m.csv
diff --git a/components/app_update/test_apps/pytest_app_update_ut.py b/components/app_update/test_apps/test_app_update/pytest_app_update_ut.py
similarity index 100%
rename from components/app_update/test_apps/pytest_app_update_ut.py
rename to components/app_update/test_apps/test_app_update/pytest_app_update_ut.py
diff --git a/components/app_update/test_apps/sdkconfig.ci.defaults b/components/app_update/test_apps/test_app_update/sdkconfig.ci.defaults
similarity index 100%
rename from components/app_update/test_apps/sdkconfig.ci.defaults
rename to components/app_update/test_apps/test_app_update/sdkconfig.ci.defaults
diff --git a/components/app_update/test_apps/sdkconfig.ci.xip_psram b/components/app_update/test_apps/test_app_update/sdkconfig.ci.xip_psram
similarity index 100%
rename from components/app_update/test_apps/sdkconfig.ci.xip_psram
rename to components/app_update/test_apps/test_app_update/sdkconfig.ci.xip_psram
diff --git a/components/app_update/test_apps/sdkconfig.ci.xip_psram_with_rom_impl b/components/app_update/test_apps/test_app_update/sdkconfig.ci.xip_psram_with_rom_impl
similarity index 100%
rename from components/app_update/test_apps/sdkconfig.ci.xip_psram_with_rom_impl
rename to components/app_update/test_apps/test_app_update/sdkconfig.ci.xip_psram_with_rom_impl
diff --git a/components/app_update/test_apps/sdkconfig.defaults b/components/app_update/test_apps/test_app_update/sdkconfig.defaults
similarity index 100%
rename from components/app_update/test_apps/sdkconfig.defaults
rename to components/app_update/test_apps/test_app_update/sdkconfig.defaults
diff --git a/components/app_update/test_apps/sdkconfig.defaults.esp32 b/components/app_update/test_apps/test_app_update/sdkconfig.defaults.esp32
similarity index 100%
rename from components/app_update/test_apps/sdkconfig.defaults.esp32
rename to components/app_update/test_apps/test_app_update/sdkconfig.defaults.esp32
diff --git a/components/app_update/test_apps/sdkconfig.defaults.esp32c2 b/components/app_update/test_apps/test_app_update/sdkconfig.defaults.esp32c2
similarity index 100%
rename from components/app_update/test_apps/sdkconfig.defaults.esp32c2
rename to components/app_update/test_apps/test_app_update/sdkconfig.defaults.esp32c2
diff --git a/components/app_update/test_apps/sdkconfig.defaults.esp32c3 b/components/app_update/test_apps/test_app_update/sdkconfig.defaults.esp32c3
similarity index 100%
rename from components/app_update/test_apps/sdkconfig.defaults.esp32c3
rename to components/app_update/test_apps/test_app_update/sdkconfig.defaults.esp32c3
diff --git a/components/app_update/test_apps/sdkconfig.defaults.esp32c6 b/components/app_update/test_apps/test_app_update/sdkconfig.defaults.esp32c6
similarity index 100%
rename from components/app_update/test_apps/sdkconfig.defaults.esp32c6
rename to components/app_update/test_apps/test_app_update/sdkconfig.defaults.esp32c6
diff --git a/components/app_update/test_apps/sdkconfig.defaults.esp32h2 b/components/app_update/test_apps/test_app_update/sdkconfig.defaults.esp32h2
similarity index 100%
rename from components/app_update/test_apps/sdkconfig.defaults.esp32h2
rename to components/app_update/test_apps/test_app_update/sdkconfig.defaults.esp32h2
diff --git a/components/app_update/test_apps/sdkconfig.defaults.esp32p4 b/components/app_update/test_apps/test_app_update/sdkconfig.defaults.esp32p4
similarity index 100%
rename from components/app_update/test_apps/sdkconfig.defaults.esp32p4
rename to components/app_update/test_apps/test_app_update/sdkconfig.defaults.esp32p4
diff --git a/components/app_update/test_apps/sdkconfig.defaults.esp32s2 b/components/app_update/test_apps/test_app_update/sdkconfig.defaults.esp32s2
similarity index 100%
rename from components/app_update/test_apps/sdkconfig.defaults.esp32s2
rename to components/app_update/test_apps/test_app_update/sdkconfig.defaults.esp32s2
diff --git a/components/app_update/test_apps/sdkconfig.defaults.esp32s3 b/components/app_update/test_apps/test_app_update/sdkconfig.defaults.esp32s3
similarity index 100%
rename from components/app_update/test_apps/sdkconfig.defaults.esp32s3
rename to components/app_update/test_apps/test_app_update/sdkconfig.defaults.esp32s3