diff --git a/storage/kvstore/tests/TESTS/direct_access_devicekey/tdb/main.cpp b/storage/kvstore/direct_access_devicekey/tests/TESTS/direct_access_devicekey/tdb/main.cpp
similarity index 100%
rename from storage/kvstore/tests/TESTS/direct_access_devicekey/tdb/main.cpp
rename to storage/kvstore/direct_access_devicekey/tests/TESTS/direct_access_devicekey/tdb/main.cpp
diff --git a/storage/kvstore/tests/TESTS/kvstore/filesystemstore_tests/main.cpp b/storage/kvstore/filesystemstore/tests/TESTS/filesystemstore/general/main.cpp
similarity index 100%
rename from storage/kvstore/tests/TESTS/kvstore/filesystemstore_tests/main.cpp
rename to storage/kvstore/filesystemstore/tests/TESTS/filesystemstore/general/main.cpp
diff --git a/storage/kvstore/tests/TESTS/securestore/whitebox/main.cpp b/storage/kvstore/securestore/tests/TESTS/securestore/whitebox/main.cpp
similarity index 100%
rename from storage/kvstore/tests/TESTS/securestore/whitebox/main.cpp
rename to storage/kvstore/securestore/tests/TESTS/securestore/whitebox/main.cpp
diff --git a/storage/kvstore/tests/TESTS/kvstore/tdbstore_whitebox/main.cpp b/storage/kvstore/tdbstore/tests/TESTS/tdbstore/whitebox/main.cpp
similarity index 100%
rename from storage/kvstore/tests/TESTS/kvstore/tdbstore_whitebox/main.cpp
rename to storage/kvstore/tdbstore/tests/TESTS/tdbstore/whitebox/main.cpp