diff --git a/connectivity/CMakeLists.txt b/connectivity/CMakeLists.txt
index dcf9b48c36..1a3bfd41c4 100644
--- a/connectivity/CMakeLists.txt
+++ b/connectivity/CMakeLists.txt
@@ -24,7 +24,17 @@ add_library(mbed-nfc INTERFACE)
 add_library(mbed-ppp INTERFACE)
 add_library(mbed-wifi INTERFACE)
 
-if(${CMAKE_CROSSCOMPILING})
+if(CMAKE_PROJECT_NAME STREQUAL PROJECT_NAME AND BUILD_TESTING)
+    # Add these subdirectories for tests
+    add_subdirectory(cellular)
+    add_subdirectory(drivers)
+    add_subdirectory(FEATURE_BLE)
+    add_subdirectory(libraries)
+    add_subdirectory(lorawan)
+    add_subdirectory(mbedtls)
+    add_subdirectory(netsocket)
+    add_subdirectory(nfc)
+else()
     # The directories below contain optional target libraries
     add_subdirectory(FEATURE_BLE EXCLUDE_FROM_ALL)
     add_subdirectory(cellular EXCLUDE_FROM_ALL)
@@ -36,12 +46,4 @@ if(${CMAKE_CROSSCOMPILING})
     add_subdirectory(nanostack EXCLUDE_FROM_ALL)
     add_subdirectory(netsocket EXCLUDE_FROM_ALL)
     add_subdirectory(nfc EXCLUDE_FROM_ALL)
-else()
-    # Add these subdirectories for the Unit test
-    add_subdirectory(cellular)
-    add_subdirectory(lorawan)
-    add_subdirectory(netsocket)
-    add_subdirectory(mbedtls)
-    add_subdirectory(libraries)
-    add_subdirectory(FEATURE_BLE)
 endif()
diff --git a/connectivity/FEATURE_BLE/CMakeLists.txt b/connectivity/FEATURE_BLE/CMakeLists.txt
index 1e9da9185a..fbd35db9af 100644
--- a/connectivity/FEATURE_BLE/CMakeLists.txt
+++ b/connectivity/FEATURE_BLE/CMakeLists.txt
@@ -2,7 +2,9 @@
 # SPDX-License-Identifier: Apache-2.0
 
 if(CMAKE_PROJECT_NAME STREQUAL PROJECT_NAME AND BUILD_TESTING)
-    add_subdirectory(tests/UNITTESTS)
+    if(NOT BUILD_GREENTEA_TESTS)
+        add_subdirectory(tests/UNITTESTS)
+    endif()
 endif()
 
 add_subdirectory(libraries)
diff --git a/connectivity/libraries/CMakeLists.txt b/connectivity/libraries/CMakeLists.txt
index 7d856fa25c..21af84b317 100644
--- a/connectivity/libraries/CMakeLists.txt
+++ b/connectivity/libraries/CMakeLists.txt
@@ -2,7 +2,9 @@
 # SPDX-License-Identifier: Apache-2.0
 
 if(CMAKE_PROJECT_NAME STREQUAL PROJECT_NAME AND BUILD_TESTING)
-    add_subdirectory(tests/UNITTESTS)
+    if(NOT BUILD_GREENTEA_TESTS)
+        add_subdirectory(tests/UNITTESTS)
+    endif()
 endif()
 
 add_subdirectory(mbed-coap)
diff --git a/connectivity/mbedtls/CMakeLists.txt b/connectivity/mbedtls/CMakeLists.txt
index f000967e33..7bacaa6d97 100644
--- a/connectivity/mbedtls/CMakeLists.txt
+++ b/connectivity/mbedtls/CMakeLists.txt
@@ -2,7 +2,9 @@
 # SPDX-License-Identifier: Apache-2.0
 
 if(CMAKE_PROJECT_NAME STREQUAL PROJECT_NAME AND BUILD_TESTING)
