diff --git a/rtos/tests/UNITTESTS/doubles/CMakeLists.txt b/rtos/tests/UNITTESTS/doubles/CMakeLists.txt
index babf17c920..ed8440daec 100644
--- a/rtos/tests/UNITTESTS/doubles/CMakeLists.txt
+++ b/rtos/tests/UNITTESTS/doubles/CMakeLists.txt
@@ -5,6 +5,7 @@ add_library(mbed-headers-rtos INTERFACE)
 
 target_include_directories(mbed-headers-rtos
     INTERFACE
+        .
         ${mbed-os_SOURCE_DIR}/rtos/include
         ${mbed-os_SOURCE_DIR}/rtos/include/rtos
 )
diff --git a/UNITTESTS/target_h/rtos/Mutex.h b/rtos/tests/UNITTESTS/doubles/rtos/Mutex.h
similarity index 100%
rename from UNITTESTS/target_h/rtos/Mutex.h
rename to rtos/tests/UNITTESTS/doubles/rtos/Mutex.h
diff --git a/UNITTESTS/target_h/rtos/Semaphore.h b/rtos/tests/UNITTESTS/doubles/rtos/Semaphore.h
similarity index 100%
rename from UNITTESTS/target_h/rtos/Semaphore.h
rename to rtos/tests/UNITTESTS/doubles/rtos/Semaphore.h
diff --git a/UNITTESTS/target_h/rtos/Thread.h b/rtos/tests/UNITTESTS/doubles/rtos/Thread.h
similarity index 100%
rename from UNITTESTS/target_h/rtos/Thread.h
rename to rtos/tests/UNITTESTS/doubles/rtos/Thread.h
diff --git a/UNITTESTS/target_h/rtos/include/rtos/internal/mbed_rtos1_types.h b/rtos/tests/UNITTESTS/doubles/rtos/internal/mbed_rtos1_types.h
similarity index 100%
rename from UNITTESTS/target_h/rtos/include/rtos/internal/mbed_rtos1_types.h
rename to rtos/tests/UNITTESTS/doubles/rtos/internal/mbed_rtos1_types.h
diff --git a/UNITTESTS/target_h/rtos/include/rtos/internal/mbed_rtos_storage.h b/rtos/tests/UNITTESTS/doubles/rtos/internal/mbed_rtos_storage.h
similarity index 100%
rename from UNITTESTS/target_h/rtos/include/rtos/internal/mbed_rtos_storage.h
rename to rtos/tests/UNITTESTS/doubles/rtos/internal/mbed_rtos_storage.h
diff --git a/UNITTESTS/target_h/rtos/rtos.h b/rtos/tests/UNITTESTS/doubles/rtos/rtos.h
similarity index 100%
rename from UNITTESTS/target_h/rtos/rtos.h
rename to rtos/tests/UNITTESTS/doubles/rtos/rtos.h