diff --git a/examples/storage/.build-test-rules.yml b/examples/storage/.build-test-rules.yml
index 341e0f595a..967d8ed5b8 100644
--- a/examples/storage/.build-test-rules.yml
+++ b/examples/storage/.build-test-rules.yml
@@ -19,21 +19,6 @@ examples/storage/emmc:
     - if: IDF_TARGET == "esp32s3"
       reason: only support on esp32s3
 
-examples/storage/ext_flash_fatfs:
-  depends_components:
-    - fatfs
-    - vfs
-    - spi_flash
-    - driver
-  disable:
-    - if: IDF_TARGET in ["esp32p4", "esp32c5", "esp32c61"]
-      temporary: true
-      reason: not supported on p4 and c5  # TODO: [ESP32C5] IDF-8715, [ESP32C61] IDF-9314
-  disable_test:
-    - if: IDF_TARGET not in ["esp32"]
-      temporary: true
-      reason: lack of runners
-
 examples/storage/nvs_rw_blob:
   depends_components:
     - nvs_flash
diff --git a/examples/storage/ext_flash_fatfs/main/CMakeLists.txt b/examples/storage/ext_flash_fatfs/main/CMakeLists.txt
deleted file mode 100644
index c8a5c30e46..0000000000
--- a/examples/storage/ext_flash_fatfs/main/CMakeLists.txt
+++ /dev/null
@@ -1 +0,0 @@
-idf_component_register(SRCS "ext_flash_fatfs_example_main.c")
diff --git a/examples/storage/fatfs/.build-test-rules.yml b/examples/storage/fatfs/.build-test-rules.yml
index f652dd52d8..4f3ae3aa16 100644
--- a/examples/storage/fatfs/.build-test-rules.yml
+++ b/examples/storage/fatfs/.build-test-rules.yml
@@ -7,3 +7,18 @@ examples/storage/fatfs:
   disable_test:
     - if: IDF_TARGET != "esp32"
       reason: only one target needed
+
+examples/storage/fatfs/ext_flash:
+  depends_components:
+    - fatfs
+    - vfs
+    - spi_flash
+    - driver
+  disable:
+    - if: IDF_TARGET in ["esp32p4", "esp32c5", "esp32c61"]
+      temporary: true
+      reason: not supported on p4 and c5  # TODO: [ESP32C5] IDF-8715, [ESP32C61] IDF-9314
+  disable_test:
+    - if: IDF_TARGET not in ["esp32"]
+      temporary: true
+      reason: lack of runners
diff --git a/examples/storage/ext_flash_fatfs/CMakeLists.txt b/examples/storage/fatfs/ext_flash/CMakeLists.txt
similarity index 100%
rename from examples/storage/ext_flash_fatfs/CMakeLists.txt
rename to examples/storage/fatfs/ext_flash/CMakeLists.txt
diff --git a/examples/storage/ext_flash_fatfs/README.md b/examples/storage/fatfs/ext_flash/README.md
similarity index 100%
rename from examples/storage/ext_flash_fatfs/README.md
rename to examples/storage/fatfs/ext_flash/README.md
diff --git a/examples/storage/fatfs/ext_flash/main/CMakeLists.txt b/examples/storage/fatfs/ext_flash/main/CMakeLists.txt
new file mode 100644
index 0000000000..dea52d1cb4
--- /dev/null
+++ b/examples/storage/fatfs/ext_flash/main/CMakeLists.txt
@@ -0,0 +1 @@
+idf_component_register(SRCS "fatfs_ext_flash_example_main.c")
diff --git a/examples/storage/ext_flash_fatfs/main/ext_flash_fatfs_example_main.c b/examples/storage/fatfs/ext_flash/main/fatfs_ext_flash_example_main.c
similarity index 98%
rename from examples/storage/ext_flash_fatfs/main/ext_flash_fatfs_example_main.c
rename to examples/storage/fatfs/ext_flash/main/fatfs_ext_flash_example_main.c
index aa2a2c0990..4e10057d10 100644
--- a/examples/storage/ext_flash_fatfs/main/ext_flash_fatfs_example_main.c
+++ b/examples/storage/fatfs/ext_flash/main/fatfs_ext_flash_example_main.c
@@ -1,3 +1,8 @@
+/*
+ * SPDX-FileCopyrightText: 2024 Espressif Systems (Shanghai) CO LTD
+ *
+ * SPDX-License-Identifier: Unlicense OR CC0-1.0
+ */
 /* Example of FAT filesystem on external Flash.
    This example code is in the Public Domain (or CC0 licensed, at your option.)
 
diff --git a/examples/storage/ext_flash_fatfs/pytest_ext_flash_fatfs.py b/examples/storage/fatfs/ext_flash/pytest_fatfs_ext_flash.py
similarity index 99%
rename from examples/storage/ext_flash_fatfs/pytest_ext_flash_fatfs.py
rename to examples/storage/fatfs/ext_flash/pytest_fatfs_ext_flash.py
index afe81763a3..56dd334a49 100644
--- a/examples/storage/ext_flash_fatfs/pytest_ext_flash_fatfs.py
+++ b/examples/storage/fatfs/ext_flash/pytest_fatfs_ext_flash.py
@@ -1,7 +1,5 @@
 # SPDX-FileCopyrightText: 2022-2023 Espressif Systems (Shanghai) CO LTD
 # SPDX-License-Identifier: Unlicense OR CC0-1.0
-
-
 import pytest
 from pytest_embedded import Dut
 
diff --git a/tools/ci/check_copyright_ignore.txt b/tools/ci/check_copyright_ignore.txt
index f605b7cd05..8ffb0dc2e2 100644
--- a/tools/ci/check_copyright_ignore.txt
+++ b/tools/ci/check_copyright_ignore.txt
@@ -1023,7 +1023,6 @@ examples/security/flash_encryption/main/flash_encrypt_main.c
 examples/storage/custom_flash_driver/components/custom_chip_driver/chip_drivers.c
 examples/storage/custom_flash_driver/components/custom_chip_driver/spi_flash_chip_eon.c
 examples/storage/custom_flash_driver/main/main.c
-examples/storage/ext_flash_fatfs/main/ext_flash_fatfs_example_main.c
 examples/storage/nvs_rw_blob/main/nvs_blob_example_main.c
 examples/storage/nvs_rw_value/main/nvs_value_example_main.c
 examples/storage/nvs_rw_value_cxx/main/nvs_value_example_main.cpp