diff --git a/connectivity/cellular/tests/UNITTESTS/framework/AT/at_cellularcontext/CMakeLists.txt b/connectivity/cellular/tests/UNITTESTS/framework/AT/at_cellularcontext/CMakeLists.txt
index ac50d03653..b94dce45c1 100644
--- a/connectivity/cellular/tests/UNITTESTS/framework/AT/at_cellularcontext/CMakeLists.txt
+++ b/connectivity/cellular/tests/UNITTESTS/framework/AT/at_cellularcontext/CMakeLists.txt
@@ -23,14 +23,21 @@ 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-headers-filesystem
-        mbed-stubs
+        mbed-stubs-platform
+        mbed-stubs-rtos
+        mbed-stubs-events
+        mbed-stubs-drivers
         mbed-stubs-netsocket
         mbed-stubs-cellular
-        mbed-stubs-headers
         gmock_main
 )
 
diff --git a/connectivity/cellular/tests/UNITTESTS/framework/AT/at_cellulardevice/CMakeLists.txt b/connectivity/cellular/tests/UNITTESTS/framework/AT/at_cellulardevice/CMakeLists.txt
index 4fd647c4a2..176bf21e4e 100644
--- a/connectivity/cellular/tests/UNITTESTS/framework/AT/at_cellulardevice/CMakeLists.txt
+++ b/connectivity/cellular/tests/UNITTESTS/framework/AT/at_cellulardevice/CMakeLists.txt
@@ -29,14 +29,19 @@ 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-netsocket
         mbed-stubs-cellular
-        mbed-stubs-headers
         mbed-stubs-rtos
+        mbed-stubs-platform
+        mbed-stubs-events
         gmock_main
 )
 
diff --git a/connectivity/cellular/tests/UNITTESTS/framework/AT/at_cellularinformation/CMakeLists.txt b/connectivity/cellular/tests/UNITTESTS/framework/AT/at_cellularinformation/CMakeLists.txt
index 3379dec8a5..ff616ebd5b 100644
--- a/connectivity/cellular/tests/UNITTESTS/framework/AT/at_cellularinformation/CMakeLists.txt
+++ b/connectivity/cellular/tests/UNITTESTS/framework/AT/at_cellularinformation/CMakeLists.txt
@@ -21,13 +21,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-netsocket
         mbed-stubs-cellular
-        mbed-stubs-headers
+        mbed-stubs-platform
+        mbed-stubs-events
         gmock_main
 )
 
diff --git a/connectivity/cellular/tests/UNITTESTS/framework/AT/at_cellularnetwork/CMakeLists.txt b/connectivity/cellular/tests/UNITTESTS/framework/AT/at_cellularnetwork/CMakeLists.txt
index 45488bf9f5..034d61bd41 100644
--- a/connectivity/cellular/tests/UNITTESTS/framework/AT/at_cellularnetwork/CMakeLists.txt
+++ b/connectivity/cellular/tests/UNITTESTS/framework/AT/at_cellularnetwork/CMakeLists.txt
@@ -22,13 +22,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-netsocket
         mbed-stubs-cellular
-        mbed-stubs-headers
+        mbed-stubs-platform
+        mbed-stubs-events
         gmock_main
 )
 
diff --git a/connectivity/cellular/tests/UNITTESTS/framework/AT/at_cellularsms/CMakeLists.txt b/connectivity/cellular/tests/UNITTESTS/framework/AT/at_cellularsms/CMakeLists.txt
index d40d85ee03..a82f0ee76b 100644
--- a/connectivity/cellular/tests/UNITTESTS/framework/AT/at_cellularsms/CMakeLists.txt
+++ b/connectivity/cellular/tests/UNITTESTS/framework/AT/at_cellularsms/CMakeLists.txt
@@ -22,13 +22,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-netsocket
         mbed-stubs-cellular
-        mbed-stubs-headers
+        mbed-stubs-platform
+        mbed-stubs-events
         gmock_main
 )
 
diff --git a/connectivity/cellular/tests/UNITTESTS/framework/AT/at_cellularstack/CMakeLists.txt b/connectivity/cellular/tests/UNITTESTS/framework/AT/at_cellularstack/CMakeLists.txt
index b7c7244f5e..9176840f6f 100644
--- a/connectivity/cellular/tests/UNITTESTS/framework/AT/at_cellularstack/CMakeLists.txt
+++ b/connectivity/cellular/tests/UNITTESTS/framework/AT/at_cellularstack/CMakeLists.txt
@@ -27,13 +27,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-nanostack-libservice
         mbed-headers-netsocket
         mbed-headers-cellular
-        mbed-stubs
         mbed-stubs-cellular
-        mbed-stubs-headers
+        mbed-stubs-platform
+        mbed-stubs-events
         gmock_main
 )