diff --git a/components/esp_partition/test_apps/pytest_esp_partition.py b/components/esp_partition/test_apps/pytest_esp_partition.py
index 8c3587ce745..38ad47694a3 100644
--- a/components/esp_partition/test_apps/pytest_esp_partition.py
+++ b/components/esp_partition/test_apps/pytest_esp_partition.py
@@ -6,6 +6,7 @@ from pytest_embedded_idf.utils import idf_parametrize
 
 
 @pytest.mark.generic
+@pytest.mark.flaky(reruns=2, reruns_delay=5)
 @idf_parametrize('target', ['esp32', 'esp32c3'], indirect=['target'])
 def test_esp_partition(dut: Dut) -> None:
     dut.expect_unity_test_output()
diff --git a/components/fatfs/test_apps/flash_ro/pytest_fatfs_flash_ro.py b/components/fatfs/test_apps/flash_ro/pytest_fatfs_flash_ro.py
index 0339f8b6b31..098e6223eb2 100644
--- a/components/fatfs/test_apps/flash_ro/pytest_fatfs_flash_ro.py
+++ b/components/fatfs/test_apps/flash_ro/pytest_fatfs_flash_ro.py
@@ -6,6 +6,7 @@ from pytest_embedded_idf.utils import idf_parametrize
 
 
 @pytest.mark.generic
+@pytest.mark.flaky(reruns=2, reruns_delay=5)
 @idf_parametrize('target', ['esp32', 'esp32c3'], indirect=['target'])
 def test_fatfs_flash_ro(dut: Dut) -> None:
     dut.run_all_single_board_cases()
diff --git a/components/fatfs/test_apps/flash_wl/pytest_fatfs_flash_wl.py b/components/fatfs/test_apps/flash_wl/pytest_fatfs_flash_wl.py
index 0ffcc3a16ce..49f61cb1a7d 100644
--- a/components/fatfs/test_apps/flash_wl/pytest_fatfs_flash_wl.py
+++ b/components/fatfs/test_apps/flash_wl/pytest_fatfs_flash_wl.py
@@ -6,6 +6,7 @@ from pytest_embedded_idf.utils import idf_parametrize
 
 
 @pytest.mark.generic
+@pytest.mark.flaky(reruns=2, reruns_delay=5)
 @pytest.mark.parametrize(
     'config',
     [
diff --git a/components/sdmmc/test_apps/pytest_sdmmc_extra.py b/components/sdmmc/test_apps/pytest_sdmmc_extra.py
index cfcbfb4d6c8..51c186ee2dc 100644
--- a/components/sdmmc/test_apps/pytest_sdmmc_extra.py
+++ b/components/sdmmc/test_apps/pytest_sdmmc_extra.py
@@ -6,6 +6,7 @@ from pytest_embedded_idf.utils import idf_parametrize
 
 
 @pytest.mark.sdcard
+@pytest.mark.flaky(reruns=2, reruns_delay=5)
 @idf_parametrize('config', ['default'], indirect=['config'])
 @idf_parametrize('target', ['esp32'], indirect=['target'])
 def test_sdmmc_extra(dut: Dut) -> None:
diff --git a/components/spiffs/test_apps/pytest_spiffs.py b/components/spiffs/test_apps/pytest_spiffs.py
index f0743781132..3580865c787 100644
--- a/components/spiffs/test_apps/pytest_spiffs.py
+++ b/components/spiffs/test_apps/pytest_spiffs.py
@@ -6,6 +6,7 @@ from pytest_embedded_idf.utils import idf_parametrize
 
 
 @pytest.mark.generic
+@pytest.mark.flaky(reruns=2, reruns_delay=5)
 @pytest.mark.parametrize(
     'config',
     [
diff --git a/components/vfs/test_apps/pytest_vfs.py b/components/vfs/test_apps/pytest_vfs.py
index 1220b7d6764..6c7baf56cc1 100644
--- a/components/vfs/test_apps/pytest_vfs.py
+++ b/components/vfs/test_apps/pytest_vfs.py
@@ -6,6 +6,7 @@ from pytest_embedded_idf.utils import idf_parametrize
 
 
 @pytest.mark.generic
+@pytest.mark.flaky(reruns=2, reruns_delay=5)
 @pytest.mark.parametrize(
     'config',
     [