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 857bde5ef5b..7036d53247a 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 2c0f85f7800..bf19528171c 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',
     [
@@ -22,6 +23,7 @@ def test_fatfs_flash_wl_generic(dut: Dut) -> None:
 
 
 @pytest.mark.generic
+@pytest.mark.flaky(reruns=2, reruns_delay=5)
 @pytest.mark.psram
 @pytest.mark.parametrize(
     'config',
diff --git a/components/spiffs/test_apps/pytest_spiffs.py b/components/spiffs/test_apps/pytest_spiffs.py
index cbeb8c62b75..da68a434240 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',
     [
@@ -20,6 +21,7 @@ def test_spiffs_generic(dut: Dut) -> None:
 
 
 @pytest.mark.quad_psram
+@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 97fc2427868..b755e88a004 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',
     [
@@ -20,6 +21,7 @@ def test_vfs_default(dut: Dut) -> None:
 
 
 @pytest.mark.generic
+@pytest.mark.flaky(reruns=2, reruns_delay=5)
 @pytest.mark.parametrize(
     'config',
     [
@@ -33,6 +35,7 @@ def test_vfs_ccomp(dut: Dut) -> None:
 
 
 @pytest.mark.quad_psram
+@pytest.mark.flaky(reruns=2, reruns_delay=5)
 @pytest.mark.parametrize(
     'config',
     [