diff --git a/testhal/STM32/STM32F4xx/FSMC_SRAM/memtest.cpp b/os/various/memtest.cpp
similarity index 99%
rename from testhal/STM32/STM32F4xx/FSMC_SRAM/memtest.cpp
rename to os/various/memtest.cpp
index 6a0630a0..49828eca 100644
--- a/testhal/STM32/STM32F4xx/FSMC_SRAM/memtest.cpp
+++ b/os/various/memtest.cpp
@@ -220,7 +220,7 @@ static void memtest_wrapper(memtest_t *testp,
                             void (*p_u8)(memtest_t *testp),
                             void (*p_u16)(memtest_t *testp),
                             void (*p_u32)(memtest_t *testp)) {
-  switch(testp->width){
+  switch(testp->width) {
   case MEMTEST_WIDTH_32:
     p_u8(testp);
     p_u16(testp);
diff --git a/testhal/STM32/STM32F4xx/FSMC_SRAM/memtest.hpp b/os/various/memtest.hpp
similarity index 100%
rename from testhal/STM32/STM32F4xx/FSMC_SRAM/memtest.hpp
rename to os/various/memtest.hpp
diff --git a/testhal/STM32/STM32F4xx/FSMC_SRAM/Makefile b/testhal/STM32/STM32F4xx/FSMC_SRAM/Makefile
index c85f1e91..e3d83c41 100644
--- a/testhal/STM32/STM32F4xx/FSMC_SRAM/Makefile
+++ b/testhal/STM32/STM32F4xx/FSMC_SRAM/Makefile
@@ -114,7 +114,7 @@ CSRC = $(STARTUPSRC) \
 # C++ sources that can be compiled in ARM or THUMB mode depending on the global
 # setting.
 CPPSRC = $(CHCPPSRC) \
-         memtest.cpp
+         $(CHIBIOS)/community/os/various/memtest.cpp
 
 # C sources to be compiled in ARM mode regardless of the global setting.
 # NOTE: Mixing ARM and THUMB mode enables the -mthumb-interwork compiler
@@ -142,7 +142,8 @@ ASMSRC = $(STARTUPASM) $(PORTASM) $(OSALASM)
 INCDIR = $(STARTUPINC) $(KERNINC) $(PORTINC) $(OSALINC) \
          $(HALINC) $(PLATFORMINC) $(BOARDINC) $(TESTINC) \
          $(CHIBIOS)/os/various/cpp_wrappers \
-         $(CHIBIOS)/os/various
+         $(CHIBIOS)/os/various \
+         $(CHIBIOS)/community/os/various
 
 #
 # Project, sources and paths