diff --git a/components/sdmmc/test_apps/.build-test-rules.yml b/components/sdmmc/test_apps/.build-test-rules.yml
deleted file mode 100644
index 47c051efab..0000000000
--- a/components/sdmmc/test_apps/.build-test-rules.yml
+++ /dev/null
@@ -1,11 +0,0 @@
-# Documentation: .gitlab/ci/README.md#manifest-file-to-control-the-buildtest-apps
-
-components/sdmmc/test_apps:
-  disable:
-    - if: IDF_TARGET in ["esp32h2"]
-      temporary: true
-      reason: Console component not supported on H2 yet
-  disable_test:
-    - if: IDF_TARGET not in ["esp32", "esp32s2", "esp32c3"]
-      temporary: true
-      reason: No runners for other targets yet
diff --git a/components/sdmmc/test_apps/sdmmc_console/components/cmd_sdmmc/CMakeLists.txt b/components/sdmmc/test_apps/sdmmc_console/components/cmd_sdmmc/CMakeLists.txt
deleted file mode 100644
index 5ba0a13810..0000000000
--- a/components/sdmmc/test_apps/sdmmc_console/components/cmd_sdmmc/CMakeLists.txt
+++ /dev/null
@@ -1,4 +0,0 @@
-idf_component_register(SRCS cmd_sdmmc.c
-                       INCLUDE_DIRS .
-                       PRIV_REQUIRES console sdmmc sdmmc_test_board
-)
diff --git a/tools/test_apps/.build-test-rules.yml b/tools/test_apps/.build-test-rules.yml
index faef23a9e2..6be7a2df80 100644
--- a/tools/test_apps/.build-test-rules.yml
+++ b/tools/test_apps/.build-test-rules.yml
@@ -87,6 +87,20 @@ tools/test_apps/storage/partition_table_readonly:
     - fatfs
     - spiffs
 
+tools/test_apps/storage/sdmmc_console:
+  disable:
+    - if: IDF_TARGET in ["esp32h2"]
+      temporary: true
+      reason: Console component not supported on H2 yet
+  disable_test:
+    - if: IDF_TARGET not in ["esp32", "esp32s2", "esp32c3"]
+      temporary: true
+      reason: No runners for other targets yet
+  depends_components:
+    - sdmmc
+    - esp_driver_sdmmc
+    - driver # driver will be replaced with esp_driver_sdspi
+
 tools/test_apps/system/bootloader_sections:
   disable:
     - if: IDF_TARGET == "esp32c2"
diff --git a/components/sdmmc/test_apps/sdmmc_console/CMakeLists.txt b/tools/test_apps/storage/sdmmc_console/CMakeLists.txt
similarity index 100%
rename from components/sdmmc/test_apps/sdmmc_console/CMakeLists.txt
rename to tools/test_apps/storage/sdmmc_console/CMakeLists.txt
diff --git a/components/sdmmc/test_apps/sdmmc_console/README.md b/tools/test_apps/storage/sdmmc_console/README.md
similarity index 100%
rename from components/sdmmc/test_apps/sdmmc_console/README.md
rename to tools/test_apps/storage/sdmmc_console/README.md
diff --git a/tools/test_apps/storage/sdmmc_console/components/cmd_sdmmc/CMakeLists.txt b/tools/test_apps/storage/sdmmc_console/components/cmd_sdmmc/CMakeLists.txt
new file mode 100644
index 0000000000..be7d6f78e7
--- /dev/null
+++ b/tools/test_apps/storage/sdmmc_console/components/cmd_sdmmc/CMakeLists.txt
@@ -0,0 +1,5 @@
+idf_component_register(SRCS cmd_sdmmc.c
+                       INCLUDE_DIRS .
+                       PRIV_REQUIRES console sdmmc esp_driver_sdmmc esp_driver_gpio sdmmc_test_board
+                       driver # driver will be replaced with esp_driver_sdspi later
+)
diff --git a/components/sdmmc/test_apps/sdmmc_console/components/cmd_sdmmc/cmd_sdmmc.c b/tools/test_apps/storage/sdmmc_console/components/cmd_sdmmc/cmd_sdmmc.c
similarity index 98%
rename from components/sdmmc/test_apps/sdmmc_console/components/cmd_sdmmc/cmd_sdmmc.c
rename to tools/test_apps/storage/sdmmc_console/components/cmd_sdmmc/cmd_sdmmc.c
index b5ec697617..4a41fbd7c8 100644
--- a/components/sdmmc/test_apps/sdmmc_console/components/cmd_sdmmc/cmd_sdmmc.c
+++ b/tools/test_apps/storage/sdmmc_console/components/cmd_sdmmc/cmd_sdmmc.c
@@ -11,8 +11,8 @@
 #include "esp_check.h"
 #include "esp_console.h"
 #include "soc/soc_caps.h"
