diff --git a/UNITTESTS/stubs/CMakeLists.txt b/UNITTESTS/stubs/CMakeLists.txt
index 4f76140bac..a81923a17d 100644
--- a/UNITTESTS/stubs/CMakeLists.txt
+++ b/UNITTESTS/stubs/CMakeLists.txt
@@ -33,7 +33,6 @@ target_include_directories(mbed-headers-connectivity
     INTERFACE
         ${mbed-os_SOURCE_DIR}/connectivity/libraries/nanostack-libservice
         ${mbed-os_SOURCE_DIR}/connectivity/libraries/nanostack-libservice/mbed-client-libservice
-        ${mbed-os_SOURCE_DIR}/connectivity/netsocket/include
         ${mbed-os_SOURCE_DIR}/connectivity
         ${mbed-os_SOURCE_DIR}/connectivity/mbedtls
         ${mbed-os_SOURCE_DIR}/connectivity/mbedtls/include
diff --git a/UNITTESTS/stubs/connectivity/CMakeLists.txt b/UNITTESTS/stubs/connectivity/CMakeLists.txt
index 72e79c551d..2e70a42ebf 100644
--- a/UNITTESTS/stubs/connectivity/CMakeLists.txt
+++ b/UNITTESTS/stubs/connectivity/CMakeLists.txt
@@ -19,17 +19,9 @@ target_compile_definitions(mbed-stubs-connectivity
 target_sources(mbed-stubs-connectivity
     PRIVATE
         aes_stub.c
-        CellularInterface_stub.cpp
         cipher_stub.c
         cmac_stub.c
         ip4tos_stub.c
-        MeshInterface_stub.cpp
-        NetworkInterfaceDefaults_stub.cpp
-        NetworkInterface_stub.cpp
-        NetworkStack_stub.cpp
-        nsapi_dns_stub.cpp
-        SocketAddress_stub.cpp
-        SocketStats_Stub.cpp
         stoip4_stub.c
         ${mbed-os_SOURCE_DIR}/connectivity/nanostack/coap-service/test/coap-service/unittest/stub/mbedtls_stub.c
 )
diff --git a/connectivity/cellular/tests/UNITTESTS/doubles/CMakeLists.txt b/connectivity/cellular/tests/UNITTESTS/doubles/CMakeLists.txt
index 7934053f08..8e310cceee 100644
--- a/connectivity/cellular/tests/UNITTESTS/doubles/CMakeLists.txt
+++ b/connectivity/cellular/tests/UNITTESTS/doubles/CMakeLists.txt
@@ -56,7 +56,9 @@ target_link_libraries(mbed-stubs-cellular
         mbed-headers-drivers
         mbed-headers-hal
         mbed-headers-events
+        mbed-headers-netsocket
         mbed-headers-cellular
+        mbed-stubs-netsocket
         mbed-stubs-headers
         gtest
 )
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 17c73c0573..b2ce284501 100644
--- a/connectivity/cellular/tests/UNITTESTS/framework/AT/at_cellularcontext/CMakeLists.txt
+++ b/connectivity/cellular/tests/UNITTESTS/framework/AT/at_cellularcontext/CMakeLists.txt
@@ -24,9 +24,11 @@ target_sources(${TEST_NAME}
 target_link_libraries(${TEST_NAME}
     PRIVATE
         mbed-headers
+        mbed-headers-netsocket
         mbed-headers-cellular
         mbed-headers-filesystem
         mbed-stubs
+        mbed-stubs-netsocket
         mbed-stubs-cellular
         mbed-stubs-headers
         mbed-stubs-rtos-headers
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 228f89da27..4fd647c4a2 100644
--- a/connectivity/cellular/tests/UNITTESTS/framework/AT/at_cellulardevice/CMakeLists.txt
+++ b/connectivity/cellular/tests/UNITTESTS/framework/AT/at_cellulardevice/CMakeLists.txt
@@ -30,8 +30,10 @@ target_sources(${TEST_NAME}
 target_link_libraries(${TEST_NAME}
     PRIVATE
         mbed-headers
+        mbed-headers-netsocket
         mbed-headers-cellular
         mbed-stubs
+        mbed-stubs-netsocket
         mbed-stubs-cellular
         mbed-stubs-headers
         mbed-stubs-rtos
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 b497c81a24..3379dec8a5 100644
--- a/connectivity/cellular/tests/UNITTESTS/framework/AT/at_cellularinformation/CMakeLists.txt
+++ b/connectivity/cellular/tests/UNITTESTS/framework/AT/at_cellularinformation/CMakeLists.txt
@@ -22,8 +22,10 @@ target_sources(${TEST_NAME}
 target_link_libraries(${TEST_NAME}
     PRIVATE
         mbed-headers
+        mbed-headers-netsocket
         mbed-headers-cellular
         mbed-stubs
+        mbed-stubs-netsocket
         mbed-stubs-cellular
         mbed-stubs-headers
         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 cec6b8f905..45488bf9f5 100644
--- a/connectivity/cellular/tests/UNITTESTS/framework/AT/at_cellularnetwork/CMakeLists.txt
+++ b/connectivity/cellular/tests/UNITTESTS/framework/AT/at_cellularnetwork/CMakeLists.txt
@@ -23,8 +23,10 @@ target_sources(${TEST_NAME}
 target_link_libraries(${TEST_NAME}
     PRIVATE
         mbed-headers
+        mbed-headers-netsocket
         mbed-headers-cellular
         mbed-stubs
+        mbed-stubs-netsocket
         mbed-stubs-cellular
         mbed-stubs-headers
         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 f8f34eb4f9..d40d85ee03 100644
--- a/connectivity/cellular/tests/UNITTESTS/framework/AT/at_cellularsms/CMakeLists.txt
+++ b/connectivity/cellular/tests/UNITTESTS/framework/AT/at_cellularsms/CMakeLists.txt
@@ -23,8 +23,10 @@ target_sources(${TEST_NAME}
 target_link_libraries(${TEST_NAME}
     PRIVATE
         mbed-headers
+        mbed-headers-netsocket
         mbed-headers-cellular
         mbed-stubs
+        mbed-stubs-netsocket
         mbed-stubs-cellular
         mbed-stubs-headers
         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 a2c2fb8c5c..2361dff4ff 100644
--- a/connectivity/cellular/tests/UNITTESTS/framework/AT/at_cellularstack/CMakeLists.txt
+++ b/connectivity/cellular/tests/UNITTESTS/framework/AT/at_cellularstack/CMakeLists.txt
@@ -28,6 +28,7 @@ target_sources(${TEST_NAME}
 target_link_libraries(${TEST_NAME}
     PRIVATE
         mbed-headers
+        mbed-headers-netsocket
         mbed-headers-cellular
         mbed-stubs
         mbed-stubs-cellular
diff --git a/connectivity/cellular/tests/UNITTESTS/framework/common/util/CMakeLists.txt b/connectivity/cellular/tests/UNITTESTS/framework/common/util/CMakeLists.txt
index cd77650fde..21cbc64bb4 100644
--- a/connectivity/cellular/tests/UNITTESTS/framework/common/util/CMakeLists.txt
+++ b/connectivity/cellular/tests/UNITTESTS/framework/common/util/CMakeLists.txt
@@ -14,6 +14,7 @@ target_sources(${TEST_NAME}
 target_link_libraries(${TEST_NAME}
     PRIVATE
         mbed-headers
+        mbed-headers-netsocket
         mbed-headers-cellular
         mbed-stubs-platform
         gmock_main
diff --git a/connectivity/cellular/tests/UNITTESTS/framework/device/athandler/CMakeLists.txt b/connectivity/cellular/tests/UNITTESTS/framework/device/athandler/CMakeLists.txt
index 76f3c8af11..1d801efa87 100644
--- a/connectivity/cellular/tests/UNITTESTS/framework/device/athandler/CMakeLists.txt
+++ b/connectivity/cellular/tests/UNITTESTS/framework/device/athandler/CMakeLists.txt
@@ -25,6 +25,7 @@ target_sources(${TEST_NAME}
 target_link_libraries(${TEST_NAME}
     PRIVATE
         mbed-headers
+        mbed-headers-netsocket
         mbed-headers-cellular
         mbed-stubs
         mbed-stubs-cellular
diff --git a/connectivity/cellular/tests/UNITTESTS/framework/device/cellularcontext/CMakeLists.txt b/connectivity/cellular/tests/UNITTESTS/framework/device/cellularcontext/CMakeLists.txt
index ddd9181d0b..9d8c2aa34a 100644
--- a/connectivity/cellular/tests/UNITTESTS/framework/device/cellularcontext/CMakeLists.txt
+++ b/connectivity/cellular/tests/UNITTESTS/framework/device/cellularcontext/CMakeLists.txt
@@ -36,9 +36,11 @@ target_sources(${TEST_NAME}
 target_link_libraries(${TEST_NAME}
     PRIVATE
         mbed-headers
+        mbed-headers-netsocket
         mbed-headers-cellular
         mbed-stubs
         mbed-stubs-cellular
+        mbed-stubs-netsocket
         mbed-stubs-headers
         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 54c9dc7616..272e30a1cc 100644
--- a/connectivity/cellular/tests/UNITTESTS/framework/device/cellulardevice/CMakeLists.txt
+++ b/connectivity/cellular/tests/UNITTESTS/framework/device/cellulardevice/CMakeLists.txt
@@ -27,6 +27,7 @@ target_sources(${TEST_NAME}
 
 target_link_libraries(${TEST_NAME}
     PRIVATE
+        mbed-headers-netsocket
         mbed-headers
         mbed-headers-cellular
         mbed-stubs
diff --git a/connectivity/cellular/tests/UNITTESTS/framework/device/cellularstatemachine/CMakeLists.txt b/connectivity/cellular/tests/UNITTESTS/framework/device/cellularstatemachine/CMakeLists.txt
index a5c1b55e4b..ab3529d51a 100644
--- a/connectivity/cellular/tests/UNITTESTS/framework/device/cellularstatemachine/CMakeLists.txt
+++ b/connectivity/cellular/tests/UNITTESTS/framework/device/cellularstatemachine/CMakeLists.txt
@@ -29,6 +29,7 @@ target_sources(${TEST_NAME}
 target_link_libraries(${TEST_NAME}
     PRIVATE
         mbed-headers
+        mbed-headers-netsocket
         mbed-headers-cellular
         mbed-stubs
         mbed-stubs-cellular
diff --git a/connectivity/netsocket/tests/UNITTESTS/CMakeLists.txt b/connectivity/netsocket/tests/UNITTESTS/CMakeLists.txt
index e23c5d4290..b54cb6bb8c 100644
--- a/connectivity/netsocket/tests/UNITTESTS/CMakeLists.txt
+++ b/connectivity/netsocket/tests/UNITTESTS/CMakeLists.txt
@@ -1,4 +1,5 @@
 # Copyright (c) 2021 ARM Limited. All rights reserved.
 # SPDX-License-Identifier: Apache-2.0
 
+add_subdirectory(doubles)
 add_subdirectory(netsocket)
diff --git a/connectivity/netsocket/tests/UNITTESTS/doubles/CMakeLists.txt b/connectivity/netsocket/tests/UNITTESTS/doubles/CMakeLists.txt
new file mode 100644
index 0000000000..634caa0b3d
--- /dev/null
+++ b/connectivity/netsocket/tests/UNITTESTS/doubles/CMakeLists.txt
@@ -0,0 +1,38 @@
+# Copyright (c) 2021 ARM Limited. All rights reserved.
+# SPDX-License-Identifier: Apache-2.0
+
+add_library(mbed-headers-netsocket INTERFACE)
+
+target_include_directories(mbed-headers-netsocket
+    INTERFACE
+        ${mbed-os_SOURCE_DIR}/connectivity/netsocket/include
+)
+
+add_library(mbed-stubs-netsocket)
+
+target_include_directories(mbed-stubs-netsocket
+    PUBLIC
+        .
+)
+
+target_sources(mbed-stubs-netsocket
+    PRIVATE
+        CellularInterface_stub.cpp
+        MeshInterface_stub.cpp
+        NetworkInterfaceDefaults_stub.cpp
+        NetworkInterface_stub.cpp
+        NetworkStack_stub.cpp
+        nsapi_dns_stub.cpp
+        SocketAddress_stub.cpp
+        SocketStats_Stub.cpp
+)
+
+target_link_libraries(mbed-stubs-netsocket
+    PRIVATE
+        mbed-headers-netsocket
+        mbed-stubs-rtos-headers
+        mbed-headers
+        mbed-stubs-headers
+        mbed-stubs-rtos
+        gtest
+)
diff --git a/UNITTESTS/stubs/connectivity/CellularInterface_stub.cpp b/connectivity/netsocket/tests/UNITTESTS/doubles/CellularInterface_stub.cpp
similarity index 100%
rename from UNITTESTS/stubs/connectivity/CellularInterface_stub.cpp
rename to connectivity/netsocket/tests/UNITTESTS/doubles/CellularInterface_stub.cpp
diff --git a/UNITTESTS/stubs/ControlPlane_netif_stub.h b/connectivity/netsocket/tests/UNITTESTS/doubles/ControlPlane_netif_stub.h
similarity index 100%
rename from UNITTESTS/stubs/ControlPlane_netif_stub.h
rename to connectivity/netsocket/tests/UNITTESTS/doubles/ControlPlane_netif_stub.h
diff --git a/UNITTESTS/stubs/EMAC_mock.h b/connectivity/netsocket/tests/UNITTESTS/doubles/EMAC_mock.h
similarity index 100%
rename from UNITTESTS/stubs/EMAC_mock.h
rename to connectivity/netsocket/tests/UNITTESTS/doubles/EMAC_mock.h
diff --git a/UNITTESTS/stubs/connectivity/MeshInterface_stub.cpp b/connectivity/netsocket/tests/UNITTESTS/doubles/MeshInterface_stub.cpp
similarity index 100%
rename from UNITTESTS/stubs/connectivity/MeshInterface_stub.cpp
rename to connectivity/netsocket/tests/UNITTESTS/doubles/MeshInterface_stub.cpp
diff --git a/UNITTESTS/stubs/connectivity/NetworkInterfaceDefaults_stub.cpp b/connectivity/netsocket/tests/UNITTESTS/doubles/NetworkInterfaceDefaults_stub.cpp
similarity index 100%
rename from UNITTESTS/stubs/connectivity/NetworkInterfaceDefaults_stub.cpp
rename to connectivity/netsocket/tests/UNITTESTS/doubles/NetworkInterfaceDefaults_stub.cpp
diff --git a/UNITTESTS/stubs/connectivity/NetworkInterface_stub.cpp b/connectivity/netsocket/tests/UNITTESTS/doubles/NetworkInterface_stub.cpp
similarity index 100%
rename from UNITTESTS/stubs/connectivity/NetworkInterface_stub.cpp
rename to connectivity/netsocket/tests/UNITTESTS/doubles/NetworkInterface_stub.cpp
diff --git a/UNITTESTS/stubs/connectivity/NetworkStack_stub.cpp b/connectivity/netsocket/tests/UNITTESTS/doubles/NetworkStack_stub.cpp
similarity index 96%
rename from UNITTESTS/stubs/connectivity/NetworkStack_stub.cpp
rename to connectivity/netsocket/tests/UNITTESTS/doubles/NetworkStack_stub.cpp
index dd68b3e9fb..7d6331a4d9 100644
--- a/UNITTESTS/stubs/connectivity/NetworkStack_stub.cpp
+++ b/connectivity/netsocket/tests/UNITTESTS/doubles/NetworkStack_stub.cpp
@@ -94,7 +94,7 @@ nsapi_error_t NetworkStack::call_in(int delay, mbed::Callback<void()> func)
     return NSAPI_ERROR_UNSUPPORTED;
 }
 
-nsapi_error_t NetworkStack::get_ip_address(SocketAddress* address)
+nsapi_error_t NetworkStack::get_ip_address(SocketAddress *address)
 {
     return NSAPI_ERROR_UNSUPPORTED;
 }
@@ -104,7 +104,7 @@ nsapi_error_t NetworkStack::get_ipv6_link_local_address(SocketAddress *address)
     return NSAPI_ERROR_UNSUPPORTED;
 }
 
-nsapi_error_t NetworkStack::get_ip_address_if(SocketAddress* address, const char *interface_name)
+nsapi_error_t NetworkStack::get_ip_address_if(SocketAddress *address, const char *interface_name)
 {
     return NSAPI_ERROR_UNSUPPORTED;
 }
diff --git a/UNITTESTS/stubs/NetworkStack_stub.h b/connectivity/netsocket/tests/UNITTESTS/doubles/NetworkStack_stub.h
similarity index 98%
rename from UNITTESTS/stubs/NetworkStack_stub.h
rename to connectivity/netsocket/tests/UNITTESTS/doubles/NetworkStack_stub.h
index 916937e645..d6b630a1d8 100644
--- a/UNITTESTS/stubs/NetworkStack_stub.h
+++ b/connectivity/netsocket/tests/UNITTESTS/doubles/NetworkStack_stub.h
@@ -40,7 +40,7 @@ public:
     {
     }
 
-    virtual nsapi_error_t get_ip_address(SocketAddress* address)
+    virtual nsapi_error_t get_ip_address(SocketAddress *address)
     {
         address->set_ip_address("127.0.0.1");
         return NSAPI_ERROR_OK;
diff --git a/UNITTESTS/stubs/OnboardNetworkStack_mock.h b/connectivity/netsocket/tests/UNITTESTS/doubles/OnboardNetworkStack_mock.h
similarity index 100%
rename from UNITTESTS/stubs/OnboardNetworkStack_mock.h
rename to connectivity/netsocket/tests/UNITTESTS/doubles/OnboardNetworkStack_mock.h
diff --git a/UNITTESTS/stubs/connectivity/SocketAddress_stub.cpp b/connectivity/netsocket/tests/UNITTESTS/doubles/SocketAddress_stub.cpp
similarity index 100%
rename from UNITTESTS/stubs/connectivity/SocketAddress_stub.cpp
rename to connectivity/netsocket/tests/UNITTESTS/doubles/SocketAddress_stub.cpp
diff --git a/UNITTESTS/stubs/connectivity/SocketStats_Stub.cpp b/connectivity/netsocket/tests/UNITTESTS/doubles/SocketStats_Stub.cpp
similarity index 100%
rename from UNITTESTS/stubs/connectivity/SocketStats_Stub.cpp
rename to connectivity/netsocket/tests/UNITTESTS/doubles/SocketStats_Stub.cpp
diff --git a/UNITTESTS/stubs/connectivity/nsapi_dns_stub.cpp b/connectivity/netsocket/tests/UNITTESTS/doubles/nsapi_dns_stub.cpp
similarity index 100%
rename from UNITTESTS/stubs/connectivity/nsapi_dns_stub.cpp
rename to connectivity/netsocket/tests/UNITTESTS/doubles/nsapi_dns_stub.cpp
diff --git a/connectivity/netsocket/tests/UNITTESTS/netsocket/CellularNonIPSocket/CMakeLists.txt b/connectivity/netsocket/tests/UNITTESTS/netsocket/CellularNonIPSocket/CMakeLists.txt
index 2acaddb6bc..98da637f74 100644
--- a/connectivity/netsocket/tests/UNITTESTS/netsocket/CellularNonIPSocket/CMakeLists.txt
+++ b/connectivity/netsocket/tests/UNITTESTS/netsocket/CellularNonIPSocket/CMakeLists.txt
@@ -23,9 +23,11 @@ target_sources(${TEST_NAME}
 target_link_libraries(${TEST_NAME}
     PRIVATE
         mbed-headers
+        mbed-headers-netsocket
         mbed-headers-cellular
         mbed-stubs
         mbed-stubs-cellular
+        mbed-stubs-netsocket
         mbed-stubs-headers
         gmock_main
 )
diff --git a/connectivity/netsocket/tests/UNITTESTS/netsocket/DTLSSocket/CMakeLists.txt b/connectivity/netsocket/tests/UNITTESTS/netsocket/DTLSSocket/CMakeLists.txt
index 9f241884a2..9564055efa 100644
--- a/connectivity/netsocket/tests/UNITTESTS/netsocket/DTLSSocket/CMakeLists.txt
+++ b/connectivity/netsocket/tests/UNITTESTS/netsocket/DTLSSocket/CMakeLists.txt
@@ -31,8 +31,10 @@ target_sources(${TEST_NAME}
 target_link_libraries(${TEST_NAME}
     PRIVATE
         mbed-headers
+        mbed-headers-netsocket
         mbed-stubs
         mbed-stubs-headers
+        mbed-stubs-netsocket
         gmock_main
 )
 
diff --git a/connectivity/netsocket/tests/UNITTESTS/netsocket/DTLSSocketWrapper/CMakeLists.txt b/connectivity/netsocket/tests/UNITTESTS/netsocket/DTLSSocketWrapper/CMakeLists.txt
index 20a0e4cfc3..bfc358b809 100644
--- a/connectivity/netsocket/tests/UNITTESTS/netsocket/DTLSSocketWrapper/CMakeLists.txt
+++ b/connectivity/netsocket/tests/UNITTESTS/netsocket/DTLSSocketWrapper/CMakeLists.txt
@@ -30,8 +30,10 @@ target_sources(${TEST_NAME}
 target_link_libraries(${TEST_NAME}
     PRIVATE
         mbed-headers
+        mbed-headers-netsocket
         mbed-stubs
         mbed-stubs-headers
+        mbed-stubs-netsocket
         gmock_main
 )
 
diff --git a/connectivity/netsocket/tests/UNITTESTS/netsocket/EthernetInterface/CMakeLists.txt b/connectivity/netsocket/tests/UNITTESTS/netsocket/EthernetInterface/CMakeLists.txt
index 2081cf2e94..6f6478b5b2 100644
--- a/connectivity/netsocket/tests/UNITTESTS/netsocket/EthernetInterface/CMakeLists.txt
+++ b/connectivity/netsocket/tests/UNITTESTS/netsocket/EthernetInterface/CMakeLists.txt
@@ -28,9 +28,11 @@ target_sources(${TEST_NAME}
 
 target_link_libraries(${TEST_NAME}
     PRIVATE
+        mbed-headers-netsocket
         mbed-headers
         mbed-stubs
         mbed-stubs-headers
+        mbed-stubs-netsocket
         gmock_main
 )
 
diff --git a/connectivity/netsocket/tests/UNITTESTS/netsocket/IfaceDnsSocket/CMakeLists.txt b/connectivity/netsocket/tests/UNITTESTS/netsocket/IfaceDnsSocket/CMakeLists.txt
index 68ee8fb941..cfaf6ae55f 100644
--- a/connectivity/netsocket/tests/UNITTESTS/netsocket/IfaceDnsSocket/CMakeLists.txt
+++ b/connectivity/netsocket/tests/UNITTESTS/netsocket/IfaceDnsSocket/CMakeLists.txt
@@ -43,8 +43,10 @@ target_sources(${TEST_NAME}
 target_link_libraries(${TEST_NAME}
     PRIVATE
         mbed-headers
+        mbed-headers-netsocket
         mbed-stubs
         mbed-stubs-headers
+        mbed-stubs-netsocket
         gmock_main
 )
 
diff --git a/connectivity/netsocket/tests/UNITTESTS/netsocket/InternetSocket/CMakeLists.txt b/connectivity/netsocket/tests/UNITTESTS/netsocket/InternetSocket/CMakeLists.txt
index 981790d6ea..efed786cc8 100644
--- a/connectivity/netsocket/tests/UNITTESTS/netsocket/InternetSocket/CMakeLists.txt
+++ b/connectivity/netsocket/tests/UNITTESTS/netsocket/InternetSocket/CMakeLists.txt
@@ -26,8 +26,10 @@ target_sources(${TEST_NAME}
 target_link_libraries(${TEST_NAME}
     PRIVATE
         mbed-headers
+        mbed-headers-netsocket
         mbed-stubs
         mbed-stubs-headers
+        mbed-stubs-netsocket
         gmock_main
 )
 
diff --git a/connectivity/netsocket/tests/UNITTESTS/netsocket/NetworkInterface/CMakeLists.txt b/connectivity/netsocket/tests/UNITTESTS/netsocket/NetworkInterface/CMakeLists.txt
index f92e9ed7fe..80862ec158 100644
--- a/connectivity/netsocket/tests/UNITTESTS/netsocket/NetworkInterface/CMakeLists.txt
+++ b/connectivity/netsocket/tests/UNITTESTS/netsocket/NetworkInterface/CMakeLists.txt
@@ -29,8 +29,10 @@ target_sources(${TEST_NAME}
 target_link_libraries(${TEST_NAME}
     PRIVATE
         mbed-headers
+        mbed-headers-netsocket
         mbed-stubs
         mbed-stubs-headers
+        mbed-stubs-netsocket
         gmock_main
 )
 
diff --git a/connectivity/netsocket/tests/UNITTESTS/netsocket/NetworkStack/CMakeLists.txt b/connectivity/netsocket/tests/UNITTESTS/netsocket/NetworkStack/CMakeLists.txt
index f320819f41..77a21b3cd2 100644
--- a/connectivity/netsocket/tests/UNITTESTS/netsocket/NetworkStack/CMakeLists.txt
+++ b/connectivity/netsocket/tests/UNITTESTS/netsocket/NetworkStack/CMakeLists.txt
@@ -25,8 +25,10 @@ target_sources(${TEST_NAME}
 target_link_libraries(${TEST_NAME}
     PRIVATE
         mbed-headers
+        mbed-headers-netsocket
         mbed-stubs
         mbed-stubs-headers
+        mbed-stubs-netsocket
         gmock_main
 )
 
diff --git a/connectivity/netsocket/tests/UNITTESTS/netsocket/PPPInterface/CMakeLists.txt b/connectivity/netsocket/tests/UNITTESTS/netsocket/PPPInterface/CMakeLists.txt
index f78c6ccf6b..ebb0ee452f 100644
--- a/connectivity/netsocket/tests/UNITTESTS/netsocket/PPPInterface/CMakeLists.txt
+++ b/connectivity/netsocket/tests/UNITTESTS/netsocket/PPPInterface/CMakeLists.txt
@@ -29,8 +29,10 @@ target_sources(${TEST_NAME}
 target_link_libraries(${TEST_NAME}
     PRIVATE
         mbed-headers
+        mbed-headers-netsocket
         mbed-stubs
         mbed-stubs-headers
+        mbed-stubs-netsocket
         gmock_main
 )
 
diff --git a/connectivity/netsocket/tests/UNITTESTS/netsocket/SocketAddress/CMakeLists.txt b/connectivity/netsocket/tests/UNITTESTS/netsocket/SocketAddress/CMakeLists.txt
index 5ac15b6a54..0e36bc724d 100644
--- a/connectivity/netsocket/tests/UNITTESTS/netsocket/SocketAddress/CMakeLists.txt
+++ b/connectivity/netsocket/tests/UNITTESTS/netsocket/SocketAddress/CMakeLists.txt
@@ -19,6 +19,7 @@ target_sources(${TEST_NAME}
 target_link_libraries(${TEST_NAME}
     PRIVATE
         mbed-headers
+        mbed-headers-netsocket
         mbed-stubs
         mbed-stubs-headers
         gmock_main
diff --git a/connectivity/netsocket/tests/UNITTESTS/netsocket/TCPSocket/CMakeLists.txt b/connectivity/netsocket/tests/UNITTESTS/netsocket/TCPSocket/CMakeLists.txt
index ca51a12f39..b4d6d164e9 100644
--- a/connectivity/netsocket/tests/UNITTESTS/netsocket/TCPSocket/CMakeLists.txt
+++ b/connectivity/netsocket/tests/UNITTESTS/netsocket/TCPSocket/CMakeLists.txt
@@ -27,8 +27,10 @@ target_sources(${TEST_NAME}
 target_link_libraries(${TEST_NAME}
     PRIVATE
         mbed-headers
+        mbed-headers-netsocket
         mbed-stubs
         mbed-stubs-headers
+        mbed-stubs-netsocket
         gmock_main
 )
 
diff --git a/connectivity/netsocket/tests/UNITTESTS/netsocket/TLSSocket/CMakeLists.txt b/connectivity/netsocket/tests/UNITTESTS/netsocket/TLSSocket/CMakeLists.txt
index b9242f928c..8d1fc33329 100644
--- a/connectivity/netsocket/tests/UNITTESTS/netsocket/TLSSocket/CMakeLists.txt
+++ b/connectivity/netsocket/tests/UNITTESTS/netsocket/TLSSocket/CMakeLists.txt
@@ -29,8 +29,10 @@ target_sources(${TEST_NAME}
 target_link_libraries(${TEST_NAME}
     PRIVATE
         mbed-headers
+        mbed-headers-netsocket
         mbed-stubs
         mbed-stubs-headers
+        mbed-stubs-netsocket
         gmock_main
 )
 
diff --git a/connectivity/netsocket/tests/UNITTESTS/netsocket/TLSSocketWrapper/CMakeLists.txt b/connectivity/netsocket/tests/UNITTESTS/netsocket/TLSSocketWrapper/CMakeLists.txt
index 459d5c689b..56248a39b7 100644
--- a/connectivity/netsocket/tests/UNITTESTS/netsocket/TLSSocketWrapper/CMakeLists.txt
+++ b/connectivity/netsocket/tests/UNITTESTS/netsocket/TLSSocketWrapper/CMakeLists.txt
@@ -28,8 +28,10 @@ target_sources(${TEST_NAME}
 target_link_libraries(${TEST_NAME}
     PRIVATE
         mbed-headers
+        mbed-headers-netsocket
         mbed-stubs
         mbed-stubs-headers
+        mbed-stubs-netsocket
         gmock_main
 )
 
diff --git a/connectivity/netsocket/tests/UNITTESTS/netsocket/UDPSocket/CMakeLists.txt b/connectivity/netsocket/tests/UNITTESTS/netsocket/UDPSocket/CMakeLists.txt
index e62438cd85..e4ffc7e663 100644
--- a/connectivity/netsocket/tests/UNITTESTS/netsocket/UDPSocket/CMakeLists.txt
+++ b/connectivity/netsocket/tests/UNITTESTS/netsocket/UDPSocket/CMakeLists.txt
@@ -28,8 +28,10 @@ target_sources(${TEST_NAME}
 target_link_libraries(${TEST_NAME}
     PRIVATE
         mbed-headers
+        mbed-headers-netsocket
         mbed-stubs
         mbed-stubs-headers
+        mbed-stubs-netsocket
         gmock_main
 )
 
diff --git a/connectivity/netsocket/tests/UNITTESTS/netsocket/WiFiAccessPoint/CMakeLists.txt b/connectivity/netsocket/tests/UNITTESTS/netsocket/WiFiAccessPoint/CMakeLists.txt
index d51f755464..f6a5ef1832 100644
--- a/connectivity/netsocket/tests/UNITTESTS/netsocket/WiFiAccessPoint/CMakeLists.txt
+++ b/connectivity/netsocket/tests/UNITTESTS/netsocket/WiFiAccessPoint/CMakeLists.txt
@@ -14,6 +14,7 @@ target_sources(${TEST_NAME}
 target_link_libraries(${TEST_NAME}
     PRIVATE
         mbed-headers
+        mbed-headers-netsocket
         mbed-stubs
         mbed-stubs-headers
         gmock_main