diff --git a/.astyleignore b/.astyleignore
index bed8d33c61..1b0c743fe5 100644
--- a/.astyleignore
+++ b/.astyleignore
@@ -29,3 +29,4 @@
 ^tools
 ^UNITTESTS
 ^storage/blockdevice/tests/UNITTESTS
+^storage/kvstore/tests/UNITTESTS
diff --git a/TESTS/configs/baremetal.json b/TESTS/configs/baremetal.json
index 7d6fff2779..c541819823 100644
--- a/TESTS/configs/baremetal.json
+++ b/TESTS/configs/baremetal.json
@@ -22,15 +22,11 @@
         "network-emac",
         "flashiap-block-device",
         "system-storage",
-        "filesystemstore",
         "SecureStore",
         "storage",
-        "kv-map",
         "direct-access-devicekey",
-        "tdbstore",
         "kv-config",
         "events",
-        "kv-global-api",
         "sd",
         "qspif",
         "spif-driver",
diff --git a/UNITTESTS/CMakeLists.txt b/UNITTESTS/CMakeLists.txt
index aa05b4b18c..121a0c833a 100644
--- a/UNITTESTS/CMakeLists.txt
+++ b/UNITTESTS/CMakeLists.txt
@@ -118,6 +118,9 @@ set(unittest-includes-base
   "${PROJECT_SOURCE_DIR}/../storage/filesystem/fat/include"
   "${PROJECT_SOURCE_DIR}/../storage/blockdevice/include"
   "${PROJECT_SOURCE_DIR}/../storage/filesystem/include"
+  "${PROJECT_SOURCE_DIR}/../storage/kvstore/include"
+  "${PROJECT_SOURCE_DIR}/../storage/kvstore/kv_config"
+  "${PROJECT_SOURCE_DIR}/../storage/kvstore/kv_config/include"
   "${PROJECT_SOURCE_DIR}/../drivers"
   "${PROJECT_SOURCE_DIR}/../hal"
   "${PROJECT_SOURCE_DIR}/../events"
@@ -146,7 +149,6 @@ set(unittest-includes-base
   "${PROJECT_SOURCE_DIR}/../features/lorawan/system"
   "${PROJECT_SOURCE_DIR}/../features/mbedtls"
   "${PROJECT_SOURCE_DIR}/../features/mbedtls/inc"
-  "${PROJECT_SOURCE_DIR}/../storage/kvstore/conf"
 )
 
 # Create a list for test suites.
diff --git a/UNITTESTS/empty_baseline/unittest.cmake b/UNITTESTS/empty_baseline/unittest.cmake
index 332526a8b0..2dc0fa4648 100644
--- a/UNITTESTS/empty_baseline/unittest.cmake
+++ b/UNITTESTS/empty_baseline/unittest.cmake
@@ -12,13 +12,6 @@ set(unittest-includes ${unittest-includes}
 )
 
 set(unittest-sources
-    ../storage/kvstore/global_api/kvstore_global_api.cpp
-    ../storage/kvstore/securestore/SecureStore.cpp
-    ../storage/kvstore/kv_map/KVMap.cpp
-    ../storage/kvstore/tdbstore/TDBStore.cpp
-    ../storage/kvstore/direct_access_devicekey/DirectAccessDevicekey.cpp
-    ../storage/kvstore/conf/kv_config.cpp
-    ../storage/kvstore/filesystemstore/FileSystemStore.cpp
     ../storage/system_storage/SystemStorage.cpp
 )
 
diff --git a/UNITTESTS/stubs/kv_config_stub.cpp b/UNITTESTS/stubs/kv_config_stub.cpp
index 4936a50d56..74eb208248 100644
--- a/UNITTESTS/stubs/kv_config_stub.cpp
+++ b/UNITTESTS/stubs/kv_config_stub.cpp
@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 
-#include "storage/kvstore/conf/kv_config.h"
+#include "kv_config/kv_config.h"
 
 const char *get_filesystemstore_folder_path()
 {
diff --git a/features/device_key/source/DeviceKey.cpp b/features/device_key/source/DeviceKey.cpp
index 354b68b41e..6cf5784a3d 100644
--- a/features/device_key/source/DeviceKey.cpp
+++ b/features/device_key/source/DeviceKey.cpp
@@ -19,10 +19,10 @@
 #if DEVICEKEY_ENABLED
 #include "mbedtls/cmac.h"
 #include "mbedtls/platform.h"
-#include "storage/kvstore/include/KVStore.h"
-#include "storage/kvstore/tdbstore/TDBStore.h"
-#include "storage/kvstore/kv_map/KVMap.h"
-#include "storage/kvstore/conf/kv_config.h"
+#include "kvstore/KVStore.h"
+#include "kvstore/TDBStore.h"
+#include "kvstore/KVMap.h"
+#include "kv_config/kv_config.h"
 #include "mbed_wait_api.h"
 #include <stdlib.h>
 #include "platform/mbed_error.h"
diff --git a/storage/kvstore/direct_access_devicekey/tests/TESTS/direct_access_devicekey/direct_access_devicekey_tdb/main.cpp b/storage/kvstore/direct_access_devicekey/tests/TESTS/direct_access_devicekey/direct_access_devicekey_tdb/main.cpp
old mode 100755
new mode 100644