-#include "driver/sdmmc_defs.h"
-#include "driver/sdmmc_types.h"
+#include "sd_protocol_defs.h"
+#include "sd_protocol_types.h"
 #include "sdmmc_cmd.h"
 #ifdef SOC_SDMMC_HOST_SUPPORTED
 #include "driver/sdmmc_host.h"
diff --git a/components/sdmmc/test_apps/sdmmc_console/components/cmd_sdmmc/cmd_sdmmc.h b/tools/test_apps/storage/sdmmc_console/components/cmd_sdmmc/cmd_sdmmc.h
similarity index 100%
rename from components/sdmmc/test_apps/sdmmc_console/components/cmd_sdmmc/cmd_sdmmc.h
rename to tools/test_apps/storage/sdmmc_console/components/cmd_sdmmc/cmd_sdmmc.h
diff --git a/components/sdmmc/test_apps/sdmmc_console/components/cmd_unity/CMakeLists.txt b/tools/test_apps/storage/sdmmc_console/components/cmd_unity/CMakeLists.txt
similarity index 100%
rename from components/sdmmc/test_apps/sdmmc_console/components/cmd_unity/CMakeLists.txt
rename to tools/test_apps/storage/sdmmc_console/components/cmd_unity/CMakeLists.txt
diff --git a/components/sdmmc/test_apps/sdmmc_console/components/cmd_unity/cmd_unity.c b/tools/test_apps/storage/sdmmc_console/components/cmd_unity/cmd_unity.c
similarity index 100%
rename from components/sdmmc/test_apps/sdmmc_console/components/cmd_unity/cmd_unity.c
rename to tools/test_apps/storage/sdmmc_console/components/cmd_unity/cmd_unity.c
diff --git a/components/sdmmc/test_apps/sdmmc_console/components/cmd_unity/cmd_unity.h b/tools/test_apps/storage/sdmmc_console/components/cmd_unity/cmd_unity.h
similarity index 100%
rename from components/sdmmc/test_apps/sdmmc_console/components/cmd_unity/cmd_unity.h
rename to tools/test_apps/storage/sdmmc_console/components/cmd_unity/cmd_unity.h
diff --git a/components/sdmmc/test_apps/sdmmc_console/components/sdmmc_test_board/CMakeLists.txt b/tools/test_apps/storage/sdmmc_console/components/sdmmc_test_board/CMakeLists.txt
similarity index 100%
rename from components/sdmmc/test_apps/sdmmc_console/components/sdmmc_test_board/CMakeLists.txt
rename to tools/test_apps/storage/sdmmc_console/components/sdmmc_test_board/CMakeLists.txt
diff --git a/components/sdmmc/test_apps/sdmmc_console/components/sdmmc_test_board/Kconfig.projbuild b/tools/test_apps/storage/sdmmc_console/components/sdmmc_test_board/Kconfig.projbuild
similarity index 100%
rename from components/sdmmc/test_apps/sdmmc_console/components/sdmmc_test_board/Kconfig.projbuild
rename to tools/test_apps/storage/sdmmc_console/components/sdmmc_test_board/Kconfig.projbuild
diff --git a/components/sdmmc/test_apps/sdmmc_console/components/sdmmc_test_board/include/sdmmc_test_board.h b/tools/test_apps/storage/sdmmc_console/components/sdmmc_test_board/include/sdmmc_test_board.h
similarity index 100%
rename from components/sdmmc/test_apps/sdmmc_console/components/sdmmc_test_board/include/sdmmc_test_board.h
rename to tools/test_apps/storage/sdmmc_console/components/sdmmc_test_board/include/sdmmc_test_board.h
diff --git a/components/sdmmc/test_apps/sdmmc_console/components/sdmmc_test_board/sdmmc_test_board.c b/tools/test_apps/storage/sdmmc_console/components/sdmmc_test_board/sdmmc_test_board.c
similarity index 100%
rename from components/sdmmc/test_apps/sdmmc_console/components/sdmmc_test_board/sdmmc_test_board.c
rename to tools/test_apps/storage/sdmmc_console/components/sdmmc_test_board/sdmmc_test_board.c
diff --git a/components/sdmmc/test_apps/sdmmc_console/components/sdmmc_test_board/sdmmc_test_board_defs.c b/tools/test_apps/storage/sdmmc_console/components/sdmmc_test_board/sdmmc_test_board_defs.c
similarity index 100%
rename from components/sdmmc/test_apps/sdmmc_console/components/sdmmc_test_board/sdmmc_test_board_defs.c
rename to tools/test_apps/storage/sdmmc_console/components/sdmmc_test_board/sdmmc_test_board_defs.c
diff --git a/components/sdmmc/test_apps/sdmmc_console/components/sdmmc_tests/CMakeLists.txt b/tools/test_apps/storage/sdmmc_console/components/sdmmc_tests/CMakeLists.txt
similarity index 81%
rename from components/sdmmc/test_apps/sdmmc_console/components/sdmmc_tests/CMakeLists.txt
rename to tools/test_apps/storage/sdmmc_console/components/sdmmc_tests/CMakeLists.txt
index 16361f9bb6..f363ef58ed 100644
--- a/components/sdmmc/test_apps/sdmmc_console/components/sdmmc_tests/CMakeLists.txt
+++ b/tools/test_apps/storage/sdmmc_console/components/sdmmc_tests/CMakeLists.txt
@@ -3,7 +3,8 @@ idf_component_register(
         sdmmc_test_cd_wp_common.c
         sdmmc_test_rw_common.c
      PRIV_REQUIRES
-          sdmmc sdmmc_test_board esp_timer unity test_utils
+          sdmmc esp_driver_sdmmc sdmmc_test_board esp_timer unity test_utils
+          driver # driver will be replaced with esp_driver_sdspi later
      WHOLE_ARCHIVE TRUE
 )
 
