diff --git a/Tools/tests-host/.gitignore b/unittests/.gitignore
similarity index 100%
rename from Tools/tests-host/.gitignore
rename to unittests/.gitignore
diff --git a/Tools/tests-host/Makefile b/unittests/Makefile
similarity index 100%
rename from Tools/tests-host/Makefile
rename to unittests/Makefile
diff --git a/Tools/tests-host/arch/board/board.h b/unittests/arch/board/board.h
similarity index 100%
rename from Tools/tests-host/arch/board/board.h
rename to unittests/arch/board/board.h
diff --git a/Tools/tests-host/autodeclination_test.cpp b/unittests/autodeclination_test.cpp
similarity index 100%
rename from Tools/tests-host/autodeclination_test.cpp
rename to unittests/autodeclination_test.cpp
diff --git a/Tools/tests-host/board_config.h b/unittests/board_config.h
similarity index 100%
rename from Tools/tests-host/board_config.h
rename to unittests/board_config.h
diff --git a/Tools/tests-host/data/fit_linear_voltage.m b/unittests/data/fit_linear_voltage.m
similarity index 100%
rename from Tools/tests-host/data/fit_linear_voltage.m
rename to unittests/data/fit_linear_voltage.m
diff --git a/Tools/tests-host/data/px4io_v1.3.csv b/unittests/data/px4io_v1.3.csv
similarity index 100%
rename from Tools/tests-host/data/px4io_v1.3.csv
rename to unittests/data/px4io_v1.3.csv
diff --git a/Tools/tests-host/debug.h b/unittests/debug.h
similarity index 100%
rename from Tools/tests-host/debug.h
rename to unittests/debug.h
diff --git a/Tools/tests-host/hrt.cpp b/unittests/hrt.cpp
similarity index 100%
rename from Tools/tests-host/hrt.cpp
rename to unittests/hrt.cpp
diff --git a/Tools/tests-host/mixer_test.cpp b/unittests/mixer_test.cpp
similarity index 100%
rename from Tools/tests-host/mixer_test.cpp
rename to unittests/mixer_test.cpp
diff --git a/Tools/tests-host/nuttx/config.h b/unittests/nuttx/config.h
similarity index 100%
rename from Tools/tests-host/nuttx/config.h
rename to unittests/nuttx/config.h
diff --git a/Tools/tests-host/queue.h b/unittests/queue.h
similarity index 100%
rename from Tools/tests-host/queue.h
rename to unittests/queue.h
diff --git a/Tools/tests-host/run_tests.sh b/unittests/run_tests.sh
similarity index 100%
rename from Tools/tests-host/run_tests.sh
rename to unittests/run_tests.sh
diff --git a/Tools/tests-host/sbus2_test.cpp b/unittests/sbus2_test.cpp
similarity index 100%
rename from Tools/tests-host/sbus2_test.cpp
rename to unittests/sbus2_test.cpp
diff --git a/Tools/tests-host/sf0x_test.cpp b/unittests/sf0x_test.cpp
similarity index 100%
rename from Tools/tests-host/sf0x_test.cpp
rename to unittests/sf0x_test.cpp
diff --git a/Tools/tests-host/st24_test.cpp b/unittests/st24_test.cpp
similarity index 100%
rename from Tools/tests-host/st24_test.cpp
rename to unittests/st24_test.cpp