diff --git a/drivers/tests/UNITTESTS/doubles/CMakeLists.txt b/drivers/tests/UNITTESTS/doubles/CMakeLists.txt
index a223876842..cb64850094 100644
--- a/drivers/tests/UNITTESTS/doubles/CMakeLists.txt
+++ b/drivers/tests/UNITTESTS/doubles/CMakeLists.txt
@@ -5,6 +5,7 @@ add_library(mbed-headers-drivers INTERFACE)
 
 target_include_directories(mbed-headers-drivers
     INTERFACE
+        .
         ${mbed-os_SOURCE_DIR}/drivers
         ${mbed-os_SOURCE_DIR}/drivers/include
         ${mbed-os_SOURCE_DIR}/drivers/include/drivers
diff --git a/UNITTESTS/target_h/drivers/LowPowerTicker.h b/drivers/tests/UNITTESTS/doubles/drivers/LowPowerTicker.h
similarity index 100%
rename from UNITTESTS/target_h/drivers/LowPowerTicker.h
rename to drivers/tests/UNITTESTS/doubles/drivers/LowPowerTicker.h
diff --git a/UNITTESTS/target_h/drivers/Ticker.h b/drivers/tests/UNITTESTS/doubles/drivers/Ticker.h
similarity index 100%
rename from UNITTESTS/target_h/drivers/Ticker.h
rename to drivers/tests/UNITTESTS/doubles/drivers/Ticker.h