diff --git a/testhal/STM32/STM32F0xx/onewire/Makefile b/testhal/STM32/STM32F0xx/onewire/Makefile
index e866cb22..e478e3ac 100644
--- a/testhal/STM32/STM32F0xx/onewire/Makefile
+++ b/testhal/STM32/STM32F0xx/onewire/Makefile
@@ -77,7 +77,7 @@ PROJECT = ch
 # Imported source files and paths
 CHIBIOS = ../../../../../ChibiOS-RT
 CHIBIOS_CONTRIB = $(CHIBIOS)/../ChibiOS-Contrib
-TESTHAL = $(CHIBIOS_CONTRIB)/testhal/hw_abstracted/onewire
+TESTHAL = $(CHIBIOS_CONTRIB)/testhal/common/onewire
 # Startup files.
 include $(CHIBIOS)/os/common/startup/ARMCMx/compilers/GCC/mk/startup_stm32f0xx.mk
 # HAL-OSAL files (optional).
diff --git a/testhal/STM32/STM32F1xx/onewire/Makefile b/testhal/STM32/STM32F1xx/onewire/Makefile
index a59db058..e9d4238e 100644
--- a/testhal/STM32/STM32F1xx/onewire/Makefile
+++ b/testhal/STM32/STM32F1xx/onewire/Makefile
@@ -82,7 +82,7 @@ PROJECT = ch
 # Imported source files and paths
 CHIBIOS = ../../../../../ChibiOS-RT
 CHIBIOS_CONTRIB = $(CHIBIOS)/../ChibiOS-Contrib
-TESTHAL = $(CHIBIOS_CONTRIB)/testhal/hw_abstracted/onewire
+TESTHAL = $(CHIBIOS_CONTRIB)/testhal/common/onewire
 # Startup files.
 include $(CHIBIOS)/os/common/startup/ARMCMx/compilers/GCC/mk/startup_stm32f1xx.mk
 # HAL-OSAL files (optional).
diff --git a/testhal/STM32/STM32F4xx/onewire/Makefile b/testhal/STM32/STM32F4xx/onewire/Makefile
index 5adcca30..092b0231 100644
--- a/testhal/STM32/STM32F4xx/onewire/Makefile
+++ b/testhal/STM32/STM32F4xx/onewire/Makefile
@@ -88,7 +88,7 @@ PROJECT = ch
 # Imported source files and paths
 CHIBIOS = ../../../../../ChibiOS-RT
 CHIBIOS_CONTRIB = $(CHIBIOS)/../ChibiOS-Contrib
-TESTHAL = $(CHIBIOS_CONTRIB)/testhal/hw_abstracted/onewire
+TESTHAL = $(CHIBIOS_CONTRIB)/testhal/common/onewire
 # Startup files.
 include $(CHIBIOS)/os/common/startup/ARMCMx/compilers/GCC/mk/startup_stm32f4xx.mk
 # HAL-OSAL files (optional).
diff --git a/testhal/hw_abstracted/onewire/real_roms.txt b/testhal/common/onewire/real_roms.txt
similarity index 100%
rename from testhal/hw_abstracted/onewire/real_roms.txt
rename to testhal/common/onewire/real_roms.txt
diff --git a/testhal/hw_abstracted/onewire/synth_searchrom.c b/testhal/common/onewire/synth_searchrom.c
similarity index 100%
rename from testhal/hw_abstracted/onewire/synth_searchrom.c
rename to testhal/common/onewire/synth_searchrom.c
diff --git a/testhal/hw_abstracted/onewire/testhal_onewire.c b/testhal/common/onewire/testhal_onewire.c
similarity index 100%
rename from testhal/hw_abstracted/onewire/testhal_onewire.c
rename to testhal/common/onewire/testhal_onewire.c
diff --git a/testhal/hw_abstracted/onewire/testhal_onewire.h b/testhal/common/onewire/testhal_onewire.h
similarity index 100%
rename from testhal/hw_abstracted/onewire/testhal_onewire.h
rename to testhal/common/onewire/testhal_onewire.h