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 7abc49a074..ad2b2636ed 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
@@ -49,9 +49,8 @@ void basic_erase_program_read_test(SPIFBlockDevice &block_device, bd_size_t bloc
     _mutex->lock();
 
     // Make sure block address per each test is unique
-    static unsigned block_seed = SPIF_TEST_NUM_OF_THREADS;
-    srand(block_seed);
-    block_seed += 2;
+    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 22f2a554b8..fecfe1a0db 100644
--- a/features/storage/TESTS/blockdevice/general_block_device/main.cpp
+++ b/features/storage/TESTS/blockdevice/general_block_device/main.cpp
@@ -189,9 +189,8 @@ void basic_erase_program_read_test(BlockDevice *block_device, bd_size_t block_si
     _mutex->lock();
 
     // Make sure block address per each test is unique
-    static unsigned block_seed = TEST_NUM_OF_THREADS;
-    srand(block_seed);
-    block_seed += 2;
+    static unsigned block_seed = 1;
+    srand(block_seed++);
 
     // Find a random block
     bd_addr_t block = (rand() * block_size) % (block_device->size());