diff --git a/events/tests/UNITTESTS/doubles/CMakeLists.txt b/events/tests/UNITTESTS/doubles/CMakeLists.txt
index 34608ddef5..8d249c091f 100644
--- a/events/tests/UNITTESTS/doubles/CMakeLists.txt
+++ b/events/tests/UNITTESTS/doubles/CMakeLists.txt
@@ -23,6 +23,11 @@ target_sources(mbed-stubs-events
         mbed_shared_queues_stub.cpp
 )
 
+target_include_directories(mbed-stubs-events
+    PUBLIC
+        .
+)
+
 target_link_libraries(mbed-stubs-events
     PRIVATE
         mbed-headers
diff --git a/UNITTESTS/stubs/EventQueue_stub.h b/events/tests/UNITTESTS/doubles/EventQueue_stub.h
similarity index 100%
rename from UNITTESTS/stubs/EventQueue_stub.h
rename to events/tests/UNITTESTS/doubles/EventQueue_stub.h
diff --git a/UNITTESTS/stubs/equeue_stub.h b/events/tests/UNITTESTS/doubles/equeue_stub.h
similarity index 100%
rename from UNITTESTS/stubs/equeue_stub.h
rename to events/tests/UNITTESTS/doubles/equeue_stub.h