diff --git a/storage/blockdevice/tests/UNITTESTS/doubles/CMakeLists.txt b/storage/blockdevice/tests/UNITTESTS/doubles/CMakeLists.txt
index b9b800968a..99337e6a35 100644
--- a/storage/blockdevice/tests/UNITTESTS/doubles/CMakeLists.txt
+++ b/storage/blockdevice/tests/UNITTESTS/doubles/CMakeLists.txt
@@ -24,6 +24,7 @@ target_sources(mbed-stubs-blockdevice
 
 target_link_libraries(mbed-stubs-blockdevice
     PRIVATE
-        mbed-headers
-        mbed-stubs-headers
+        mbed-headers-base
+        mbed-headers-platform
+        mbed-headers-storage
 )
diff --git a/storage/kvstore/filesystemstore/tests/UNITTESTS/doubles/CMakeLists.txt b/storage/kvstore/filesystemstore/tests/UNITTESTS/doubles/CMakeLists.txt
index 27782fbd6c..4152c91e04 100644
--- a/storage/kvstore/filesystemstore/tests/UNITTESTS/doubles/CMakeLists.txt
+++ b/storage/kvstore/filesystemstore/tests/UNITTESTS/doubles/CMakeLists.txt
@@ -10,6 +10,5 @@ target_sources(mbed-stubs-filesystemstore
 
 target_link_libraries(mbed-stubs-filesystemstore
     PRIVATE
-        mbed-headers
-        mbed-stubs-headers
+        mbed-headers-storage
 )