diff --git a/components/esp_partition/test_apps/.build-test-rules.yml b/components/esp_partition/test_apps/.build-test-rules.yml
index 5205adef8c..58a3b84b2c 100644
--- a/components/esp_partition/test_apps/.build-test-rules.yml
+++ b/components/esp_partition/test_apps/.build-test-rules.yml
@@ -5,3 +5,6 @@ components/esp_partition/test_apps:
     - if: IDF_TARGET in ["esp32", "esp32c3"]
       temporary: false
       reason: sufficient to test on one Xtensa and one RISC-V target
+  depends_components:
+    - esp_partition
+    - esp_blockdev
diff --git a/components/fatfs/test_apps/.build-test-rules.yml b/components/fatfs/test_apps/.build-test-rules.yml
index 58c92b00cb..55db11c8bf 100644
--- a/components/fatfs/test_apps/.build-test-rules.yml
+++ b/components/fatfs/test_apps/.build-test-rules.yml
@@ -6,7 +6,6 @@ components/fatfs/test_apps/dyn_buffers:
       reason: only one target required
 
   depends_components:
-    - *common_components
     - fatfs
 
 components/fatfs/test_apps/flash_ro:
@@ -15,9 +14,7 @@ components/fatfs/test_apps/flash_ro:
       reason: only one target per arch needed
 
   depends_components:
-    - *common_components
     - esp_partition
-    - spi_flash
     - fatfs
     - vfs
 
@@ -26,9 +23,7 @@ components/fatfs/test_apps/flash_wl:
     - if: IDF_TARGET not in ["esp32", "esp32c3", "linux"]
       reason: only one target per arch needed
   depends_components:
-    - *common_components
     - esp_partition
-    - spi_flash
     - fatfs
     - vfs
     - wear_leveling
@@ -43,7 +38,6 @@ components/fatfs/test_apps/sdcard:
       temporary: true
       reason: lack of runners
   depends_components:
-    - *common_components
     - esp_driver_sdmmc
     - esp_driver_spi
     - sdmmc
diff --git a/components/spiffs/test_apps/.build-test-rules.yml b/components/spiffs/test_apps/.build-test-rules.yml
index 9fac1f8066..96d1327ff7 100644
--- a/components/spiffs/test_apps/.build-test-rules.yml
+++ b/components/spiffs/test_apps/.build-test-rules.yml
@@ -4,8 +4,6 @@ components/spiffs/test_apps:
       reason: These chips should be sufficient for test coverage (Xtensa and RISC-V, single and dual core)
 
   depends_components:
-    - *common_components
-    - spi_flash
     - esp_partition
     - spiffs
     - vfs
diff --git a/components/wear_levelling/host_test/.build-test-rules.yml b/components/wear_levelling/host_test/.build-test-rules.yml
index 6a71b6a08d..de46213c52 100644
--- a/components/wear_levelling/host_test/.build-test-rules.yml
+++ b/components/wear_levelling/host_test/.build-test-rules.yml
@@ -4,3 +4,5 @@ components/wear_levelling/host_test:
   enable:
     - if: IDF_TARGET == "linux"
       reason: only test on linux
+  depends_components:
+    - wear_levelling
diff --git a/components/wear_levelling/test_apps/.build-test-rules.yml b/components/wear_levelling/test_apps/.build-test-rules.yml
index f596e6c08a..b9586dec0e 100644
--- a/components/wear_levelling/test_apps/.build-test-rules.yml
+++ b/components/wear_levelling/test_apps/.build-test-rules.yml
@@ -5,3 +5,6 @@ components/wear_levelling/test_apps:
     - if: IDF_TARGET in ["esp32", "esp32c3"]
       temporary: true
       reason: the other targets are not tested yet
+  depends_components:
+    - esp_partition
+    - wear_levelling
diff --git a/examples/storage/.build-test-rules.yml b/examples/storage/.build-test-rules.yml
index 26ec9249bd..afbff82ad2 100644
--- a/examples/storage/.build-test-rules.yml
+++ b/examples/storage/.build-test-rules.yml
@@ -2,14 +2,11 @@
 
 examples/storage/custom_flash_driver:
   depends_components:
-    - *common_components
     - spi_flash
 
 examples/storage/emmc:
   depends_components:
-    - *common_components
     - fatfs
-    - vfs
     - sdmmc
     - esp_driver_sdmmc
     - esp_driver_sdspi
@@ -19,7 +16,6 @@ examples/storage/emmc:
 
 examples/storage/partition_api/partition_find:
   depends_components:
-    - *common_components
     - esp_partition
   disable_test:
     - if: IDF_TARGET not in ["esp32", "esp32c3"]
@@ -27,7 +23,6 @@ examples/storage/partition_api/partition_find:
 
 examples/storage/partition_api/partition_mmap:
   depends_components:
-    - *common_components
     - esp_partition
   disable_test:
     - if: IDF_TARGET not in ["esp32", "esp32c3"]
@@ -35,7 +30,6 @@ examples/storage/partition_api/partition_mmap:
 
 examples/storage/partition_api/partition_ops:
   depends_components:
-    - *common_components
     - esp_partition
     - spi_flash
   disable_test:
@@ -44,7 +38,6 @@ examples/storage/partition_api/partition_ops:
 
 examples/storage/parttool:
   depends_components:
-    - *common_components
     - partition_table
   disable_test:
     - if: IDF_TARGET != "esp32"
@@ -52,15 +45,11 @@ examples/storage/parttool:
 
 examples/storage/perf_benchmark:
   depends_components:
-    - *common_components
     - fatfs
     - spi_flash
     - vfs
-    - sdmmc
     - spiffs
     - wear_levelling
-    - esp_partition
-    - esp_driver_sdmmc
   disable:
     - if: SOC_GPSPI_SUPPORTED != 1
       temporary: true
@@ -72,11 +61,8 @@ examples/storage/perf_benchmark:
 
 examples/storage/sd_card/sdmmc:
   depends_components:
-    - *common_components
     - fatfs
-    - vfs
     - sdmmc
-    - esp_driver_sdmmc
   disable:
     - if: SOC_SDMMC_HOST_SUPPORTED != 1
   disable_test:
@@ -86,11 +72,8 @@ examples/storage/sd_card/sdmmc:
 
 examples/storage/sd_card/sdspi:
   depends_components:
-    - *common_components
     - fatfs
-    - vfs
     - sdmmc
-    - esp_driver_sdspi
   disable:
     - if: SOC_GPSPI_SUPPORTED != 1
   disable_test:
@@ -99,7 +82,6 @@ examples/storage/sd_card/sdspi:
 
 examples/storage/semihost_vfs:
   depends_components:
-    - *common_components
     - vfs
   disable_test:
     - if: IDF_TARGET not in ["esp32"]
@@ -108,7 +90,6 @@ examples/storage/semihost_vfs:
 
 examples/storage/spiffs:
   depends_components:
-    - *common_components
     - spiffs
     - vfs
   disable_test:
@@ -117,7 +98,6 @@ examples/storage/spiffs:
 
 examples/storage/spiffsgen:
   depends_components:
-    - *common_components
     - spiffs
     - vfs
     - mbedtls
@@ -127,8 +107,6 @@ examples/storage/spiffsgen:
 
 examples/storage/wear_levelling:
   depends_components:
-    - *common_components
-    - vfs
     - wear_levelling
     - fatfs
   disable_test: