diff --git a/UNITTESTS/stubs/ATHandler_stub.h b/connectivity/cellular/tests/UNITTESTS/doubles/ATHandler_stub.h
similarity index 100%
rename from UNITTESTS/stubs/ATHandler_stub.h
rename to connectivity/cellular/tests/UNITTESTS/doubles/ATHandler_stub.h
diff --git a/UNITTESTS/stubs/AT_CellularDevice_stub.h b/connectivity/cellular/tests/UNITTESTS/doubles/AT_CellularDevice_stub.h
similarity index 100%
rename from UNITTESTS/stubs/AT_CellularDevice_stub.h
rename to connectivity/cellular/tests/UNITTESTS/doubles/AT_CellularDevice_stub.h
diff --git a/UNITTESTS/stubs/AT_CellularNetwork_stub.h b/connectivity/cellular/tests/UNITTESTS/doubles/AT_CellularNetwork_stub.h
similarity index 100%
rename from UNITTESTS/stubs/AT_CellularNetwork_stub.h
rename to connectivity/cellular/tests/UNITTESTS/doubles/AT_CellularNetwork_stub.h
diff --git a/connectivity/cellular/tests/UNITTESTS/doubles/CMakeLists.txt b/connectivity/cellular/tests/UNITTESTS/doubles/CMakeLists.txt
index adbed153d5..35d9d865e2 100644
--- a/connectivity/cellular/tests/UNITTESTS/doubles/CMakeLists.txt
+++ b/connectivity/cellular/tests/UNITTESTS/doubles/CMakeLists.txt
@@ -26,6 +26,11 @@ target_compile_definitions(mbed-stubs-cellular
         MDMRXD=NC
 )
 
+target_include_directories(mbed-stubs-cellular
+    PUBLIC
+        .
+)
+
 target_sources(mbed-stubs-cellular
     PRIVATE
         AT_CellularContext_stub.cpp
diff --git a/UNITTESTS/stubs/CellularDevice_stub.h b/connectivity/cellular/tests/UNITTESTS/doubles/CellularDevice_stub.h
similarity index 100%
rename from UNITTESTS/stubs/CellularDevice_stub.h
rename to connectivity/cellular/tests/UNITTESTS/doubles/CellularDevice_stub.h
diff --git a/UNITTESTS/stubs/CellularStateMachine_stub.h b/connectivity/cellular/tests/UNITTESTS/doubles/CellularStateMachine_stub.h
similarity index 100%
rename from UNITTESTS/stubs/CellularStateMachine_stub.h
rename to connectivity/cellular/tests/UNITTESTS/doubles/CellularStateMachine_stub.h
diff --git a/UNITTESTS/stubs/CellularUtil_stub.h b/connectivity/cellular/tests/UNITTESTS/doubles/CellularUtil_stub.h
similarity index 100%
rename from UNITTESTS/stubs/CellularUtil_stub.h
rename to connectivity/cellular/tests/UNITTESTS/doubles/CellularUtil_stub.h