diff --git a/UNITTESTS/stubs/CMakeLists.txt b/UNITTESTS/stubs/CMakeLists.txt
index 677566fe77..3e1881c1cc 100644
--- a/UNITTESTS/stubs/CMakeLists.txt
+++ b/UNITTESTS/stubs/CMakeLists.txt
@@ -103,7 +103,6 @@ target_include_directories(mbed-stubs-headers
 add_subdirectory(connectivity)
 add_subdirectory(events)
 add_subdirectory(platform)
-add_subdirectory(storage)
 
 add_library(mbed-stubs INTERFACE)
 
@@ -115,5 +114,4 @@ target_link_libraries(mbed-stubs
         mbed-stubs-hal
         mbed-stubs-platform
         mbed-stubs-rtos
-        mbed-stubs-storage
 )
diff --git a/storage/blockdevice/tests/UNITTESTS/CMakeLists.txt b/storage/blockdevice/tests/UNITTESTS/CMakeLists.txt
index c4980cb0db..40827f215f 100644
--- a/storage/blockdevice/tests/UNITTESTS/CMakeLists.txt
+++ b/storage/blockdevice/tests/UNITTESTS/CMakeLists.txt
@@ -3,3 +3,4 @@
 
 add_subdirectory(blockdevice)
 add_subdirectory(SFDP)
+add_subdirectory(doubles)
diff --git a/storage/blockdevice/tests/UNITTESTS/blockdevice/BufferedBlockDevice/CMakeLists.txt b/storage/blockdevice/tests/UNITTESTS/blockdevice/BufferedBlockDevice/CMakeLists.txt
index b0f0b40469..ac90fa55f1 100644
--- a/storage/blockdevice/tests/UNITTESTS/blockdevice/BufferedBlockDevice/CMakeLists.txt
+++ b/storage/blockdevice/tests/UNITTESTS/blockdevice/BufferedBlockDevice/CMakeLists.txt
@@ -16,6 +16,7 @@ target_link_libraries(${TEST_NAME}
         mbed-headers
         mbed-stubs-headers
         mbed-stubs-platform
+        mbed-stubs-blockdevice
         gmock_main
 )
 
diff --git a/storage/blockdevice/tests/UNITTESTS/blockdevice/ChainingBlockDevice/CMakeLists.txt b/storage/blockdevice/tests/UNITTESTS/blockdevice/ChainingBlockDevice/CMakeLists.txt
index d5a49ac9b2..cccd23bd29 100644
--- a/storage/blockdevice/tests/UNITTESTS/blockdevice/ChainingBlockDevice/CMakeLists.txt
+++ b/storage/blockdevice/tests/UNITTESTS/blockdevice/ChainingBlockDevice/CMakeLists.txt
@@ -17,6 +17,7 @@ target_link_libraries(${TEST_NAME}
         mbed-headers
         mbed-stubs-headers
         mbed-stubs-platform
+        mbed-stubs-blockdevice
         gmock_main
 )
 
diff --git a/storage/blockdevice/tests/UNITTESTS/blockdevice/ExhaustibleBlockDevice/CMakeLists.txt b/storage/blockdevice/tests/UNITTESTS/blockdevice/ExhaustibleBlockDevice/CMakeLists.txt
index ea596a7f39..26ba970585 100644
--- a/storage/blockdevice/tests/UNITTESTS/blockdevice/ExhaustibleBlockDevice/CMakeLists.txt
+++ b/storage/blockdevice/tests/UNITTESTS/blockdevice/ExhaustibleBlockDevice/CMakeLists.txt
@@ -16,6 +16,7 @@ target_link_libraries(${TEST_NAME}
         mbed-headers
         mbed-stubs-headers
         mbed-stubs-platform
+        mbed-stubs-blockdevice
         gmock_main
 )
 
diff --git a/storage/blockdevice/tests/UNITTESTS/blockdevice/FlashSimBlockDevice/CMakeLists.txt b/storage/blockdevice/tests/UNITTESTS/blockdevice/FlashSimBlockDevice/CMakeLists.txt
index c708f3eaef..db5d173795 100644
--- a/storage/blockdevice/tests/UNITTESTS/blockdevice/FlashSimBlockDevice/CMakeLists.txt
+++ b/storage/blockdevice/tests/UNITTESTS/blockdevice/FlashSimBlockDevice/CMakeLists.txt
@@ -16,6 +16,7 @@ target_link_libraries(${TEST_NAME}
         mbed-headers
         mbed-stubs-headers
         mbed-stubs-platform
+        mbed-stubs-blockdevice
         gmock_main
 )
 
diff --git a/storage/blockdevice/tests/UNITTESTS/blockdevice/HeapBlockDevice/CMakeLists.txt b/storage/blockdevice/tests/UNITTESTS/blockdevice/HeapBlockDevice/CMakeLists.txt
index 822e44746a..7e3aaa4429 100644
--- a/storage/blockdevice/tests/UNITTESTS/blockdevice/HeapBlockDevice/CMakeLists.txt
+++ b/storage/blockdevice/tests/UNITTESTS/blockdevice/HeapBlockDevice/CMakeLists.txt
@@ -59,6 +59,7 @@ target_link_libraries(${TEST_NAME}
     PRIVATE
         mbed-headers
         mbed-stubs-platform
+        mbed-stubs-blockdevice
         gmock_main
 )
 
diff --git a/storage/blockdevice/tests/UNITTESTS/blockdevice/MBRBlockDevice/CMakeLists.txt b/storage/blockdevice/tests/UNITTESTS/blockdevice/MBRBlockDevice/CMakeLists.txt
index 31f7ad1959..5b77b4b48a 100644
--- a/storage/blockdevice/tests/UNITTESTS/blockdevice/MBRBlockDevice/CMakeLists.txt
+++ b/storage/blockdevice/tests/UNITTESTS/blockdevice/MBRBlockDevice/CMakeLists.txt
@@ -16,6 +16,7 @@ target_link_libraries(${TEST_NAME}
         mbed-headers
         mbed-stubs-headers
         mbed-stubs-platform
+        mbed-stubs-blockdevice
         gmock_main
 )
 
diff --git a/storage/blockdevice/tests/UNITTESTS/blockdevice/ObservingBlockDevice/CMakeLists.txt b/storage/blockdevice/tests/UNITTESTS/blockdevice/ObservingBlockDevice/CMakeLists.txt
index fe5785dddb..023ab1c95a 100644
--- a/storage/blockdevice/tests/UNITTESTS/blockdevice/ObservingBlockDevice/CMakeLists.txt
+++ b/storage/blockdevice/tests/UNITTESTS/blockdevice/ObservingBlockDevice/CMakeLists.txt
@@ -17,6 +17,7 @@ target_link_libraries(${TEST_NAME}
         mbed-headers
         mbed-stubs-headers
         mbed-stubs-platform
+        mbed-stubs-blockdevice
         gmock_main
 )
 
diff --git a/storage/blockdevice/tests/UNITTESTS/blockdevice/ProfilingBlockDevice/CMakeLists.txt b/storage/blockdevice/tests/UNITTESTS/blockdevice/ProfilingBlockDevice/CMakeLists.txt
index b58bd7140c..ed4ed3b8f9 100644
--- a/storage/blockdevice/tests/UNITTESTS/blockdevice/ProfilingBlockDevice/CMakeLists.txt
+++ b/storage/blockdevice/tests/UNITTESTS/blockdevice/ProfilingBlockDevice/CMakeLists.txt
@@ -17,6 +17,7 @@ target_link_libraries(${TEST_NAME}
         mbed-headers
         mbed-stubs-headers
         mbed-stubs-platform
+        mbed-stubs-blockdevice
         gmock_main
 )
 
diff --git a/storage/blockdevice/tests/UNITTESTS/blockdevice/ReadOnlyBlockDevice/CMakeLists.txt b/storage/blockdevice/tests/UNITTESTS/blockdevice/ReadOnlyBlockDevice/CMakeLists.txt
index e96d524beb..463b589e9e 100644
--- a/storage/blockdevice/tests/UNITTESTS/blockdevice/ReadOnlyBlockDevice/CMakeLists.txt
+++ b/storage/blockdevice/tests/UNITTESTS/blockdevice/ReadOnlyBlockDevice/CMakeLists.txt
@@ -17,6 +17,7 @@ target_link_libraries(${TEST_NAME}
         mbed-headers
         mbed-stubs-headers
         mbed-stubs-platform
+        mbed-stubs-blockdevice
         gmock_main
 )
 
diff --git a/storage/blockdevice/tests/UNITTESTS/blockdevice/SlicingBlockDevice/CMakeLists.txt b/storage/blockdevice/tests/UNITTESTS/blockdevice/SlicingBlockDevice/CMakeLists.txt
index a907791915..c9c869e953 100644
--- a/storage/blockdevice/tests/UNITTESTS/blockdevice/SlicingBlockDevice/CMakeLists.txt
+++ b/storage/blockdevice/tests/UNITTESTS/blockdevice/SlicingBlockDevice/CMakeLists.txt
@@ -16,6 +16,7 @@ target_link_libraries(${TEST_NAME}
     PRIVATE
         mbed-headers
         mbed-stubs-platform
+        mbed-stubs-blockdevice
         gmock_main
 )
 
diff --git a/UNITTESTS/stubs/BlockDevice_mock.h b/storage/blockdevice/tests/UNITTESTS/doubles/BlockDevice_mock.h
similarity index 100%
rename from UNITTESTS/stubs/BlockDevice_mock.h
rename to storage/blockdevice/tests/UNITTESTS/doubles/BlockDevice_mock.h
diff --git a/UNITTESTS/stubs/storage/BufferedBlockDevice_stub.cpp b/storage/blockdevice/tests/UNITTESTS/doubles/BufferedBlockDevice_stub.cpp
similarity index 100%
rename from UNITTESTS/stubs/storage/BufferedBlockDevice_stub.cpp
rename to storage/blockdevice/tests/UNITTESTS/doubles/BufferedBlockDevice_stub.cpp
diff --git a/UNITTESTS/stubs/storage/CMakeLists.txt b/storage/blockdevice/tests/UNITTESTS/doubles/CMakeLists.txt
similarity index 73%
rename from UNITTESTS/stubs/storage/CMakeLists.txt
rename to storage/blockdevice/tests/UNITTESTS/doubles/CMakeLists.txt
index c6a1de0351..b9b800968a 100644
--- a/UNITTESTS/stubs/storage/CMakeLists.txt
+++ b/storage/blockdevice/tests/UNITTESTS/doubles/CMakeLists.txt
@@ -1,9 +1,14 @@
 # Copyright (c) 2021 ARM Limited. All rights reserved.
 # SPDX-License-Identifier: Apache-2.0
 
-add_library(mbed-stubs-storage)
+add_library(mbed-stubs-blockdevice)
 
-target_sources(mbed-stubs-storage
+target_include_directories(mbed-stubs-blockdevice
+    PUBLIC
+        .
+)
+
+target_sources(mbed-stubs-blockdevice
     PRIVATE
         BufferedBlockDevice_stub.cpp
         ChainingBlockDevice_stub.cpp
@@ -15,10 +20,9 @@ target_sources(mbed-stubs-storage
         ProfilingBlockDevice_stub.cpp
         ReadOnlyBlockDevice_stub.cpp
         SlicingBlockDevice_stub.cpp
-        kv_config_stub.cpp
 )
 
-target_link_libraries(mbed-stubs-storage
+target_link_libraries(mbed-stubs-blockdevice
     PRIVATE
         mbed-headers
         mbed-stubs-headers
diff --git a/UNITTESTS/stubs/storage/ChainingBlockDevice_stub.cpp b/storage/blockdevice/tests/UNITTESTS/doubles/ChainingBlockDevice_stub.cpp
similarity index 100%
rename from UNITTESTS/stubs/storage/ChainingBlockDevice_stub.cpp
rename to storage/blockdevice/tests/UNITTESTS/doubles/ChainingBlockDevice_stub.cpp
diff --git a/UNITTESTS/stubs/storage/ExhaustibleBlockDevice_stub.cpp b/storage/blockdevice/tests/UNITTESTS/doubles/ExhaustibleBlockDevice_stub.cpp
similarity index 100%
rename from UNITTESTS/stubs/storage/ExhaustibleBlockDevice_stub.cpp
rename to storage/blockdevice/tests/UNITTESTS/doubles/ExhaustibleBlockDevice_stub.cpp
diff --git a/UNITTESTS/stubs/storage/FlashSimBlockDevice_stub.cpp b/storage/blockdevice/tests/UNITTESTS/doubles/FlashSimBlockDevice_stub.cpp
similarity index 100%
rename from UNITTESTS/stubs/storage/FlashSimBlockDevice_stub.cpp
rename to storage/blockdevice/tests/UNITTESTS/doubles/FlashSimBlockDevice_stub.cpp
diff --git a/UNITTESTS/stubs/storage/HeapBlockDevice_stub.cpp b/storage/blockdevice/tests/UNITTESTS/doubles/HeapBlockDevice_stub.cpp
similarity index 100%
rename from UNITTESTS/stubs/storage/HeapBlockDevice_stub.cpp
rename to storage/blockdevice/tests/UNITTESTS/doubles/HeapBlockDevice_stub.cpp
diff --git a/UNITTESTS/stubs/storage/MBRBlockDevice_stub.cpp b/storage/blockdevice/tests/UNITTESTS/doubles/MBRBlockDevice_stub.cpp
similarity index 100%
rename from UNITTESTS/stubs/storage/MBRBlockDevice_stub.cpp
rename to storage/blockdevice/tests/UNITTESTS/doubles/MBRBlockDevice_stub.cpp
diff --git a/UNITTESTS/stubs/storage/ObservingBlockDevice_stub.cpp b/storage/blockdevice/tests/UNITTESTS/doubles/ObservingBlockDevice_stub.cpp
similarity index 100%
rename from UNITTESTS/stubs/storage/ObservingBlockDevice_stub.cpp
rename to storage/blockdevice/tests/UNITTESTS/doubles/ObservingBlockDevice_stub.cpp
diff --git a/UNITTESTS/stubs/storage/ProfilingBlockDevice_stub.cpp b/storage/blockdevice/tests/UNITTESTS/doubles/ProfilingBlockDevice_stub.cpp
similarity index 100%
rename from UNITTESTS/stubs/storage/ProfilingBlockDevice_stub.cpp
rename to storage/blockdevice/tests/UNITTESTS/doubles/ProfilingBlockDevice_stub.cpp
diff --git a/UNITTESTS/stubs/storage/ReadOnlyBlockDevice_stub.cpp b/storage/blockdevice/tests/UNITTESTS/doubles/ReadOnlyBlockDevice_stub.cpp
similarity index 100%
rename from UNITTESTS/stubs/storage/ReadOnlyBlockDevice_stub.cpp
rename to storage/blockdevice/tests/UNITTESTS/doubles/ReadOnlyBlockDevice_stub.cpp
diff --git a/UNITTESTS/stubs/storage/SlicingBlockDevice_stub.cpp b/storage/blockdevice/tests/UNITTESTS/doubles/SlicingBlockDevice_stub.cpp
similarity index 100%
rename from UNITTESTS/stubs/storage/SlicingBlockDevice_stub.cpp
rename to storage/blockdevice/tests/UNITTESTS/doubles/SlicingBlockDevice_stub.cpp
diff --git a/storage/kvstore/filesystemstore/tests/UNITTESTS/CMakeLists.txt b/storage/kvstore/filesystemstore/tests/UNITTESTS/CMakeLists.txt
index d1af4569d2..c5286de2c6 100644
--- a/storage/kvstore/filesystemstore/tests/UNITTESTS/CMakeLists.txt
+++ b/storage/kvstore/filesystemstore/tests/UNITTESTS/CMakeLists.txt
@@ -2,3 +2,4 @@
 # SPDX-License-Identifier: Apache-2.0
 
 add_subdirectory(FileSystemStore)
+add_subdirectory(doubles)
diff --git a/storage/kvstore/filesystemstore/tests/UNITTESTS/FileSystemStore/CMakeLists.txt b/storage/kvstore/filesystemstore/tests/UNITTESTS/FileSystemStore/CMakeLists.txt
index bd120f19a5..7c420d1a0c 100644
--- a/storage/kvstore/filesystemstore/tests/UNITTESTS/FileSystemStore/CMakeLists.txt
+++ b/storage/kvstore/filesystemstore/tests/UNITTESTS/FileSystemStore/CMakeLists.txt
@@ -34,7 +34,7 @@ target_link_libraries(${TEST_NAME}
     PRIVATE
         mbed-headers
         mbed-stubs-platform
-        mbed-stubs-storage
+        mbed-stubs-filesystemstore
         gmock_main
 )
 
diff --git a/storage/kvstore/filesystemstore/tests/UNITTESTS/doubles/CMakeLists.txt b/storage/kvstore/filesystemstore/tests/UNITTESTS/doubles/CMakeLists.txt
new file mode 100644
index 0000000000..27782fbd6c
--- /dev/null
+++ b/storage/kvstore/filesystemstore/tests/UNITTESTS/doubles/CMakeLists.txt
@@ -0,0 +1,15 @@
+# Copyright (c) 2021 ARM Limited. All rights reserved.
+# SPDX-License-Identifier: Apache-2.0
+
+add_library(mbed-stubs-filesystemstore)
+
+target_sources(mbed-stubs-filesystemstore
+    PRIVATE
+        filesystemstore_kv_config_stub.cpp
+)
+
+target_link_libraries(mbed-stubs-filesystemstore
+    PRIVATE
+        mbed-headers
+        mbed-stubs-headers
+)
diff --git a/UNITTESTS/stubs/storage/kv_config_stub.cpp b/storage/kvstore/filesystemstore/tests/UNITTESTS/doubles/filesystemstore_kv_config_stub.cpp
similarity index 100%
rename from UNITTESTS/stubs/storage/kv_config_stub.cpp
rename to storage/kvstore/filesystemstore/tests/UNITTESTS/doubles/filesystemstore_kv_config_stub.cpp