diff --git a/UNITTESTS/CMakeLists.txt b/UNITTESTS/CMakeLists.txt
index 612155a15e..6aba4ba07f 100644
--- a/UNITTESTS/CMakeLists.txt
+++ b/UNITTESTS/CMakeLists.txt
@@ -122,6 +122,9 @@ set(unittest-includes-base
   "${PROJECT_SOURCE_DIR}/../storage/kvstore/include"
   "${PROJECT_SOURCE_DIR}/../storage/kvstore/kv_config"
   "${PROJECT_SOURCE_DIR}/../storage/kvstore/kv_config/include"
+  "${PROJECT_SOURCE_DIR}/../storage/kvstore/tdbstore/include"
+  "${PROJECT_SOURCE_DIR}/../storage/kvstore/filesystemstore/include"
+  "${PROJECT_SOURCE_DIR}/../storage/kvstore/kvstore_global_api/include"
   "${PROJECT_SOURCE_DIR}/../drivers"
   "${PROJECT_SOURCE_DIR}/../drivers/include"
   "${PROJECT_SOURCE_DIR}/../drivers/include/drivers"
diff --git a/storage/kvstore/tests/UNITTESTS/FileSystemStore/unittest.cmake b/storage/kvstore/tests/UNITTESTS/FileSystemStore/unittest.cmake
index 30230a6aae..b12cabe869 100644
--- a/storage/kvstore/tests/UNITTESTS/FileSystemStore/unittest.cmake
+++ b/storage/kvstore/tests/UNITTESTS/FileSystemStore/unittest.cmake
@@ -10,7 +10,7 @@ set(unittest-includes ${unittest-includes}
 
 set(unittest-sources
   ../storage/blockdevice/source/HeapBlockDevice.cpp
-  ../storage/kvstore/source/FileSystemStore.cpp
+  ../storage/kvstore/filesystemstore/source/FileSystemStore.cpp
   ../storage/filesystem/littlefs/source/LittleFileSystem.cpp
   ../storage/filesystem/source/Dir.cpp
   ../storage/filesystem/source/File.cpp
diff --git a/storage/kvstore/tests/UNITTESTS/TDBStore/unittest.cmake b/storage/kvstore/tests/UNITTESTS/TDBStore/unittest.cmake
index dccc840777..e11382cd33 100644
--- a/storage/kvstore/tests/UNITTESTS/TDBStore/unittest.cmake
+++ b/storage/kvstore/tests/UNITTESTS/TDBStore/unittest.cmake
@@ -13,7 +13,7 @@ set(unittest-sources
   ../storage/blockdevice/source/FlashSimBlockDevice.cpp
   ../storage/blockdevice/source/HeapBlockDevice.cpp
   ../storage/blockdevice/source/BufferedBlockDevice.cpp
-  ../storage/kvstore/source/TDBStore.cpp
+  ../storage/kvstore/tdbstore/source/TDBStore.cpp
   ../platform/mbed-trace/source/mbed_trace.c
   stubs/mbed_atomic_stub.c
   stubs/mbed_assert_stub.cpp