diff --git a/UNITTESTS/stubs/CMakeLists.txt b/UNITTESTS/stubs/CMakeLists.txt
index 154868a..0d69fc3 100644
--- a/UNITTESTS/stubs/CMakeLists.txt
+++ b/UNITTESTS/stubs/CMakeLists.txt
@@ -43,12 +43,6 @@
 
 target_include_directories(mbed-headers-storage
     INTERFACE
-        ${mbed-os_SOURCE_DIR}/storage/kvstore/include
-        ${mbed-os_SOURCE_DIR}/storage/kvstore/kv_config
-        ${mbed-os_SOURCE_DIR}/storage/kvstore/kv_config/include
-        ${mbed-os_SOURCE_DIR}/storage/kvstore/tdbstore/include
-        ${mbed-os_SOURCE_DIR}/storage/kvstore/filesystemstore/include
-        ${mbed-os_SOURCE_DIR}/storage/kvstore/kvstore_global_api/include
 )
 
 target_include_directories(mbed-headers-connectivity
diff --git a/storage/kvstore/CMakeLists.txt b/storage/kvstore/CMakeLists.txt
index 2f32123..3f9f137 100644
--- a/storage/kvstore/CMakeLists.txt
+++ b/storage/kvstore/CMakeLists.txt
@@ -1,6 +1,10 @@
 # Copyright (c) 2020 ARM Limited. All rights reserved.
 # SPDX-License-Identifier: Apache-2.0
 
+if(CMAKE_PROJECT_NAME STREQUAL PROJECT_NAME AND BUILD_TESTING)
+    add_subdirectory(tests/UNITTESTS)
+endif()
+
 add_subdirectory(tdbstore)
 add_subdirectory(filesystemstore)
 add_subdirectory(securestore)
diff --git a/storage/kvstore/filesystemstore/tests/UNITTESTS/FileSystemStore/CMakeLists.txt b/storage/kvstore/filesystemstore/tests/UNITTESTS/FileSystemStore/CMakeLists.txt
index b505e0c..a11b900 100644
--- a/storage/kvstore/filesystemstore/tests/UNITTESTS/FileSystemStore/CMakeLists.txt
+++ b/storage/kvstore/filesystemstore/tests/UNITTESTS/FileSystemStore/CMakeLists.txt
@@ -35,6 +35,7 @@
         mbed-headers
         mbed-headers-blockdevice
         mbed-headers-filesystem
+        mbed-headers-kvstore
         mbed-stubs-platform
         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
index e780ad9..3b8c4df 100644
--- a/storage/kvstore/filesystemstore/tests/UNITTESTS/doubles/CMakeLists.txt
+++ b/storage/kvstore/filesystemstore/tests/UNITTESTS/doubles/CMakeLists.txt
@@ -11,5 +11,5 @@
 target_link_libraries(mbed-stubs-filesystemstore
     PRIVATE
         mbed-headers-blockdevice
-        mbed-headers-storage
+        mbed-headers-kvstore
 )
diff --git a/storage/kvstore/tdbstore/tests/UNITTESTS/TDBStore/CMakeLists.txt b/storage/kvstore/tdbstore/tests/UNITTESTS/TDBStore/CMakeLists.txt
index bd603f6..46dd748 100644
--- a/storage/kvstore/tdbstore/tests/UNITTESTS/TDBStore/CMakeLists.txt
+++ b/storage/kvstore/tdbstore/tests/UNITTESTS/TDBStore/CMakeLists.txt
@@ -22,6 +22,7 @@
     PRIVATE
         mbed-headers
         mbed-headers-blockdevice
+        mbed-headers-kvstore
         mbed-stubs-platform
         gmock_main
 )
diff --git a/storage/kvstore/tests/UNITTESTS/.mbedignore b/storage/kvstore/tests/UNITTESTS/.mbedignore
new file mode 100644
index 0000000..72e8ffc
--- /dev/null
+++ b/storage/kvstore/tests/UNITTESTS/.mbedignore
@@ -0,0 +1 @@
+*
diff --git a/storage/kvstore/tests/UNITTESTS/CMakeLists.txt b/storage/kvstore/tests/UNITTESTS/CMakeLists.txt
new file mode 100644
index 0000000..0f24921
--- /dev/null
+++ b/storage/kvstore/tests/UNITTESTS/CMakeLists.txt
@@ -0,0 +1,14 @@
+# Copyright (c) 2021 ARM Limited. All rights reserved.
+# SPDX-License-Identifier: Apache-2.0
+
+add_library(mbed-headers-kvstore INTERFACE)
+
+target_include_directories(mbed-headers-kvstore
+    INTERFACE
+        ${mbed-os_SOURCE_DIR}/storage/kvstore/include
+        ${mbed-os_SOURCE_DIR}/storage/kvstore/kv_config/include
+        ${mbed-os_SOURCE_DIR}/storage/kvstore/kvstore_global_api/include
+        ${mbed-os_SOURCE_DIR}/storage/kvstore/securestore/include
+        ${mbed-os_SOURCE_DIR}/storage/kvstore/tdbstore/include
+        ${mbed-os_SOURCE_DIR}/storage/kvstore/filesystemstore/include
+)