-    add_subdirectory(tests/UNITTESTS)
+    if(NOT BUILD_GREENTEA_TESTS)
+        add_subdirectory(tests/UNITTESTS)
+    endif()
 endif()
 
 target_include_directories(mbed-mbedtls
diff --git a/connectivity/nfc/CMakeLists.txt b/connectivity/nfc/CMakeLists.txt
index b8098066ae..a1c48ac045 100644
--- a/connectivity/nfc/CMakeLists.txt
+++ b/connectivity/nfc/CMakeLists.txt
@@ -3,6 +3,12 @@
 
 add_subdirectory(libraries)
 
+if(CMAKE_PROJECT_NAME STREQUAL PROJECT_NAME AND BUILD_TESTING)
+    if(BUILD_GREENTEA_TESTS)
+        add_subdirectory(tests/TESTS)
+    endif()
+endif()
+
 target_include_directories(mbed-nfc
     INTERFACE
         .
diff --git a/connectivity/nfc/tests/TESTS/CMakeLists.txt b/connectivity/nfc/tests/TESTS/CMakeLists.txt
new file mode 100644
index 0000000000..c146e3a675
--- /dev/null
+++ b/connectivity/nfc/tests/TESTS/CMakeLists.txt
@@ -0,0 +1,4 @@
+# Copyright (c) 2021 ARM Limited. All rights reserved.
+# SPDX-License-Identifier: Apache-2.0
+
+add_subdirectory(nfc/eeprom)
diff --git a/connectivity/nfc/tests/TESTS/nfc/eeprom/CMakeLists.txt b/connectivity/nfc/tests/TESTS/nfc/eeprom/CMakeLists.txt
index f57d64918b..0acf6fa0ed 100644
--- a/connectivity/nfc/tests/TESTS/nfc/eeprom/CMakeLists.txt
+++ b/connectivity/nfc/tests/TESTS/nfc/eeprom/CMakeLists.txt
@@ -1,20 +1,19 @@
-# Copyright (c) 2020 ARM Limited. All rights reserved.
+# Copyright (c) 2020-2021 ARM Limited. All rights reserved.
 # SPDX-License-Identifier: Apache-2.0
 
-cmake_minimum_required(VERSION 3.19.0 FATAL_ERROR)
+include(mbed_greentea)
 
-set(MBED_PATH ${CMAKE_CURRENT_SOURCE_DIR}/../../../../../.. CACHE INTERNAL "")
-set(TEST_TARGET mbed-connectivity-nfc-eeprom)
-
-include(${MBED_PATH}/tools/cmake/mbed_greentea.cmake)
-
-project(${TEST_TARGET})
+if(NOT "MBED_CONF_NFCEEPROM=1" IN_LIST MBED_CONFIG_DEFINITIONS)
+    set(TEST_SKIPPED "NFC EEPROM required")
+endif()
 
 mbed_greentea_add_test(
     TEST_NAME
-        ${TEST_TARGET}
+        mbed-connectivity-nfc-eeprom
     TEST_SOURCES
         main.cpp
     TEST_REQUIRED_LIBS
         mbed-nfc
+    TEST_SKIPPED
+        ${TEST_SKIPPED}
 )
diff --git a/targets/targets.json b/targets/targets.json
index be72fad01f..382801f9c1 100644
--- a/targets/targets.json
+++ b/targets/targets.json
@@ -3920,7 +3920,8 @@
         ],
         "extra_labels_add": [
             "CORDIO",
-            "MX25R6435F"
+            "MX25R6435F",
+            "M24SR"
         ],
         "supported_form_factors": [
             "ARDUINO_UNO"
diff --git a/tools/memap.py b/tools/memap.py
index 2a0a90a596..42f3a5ad94 100644
--- a/tools/memap.py
+++ b/tools/memap.py
@@ -247,7 +247,7 @@ class _GccParser(_Parser):
 class _ArmccParser(_Parser):
     RE = re.compile(
         r'^\s+0x(\w{8})\s+0x(\w{8})\s+(\w+)\s+(\w+)\s+(\d+)\s+[*]?.+\s+(.+)$')
-    RE_OBJECT = re.compile(r'(.+\.(l|ar))\((.+\.o(bj)?)\)')
+    RE_OBJECT = re.compile(r'(.+\.(l|a|ar))\((.+\.o(bj)?)\)')
     OBJECT_EXTENSIONS = (".o", ".obj")
 
     def parse_object_name(self, line):