diff --git a/storage/CMakeLists.txt b/storage/CMakeLists.txt
index e27f47dd11..745116cbd3 100644
--- a/storage/CMakeLists.txt
+++ b/storage/CMakeLists.txt
@@ -26,7 +26,7 @@ add_library(mbed-storage-kv-config INTERFACE)
 add_library(mbed-storage-direct-access-devicekey INTERFACE)
 add_library(mbed-storage-kv-global-api INTERFACE)
 
-if(${CMAKE_CROSSCOMPILING})
+if(${CMAKE_CROSSCOMPILING} AND NOT BUILD_GREENTEA_TESTS)
     # The directories below contain optional target libraries
     add_subdirectory(blockdevice EXCLUDE_FROM_ALL)
     add_subdirectory(filesystem EXCLUDE_FROM_ALL)
@@ -37,6 +37,7 @@ else()
     add_subdirectory(blockdevice)
     add_subdirectory(filesystem)
     add_subdirectory(kvstore)
+    add_subdirectory(platform)
 endif()
 
 target_include_directories(mbed-storage
diff --git a/storage/blockdevice/CMakeLists.txt b/storage/blockdevice/CMakeLists.txt
index 6b03244aeb..1ecc79e951 100644
--- a/storage/blockdevice/CMakeLists.txt
+++ b/storage/blockdevice/CMakeLists.txt
@@ -3,7 +3,7 @@
 
 if(CMAKE_PROJECT_NAME STREQUAL PROJECT_NAME AND BUILD_TESTING)
     if(BUILD_GREENTEA_TESTS)
-        # add greentea test
+        add_subdirectory(tests/TESTS)
     else()
         add_subdirectory(tests/UNITTESTS)
     endif()
diff --git a/storage/blockdevice/tests/TESTS/CMakeLists.txt b/storage/blockdevice/tests/TESTS/CMakeLists.txt
new file mode 100644
index 0000000000..7180097367
--- /dev/null
+++ b/storage/blockdevice/tests/TESTS/CMakeLists.txt
@@ -0,0 +1,9 @@
+# Copyright (c) 2021 ARM Limited. All rights reserved.
+# SPDX-License-Identifier: Apache-2.0
+
+add_subdirectory(blockdevice/buffered_block_device)
+add_subdirectory(blockdevice/flashsim_block_device)
+add_subdirectory(blockdevice/general_block_device)
+add_subdirectory(blockdevice/heap_block_device)
+add_subdirectory(blockdevice/mbr_block_device)
+add_subdirectory(blockdevice/util_block_device)