diff --git a/connectivity/cellular/tests/UNITTESTS/framework/device/athandler/CMakeLists.txt b/connectivity/cellular/tests/UNITTESTS/framework/device/athandler/CMakeLists.txt
index 1d801efa87..66960f37cc 100644
--- a/connectivity/cellular/tests/UNITTESTS/framework/device/athandler/CMakeLists.txt
+++ b/connectivity/cellular/tests/UNITTESTS/framework/device/athandler/CMakeLists.txt
@@ -24,12 +24,18 @@ target_sources(${TEST_NAME}
 
 target_link_libraries(${TEST_NAME}
     PRIVATE
-        mbed-headers
+        mbed-headers-base
+        mbed-headers-platform
+        mbed-headers-events
+        mbed-headers-rtos
+        mbed-headers-drivers
+        mbed-headers-hal
         mbed-headers-netsocket
         mbed-headers-cellular
-        mbed-stubs
         mbed-stubs-cellular
-        mbed-stubs-headers
+        mbed-stubs-platform
+        mbed-stubs-events
+        mbed-stubs-drivers
         gmock_main
 )
 
diff --git a/connectivity/cellular/tests/UNITTESTS/framework/device/cellularcontext/CMakeLists.txt b/connectivity/cellular/tests/UNITTESTS/framework/device/cellularcontext/CMakeLists.txt
index 56e3e80aa0..6d63421886 100644
--- a/connectivity/cellular/tests/UNITTESTS/framework/device/cellularcontext/CMakeLists.txt
+++ b/connectivity/cellular/tests/UNITTESTS/framework/device/cellularcontext/CMakeLists.txt
@@ -24,25 +24,24 @@ target_compile_definitions(${TEST_NAME}
 target_sources(${TEST_NAME}
     PRIVATE
         ${mbed-os_SOURCE_DIR}/connectivity/cellular/source/framework/device/CellularContext.cpp
-        ${mbed-os_SOURCE_DIR}/connectivity/libraries/nanostack-libservice/source/libip4string/ip4tos.c
-        ${mbed-os_SOURCE_DIR}/connectivity/libraries/nanostack-libservice/source/libip6string/ip6tos.c
-        ${mbed-os_SOURCE_DIR}/connectivity/libraries/nanostack-libservice/source/libip4string/stoip4.c
-        ${mbed-os_SOURCE_DIR}/connectivity/libraries/nanostack-libservice/source/libip6string/stoip6.c
-        ${mbed-os_SOURCE_DIR}/connectivity/libraries/nanostack-libservice/source/libBits/common_functions.c
-        ${mbed-os_SOURCE_DIR}/connectivity/netsocket/source/SocketAddress.cpp
         cellularcontexttest.cpp
 )
 
 target_link_libraries(${TEST_NAME}
     PRIVATE
-        mbed-headers
+        mbed-headers-base
+        mbed-headers-platform
+        mbed-headers-events
+        mbed-headers-rtos
+        mbed-headers-drivers
+        mbed-headers-hal
         mbed-headers-nanostack-libservice
         mbed-headers-netsocket
         mbed-headers-cellular
-        mbed-stubs
         mbed-stubs-cellular
         mbed-stubs-netsocket
-        mbed-stubs-headers
+        mbed-stubs-platform
+        mbed-stubs-events
         gmock_main
 )
 
diff --git a/connectivity/cellular/tests/UNITTESTS/framework/device/cellulardevice/CMakeLists.txt b/connectivity/cellular/tests/UNITTESTS/framework/device/cellulardevice/CMakeLists.txt
index 272e30a1cc..65ae0e2d85 100644
--- a/connectivity/cellular/tests/UNITTESTS/framework/device/cellulardevice/CMakeLists.txt
+++ b/connectivity/cellular/tests/UNITTESTS/framework/device/cellulardevice/CMakeLists.txt
@@ -27,12 +27,17 @@ target_sources(${TEST_NAME}
 
 target_link_libraries(${TEST_NAME}
     PRIVATE
+        mbed-headers-base
+        mbed-headers-platform
+        mbed-headers-events
+        mbed-headers-rtos
+        mbed-headers-drivers
+        mbed-headers-hal
         mbed-headers-netsocket
-        mbed-headers
         mbed-headers-cellular
-        mbed-stubs
         mbed-stubs-cellular
-        mbed-stubs-headers
+        mbed-stubs-platform
+        mbed-stubs-events
         gmock_main
 )
 
diff --git a/connectivity/cellular/tests/UNITTESTS/framework/device/cellularstatemachine/CMakeLists.txt b/connectivity/cellular/tests/UNITTESTS/framework/device/cellularstatemachine/CMakeLists.txt
index 24cdefd4d2..10d3dbdc7d 100644
--- a/connectivity/cellular/tests/UNITTESTS/framework/device/cellularstatemachine/CMakeLists.txt
+++ b/connectivity/cellular/tests/UNITTESTS/framework/device/cellularstatemachine/CMakeLists.txt
@@ -28,12 +28,18 @@ target_sources(${TEST_NAME}
 
 target_link_libraries(${TEST_NAME}
     PRIVATE
-        mbed-headers
+        mbed-headers-base
+        mbed-headers-platform
+        mbed-headers-events
+        mbed-headers-rtos
+        mbed-headers-drivers
+        mbed-headers-hal
         mbed-headers-netsocket
         mbed-headers-cellular
-        mbed-stubs
         mbed-stubs-cellular
-        mbed-stubs-headers
+        mbed-stubs-platform
+        mbed-stubs-events
+        mbed-stubs-rtos
         gmock_main
 )