diff --git a/components/storage/blockdevice/COMPONENT_SPIF/TESTS/block_device/spif/main.cpp b/components/storage/blockdevice/COMPONENT_SPIF/TESTS/block_device/spif/main.cpp
index c012c4a6e9e..ad2b2636ed7 100644
--- a/components/storage/blockdevice/COMPONENT_SPIF/TESTS/block_device/spif/main.cpp
+++ b/components/storage/blockdevice/COMPONENT_SPIF/TESTS/block_device/spif/main.cpp
@@ -47,6 +47,11 @@ void basic_erase_program_read_test(SPIFBlockDevice &block_device, bd_size_t bloc
 {
     int err = 0;
     _mutex->lock();
+
+    // Make sure block address per each test is unique
+    static unsigned block_seed = 1;
+    srand(block_seed++);
+
     // Find a random block
     bd_addr_t block = (rand() * block_size) % block_device.size();
 
diff --git a/features/storage/TESTS/blockdevice/general_block_device/main.cpp b/features/storage/TESTS/blockdevice/general_block_device/main.cpp
index 5e47ad8b0e8..fecfe1a0dbc 100644
--- a/features/storage/TESTS/blockdevice/general_block_device/main.cpp
+++ b/features/storage/TESTS/blockdevice/general_block_device/main.cpp
@@ -187,6 +187,11 @@ void basic_erase_program_read_test(BlockDevice *block_device, bd_size_t block_si
 {
     int err = 0;
     _mutex->lock();
+
+    // Make sure block address per each test is unique
+    static unsigned block_seed = 1;
+    srand(block_seed++);
+
     // Find a random block
     bd_addr_t block = (rand() * block_size) % (block_device->size());