diff --git a/storage/kvstore/tests/TESTS/kvstore/general_tests_phase_1/CMakeLists.txt b/storage/kvstore/tests/TESTS/kvstore/general_tests_phase_1/CMakeLists.txt
new file mode 100644
index 0000000000..1d09fa9c4c
--- /dev/null
+++ b/storage/kvstore/tests/TESTS/kvstore/general_tests_phase_1/CMakeLists.txt
@@ -0,0 +1,18 @@
+# Copyright (c) 2020 ARM Limited. All rights reserved.
+# SPDX-License-Identifier: Apache-2.0
+
+cmake_minimum_required(VERSION 3.19.0 FATAL_ERROR)
+
+set(MBED_PATH ${CMAKE_CURRENT_SOURCE_DIR}/../../../../../.. CACHE INTERNAL "")
+set(TEST_TARGET mbed-storage-kvstore-general_tests_phase_1)
+
+include(${MBED_PATH}/tools/cmake/mbed_greentea.cmake)
+
+project(${TEST_TARGET})
+
+mbed_greentea_cmake_macro(
+    TEST_NAME ${TEST_TARGET}
+    TEST_REQUIRED_LIBS
+        mbed-storage
+        mbed-storage-filesystemstore
+)
diff --git a/storage/kvstore/tests/TESTS/kvstore/general_tests_phase_2/CMakeLists.txt b/storage/kvstore/tests/TESTS/kvstore/general_tests_phase_2/CMakeLists.txt
new file mode 100644
index 0000000000..631d87cfec
--- /dev/null
+++ b/storage/kvstore/tests/TESTS/kvstore/general_tests_phase_2/CMakeLists.txt
@@ -0,0 +1,18 @@
+# Copyright (c) 2020 ARM Limited. All rights reserved.
+# SPDX-License-Identifier: Apache-2.0
+
+cmake_minimum_required(VERSION 3.19.0 FATAL_ERROR)
+
+set(MBED_PATH ${CMAKE_CURRENT_SOURCE_DIR}/../../../../../.. CACHE INTERNAL "")
+set(TEST_TARGET mbed-storage-kvstore-general_tests_phase_2)
+
+include(${MBED_PATH}/tools/cmake/mbed_greentea.cmake)
+
+project(${TEST_TARGET})
+
+mbed_greentea_cmake_macro(
+    TEST_NAME ${TEST_TARGET}
+    TEST_REQUIRED_LIBS
+        mbed-storage
+        mbed-storage-filesystemstore
+)
diff --git a/storage/kvstore/tests/TESTS/kvstore/static_tests/CMakeLists.txt b/storage/kvstore/tests/TESTS/kvstore/static_tests/CMakeLists.txt
new file mode 100644
index 0000000000..444670e6c5
--- /dev/null
+++ b/storage/kvstore/tests/TESTS/kvstore/static_tests/CMakeLists.txt
@@ -0,0 +1,17 @@
+# Copyright (c) 2020 ARM Limited. All rights reserved.
+# SPDX-License-Identifier: Apache-2.0
+
+cmake_minimum_required(VERSION 3.19.0 FATAL_ERROR)
+
+set(MBED_PATH ${CMAKE_CURRENT_SOURCE_DIR}/../../../../../.. CACHE INTERNAL "")
+set(TEST_TARGET mbed-storage-kvstore-static_tests)
+
+include(${MBED_PATH}/tools/cmake/mbed_greentea.cmake)
+
+project(${TEST_TARGET})
+
+mbed_greentea_cmake_macro(
+    TEST_NAME ${TEST_TARGET}
+    TEST_REQUIRED_LIBS
+        mbed-storage-kv-global-api
+)