diff --git a/storage/kvstore/tests/UNITTESTS/.mbedignore b/storage/kvstore/filesystemstore/tests/UNITTESTS/.mbedignore
similarity index 100%
rename from storage/kvstore/tests/UNITTESTS/.mbedignore
rename to storage/kvstore/filesystemstore/tests/UNITTESTS/.mbedignore
diff --git a/storage/kvstore/tests/UNITTESTS/FileSystemStore/moduletest.cpp b/storage/kvstore/filesystemstore/tests/UNITTESTS/FileSystemStore/moduletest.cpp
similarity index 100%
rename from storage/kvstore/tests/UNITTESTS/FileSystemStore/moduletest.cpp
rename to storage/kvstore/filesystemstore/tests/UNITTESTS/FileSystemStore/moduletest.cpp
diff --git a/storage/kvstore/tests/UNITTESTS/FileSystemStore/unittest.cmake b/storage/kvstore/filesystemstore/tests/UNITTESTS/FileSystemStore/unittest.cmake
similarity index 100%
rename from storage/kvstore/tests/UNITTESTS/FileSystemStore/unittest.cmake
rename to storage/kvstore/filesystemstore/tests/UNITTESTS/FileSystemStore/unittest.cmake
diff --git a/storage/kvstore/tdbstore/tests/UNITTESTS/.mbedignore b/storage/kvstore/tdbstore/tests/UNITTESTS/.mbedignore
new file mode 100644
index 0000000000..72e8ffc0db
--- /dev/null
+++ b/storage/kvstore/tdbstore/tests/UNITTESTS/.mbedignore
@@ -0,0 +1 @@
+*
diff --git a/storage/kvstore/tests/UNITTESTS/TDBStore/moduletest.cpp b/storage/kvstore/tdbstore/tests/UNITTESTS/TDBStore/moduletest.cpp
similarity index 100%
rename from storage/kvstore/tests/UNITTESTS/TDBStore/moduletest.cpp
rename to storage/kvstore/tdbstore/tests/UNITTESTS/TDBStore/moduletest.cpp
diff --git a/storage/kvstore/tests/UNITTESTS/TDBStore/unittest.cmake b/storage/kvstore/tdbstore/tests/UNITTESTS/TDBStore/unittest.cmake
similarity index 100%
rename from storage/kvstore/tests/UNITTESTS/TDBStore/unittest.cmake
rename to storage/kvstore/tdbstore/tests/UNITTESTS/TDBStore/unittest.cmake