diff --git a/components/spi_flash/.build-test-rules.yml b/components/spi_flash/.build-test-rules.yml
index 89ee01ae91..6f208cb0ab 100644
--- a/components/spi_flash/.build-test-rules.yml
+++ b/components/spi_flash/.build-test-rules.yml
@@ -11,9 +11,3 @@ components/spi_flash/test_apps/flash_encryption:
     - if: IDF_TARGET in ["esp32c2", "esp32s2", "esp32c6", "esp32h2"]
       temporary: true
       reason: No runners # IDF-5634
-
-components/spi_flash/test_apps/flash_mmap:
-  disable:
-    - if: IDF_TARGET == "esp32c6" or IDF_TARGET == "esp32h2"
-      temporary: true
-      reason: target esp32c6, esp32h2 is not supported yet
diff --git a/components/spi_flash/test_apps/flash_mmap/README.md b/components/spi_flash/test_apps/flash_mmap/README.md
index b5be4985c5..a8b7833fa3 100644
--- a/components/spi_flash/test_apps/flash_mmap/README.md
+++ b/components/spi_flash/test_apps/flash_mmap/README.md
@@ -1,2 +1,2 @@
-| Supported Targets | ESP32 | ESP32-C2 | ESP32-C3 | ESP32-S2 | ESP32-S3 |
-| ----------------- | ----- | -------- | -------- | -------- | -------- |
+| Supported Targets | ESP32 | ESP32-C2 | ESP32-C3 | ESP32-C6 | ESP32-H2 | ESP32-S2 | ESP32-S3 |
+| ----------------- | ----- | -------- | -------- | -------- | -------- | -------- | -------- |
diff --git a/components/spi_flash/test_apps/flash_mmap/pytest_flash_mmap.py b/components/spi_flash/test_apps/flash_mmap/pytest_flash_mmap.py
index ce5fb64224..0523bcf537 100644
--- a/components/spi_flash/test_apps/flash_mmap/pytest_flash_mmap.py
+++ b/components/spi_flash/test_apps/flash_mmap/pytest_flash_mmap.py
@@ -6,7 +6,6 @@ from pytest_embedded import Dut
 
 
 @pytest.mark.supported_targets
-@pytest.mark.temp_skip_ci(targets=['esp32c6', 'esp32h2'], reason='c6/h2 support TBD')
 @pytest.mark.generic
 @pytest.mark.parametrize(
     'config',
@@ -22,6 +21,8 @@ def test_flash_mmap(dut: Dut) -> None:
 @pytest.mark.esp32s3
 @pytest.mark.esp32c3
 @pytest.mark.esp32c2
+@pytest.mark.esp32c6
+@pytest.mark.esp32h2
 @pytest.mark.generic
 @pytest.mark.parametrize(
     'config',