diff --git a/examples/storage/nvs_rw_blob/pytest_nvs_rw_blob.py b/examples/storage/nvs_rw_blob/pytest_nvs_rw_blob.py
index 23430e76d1..9cdb2a0a97 100644
--- a/examples/storage/nvs_rw_blob/pytest_nvs_rw_blob.py
+++ b/examples/storage/nvs_rw_blob/pytest_nvs_rw_blob.py
@@ -1,6 +1,5 @@
 # SPDX-FileCopyrightText: 2022 Espressif Systems (Shanghai) CO LTD
 # SPDX-License-Identifier: Unlicense OR CC0-1.0
-
 import logging
 import random
 import re
@@ -13,6 +12,7 @@ from pytest_embedded import Dut
 
 @pytest.mark.esp32
 @pytest.mark.esp32c3
+@pytest.mark.generic
 def test_examples_nvs_rw_blob(dut: Dut) -> None:
     def expect_start_msg(index: int) -> None:
         dut.expect('Restart counter = {}'.format(index), timeout=10)
diff --git a/examples/storage/nvs_rw_value/pytest_nvs_rw_value.py b/examples/storage/nvs_rw_value/pytest_nvs_rw_value.py
index f42756d6f4..5363af38cb 100644
--- a/examples/storage/nvs_rw_value/pytest_nvs_rw_value.py
+++ b/examples/storage/nvs_rw_value/pytest_nvs_rw_value.py
@@ -1,6 +1,5 @@
 # SPDX-FileCopyrightText: 2022 Espressif Systems (Shanghai) CO LTD
 # SPDX-License-Identifier: Unlicense OR CC0-1.0
-
 import logging
 from itertools import zip_longest
 
@@ -10,11 +9,14 @@ from pytest_embedded import Dut
 
 @pytest.mark.esp32
 @pytest.mark.esp32c3
+@pytest.mark.generic
 def test_examples_nvs_rw_value(dut: Dut) -> None:
+    dut.serial.erase_flash()
+    dut.serial.flash()
     for i, counter_state in zip_longest(range(4), ('The value is not initialized yet!',), fillvalue='Done'):
         dut.expect('Opening Non-Volatile Storage \\(NVS\\) handle... Done', timeout=20)
         dut.expect('Reading restart counter from NVS ... {}'.format(counter_state), timeout=20)
-        dut.expect('Restart counter = {}'.format(i) if i > 0 else '', timeout=20)
+        dut.expect('Restart counter = {}'.format(i) if int(i) > 0 else '', timeout=20)
         dut.expect('Updating restart counter in NVS ... Done', timeout=20)
         dut.expect('Committing updates in NVS ... Done', timeout=20)
         dut.expect('Restarting in 10 seconds...', timeout=20)
diff --git a/examples/storage/nvs_rw_value_cxx/pytest_nvs_rw_value_cxx.py b/examples/storage/nvs_rw_value_cxx/pytest_nvs_rw_value_cxx.py
index f42756d6f4..e4e6e33cf0 100644
--- a/examples/storage/nvs_rw_value_cxx/pytest_nvs_rw_value_cxx.py
+++ b/examples/storage/nvs_rw_value_cxx/pytest_nvs_rw_value_cxx.py
@@ -1,6 +1,5 @@
 # SPDX-FileCopyrightText: 2022 Espressif Systems (Shanghai) CO LTD
 # SPDX-License-Identifier: Unlicense OR CC0-1.0
-
 import logging
 from itertools import zip_longest
 
@@ -10,11 +9,14 @@ from pytest_embedded import Dut
 
 @pytest.mark.esp32
 @pytest.mark.esp32c3
-def test_examples_nvs_rw_value(dut: Dut) -> None:
+@pytest.mark.generic
+def test_examples_nvs_rw_value_cxx(dut: Dut) -> None:
+    dut.serial.erase_flash()
+    dut.serial.flash()
     for i, counter_state in zip_longest(range(4), ('The value is not initialized yet!',), fillvalue='Done'):
         dut.expect('Opening Non-Volatile Storage \\(NVS\\) handle... Done', timeout=20)
         dut.expect('Reading restart counter from NVS ... {}'.format(counter_state), timeout=20)
-        dut.expect('Restart counter = {}'.format(i) if i > 0 else '', timeout=20)
+        dut.expect('Restart counter = {}'.format(i) if int(i) > 0 else '', timeout=20)
         dut.expect('Updating restart counter in NVS ... Done', timeout=20)
         dut.expect('Committing updates in NVS ... Done', timeout=20)
         dut.expect('Restarting in 10 seconds...', timeout=20)
diff --git a/examples/storage/wear_levelling/pytest_wear_levelling_example.py b/examples/storage/wear_levelling/pytest_wear_levelling_example.py
index 8edfd1aa00..a7a23abe3c 100644
--- a/examples/storage/wear_levelling/pytest_wear_levelling_example.py
+++ b/examples/storage/wear_levelling/pytest_wear_levelling_example.py
@@ -1,7 +1,5 @@
-# SPDX-FileCopyrightText: 2022 Espressif Systems (Shanghai) CO LTD
+# SPDX-FileCopyrightText: 2022-2024 Espressif Systems (Shanghai) CO LTD
 # SPDX-License-Identifier: Unlicense OR CC0-1.0
-
-
 import re
 
 import pytest
@@ -10,6 +8,7 @@ from pytest_embedded import Dut
 
 @pytest.mark.esp32
 @pytest.mark.esp32c3
+@pytest.mark.generic
 def test_wear_levelling_example(dut: Dut) -> None:
 
     message_list = ('example: Mounting FAT filesystem',