diff --git a/components/esp_hw_support/.build-test-rules.yml b/components/esp_hw_support/.build-test-rules.yml
index 41b011ed05..a81d81ab5c 100644
--- a/components/esp_hw_support/.build-test-rules.yml
+++ b/components/esp_hw_support/.build-test-rules.yml
@@ -17,19 +17,31 @@ components/esp_hw_support/test_apps/etm:
 components/esp_hw_support/test_apps/host_test_linux:
   enable:
     - if: IDF_TARGET == "linux"
+
 components/esp_hw_support/test_apps/mspi:
   disable:
     - if: IDF_TARGET != "esp32s3"
+
 components/esp_hw_support/test_apps/mspi_psram_with_dfs:
   disable:
     - if: IDF_TARGET != "esp32s3"
 
+components/esp_hw_support/test_apps/rtc_8md256:
+  disable:
+    - if: SOC_RTC_SLOW_CLK_SUPPORT_RC_FAST_D256 != 1
+
 components/esp_hw_support/test_apps/rtc_clk:
   disable:
     - if: IDF_TARGET in ["esp32c6", "esp32h2"]
       temporary: true
       reason: Unsupported on C6 for now. TODO IDF-5645
 
+components/esp_hw_support/test_apps/rtc_power_modes:
+  enable:
+    - if: IDF_TARGET in ["esp32s2", "esp32s3", "esp32c2", "esp32c3"]
+      temporary: true
+      reason: the other targets are not tested yet
+
 components/esp_hw_support/test_apps/security_support/esp_hw_support_unity_tests:
   disable_test:
     - if: IDF_TARGET in ["esp32h2"]
diff --git a/components/esp_system/test_apps/rtc_8md256/CMakeLists.txt b/components/esp_hw_support/test_apps/rtc_8md256/CMakeLists.txt
similarity index 100%
rename from components/esp_system/test_apps/rtc_8md256/CMakeLists.txt
rename to components/esp_hw_support/test_apps/rtc_8md256/CMakeLists.txt
diff --git a/components/esp_system/test_apps/rtc_8md256/README.md b/components/esp_hw_support/test_apps/rtc_8md256/README.md
similarity index 100%
rename from components/esp_system/test_apps/rtc_8md256/README.md
rename to components/esp_hw_support/test_apps/rtc_8md256/README.md
diff --git a/components/esp_system/test_apps/rtc_8md256/main/CMakeLists.txt b/components/esp_hw_support/test_apps/rtc_8md256/main/CMakeLists.txt
similarity index 100%
rename from components/esp_system/test_apps/rtc_8md256/main/CMakeLists.txt
rename to components/esp_hw_support/test_apps/rtc_8md256/main/CMakeLists.txt
diff --git a/components/esp_system/test_apps/rtc_8md256/main/test_app_main.c b/components/esp_hw_support/test_apps/rtc_8md256/main/test_app_main.c
similarity index 100%
rename from components/esp_system/test_apps/rtc_8md256/main/test_app_main.c
rename to components/esp_hw_support/test_apps/rtc_8md256/main/test_app_main.c
diff --git a/components/esp_system/test_apps/rtc_8md256/main/test_rtc_8md256.c b/components/esp_hw_support/test_apps/rtc_8md256/main/test_rtc_8md256.c
similarity index 100%
rename from components/esp_system/test_apps/rtc_8md256/main/test_rtc_8md256.c
rename to components/esp_hw_support/test_apps/rtc_8md256/main/test_rtc_8md256.c
diff --git a/components/esp_system/test_apps/rtc_8md256/pytest_rtc_8md256.py b/components/esp_hw_support/test_apps/rtc_8md256/pytest_rtc_8md256.py
similarity index 100%
rename from components/esp_system/test_apps/rtc_8md256/pytest_rtc_8md256.py
rename to components/esp_hw_support/test_apps/rtc_8md256/pytest_rtc_8md256.py
diff --git a/components/esp_system/test_apps/rtc_8md256/sdkconfig.defaults b/components/esp_hw_support/test_apps/rtc_8md256/sdkconfig.defaults
similarity index 100%
rename from components/esp_system/test_apps/rtc_8md256/sdkconfig.defaults
rename to components/esp_hw_support/test_apps/rtc_8md256/sdkconfig.defaults
diff --git a/components/esp_system/test_apps/rtc_power_modes/CMakeLists.txt b/components/esp_hw_support/test_apps/rtc_power_modes/CMakeLists.txt
similarity index 100%
rename from components/esp_system/test_apps/rtc_power_modes/CMakeLists.txt
rename to components/esp_hw_support/test_apps/rtc_power_modes/CMakeLists.txt
diff --git a/components/esp_system/test_apps/rtc_power_modes/README.md b/components/esp_hw_support/test_apps/rtc_power_modes/README.md
similarity index 100%
rename from components/esp_system/test_apps/rtc_power_modes/README.md
rename to components/esp_hw_support/test_apps/rtc_power_modes/README.md
diff --git a/components/esp_system/test_apps/rtc_power_modes/main/CMakeLists.txt b/components/esp_hw_support/test_apps/rtc_power_modes/main/CMakeLists.txt
similarity index 100%
rename from components/esp_system/test_apps/rtc_power_modes/main/CMakeLists.txt
rename to components/esp_hw_support/test_apps/rtc_power_modes/main/CMakeLists.txt
diff --git a/components/esp_system/test_apps/rtc_power_modes/main/test_app_main.c b/components/esp_hw_support/test_apps/rtc_power_modes/main/test_app_main.c
similarity index 100%
rename from components/esp_system/test_apps/rtc_power_modes/main/test_app_main.c
rename to components/esp_hw_support/test_apps/rtc_power_modes/main/test_app_main.c
diff --git a/components/esp_system/test_apps/rtc_power_modes/main/test_rtc_power.c b/components/esp_hw_support/test_apps/rtc_power_modes/main/test_rtc_power.c
similarity index 100%
rename from components/esp_system/test_apps/rtc_power_modes/main/test_rtc_power.c
rename to components/esp_hw_support/test_apps/rtc_power_modes/main/test_rtc_power.c
diff --git a/components/esp_system/test_apps/rtc_power_modes/sdkconfig.defaults b/components/esp_hw_support/test_apps/rtc_power_modes/sdkconfig.defaults
similarity index 100%
rename from components/esp_system/test_apps/rtc_power_modes/sdkconfig.defaults
rename to components/esp_hw_support/test_apps/rtc_power_modes/sdkconfig.defaults
diff --git a/components/esp_system/.build-test-rules.yml b/components/esp_system/.build-test-rules.yml
index 0aaac71d59..1eebf6ca17 100644
--- a/components/esp_system/.build-test-rules.yml
+++ b/components/esp_system/.build-test-rules.yml
@@ -7,13 +7,3 @@ components/esp_system/test_apps/esp_system_unity_tests:
 components/esp_system/test_apps/linux_apis:
   enable:
     - if: IDF_TARGET == "linux"
-
-components/esp_system/test_apps/rtc_8md256:
-  disable:
-    - if: SOC_RTC_SLOW_CLK_SUPPORT_RC_FAST_D256 != 1
-
-components/esp_system/test_apps/rtc_power_modes:
-  enable:
-    - if: IDF_TARGET == "esp32s3"
-      temporary: true
-      reason: the other targets are not tested yet