diff --git a/hal/tests/UNITTESTS/doubles/CMakeLists.txt b/hal/tests/UNITTESTS/doubles/CMakeLists.txt
index 3dc195030d..f82ceb58c9 100644
--- a/hal/tests/UNITTESTS/doubles/CMakeLists.txt
+++ b/hal/tests/UNITTESTS/doubles/CMakeLists.txt
@@ -5,6 +5,7 @@ add_library(mbed-headers-hal INTERFACE)
 
 target_include_directories(mbed-headers-hal
     INTERFACE
+        .
         ${mbed-os_SOURCE_DIR}/hal
         ${mbed-os_SOURCE_DIR}/hal/include
 )
diff --git a/UNITTESTS/target_h/PeripheralNames.h b/hal/tests/UNITTESTS/doubles/PeripheralNames.h
similarity index 100%
rename from UNITTESTS/target_h/PeripheralNames.h
rename to hal/tests/UNITTESTS/doubles/PeripheralNames.h
diff --git a/UNITTESTS/target_h/PinNames.h b/hal/tests/UNITTESTS/doubles/PinNames.h
similarity index 100%
rename from UNITTESTS/target_h/PinNames.h
rename to hal/tests/UNITTESTS/doubles/PinNames.h
diff --git a/UNITTESTS/target_h/device.h b/hal/tests/UNITTESTS/doubles/device.h
similarity index 100%
rename from UNITTESTS/target_h/device.h
rename to hal/tests/UNITTESTS/doubles/device.h
diff --git a/UNITTESTS/target_h/gpio_object.h b/hal/tests/UNITTESTS/doubles/gpio_object.h
similarity index 100%
rename from UNITTESTS/target_h/gpio_object.h
rename to hal/tests/UNITTESTS/doubles/gpio_object.h
diff --git a/UNITTESTS/target_h/objects.h b/hal/tests/UNITTESTS/doubles/objects.h
similarity index 100%
rename from UNITTESTS/target_h/objects.h
rename to hal/tests/UNITTESTS/doubles/objects.h