diff --git a/components/sdmmc/test_apps/sdmmc_console/components/sdmmc_tests/sdmmc_test_begin_end.h b/tools/test_apps/storage/sdmmc_console/components/sdmmc_tests/sdmmc_test_begin_end.h
similarity index 98%
rename from components/sdmmc/test_apps/sdmmc_console/components/sdmmc_tests/sdmmc_test_begin_end.h
rename to tools/test_apps/storage/sdmmc_console/components/sdmmc_tests/sdmmc_test_begin_end.h
index da5126b6c3..8072937e95 100644
--- a/components/sdmmc/test_apps/sdmmc_console/components/sdmmc_tests/sdmmc_test_begin_end.h
+++ b/tools/test_apps/storage/sdmmc_console/components/sdmmc_tests/sdmmc_test_begin_end.h
@@ -5,7 +5,7 @@
  */
 #pragma once
 
-#include "driver/sdmmc_types.h"
+#include "sd_protocol_types.h"
 
 #ifdef __cplusplus
 extern "C" {
diff --git a/components/sdmmc/test_apps/sdmmc_console/components/sdmmc_tests/sdmmc_test_begin_end_sd.c b/tools/test_apps/storage/sdmmc_console/components/sdmmc_tests/sdmmc_test_begin_end_sd.c
similarity index 99%
rename from components/sdmmc/test_apps/sdmmc_console/components/sdmmc_tests/sdmmc_test_begin_end_sd.c
rename to tools/test_apps/storage/sdmmc_console/components/sdmmc_tests/sdmmc_test_begin_end_sd.c
index f67be4ead6..01cfacb692 100644
--- a/components/sdmmc/test_apps/sdmmc_console/components/sdmmc_tests/sdmmc_test_begin_end_sd.c
+++ b/tools/test_apps/storage/sdmmc_console/components/sdmmc_tests/sdmmc_test_begin_end_sd.c
@@ -11,7 +11,7 @@
 #include "unity.h"
 #include "sdmmc_test_board.h"
 #include "driver/sdmmc_host.h"
-#include "driver/sdmmc_defs.h"
+#include "sd_protocol_defs.h"
 #include "sdmmc_cmd.h"
 #include "sdmmc_test_begin_end.h"
 #include "hal/gpio_hal.h"
diff --git a/components/sdmmc/test_apps/sdmmc_console/components/sdmmc_tests/sdmmc_test_begin_end_spi.c b/tools/test_apps/storage/sdmmc_console/components/sdmmc_tests/sdmmc_test_begin_end_spi.c
similarity index 99%
rename from components/sdmmc/test_apps/sdmmc_console/components/sdmmc_tests/sdmmc_test_begin_end_spi.c
rename to tools/test_apps/storage/sdmmc_console/components/sdmmc_tests/sdmmc_test_begin_end_spi.c
index d69dc80565..9ed663f98a 100644
--- a/components/sdmmc/test_apps/sdmmc_console/components/sdmmc_tests/sdmmc_test_begin_end_spi.c
+++ b/tools/test_apps/storage/sdmmc_console/components/sdmmc_tests/sdmmc_test_begin_end_spi.c
@@ -11,7 +11,7 @@
 #include "esp_log.h"
 #include "sdmmc_test_board.h"
 #include "driver/sdspi_host.h"
-#include "driver/sdmmc_defs.h"
+#include "sd_protocol_defs.h"
 #include "sdmmc_cmd.h"
 #include "sdmmc_test_begin_end.h"
 
diff --git a/components/sdmmc/test_apps/sdmmc_console/components/sdmmc_tests/sdmmc_test_cd_wp_common.c b/tools/test_apps/storage/sdmmc_console/components/sdmmc_tests/sdmmc_test_cd_wp_common.c
similarity index 100%
rename from components/sdmmc/test_apps/sdmmc_console/components/sdmmc_tests/sdmmc_test_cd_wp_common.c
rename to tools/test_apps/storage/sdmmc_console/components/sdmmc_tests/sdmmc_test_cd_wp_common.c
diff --git a/components/sdmmc/test_apps/sdmmc_console/components/sdmmc_tests/sdmmc_test_cd_wp_common.h b/tools/test_apps/storage/sdmmc_console/components/sdmmc_tests/sdmmc_test_cd_wp_common.h
similarity index 97%
rename from components/sdmmc/test_apps/sdmmc_console/components/sdmmc_tests/sdmmc_test_cd_wp_common.h
rename to tools/test_apps/storage/sdmmc_console/components/sdmmc_tests/sdmmc_test_cd_wp_common.h
index 0b8e248f3a..f1f61a7657 100644
--- a/components/sdmmc/test_apps/sdmmc_console/components/sdmmc_tests/sdmmc_test_cd_wp_common.h
+++ b/tools/test_apps/storage/sdmmc_console/components/sdmmc_tests/sdmmc_test_cd_wp_common.h
@@ -5,7 +5,7 @@
  */
 #pragma once
 
-#include "driver/sdmmc_types.h"
+#include "sd_protocol_types.h"
 #ifdef __cplusplus
 extern "C" {
 #endif
diff --git a/components/sdmmc/test_apps/sdmmc_console/components/sdmmc_tests/sdmmc_test_cd_wp_sd.c b/tools/test_apps/storage/sdmmc_console/components/sdmmc_tests/sdmmc_test_cd_wp_sd.c
similarity index 100%
rename from components/sdmmc/test_apps/sdmmc_console/components/sdmmc_tests/sdmmc_test_cd_wp_sd.c
rename to tools/test_apps/storage/sdmmc_console/components/sdmmc_tests/sdmmc_test_cd_wp_sd.c
diff --git a/components/sdmmc/test_apps/sdmmc_console/components/sdmmc_tests/sdmmc_test_cd_wp_spi.c b/tools/test_apps/storage/sdmmc_console/components/sdmmc_tests/sdmmc_test_cd_wp_spi.c
similarity index 100%
rename from components/sdmmc/test_apps/sdmmc_console/components/sdmmc_tests/sdmmc_test_cd_wp_spi.c
rename to tools/test_apps/storage/sdmmc_console/components/sdmmc_tests/sdmmc_test_cd_wp_spi.c
diff --git a/components/sdmmc/test_apps/sdmmc_console/components/sdmmc_tests/sdmmc_test_probe_sd.c b/tools/test_apps/storage/sdmmc_console/components/sdmmc_tests/sdmmc_test_probe_sd.c
similarity index 100%
rename from components/sdmmc/test_apps/sdmmc_console/components/sdmmc_tests/sdmmc_test_probe_sd.c
rename to tools/test_apps/storage/sdmmc_console/components/sdmmc_tests/sdmmc_test_probe_sd.c
diff --git a/components/sdmmc/test_apps/sdmmc_console/components/sdmmc_tests/sdmmc_test_probe_spi.c b/tools/test_apps/storage/sdmmc_console/components/sdmmc_tests/sdmmc_test_probe_spi.c
similarity index 100%
rename from components/sdmmc/test_apps/sdmmc_console/components/sdmmc_tests/sdmmc_test_probe_spi.c
rename to tools/test_apps/storage/sdmmc_console/components/sdmmc_tests/sdmmc_test_probe_spi.c
diff --git a/components/sdmmc/test_apps/sdmmc_console/components/sdmmc_tests/sdmmc_test_rw_common.c b/tools/test_apps/storage/sdmmc_console/components/sdmmc_tests/sdmmc_test_rw_common.c
similarity index 99%
rename from components/sdmmc/test_apps/sdmmc_console/components/sdmmc_tests/sdmmc_test_rw_common.c
rename to tools/test_apps/storage/sdmmc_console/components/sdmmc_tests/sdmmc_test_rw_common.c
index 8bed8e394f..cf889efd5f 100644
--- a/components/sdmmc/test_apps/sdmmc_console/components/sdmmc_tests/sdmmc_test_rw_common.c
+++ b/tools/test_apps/storage/sdmmc_console/components/sdmmc_tests/sdmmc_test_rw_common.c
@@ -12,7 +12,7 @@
 #include "sdkconfig.h"
 #include "soc/soc_caps.h"
 #include "unity.h"
-#include "driver/sdmmc_defs.h"
+#include "sd_protocol_defs.h"
 #include "sdmmc_cmd.h"
 #include "sdmmc_test_rw_common.h"
 
diff --git a/components/sdmmc/test_apps/sdmmc_console/components/sdmmc_tests/sdmmc_test_rw_common.h b/tools/test_apps/storage/sdmmc_console/components/sdmmc_tests/sdmmc_test_rw_common.h
similarity index 98%
rename from components/sdmmc/test_apps/sdmmc_console/components/sdmmc_tests/sdmmc_test_rw_common.h
rename to tools/test_apps/storage/sdmmc_console/components/sdmmc_tests/sdmmc_test_rw_common.h
index 3ca55aeb12..3398c79f02 100644
--- a/components/sdmmc/test_apps/sdmmc_console/components/sdmmc_tests/sdmmc_test_rw_common.h
+++ b/tools/test_apps/storage/sdmmc_console/components/sdmmc_tests/sdmmc_test_rw_common.h
@@ -5,7 +5,7 @@
  */
 #pragma once
 
-#include "driver/sdmmc_types.h"
+#include "sd_protocol_types.h"
 
 #ifdef __cplusplus
 extern "C" {
diff --git a/components/sdmmc/test_apps/sdmmc_console/components/sdmmc_tests/sdmmc_test_rw_sd.c b/tools/test_apps/storage/sdmmc_console/components/sdmmc_tests/sdmmc_test_rw_sd.c
similarity index 100%
rename from components/sdmmc/test_apps/sdmmc_console/components/sdmmc_tests/sdmmc_test_rw_sd.c
rename to tools/test_apps/storage/sdmmc_console/components/sdmmc_tests/sdmmc_test_rw_sd.c
diff --git a/components/sdmmc/test_apps/sdmmc_console/components/sdmmc_tests/sdmmc_test_rw_spi.c b/tools/test_apps/storage/sdmmc_console/components/sdmmc_tests/sdmmc_test_rw_spi.c
similarity index 100%
rename from components/sdmmc/test_apps/sdmmc_console/components/sdmmc_tests/sdmmc_test_rw_spi.c
rename to tools/test_apps/storage/sdmmc_console/components/sdmmc_tests/sdmmc_test_rw_spi.c
diff --git a/components/sdmmc/test_apps/sdmmc_console/main/CMakeLists.txt b/tools/test_apps/storage/sdmmc_console/main/CMakeLists.txt
similarity index 100%
rename from components/sdmmc/test_apps/sdmmc_console/main/CMakeLists.txt
rename to tools/test_apps/storage/sdmmc_console/main/CMakeLists.txt
diff --git a/components/sdmmc/test_apps/sdmmc_console/main/sdmmc_console_main.c b/tools/test_apps/storage/sdmmc_console/main/sdmmc_console_main.c
similarity index 100%
rename from components/sdmmc/test_apps/sdmmc_console/main/sdmmc_console_main.c
rename to tools/test_apps/storage/sdmmc_console/main/sdmmc_console_main.c
diff --git a/components/sdmmc/test_apps/sdmmc_console/partitions.csv b/tools/test_apps/storage/sdmmc_console/partitions.csv
similarity index 100%
rename from components/sdmmc/test_apps/sdmmc_console/partitions.csv
rename to tools/test_apps/storage/sdmmc_console/partitions.csv
diff --git a/components/sdmmc/test_apps/sdmmc_console/sdkconfig.defaults b/tools/test_apps/storage/sdmmc_console/sdkconfig.defaults
similarity index 100%
rename from components/sdmmc/test_apps/sdmmc_console/sdkconfig.defaults
rename to tools/test_apps/storage/sdmmc_console/sdkconfig.defaults