diff --git a/connectivity/cellular/tests/UNITTESTS/doubles/CMakeLists.txt b/connectivity/cellular/tests/UNITTESTS/doubles/CMakeLists.txt
index adbed153d5..f0b911468d 100644
--- a/connectivity/cellular/tests/UNITTESTS/doubles/CMakeLists.txt
+++ b/connectivity/cellular/tests/UNITTESTS/doubles/CMakeLists.txt
@@ -52,6 +52,7 @@ target_link_libraries(mbed-stubs-cellular
         mbed-headers-hal
         mbed-headers-events
         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..9bb9bb3e20 100644
--- a/connectivity/cellular/tests/UNITTESTS/framework/AT/at_cellularcontext/CMakeLists.txt
+++ b/connectivity/cellular/tests/UNITTESTS/framework/AT/at_cellularcontext/CMakeLists.txt
@@ -27,6 +27,7 @@ target_link_libraries(${TEST_NAME}
         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..26faee9fe6 100644
--- a/connectivity/cellular/tests/UNITTESTS/framework/AT/at_cellulardevice/CMakeLists.txt
+++ b/connectivity/cellular/tests/UNITTESTS/framework/AT/at_cellulardevice/CMakeLists.txt
@@ -32,6 +32,7 @@ target_link_libraries(${TEST_NAME}
         mbed-headers
         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..4460257c8f 100644
--- a/connectivity/cellular/tests/UNITTESTS/framework/AT/at_cellularinformation/CMakeLists.txt
+++ b/connectivity/cellular/tests/UNITTESTS/framework/AT/at_cellularinformation/CMakeLists.txt
@@ -24,6 +24,7 @@ target_link_libraries(${TEST_NAME}
         mbed-headers
         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..9126dd109a 100644
--- a/connectivity/cellular/tests/UNITTESTS/framework/AT/at_cellularnetwork/CMakeLists.txt
+++ b/connectivity/cellular/tests/UNITTESTS/framework/AT/at_cellularnetwork/CMakeLists.txt
@@ -25,6 +25,7 @@ target_link_libraries(${TEST_NAME}
         mbed-headers
         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..cde874b927 100644
--- a/connectivity/cellular/tests/UNITTESTS/framework/AT/at_cellularsms/CMakeLists.txt
+++ b/connectivity/cellular/tests/UNITTESTS/framework/AT/at_cellularsms/CMakeLists.txt
@@ -25,6 +25,7 @@ target_link_libraries(${TEST_NAME}
         mbed-headers
         mbed-headers-cellular
         mbed-stubs
+        mbed-stubs-netsocket
         mbed-stubs-cellular
         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..5684dcb804 100644
--- a/connectivity/netsocket/tests/UNITTESTS/netsocket/DTLSSocket/CMakeLists.txt
+++ b/connectivity/netsocket/tests/UNITTESTS/netsocket/DTLSSocket/CMakeLists.txt
@@ -33,6 +33,7 @@ target_link_libraries(${TEST_NAME}
         mbed-headers
         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..eddf663b8c 100644
--- a/connectivity/netsocket/tests/UNITTESTS/netsocket/DTLSSocketWrapper/CMakeLists.txt
+++ b/connectivity/netsocket/tests/UNITTESTS/netsocket/DTLSSocketWrapper/CMakeLists.txt
@@ -32,6 +32,7 @@ target_link_libraries(${TEST_NAME}
         mbed-headers
         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..a35d2b680a 100644
--- a/connectivity/netsocket/tests/UNITTESTS/netsocket/EthernetInterface/CMakeLists.txt
+++ b/connectivity/netsocket/tests/UNITTESTS/netsocket/EthernetInterface/CMakeLists.txt
@@ -31,6 +31,7 @@ target_link_libraries(${TEST_NAME}
         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..7e2143a971 100644
--- a/connectivity/netsocket/tests/UNITTESTS/netsocket/IfaceDnsSocket/CMakeLists.txt
+++ b/connectivity/netsocket/tests/UNITTESTS/netsocket/IfaceDnsSocket/CMakeLists.txt
@@ -45,6 +45,7 @@ target_link_libraries(${TEST_NAME}
         mbed-headers
         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..0abb4d5cc7 100644
--- a/connectivity/netsocket/tests/UNITTESTS/netsocket/InternetSocket/CMakeLists.txt
+++ b/connectivity/netsocket/tests/UNITTESTS/netsocket/InternetSocket/CMakeLists.txt
@@ -28,6 +28,7 @@ target_link_libraries(${TEST_NAME}
         mbed-headers
         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..4d1cd6bb97 100644
--- a/connectivity/netsocket/tests/UNITTESTS/netsocket/NetworkInterface/CMakeLists.txt
+++ b/connectivity/netsocket/tests/UNITTESTS/netsocket/NetworkInterface/CMakeLists.txt
@@ -31,6 +31,7 @@ target_link_libraries(${TEST_NAME}
         mbed-headers
         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..d0fe1d614d 100644
--- a/connectivity/netsocket/tests/UNITTESTS/netsocket/NetworkStack/CMakeLists.txt
+++ b/connectivity/netsocket/tests/UNITTESTS/netsocket/NetworkStack/CMakeLists.txt
@@ -27,6 +27,7 @@ target_link_libraries(${TEST_NAME}
         mbed-headers
         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..21c7f1eb89 100644
--- a/connectivity/netsocket/tests/UNITTESTS/netsocket/PPPInterface/CMakeLists.txt
+++ b/connectivity/netsocket/tests/UNITTESTS/netsocket/PPPInterface/CMakeLists.txt
@@ -31,6 +31,7 @@ target_link_libraries(${TEST_NAME}
         mbed-headers
         mbed-stubs
         mbed-stubs-headers
+        mbed-stubs-netsocket
         gmock_main
 )
 
diff --git a/connectivity/netsocket/tests/UNITTESTS/netsocket/TCPSocket/CMakeLists.txt b/connectivity/netsocket/tests/UNITTESTS/netsocket/TCPSocket/CMakeLists.txt
index ca51a12f39..1078a2a007 100644
--- a/connectivity/netsocket/tests/UNITTESTS/netsocket/TCPSocket/CMakeLists.txt
+++ b/connectivity/netsocket/tests/UNITTESTS/netsocket/TCPSocket/CMakeLists.txt
@@ -29,6 +29,7 @@ target_link_libraries(${TEST_NAME}
         mbed-headers
         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..d2bafa145e 100644
--- a/connectivity/netsocket/tests/UNITTESTS/netsocket/TLSSocket/CMakeLists.txt
+++ b/connectivity/netsocket/tests/UNITTESTS/netsocket/TLSSocket/CMakeLists.txt
@@ -31,6 +31,7 @@ target_link_libraries(${TEST_NAME}
         mbed-headers
         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..4b03c3d546 100644
--- a/connectivity/netsocket/tests/UNITTESTS/netsocket/TLSSocketWrapper/CMakeLists.txt
+++ b/connectivity/netsocket/tests/UNITTESTS/netsocket/TLSSocketWrapper/CMakeLists.txt
@@ -30,6 +30,7 @@ target_link_libraries(${TEST_NAME}
         mbed-headers
         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..d9a8e816af 100644
--- a/connectivity/netsocket/tests/UNITTESTS/netsocket/UDPSocket/CMakeLists.txt
+++ b/connectivity/netsocket/tests/UNITTESTS/netsocket/UDPSocket/CMakeLists.txt
@@ -30,6 +30,7 @@ target_link_libraries(${TEST_NAME}
         mbed-headers
         mbed-stubs
         mbed-stubs-headers
+        mbed-stubs-netsocket
         gmock_main
 )