diff --git a/connectivity/lorawan/tests/UNITTESTS/doubles/CMakeLists.txt b/connectivity/lorawan/tests/UNITTESTS/doubles/CMakeLists.txt
index 1ff48551f9..c9250fbf46 100644
--- a/connectivity/lorawan/tests/UNITTESTS/doubles/CMakeLists.txt
+++ b/connectivity/lorawan/tests/UNITTESTS/doubles/CMakeLists.txt
@@ -20,6 +20,11 @@ target_compile_definitions(mbed-stubs-lorawan
         MBED_CONF_LORA_TX_MAX_SIZE=255
 )
 
+target_include_directories(mbed-stubs-lorawan
+    PUBLIC
+        .
+)
+
 target_sources(mbed-stubs-lorawan
     PRIVATE
         LoRaMacChannelPlan_stub.cpp
diff --git a/UNITTESTS/stubs/LoRaMacCommand_stub.h b/connectivity/lorawan/tests/UNITTESTS/doubles/LoRaMacCommand_stub.h
similarity index 100%
rename from UNITTESTS/stubs/LoRaMacCommand_stub.h
rename to connectivity/lorawan/tests/UNITTESTS/doubles/LoRaMacCommand_stub.h
diff --git a/UNITTESTS/stubs/LoRaMacCrypto_stub.h b/connectivity/lorawan/tests/UNITTESTS/doubles/LoRaMacCrypto_stub.h
similarity index 100%
rename from UNITTESTS/stubs/LoRaMacCrypto_stub.h
rename to connectivity/lorawan/tests/UNITTESTS/doubles/LoRaMacCrypto_stub.h
diff --git a/UNITTESTS/stubs/LoRaMac_stub.h b/connectivity/lorawan/tests/UNITTESTS/doubles/LoRaMac_stub.h
similarity index 100%
rename from UNITTESTS/stubs/LoRaMac_stub.h
rename to connectivity/lorawan/tests/UNITTESTS/doubles/LoRaMac_stub.h
diff --git a/UNITTESTS/stubs/LoRaPHY_stub.h b/connectivity/lorawan/tests/UNITTESTS/doubles/LoRaPHY_stub.h
similarity index 100%
rename from UNITTESTS/stubs/LoRaPHY_stub.h
rename to connectivity/lorawan/tests/UNITTESTS/doubles/LoRaPHY_stub.h
diff --git a/UNITTESTS/stubs/LoRaWANTimer_stub.h b/connectivity/lorawan/tests/UNITTESTS/doubles/LoRaWANTimer_stub.h
similarity index 100%
rename from UNITTESTS/stubs/LoRaWANTimer_stub.h
rename to connectivity/lorawan/tests/UNITTESTS/doubles/LoRaWANTimer_stub.h