diff --git a/cpu/stm32/periph/gpio_all.c b/cpu/stm32/periph/gpio_all.c
index 68c5fa0737..8a253d7503 100644
--- a/cpu/stm32/periph/gpio_all.c
+++ b/cpu/stm32/periph/gpio_all.c
@@ -186,8 +186,9 @@ void gpio_init_analog(gpio_t pin)
 #else
     periph_clk_en(AHB1, (RCC_AHB1ENR_GPIOAEN << _port_num(pin)));
 #endif
-    /* set to analog mode */
+    /* set to analog mode, PUPD has to be 0b00 */
     _port(pin)->MODER |= (0x3 << (2 * _pin_num(pin)));
+    _port(pin)->PUPDR &= ~(0x3 << (2 * _pin_num(pin)));
 }
 
 void gpio_irq_enable(gpio_t pin)
diff --git a/makefiles/app_dirs.inc.mk b/makefiles/app_dirs.inc.mk
index e7c2a9e7d3..9e17f5c2a5 100644
--- a/makefiles/app_dirs.inc.mk
+++ b/makefiles/app_dirs.inc.mk
@@ -15,6 +15,7 @@ APPLICATION_DIRS :=                   \
     examples                          \
     tests                             \
     tests/bench                       \
+    tests/core                        \
     tests/drivers                     \
     tests/periph                      \
     tests/pkg                         \
diff --git a/tests/core/Makefile.core_common b/tests/core/Makefile.core_common
new file mode 100644
index 0000000000..ecfb7b7d01
--- /dev/null
+++ b/tests/core/Makefile.core_common
@@ -0,0 +1,2 @@
+RIOTBASE ?= $(CURDIR)/../../..
+include $(CURDIR)/../../Makefile.tests_common
diff --git a/tests/bitarithm_timings/Makefile b/tests/core/bitarithm_timings/Makefile
similarity index 64%
rename from tests/bitarithm_timings/Makefile
rename to tests/core/bitarithm_timings/Makefile
index 8bff23ceea..729abbe1a2 100644
--- a/tests/bitarithm_timings/Makefile
+++ b/tests/core/bitarithm_timings/Makefile
@@ -1,4 +1,4 @@
-include ../Makefile.tests_common
+include ../Makefile.core_common
 
 USEMODULE += xtimer
 
diff --git a/tests/bitarithm_timings/main.c b/tests/core/bitarithm_timings/main.c
similarity index 100%
rename from tests/bitarithm_timings/main.c
rename to tests/core/bitarithm_timings/main.c
diff --git a/tests/bitarithm_timings/tests/01-run.py b/tests/core/bitarithm_timings/tests/01-run.py
similarity index 100%
rename from tests/bitarithm_timings/tests/01-run.py
rename to tests/core/bitarithm_timings/tests/01-run.py
diff --git a/tests/cond_order/Makefile b/tests/core/cond_order/Makefile
similarity index 70%
rename from tests/cond_order/Makefile
rename to tests/core/cond_order/Makefile
index 0d02a8d022..143c363d2f 100644
--- a/tests/cond_order/Makefile
+++ b/tests/core/cond_order/Makefile
@@ -1,4 +1,4 @@
-include ../Makefile.tests_common
+include ../Makefile.core_common
 
 USEMODULE += test_utils_interactive_sync
 
diff --git a/tests/cond_order/Makefile.ci b/tests/core/cond_order/Makefile.ci
similarity index 100%
rename from tests/cond_order/Makefile.ci
rename to tests/core/cond_order/Makefile.ci
diff --git a/tests/cond_order/README.md b/tests/core/cond_order/README.md
similarity index 100%
rename from tests/cond_order/README.md
rename to tests/core/cond_order/README.md
diff --git a/tests/cond_order/main.c b/tests/core/cond_order/main.c
similarity index 100%
rename from tests/cond_order/main.c
rename to tests/core/cond_order/main.c
diff --git a/tests/cond_order/tests/01-run.py b/tests/core/cond_order/tests/01-run.py
similarity index 100%
rename from tests/cond_order/tests/01-run.py
rename to tests/core/cond_order/tests/01-run.py
diff --git a/tests/deferred_yield_higher/Makefile b/tests/core/deferred_yield_higher/Makefile
similarity index 74%
rename from tests/deferred_yield_higher/Makefile
rename to tests/core/deferred_yield_higher/Makefile
index f38d9f04b9..2387a66db4 100644
--- a/tests/deferred_yield_higher/Makefile
+++ b/tests/core/deferred_yield_higher/Makefile
@@ -1,4 +1,4 @@
-include ../Makefile.tests_common
+include ../Makefile.core_common
 
 FEATURES_BLACKLIST += arch_avr8 arch_msp430 arch_riscv
 
diff --git a/tests/deferred_yield_higher/Makefile.ci b/tests/core/deferred_yield_higher/Makefile.ci
similarity index 100%
rename from tests/deferred_yield_higher/Makefile.ci
rename to tests/core/deferred_yield_higher/Makefile.ci
diff --git a/tests/deferred_yield_higher/README.md b/tests/core/deferred_yield_higher/README.md
similarity index 100%
rename from tests/deferred_yield_higher/README.md
rename to tests/core/deferred_yield_higher/README.md
diff --git a/tests/deferred_yield_higher/main.c b/tests/core/deferred_yield_higher/main.c
similarity index 100%
rename from tests/deferred_yield_higher/main.c
rename to tests/core/deferred_yield_higher/main.c
diff --git a/tests/deferred_yield_higher/tests/test.py b/tests/core/deferred_yield_higher/tests/test.py
similarity index 100%
rename from tests/deferred_yield_higher/tests/test.py
rename to tests/core/deferred_yield_higher/tests/test.py
diff --git a/tests/isr_yield_higher/Makefile b/tests/core/irq/Makefile
similarity index 64%
rename from tests/isr_yield_higher/Makefile
rename to tests/core/irq/Makefile
index 8bff23ceea..729abbe1a2 100644
--- a/tests/isr_yield_higher/Makefile
+++ b/tests/core/irq/Makefile
@@ -1,4 +1,4 @@
-include ../Makefile.tests_common
+include ../Makefile.core_common
 
 USEMODULE += xtimer
 
diff --git a/tests/irq/Makefile.ci b/tests/core/irq/Makefile.ci
similarity index 100%
rename from tests/irq/Makefile.ci
rename to tests/core/irq/Makefile.ci
diff --git a/tests/irq/main.c b/tests/core/irq/main.c
similarity index 100%
rename from tests/irq/main.c
rename to tests/core/irq/main.c
diff --git a/tests/irq/tests/01-run.py b/tests/core/irq/tests/01-run.py
similarity index 100%
rename from tests/irq/tests/01-run.py
rename to tests/core/irq/tests/01-run.py
diff --git a/tests/irq_cpp/Makefile b/tests/core/irq_cpp/Makefile
similarity index 89%
rename from tests/irq_cpp/Makefile
rename to tests/core/irq_cpp/Makefile
index ed9ef849ab..c1f1514ef3 100644
--- a/tests/irq_cpp/Makefile
+++ b/tests/core/irq_cpp/Makefile
@@ -1,4 +1,4 @@
-include ../Makefile.tests_common
+include ../Makefile.core_common
 FEATURES_REQUIRED += cpp
 FEATURES_REQUIRED += libstdcpp
 USEPKG += fff
diff --git a/tests/irq_cpp/Makefile.ci b/tests/core/irq_cpp/Makefile.ci
similarity index 100%
rename from tests/irq_cpp/Makefile.ci
rename to tests/core/irq_cpp/Makefile.ci
diff --git a/tests/irq_cpp/irq.h b/tests/core/irq_cpp/irq.h
similarity index 100%
rename from tests/irq_cpp/irq.h
rename to tests/core/irq_cpp/irq.h
diff --git a/tests/irq_cpp/main.cpp b/tests/core/irq_cpp/main.cpp
similarity index 100%
rename from tests/irq_cpp/main.cpp
rename to tests/core/irq_cpp/main.cpp
diff --git a/tests/irq_cpp/tests/01-run.py b/tests/core/irq_cpp/tests/01-run.py
similarity index 100%
rename from tests/irq_cpp/tests/01-run.py
rename to tests/core/irq_cpp/tests/01-run.py
diff --git a/tests/irq_disable_restore/Makefile b/tests/core/irq_disable_restore/Makefile
similarity index 69%
rename from tests/irq_disable_restore/Makefile
rename to tests/core/irq_disable_restore/Makefile
index b44722f60f..e87db4e2c7 100644
--- a/tests/irq_disable_restore/Makefile
+++ b/tests/core/irq_disable_restore/Makefile
@@ -1,4 +1,4 @@
-include ../Makefile.tests_common
+include ../Makefile.core_common
 
 USEMODULE += fmt
 USEMODULE += xtimer
diff --git a/tests/irq_disable_restore/README.md b/tests/core/irq_disable_restore/README.md
similarity index 100%
rename from tests/irq_disable_restore/README.md
rename to tests/core/irq_disable_restore/README.md
diff --git a/tests/irq_disable_restore/main.c b/tests/core/irq_disable_restore/main.c
similarity index 100%
rename from tests/irq_disable_restore/main.c
rename to tests/core/irq_disable_restore/main.c
diff --git a/tests/irq_disable_restore/tests/01-run.py b/tests/core/irq_disable_restore/tests/01-run.py
similarity index 100%
rename from tests/irq_disable_restore/tests/01-run.py
rename to tests/core/irq_disable_restore/tests/01-run.py
diff --git a/tests/mutex_cancel/Makefile b/tests/core/isr_yield_higher/Makefile
similarity index 64%
rename from tests/mutex_cancel/Makefile
rename to tests/core/isr_yield_higher/Makefile
index 8bff23ceea..729abbe1a2 100644
--- a/tests/mutex_cancel/Makefile
+++ b/tests/core/isr_yield_higher/Makefile
@@ -1,4 +1,4 @@
-include ../Makefile.tests_common
+include ../Makefile.core_common
 
 USEMODULE += xtimer
 
diff --git a/tests/isr_yield_higher/Makefile.ci b/tests/core/isr_yield_higher/Makefile.ci
similarity index 100%
rename from tests/isr_yield_higher/Makefile.ci
rename to tests/core/isr_yield_higher/Makefile.ci
diff --git a/tests/isr_yield_higher/main.c b/tests/core/isr_yield_higher/main.c
similarity index 100%
rename from tests/isr_yield_higher/main.c
rename to tests/core/isr_yield_higher/main.c
diff --git a/tests/isr_yield_higher/tests/test.py b/tests/core/isr_yield_higher/tests/test.py
similarity index 100%
rename from tests/isr_yield_higher/tests/test.py
rename to tests/core/isr_yield_higher/tests/test.py
diff --git a/tests/msg_queue_print/Makefile b/tests/core/msg_avail/Makefile
similarity index 53%
rename from tests/msg_queue_print/Makefile
rename to tests/core/msg_avail/Makefile
index 24bb481657..f4e5bc0fb4 100644
--- a/tests/msg_queue_print/Makefile
+++ b/tests/core/msg_avail/Makefile
@@ -1,3 +1,3 @@
-include ../Makefile.tests_common
+include ../Makefile.core_common
 
 include $(RIOTBASE)/Makefile.include
diff --git a/tests/msg_avail/main.c b/tests/core/msg_avail/main.c
similarity index 100%
rename from tests/msg_avail/main.c
rename to tests/core/msg_avail/main.c
diff --git a/tests/msg_avail/tests/01-run.py b/tests/core/msg_avail/tests/01-run.py
similarity index 100%
rename from tests/msg_avail/tests/01-run.py
rename to tests/core/msg_avail/tests/01-run.py
diff --git a/tests/msg_queue_capacity/Makefile b/tests/core/msg_queue_capacity/Makefile
similarity index 64%
rename from tests/msg_queue_capacity/Makefile
rename to tests/core/msg_queue_capacity/Makefile
index 921bf433d1..acc01fea80 100644
--- a/tests/msg_queue_capacity/Makefile
+++ b/tests/core/msg_queue_capacity/Makefile
@@ -1,4 +1,4 @@
-include ../Makefile.tests_common
+include ../Makefile.core_common
 
 USEMODULE += embunit
 
diff --git a/tests/msg_queue_capacity/main.c b/tests/core/msg_queue_capacity/main.c
similarity index 100%
rename from tests/msg_queue_capacity/main.c
rename to tests/core/msg_queue_capacity/main.c
diff --git a/tests/msg_queue_capacity/tests/01-run.py b/tests/core/msg_queue_capacity/tests/01-run.py
similarity index 100%
rename from tests/msg_queue_capacity/tests/01-run.py
rename to tests/core/msg_queue_capacity/tests/01-run.py
diff --git a/tests/msg_send_receive/Makefile b/tests/core/msg_queue_print/Makefile
similarity index 53%
rename from tests/msg_send_receive/Makefile
rename to tests/core/msg_queue_print/Makefile
index 24bb481657..f4e5bc0fb4 100644
--- a/tests/msg_send_receive/Makefile
+++ b/tests/core/msg_queue_print/Makefile
@@ -1,3 +1,3 @@
-include ../Makefile.tests_common
+include ../Makefile.core_common
 
 include $(RIOTBASE)/Makefile.include
diff --git a/tests/msg_queue_print/main.c b/tests/core/msg_queue_print/main.c
similarity index 100%
rename from tests/msg_queue_print/main.c
rename to tests/core/msg_queue_print/main.c
diff --git a/tests/msg_queue_print/tests/01-run.py b/tests/core/msg_queue_print/tests/01-run.py
similarity index 100%
rename from tests/msg_queue_print/tests/01-run.py
rename to tests/core/msg_queue_print/tests/01-run.py
diff --git a/tests/msg_avail/Makefile b/tests/core/msg_send_receive/Makefile
similarity index 53%
rename from tests/msg_avail/Makefile
rename to tests/core/msg_send_receive/Makefile
index 24bb481657..f4e5bc0fb4 100644
--- a/tests/msg_avail/Makefile
+++ b/tests/core/msg_send_receive/Makefile
@@ -1,3 +1,3 @@
-include ../Makefile.tests_common
+include ../Makefile.core_common
 
 include $(RIOTBASE)/Makefile.include
diff --git a/tests/msg_send_receive/Makefile.ci b/tests/core/msg_send_receive/Makefile.ci
similarity index 100%
rename from tests/msg_send_receive/Makefile.ci
rename to tests/core/msg_send_receive/Makefile.ci
diff --git a/tests/msg_send_receive/main.c b/tests/core/msg_send_receive/main.c
similarity index 100%
rename from tests/msg_send_receive/main.c
rename to tests/core/msg_send_receive/main.c
diff --git a/tests/msg_send_receive/tests/01-run.py b/tests/core/msg_send_receive/tests/01-run.py
similarity index 100%
rename from tests/msg_send_receive/tests/01-run.py
rename to tests/core/msg_send_receive/tests/01-run.py
diff --git a/tests/msg_try_receive/Makefile b/tests/core/msg_try_receive/Makefile
similarity index 53%
rename from tests/msg_try_receive/Makefile
rename to tests/core/msg_try_receive/Makefile
index 24bb481657..f4e5bc0fb4 100644
--- a/tests/msg_try_receive/Makefile
+++ b/tests/core/msg_try_receive/Makefile
@@ -1,3 +1,3 @@
-include ../Makefile.tests_common
+include ../Makefile.core_common
 
 include $(RIOTBASE)/Makefile.include
diff --git a/tests/msg_try_receive/Makefile.ci b/tests/core/msg_try_receive/Makefile.ci
similarity index 100%
rename from tests/msg_try_receive/Makefile.ci
rename to tests/core/msg_try_receive/Makefile.ci
diff --git a/tests/msg_try_receive/main.c b/tests/core/msg_try_receive/main.c
similarity index 100%
rename from tests/msg_try_receive/main.c
rename to tests/core/msg_try_receive/main.c
diff --git a/tests/msg_try_receive/tests/01-run.py b/tests/core/msg_try_receive/tests/01-run.py
similarity index 100%
rename from tests/msg_try_receive/tests/01-run.py
rename to tests/core/msg_try_receive/tests/01-run.py
diff --git a/tests/irq/Makefile b/tests/core/mutex_cancel/Makefile
similarity index 64%
rename from tests/irq/Makefile
rename to tests/core/mutex_cancel/Makefile
index 8bff23ceea..729abbe1a2 100644
--- a/tests/irq/Makefile
+++ b/tests/core/mutex_cancel/Makefile
@@ -1,4 +1,4 @@
-include ../Makefile.tests_common
+include ../Makefile.core_common
 
 USEMODULE += xtimer
 
diff --git a/tests/mutex_cancel/main.c b/tests/core/mutex_cancel/main.c
similarity index 100%
rename from tests/mutex_cancel/main.c
rename to tests/core/mutex_cancel/main.c
diff --git a/tests/mutex_cancel/tests/01-run.py b/tests/core/mutex_cancel/tests/01-run.py
similarity index 100%
rename from tests/mutex_cancel/tests/01-run.py
rename to tests/core/mutex_cancel/tests/01-run.py
diff --git a/tests/core/mutex_order/Makefile b/tests/core/mutex_order/Makefile
new file mode 100644
index 0000000000..f4e5bc0fb4
--- /dev/null
+++ b/tests/core/mutex_order/Makefile
@@ -0,0 +1,3 @@
+include ../Makefile.core_common
+
+include $(RIOTBASE)/Makefile.include
diff --git a/tests/mutex_order/Makefile.ci b/tests/core/mutex_order/Makefile.ci
similarity index 100%
rename from tests/mutex_order/Makefile.ci
rename to tests/core/mutex_order/Makefile.ci
diff --git a/tests/mutex_order/README.md b/tests/core/mutex_order/README.md
similarity index 100%
rename from tests/mutex_order/README.md
rename to tests/core/mutex_order/README.md
diff --git a/tests/mutex_order/main.c b/tests/core/mutex_order/main.c
similarity index 100%
rename from tests/mutex_order/main.c
rename to tests/core/mutex_order/main.c
diff --git a/tests/mutex_order/tests/01-run.py b/tests/core/mutex_order/tests/01-run.py
similarity index 100%
rename from tests/mutex_order/tests/01-run.py
rename to tests/core/mutex_order/tests/01-run.py
diff --git a/tests/thread_race/Makefile b/tests/core/mutex_unlock_and_sleep/Makefile
similarity index 87%
rename from tests/thread_race/Makefile
rename to tests/core/mutex_unlock_and_sleep/Makefile
index bc648d8a13..c97f29a63c 100644
--- a/tests/thread_race/Makefile
+++ b/tests/core/mutex_unlock_and_sleep/Makefile
@@ -1,4 +1,4 @@
-include ../Makefile.tests_common
+include ../Makefile.core_common
 
 # stm32f030f4-demo doesn't have enough RAM to run the test
 # so we reduce the stack size for every thread
diff --git a/tests/mutex_unlock_and_sleep/Makefile.ci b/tests/core/mutex_unlock_and_sleep/Makefile.ci
similarity index 100%
rename from tests/mutex_unlock_and_sleep/Makefile.ci
rename to tests/core/mutex_unlock_and_sleep/Makefile.ci
diff --git a/tests/mutex_unlock_and_sleep/main.c b/tests/core/mutex_unlock_and_sleep/main.c
similarity index 100%
rename from tests/mutex_unlock_and_sleep/main.c
rename to tests/core/mutex_unlock_and_sleep/main.c
diff --git a/tests/mutex_unlock_and_sleep/tests/01-run.py b/tests/core/mutex_unlock_and_sleep/tests/01-run.py
similarity index 100%
rename from tests/mutex_unlock_and_sleep/tests/01-run.py
rename to tests/core/mutex_unlock_and_sleep/tests/01-run.py
diff --git a/tests/core/rmutex/Makefile b/tests/core/rmutex/Makefile
new file mode 100644
index 0000000000..f4e5bc0fb4
--- /dev/null
+++ b/tests/core/rmutex/Makefile
@@ -0,0 +1,3 @@
+include ../Makefile.core_common
+
+include $(RIOTBASE)/Makefile.include
diff --git a/tests/rmutex/Makefile.ci b/tests/core/rmutex/Makefile.ci
similarity index 100%
rename from tests/rmutex/Makefile.ci
rename to tests/core/rmutex/Makefile.ci
diff --git a/tests/rmutex/README.md b/tests/core/rmutex/README.md
similarity index 100%
rename from tests/rmutex/README.md
rename to tests/core/rmutex/README.md
diff --git a/tests/rmutex/main.c b/tests/core/rmutex/main.c
similarity index 100%
rename from tests/rmutex/main.c
rename to tests/core/rmutex/main.c
diff --git a/tests/rmutex/tests/01-run.py b/tests/core/rmutex/tests/01-run.py
similarity index 100%
rename from tests/rmutex/tests/01-run.py
rename to tests/core/rmutex/tests/01-run.py
diff --git a/tests/rmutex_cpp/Makefile b/tests/core/rmutex_cpp/Makefile
similarity index 65%
rename from tests/rmutex_cpp/Makefile
rename to tests/core/rmutex_cpp/Makefile
index 028c3d489a..786d4873bc 100644
--- a/tests/rmutex_cpp/Makefile
+++ b/tests/core/rmutex_cpp/Makefile
@@ -1,4 +1,4 @@
-include ../Makefile.tests_common
+include ../Makefile.core_common
 
 FEATURES_REQUIRED += cpp
 
diff --git a/tests/rmutex_cpp/Makefile.ci b/tests/core/rmutex_cpp/Makefile.ci
similarity index 100%
rename from tests/rmutex_cpp/Makefile.ci
rename to tests/core/rmutex_cpp/Makefile.ci
diff --git a/tests/rmutex_cpp/README.md b/tests/core/rmutex_cpp/README.md
similarity index 100%
rename from tests/rmutex_cpp/README.md
rename to tests/core/rmutex_cpp/README.md
diff --git a/tests/rmutex_cpp/main.cpp b/tests/core/rmutex_cpp/main.cpp
similarity index 100%
rename from tests/rmutex_cpp/main.cpp
rename to tests/core/rmutex_cpp/main.cpp
diff --git a/tests/rmutex_cpp/tests/01-run.py b/tests/core/rmutex_cpp/tests/01-run.py
similarity index 100%
rename from tests/rmutex_cpp/tests/01-run.py
rename to tests/core/rmutex_cpp/tests/01-run.py
diff --git a/tests/sched_change_priority/Makefile b/tests/core/sched_change_priority/Makefile
similarity index 87%
rename from tests/sched_change_priority/Makefile
rename to tests/core/sched_change_priority/Makefile
index 34995da49d..2db2b35102 100644
--- a/tests/sched_change_priority/Makefile
+++ b/tests/core/sched_change_priority/Makefile
@@ -1,4 +1,4 @@
-include ../Makefile.tests_common
+include ../Makefile.core_common
 
 USEMODULE += nice
 USEMODULE += ps
diff --git a/tests/sched_change_priority/Makefile.ci b/tests/core/sched_change_priority/Makefile.ci
similarity index 100%
rename from tests/sched_change_priority/Makefile.ci
rename to tests/core/sched_change_priority/Makefile.ci
diff --git a/tests/sched_change_priority/main.c b/tests/core/sched_change_priority/main.c
similarity index 100%
rename from tests/sched_change_priority/main.c
rename to tests/core/sched_change_priority/main.c
diff --git a/tests/sched_change_priority/tests/01-run.py b/tests/core/sched_change_priority/tests/01-run.py
similarity index 100%
rename from tests/sched_change_priority/tests/01-run.py
rename to tests/core/sched_change_priority/tests/01-run.py
diff --git a/tests/core/sched_testing/Makefile b/tests/core/sched_testing/Makefile
new file mode 100644
index 0000000000..f4e5bc0fb4
--- /dev/null
+++ b/tests/core/sched_testing/Makefile
@@ -0,0 +1,3 @@
+include ../Makefile.core_common
+
+include $(RIOTBASE)/Makefile.include
diff --git a/tests/sched_testing/Makefile.ci b/tests/core/sched_testing/Makefile.ci
similarity index 100%
rename from tests/sched_testing/Makefile.ci
rename to tests/core/sched_testing/Makefile.ci
diff --git a/tests/sched_testing/main.c b/tests/core/sched_testing/main.c
similarity index 100%
rename from tests/sched_testing/main.c
rename to tests/core/sched_testing/main.c
diff --git a/tests/sched_testing/tests/01-run.py b/tests/core/sched_testing/tests/01-run.py
similarity index 100%
rename from tests/sched_testing/tests/01-run.py
rename to tests/core/sched_testing/tests/01-run.py
diff --git a/tests/core/thread_basic/Makefile b/tests/core/thread_basic/Makefile
new file mode 100644
index 0000000000..f4e5bc0fb4
--- /dev/null
+++ b/tests/core/thread_basic/Makefile
@@ -0,0 +1,3 @@
+include ../Makefile.core_common
+
+include $(RIOTBASE)/Makefile.include
diff --git a/tests/thread_basic/Makefile.ci b/tests/core/thread_basic/Makefile.ci
similarity index 100%
rename from tests/thread_basic/Makefile.ci
rename to tests/core/thread_basic/Makefile.ci
diff --git a/tests/thread_basic/main.c b/tests/core/thread_basic/main.c
similarity index 100%
rename from tests/thread_basic/main.c
rename to tests/core/thread_basic/main.c
diff --git a/tests/thread_basic/tests/01-run.py b/tests/core/thread_basic/tests/01-run.py
similarity index 100%
rename from tests/thread_basic/tests/01-run.py
rename to tests/core/thread_basic/tests/01-run.py
diff --git a/tests/thread_cooperation/Makefile b/tests/core/thread_cooperation/Makefile
similarity index 92%
rename from tests/thread_cooperation/Makefile
rename to tests/core/thread_cooperation/Makefile
index e5cde12ccf..88583dcfa0 100644
--- a/tests/thread_cooperation/Makefile
+++ b/tests/core/thread_cooperation/Makefile
@@ -1,4 +1,4 @@
-include ../Makefile.tests_common
+include ../Makefile.core_common
 
 ifneq (,$(filter nucleo-f042k6,$(BOARD)))
   PROBLEM ?= 3
diff --git a/tests/thread_cooperation/Makefile.ci b/tests/core/thread_cooperation/Makefile.ci
similarity index 100%
rename from tests/thread_cooperation/Makefile.ci
rename to tests/core/thread_cooperation/Makefile.ci
diff --git a/tests/thread_cooperation/main.c b/tests/core/thread_cooperation/main.c
similarity index 100%
rename from tests/thread_cooperation/main.c
rename to tests/core/thread_cooperation/main.c
diff --git a/tests/thread_cooperation/tests/01-run.py b/tests/core/thread_cooperation/tests/01-run.py
similarity index 100%
rename from tests/thread_cooperation/tests/01-run.py
rename to tests/core/thread_cooperation/tests/01-run.py
diff --git a/tests/core/thread_exit/Makefile b/tests/core/thread_exit/Makefile
new file mode 100644
index 0000000000..f4e5bc0fb4
--- /dev/null
+++ b/tests/core/thread_exit/Makefile
@@ -0,0 +1,3 @@
+include ../Makefile.core_common
+
+include $(RIOTBASE)/Makefile.include
diff --git a/tests/thread_exit/Makefile.ci b/tests/core/thread_exit/Makefile.ci
similarity index 100%
rename from tests/thread_exit/Makefile.ci
rename to tests/core/thread_exit/Makefile.ci
diff --git a/tests/thread_exit/README.md b/tests/core/thread_exit/README.md
similarity index 100%
rename from tests/thread_exit/README.md
rename to tests/core/thread_exit/README.md
diff --git a/tests/thread_exit/main.c b/tests/core/thread_exit/main.c
similarity index 100%
rename from tests/thread_exit/main.c
rename to tests/core/thread_exit/main.c
diff --git a/tests/thread_exit/tests/01-run.py b/tests/core/thread_exit/tests/01-run.py
similarity index 100%
rename from tests/thread_exit/tests/01-run.py
rename to tests/core/thread_exit/tests/01-run.py
diff --git a/tests/thread_flags/Makefile b/tests/core/thread_flags/Makefile
similarity index 82%
rename from tests/thread_flags/Makefile
rename to tests/core/thread_flags/Makefile
index bf1b067432..4c4170d48f 100644
--- a/tests/thread_flags/Makefile
+++ b/tests/core/thread_flags/Makefile
@@ -1,4 +1,4 @@
-include ../Makefile.tests_common
+include ../Makefile.core_common
 
 USEMODULE += core_thread_flags
 USEMODULE += xtimer
diff --git a/tests/thread_flags/Makefile.ci b/tests/core/thread_flags/Makefile.ci
similarity index 100%
rename from tests/thread_flags/Makefile.ci
rename to tests/core/thread_flags/Makefile.ci
diff --git a/tests/thread_flags/main.c b/tests/core/thread_flags/main.c
similarity index 100%
rename from tests/thread_flags/main.c
rename to tests/core/thread_flags/main.c
diff --git a/tests/thread_flags/tests/01-run.py b/tests/core/thread_flags/tests/01-run.py
similarity index 100%
rename from tests/thread_flags/tests/01-run.py
rename to tests/core/thread_flags/tests/01-run.py
diff --git a/tests/thread_flags_xtimer/Makefile b/tests/core/thread_flags_xtimer/Makefile
similarity index 73%
rename from tests/thread_flags_xtimer/Makefile
rename to tests/core/thread_flags_xtimer/Makefile
index 389a406291..6a7f049d3d 100644
--- a/tests/thread_flags_xtimer/Makefile
+++ b/tests/core/thread_flags_xtimer/Makefile
@@ -1,4 +1,4 @@
-include ../Makefile.tests_common
+include ../Makefile.core_common
 
 USEMODULE += core_thread_flags
 USEMODULE += xtimer
diff --git a/tests/thread_flags_xtimer/main.c b/tests/core/thread_flags_xtimer/main.c
similarity index 100%
rename from tests/thread_flags_xtimer/main.c
rename to tests/core/thread_flags_xtimer/main.c
diff --git a/tests/thread_flags_xtimer/tests/01-run.py b/tests/core/thread_flags_xtimer/tests/01-run.py
similarity index 100%
rename from tests/thread_flags_xtimer/tests/01-run.py
rename to tests/core/thread_flags_xtimer/tests/01-run.py
diff --git a/tests/thread_float/Makefile b/tests/core/thread_float/Makefile
similarity index 92%
rename from tests/thread_float/Makefile
rename to tests/core/thread_float/Makefile
index e533aeea2d..58b0d218d5 100644
--- a/tests/thread_float/Makefile
+++ b/tests/core/thread_float/Makefile
@@ -1,4 +1,4 @@
-include ../Makefile.tests_common
+include ../Makefile.core_common
 
 USEMODULE += printf_float
 USEMODULE += ztimer_usec
diff --git a/tests/thread_float/Makefile.ci b/tests/core/thread_float/Makefile.ci
similarity index 100%
rename from tests/thread_float/Makefile.ci
rename to tests/core/thread_float/Makefile.ci
diff --git a/tests/thread_float/README.md b/tests/core/thread_float/README.md
similarity index 100%
rename from tests/thread_float/README.md
rename to tests/core/thread_float/README.md
diff --git a/tests/thread_float/main.c b/tests/core/thread_float/main.c
similarity index 100%
rename from tests/thread_float/main.c
rename to tests/core/thread_float/main.c
diff --git a/tests/thread_float/tests/01-run.py b/tests/core/thread_float/tests/01-run.py
similarity index 100%
rename from tests/thread_float/tests/01-run.py
rename to tests/core/thread_float/tests/01-run.py
diff --git a/tests/core/thread_flood/Makefile b/tests/core/thread_flood/Makefile
new file mode 100644
index 0000000000..f4e5bc0fb4
--- /dev/null
+++ b/tests/core/thread_flood/Makefile
@@ -0,0 +1,3 @@
+include ../Makefile.core_common
+
+include $(RIOTBASE)/Makefile.include
diff --git a/tests/thread_flood/Makefile.ci b/tests/core/thread_flood/Makefile.ci
similarity index 100%
rename from tests/thread_flood/Makefile.ci
rename to tests/core/thread_flood/Makefile.ci
diff --git a/tests/thread_flood/main.c b/tests/core/thread_flood/main.c
similarity index 100%
rename from tests/thread_flood/main.c
rename to tests/core/thread_flood/main.c
diff --git a/tests/thread_flood/tests/01-run.py b/tests/core/thread_flood/tests/01-run.py
similarity index 100%
rename from tests/thread_flood/tests/01-run.py
rename to tests/core/thread_flood/tests/01-run.py
diff --git a/tests/core/thread_msg/Makefile b/tests/core/thread_msg/Makefile
new file mode 100644
index 0000000000..f4e5bc0fb4
--- /dev/null
+++ b/tests/core/thread_msg/Makefile
@@ -0,0 +1,3 @@
+include ../Makefile.core_common
+
+include $(RIOTBASE)/Makefile.include
diff --git a/tests/thread_msg/Makefile.ci b/tests/core/thread_msg/Makefile.ci
similarity index 100%
rename from tests/thread_msg/Makefile.ci
rename to tests/core/thread_msg/Makefile.ci
diff --git a/tests/thread_msg/main.c b/tests/core/thread_msg/main.c
similarity index 100%
rename from tests/thread_msg/main.c
rename to tests/core/thread_msg/main.c
diff --git a/tests/thread_msg/tests/01-run.py b/tests/core/thread_msg/tests/01-run.py
similarity index 100%
rename from tests/thread_msg/tests/01-run.py
rename to tests/core/thread_msg/tests/01-run.py
diff --git a/tests/thread_msg_block_race/Makefile b/tests/core/thread_msg_block_race/Makefile
similarity index 84%
rename from tests/thread_msg_block_race/Makefile
rename to tests/core/thread_msg_block_race/Makefile
index d2f4d33b0c..7a63972595 100644
--- a/tests/thread_msg_block_race/Makefile
+++ b/tests/core/thread_msg_block_race/Makefile
@@ -1,6 +1,6 @@
 DEVELHELP := 1
 
-include ../Makefile.tests_common
+include ../Makefile.core_common
 
 DISABLE_MODULE += auto_init_xtimer
 DISABLE_MODULE += auto_init_random
diff --git a/tests/thread_msg_block_race/Makefile.ci b/tests/core/thread_msg_block_race/Makefile.ci
similarity index 100%
rename from tests/thread_msg_block_race/Makefile.ci
rename to tests/core/thread_msg_block_race/Makefile.ci
diff --git a/tests/thread_msg_block_race/main.c b/tests/core/thread_msg_block_race/main.c
similarity index 100%
rename from tests/thread_msg_block_race/main.c
rename to tests/core/thread_msg_block_race/main.c
diff --git a/tests/thread_msg_block_race/tests/01-run.py b/tests/core/thread_msg_block_race/tests/01-run.py
similarity index 100%
rename from tests/thread_msg_block_race/tests/01-run.py
rename to tests/core/thread_msg_block_race/tests/01-run.py
diff --git a/tests/core/thread_msg_block_w_queue/Makefile b/tests/core/thread_msg_block_w_queue/Makefile
new file mode 100644
index 0000000000..f4e5bc0fb4
--- /dev/null
+++ b/tests/core/thread_msg_block_w_queue/Makefile
@@ -0,0 +1,3 @@
+include ../Makefile.core_common
+
+include $(RIOTBASE)/Makefile.include
diff --git a/tests/thread_msg_block_w_queue/Makefile.ci b/tests/core/thread_msg_block_w_queue/Makefile.ci
similarity index 100%
rename from tests/thread_msg_block_w_queue/Makefile.ci
rename to tests/core/thread_msg_block_w_queue/Makefile.ci
diff --git a/tests/thread_msg_block_w_queue/README.md b/tests/core/thread_msg_block_w_queue/README.md
similarity index 100%
rename from tests/thread_msg_block_w_queue/README.md
rename to tests/core/thread_msg_block_w_queue/README.md
diff --git a/tests/thread_msg_block_w_queue/main.c b/tests/core/thread_msg_block_w_queue/main.c
similarity index 100%
rename from tests/thread_msg_block_w_queue/main.c
rename to tests/core/thread_msg_block_w_queue/main.c
diff --git a/tests/thread_msg_block_w_queue/tests/01-run.py b/tests/core/thread_msg_block_w_queue/tests/01-run.py
similarity index 100%
rename from tests/thread_msg_block_w_queue/tests/01-run.py
rename to tests/core/thread_msg_block_w_queue/tests/01-run.py
diff --git a/tests/core/thread_msg_block_wo_queue/Makefile b/tests/core/thread_msg_block_wo_queue/Makefile
new file mode 100644
index 0000000000..f4e5bc0fb4
--- /dev/null
+++ b/tests/core/thread_msg_block_wo_queue/Makefile
@@ -0,0 +1,3 @@
+include ../Makefile.core_common
+
+include $(RIOTBASE)/Makefile.include
diff --git a/tests/thread_msg_block_wo_queue/Makefile.ci b/tests/core/thread_msg_block_wo_queue/Makefile.ci
similarity index 100%
rename from tests/thread_msg_block_wo_queue/Makefile.ci
rename to tests/core/thread_msg_block_wo_queue/Makefile.ci
diff --git a/tests/thread_msg_block_wo_queue/README.md b/tests/core/thread_msg_block_wo_queue/README.md
similarity index 100%
rename from tests/thread_msg_block_wo_queue/README.md
rename to tests/core/thread_msg_block_wo_queue/README.md
diff --git a/tests/thread_msg_block_wo_queue/main.c b/tests/core/thread_msg_block_wo_queue/main.c
similarity index 100%
rename from tests/thread_msg_block_wo_queue/main.c
rename to tests/core/thread_msg_block_wo_queue/main.c
diff --git a/tests/thread_msg_block_wo_queue/tests/01-run.py b/tests/core/thread_msg_block_wo_queue/tests/01-run.py
similarity index 100%
rename from tests/thread_msg_block_wo_queue/tests/01-run.py
rename to tests/core/thread_msg_block_wo_queue/tests/01-run.py
diff --git a/tests/thread_msg_bus/Makefile b/tests/core/thread_msg_bus/Makefile
similarity index 66%
rename from tests/thread_msg_bus/Makefile
rename to tests/core/thread_msg_bus/Makefile
index aa0b972871..b5aacce506 100644
--- a/tests/thread_msg_bus/Makefile
+++ b/tests/core/thread_msg_bus/Makefile
@@ -1,4 +1,4 @@
-include ../Makefile.tests_common
+include ../Makefile.core_common
 
 USEMODULE += core_msg_bus
 
diff --git a/tests/thread_msg_bus/Makefile.ci b/tests/core/thread_msg_bus/Makefile.ci
similarity index 100%
rename from tests/thread_msg_bus/Makefile.ci
rename to tests/core/thread_msg_bus/Makefile.ci
diff --git a/tests/thread_msg_bus/main.c b/tests/core/thread_msg_bus/main.c
similarity index 100%
rename from tests/thread_msg_bus/main.c
rename to tests/core/thread_msg_bus/main.c
diff --git a/tests/thread_msg_bus/tests/01-run.py b/tests/core/thread_msg_bus/tests/01-run.py
similarity index 100%
rename from tests/thread_msg_bus/tests/01-run.py
rename to tests/core/thread_msg_bus/tests/01-run.py
diff --git a/tests/core/thread_msg_seq/Makefile b/tests/core/thread_msg_seq/Makefile
new file mode 100644
index 0000000000..f4e5bc0fb4
--- /dev/null
+++ b/tests/core/thread_msg_seq/Makefile
@@ -0,0 +1,3 @@
+include ../Makefile.core_common
+
+include $(RIOTBASE)/Makefile.include
diff --git a/tests/thread_msg_seq/Makefile.ci b/tests/core/thread_msg_seq/Makefile.ci
similarity index 100%
rename from tests/thread_msg_seq/Makefile.ci
rename to tests/core/thread_msg_seq/Makefile.ci
diff --git a/tests/thread_msg_seq/main.c b/tests/core/thread_msg_seq/main.c
similarity index 100%
rename from tests/thread_msg_seq/main.c
rename to tests/core/thread_msg_seq/main.c
diff --git a/tests/thread_msg_seq/tests/01-run.py b/tests/core/thread_msg_seq/tests/01-run.py
similarity index 100%
rename from tests/thread_msg_seq/tests/01-run.py
rename to tests/core/thread_msg_seq/tests/01-run.py
diff --git a/tests/thread_priority_inversion/Makefile b/tests/core/thread_priority_inversion/Makefile
similarity index 92%
rename from tests/thread_priority_inversion/Makefile
rename to tests/core/thread_priority_inversion/Makefile
index f48eecd09c..173dae8a74 100644
--- a/tests/thread_priority_inversion/Makefile
+++ b/tests/core/thread_priority_inversion/Makefile
@@ -1,4 +1,4 @@
-include ../Makefile.tests_common
+include ../Makefile.core_common
 
 USEMODULE += fmt
 USEMODULE += core_mutex_priority_inheritance
diff --git a/tests/thread_priority_inversion/README.md b/tests/core/thread_priority_inversion/README.md
similarity index 100%
rename from tests/thread_priority_inversion/README.md
rename to tests/core/thread_priority_inversion/README.md
diff --git a/tests/thread_priority_inversion/main.c b/tests/core/thread_priority_inversion/main.c
similarity index 100%
rename from tests/thread_priority_inversion/main.c
rename to tests/core/thread_priority_inversion/main.c
diff --git a/tests/thread_priority_inversion/tests/01-run.py b/tests/core/thread_priority_inversion/tests/01-run.py
similarity index 100%
rename from tests/thread_priority_inversion/tests/01-run.py
rename to tests/core/thread_priority_inversion/tests/01-run.py
diff --git a/tests/mutex_unlock_and_sleep/Makefile b/tests/core/thread_race/Makefile
similarity index 87%
rename from tests/mutex_unlock_and_sleep/Makefile
rename to tests/core/thread_race/Makefile
index bc648d8a13..c97f29a63c 100644
--- a/tests/mutex_unlock_and_sleep/Makefile
+++ b/tests/core/thread_race/Makefile
@@ -1,4 +1,4 @@
-include ../Makefile.tests_common
+include ../Makefile.core_common
 
 # stm32f030f4-demo doesn't have enough RAM to run the test
 # so we reduce the stack size for every thread
diff --git a/tests/thread_race/Makefile.ci b/tests/core/thread_race/Makefile.ci
similarity index 100%
rename from tests/thread_race/Makefile.ci
rename to tests/core/thread_race/Makefile.ci
diff --git a/tests/thread_race/main.c b/tests/core/thread_race/main.c
similarity index 100%
rename from tests/thread_race/main.c
rename to tests/core/thread_race/main.c
diff --git a/tests/thread_race/tests/01-run.py b/tests/core/thread_race/tests/01-run.py
similarity index 100%
rename from tests/thread_race/tests/01-run.py
rename to tests/core/thread_race/tests/01-run.py
diff --git a/tests/thread_stack_alignment/Makefile b/tests/core/thread_stack_alignment/Makefile
similarity index 90%
rename from tests/thread_stack_alignment/Makefile
rename to tests/core/thread_stack_alignment/Makefile
index 439621d3cf..f115224043 100644
--- a/tests/thread_stack_alignment/Makefile
+++ b/tests/core/thread_stack_alignment/Makefile
@@ -1,4 +1,4 @@
-include ../Makefile.tests_common
+include ../Makefile.core_common
 
 USEMODULE += printf_float
 
diff --git a/tests/thread_stack_alignment/Makefile.ci b/tests/core/thread_stack_alignment/Makefile.ci
similarity index 100%
rename from tests/thread_stack_alignment/Makefile.ci
rename to tests/core/thread_stack_alignment/Makefile.ci
diff --git a/tests/thread_stack_alignment/README.md b/tests/core/thread_stack_alignment/README.md
similarity index 100%
rename from tests/thread_stack_alignment/README.md
rename to tests/core/thread_stack_alignment/README.md
diff --git a/tests/thread_stack_alignment/main.c b/tests/core/thread_stack_alignment/main.c
similarity index 100%
rename from tests/thread_stack_alignment/main.c
rename to tests/core/thread_stack_alignment/main.c
diff --git a/tests/thread_stack_alignment/tests/01-run.py b/tests/core/thread_stack_alignment/tests/01-run.py
similarity index 100%
rename from tests/thread_stack_alignment/tests/01-run.py
rename to tests/core/thread_stack_alignment/tests/01-run.py
diff --git a/tests/thread_zombie/Makefile b/tests/core/thread_zombie/Makefile
similarity index 71%
rename from tests/thread_zombie/Makefile
rename to tests/core/thread_zombie/Makefile
index b92b2878f5..53550198b0 100644
--- a/tests/thread_zombie/Makefile
+++ b/tests/core/thread_zombie/Makefile
@@ -1,4 +1,4 @@
-include ../Makefile.tests_common
+include ../Makefile.core_common
 
 # For better testing use ps
 #USEMODULE += ps
diff --git a/tests/thread_zombie/Makefile.ci b/tests/core/thread_zombie/Makefile.ci
similarity index 100%
rename from tests/thread_zombie/Makefile.ci
rename to tests/core/thread_zombie/Makefile.ci
diff --git a/tests/thread_zombie/main.c b/tests/core/thread_zombie/main.c
similarity index 100%
rename from tests/thread_zombie/main.c
rename to tests/core/thread_zombie/main.c
diff --git a/tests/thread_zombie/tests/01-run.py b/tests/core/thread_zombie/tests/01-run.py
similarity index 100%
rename from tests/thread_zombie/tests/01-run.py
rename to tests/core/thread_zombie/tests/01-run.py
diff --git a/tests/disp_dev/Makefile b/tests/drivers/disp_dev/Makefile
similarity index 90%
rename from tests/disp_dev/Makefile
rename to tests/drivers/disp_dev/Makefile
index c21712b2c5..ec6a6c165b 100644
--- a/tests/disp_dev/Makefile
+++ b/tests/drivers/disp_dev/Makefile
@@ -1,5 +1,5 @@
 BOARD ?= stm32f429i-disc1
-include ../Makefile.tests_common
+include ../Makefile.drivers_common
 
 DISABLE_MODULE += test_utils_interactive_sync
 
diff --git a/tests/disp_dev/Makefile.ci b/tests/drivers/disp_dev/Makefile.ci
similarity index 100%
rename from tests/disp_dev/Makefile.ci
rename to tests/drivers/disp_dev/Makefile.ci
diff --git a/tests/disp_dev/app.config.test b/tests/drivers/disp_dev/app.config.test
similarity index 100%
rename from tests/disp_dev/app.config.test
rename to tests/drivers/disp_dev/app.config.test
diff --git a/tests/disp_dev/main.c b/tests/drivers/disp_dev/main.c
similarity index 100%
rename from tests/disp_dev/main.c
rename to tests/drivers/disp_dev/main.c
diff --git a/tests/mtd_at24cxxx/Makefile b/tests/drivers/mtd_at24cxxx/Makefile
similarity index 75%
rename from tests/mtd_at24cxxx/Makefile
rename to tests/drivers/mtd_at24cxxx/Makefile
index 3dcadaffb8..83e3f85d0d 100644
--- a/tests/mtd_at24cxxx/Makefile
+++ b/tests/drivers/mtd_at24cxxx/Makefile
@@ -1,6 +1,6 @@
 BOARD ?= nucleo-f767zi
 
-include ../Makefile.tests_common
+include ../Makefile.drivers_common
 
 USEMODULE += mtd_at24cxxx
 USEMODULE += embunit
diff --git a/tests/mtd_at24cxxx/main.c b/tests/drivers/mtd_at24cxxx/main.c
similarity index 100%
rename from tests/mtd_at24cxxx/main.c
rename to tests/drivers/mtd_at24cxxx/main.c
diff --git a/tests/mtd_at25xxx/Makefile b/tests/drivers/mtd_at25xxx/Makefile
similarity index 70%
rename from tests/mtd_at25xxx/Makefile
rename to tests/drivers/mtd_at25xxx/Makefile
index 2f61c782ef..73d7dedb26 100644
--- a/tests/mtd_at25xxx/Makefile
+++ b/tests/drivers/mtd_at25xxx/Makefile
@@ -1,4 +1,4 @@
-include ../Makefile.tests_common
+include ../Makefile.drivers_common
 
 USEMODULE += mtd_at25xxx
 USEMODULE += embunit
diff --git a/tests/mtd_at25xxx/main.c b/tests/drivers/mtd_at25xxx/main.c
similarity index 100%
rename from tests/mtd_at25xxx/main.c
rename to tests/drivers/mtd_at25xxx/main.c
diff --git a/tests/mtd_flashpage/Makefile b/tests/drivers/mtd_flashpage/Makefile
similarity index 76%
rename from tests/mtd_flashpage/Makefile
rename to tests/drivers/mtd_flashpage/Makefile
index ed285b46f2..fc32dba0f4 100644
--- a/tests/mtd_flashpage/Makefile
+++ b/tests/drivers/mtd_flashpage/Makefile
@@ -1,4 +1,4 @@
-include ../Makefile.tests_common
+include ../Makefile.drivers_common
 
 USEMODULE += mtd_flashpage
 USEMODULE += mtd_write_page
diff --git a/tests/mtd_flashpage/app.config.test b/tests/drivers/mtd_flashpage/app.config.test
similarity index 100%
rename from tests/mtd_flashpage/app.config.test
rename to tests/drivers/mtd_flashpage/app.config.test
diff --git a/tests/mtd_flashpage/main.c b/tests/drivers/mtd_flashpage/main.c
similarity index 100%
rename from tests/mtd_flashpage/main.c
rename to tests/drivers/mtd_flashpage/main.c
diff --git a/tests/mtd_flashpage/tests/01-run.py b/tests/drivers/mtd_flashpage/tests/01-run.py
similarity index 100%
rename from tests/mtd_flashpage/tests/01-run.py
rename to tests/drivers/mtd_flashpage/tests/01-run.py
diff --git a/tests/mtd_mapper/Makefile b/tests/drivers/mtd_mapper/Makefile
similarity index 76%
rename from tests/mtd_mapper/Makefile
rename to tests/drivers/mtd_mapper/Makefile
index aa84efe04b..ee8292d717 100644
--- a/tests/mtd_mapper/Makefile
+++ b/tests/drivers/mtd_mapper/Makefile
@@ -1,4 +1,4 @@
-include ../Makefile.tests_common
+include ../Makefile.drivers_common
 
 USEMODULE += mtd_mapper
 USEMODULE += mtd_write_page
diff --git a/tests/mtd_mapper/Makefile.ci b/tests/drivers/mtd_mapper/Makefile.ci
similarity index 100%
rename from tests/mtd_mapper/Makefile.ci
rename to tests/drivers/mtd_mapper/Makefile.ci
diff --git a/tests/mtd_mapper/app.config.test b/tests/drivers/mtd_mapper/app.config.test
similarity index 100%
rename from tests/mtd_mapper/app.config.test
rename to tests/drivers/mtd_mapper/app.config.test
diff --git a/tests/mtd_mapper/main.c b/tests/drivers/mtd_mapper/main.c
similarity index 100%
rename from tests/mtd_mapper/main.c
rename to tests/drivers/mtd_mapper/main.c
diff --git a/tests/mtd_mapper/tests/01-run.py b/tests/drivers/mtd_mapper/tests/01-run.py
similarity index 100%
rename from tests/mtd_mapper/tests/01-run.py
rename to tests/drivers/mtd_mapper/tests/01-run.py
diff --git a/tests/mtd_raw/Makefile b/tests/drivers/mtd_raw/Makefile
similarity index 91%
rename from tests/mtd_raw/Makefile
rename to tests/drivers/mtd_raw/Makefile
index 812022b200..b8efa79003 100644
--- a/tests/mtd_raw/Makefile
+++ b/tests/drivers/mtd_raw/Makefile
@@ -1,4 +1,4 @@
-include ../Makefile.tests_common
+include ../Makefile.drivers_common
 
 USEMODULE += shell
 USEMODULE += shell_cmds_default
diff --git a/tests/mtd_raw/Makefile.ci b/tests/drivers/mtd_raw/Makefile.ci
similarity index 100%
rename from tests/mtd_raw/Makefile.ci
rename to tests/drivers/mtd_raw/Makefile.ci
diff --git a/tests/mtd_raw/app.config.test b/tests/drivers/mtd_raw/app.config.test
similarity index 100%
rename from tests/mtd_raw/app.config.test
rename to tests/drivers/mtd_raw/app.config.test
diff --git a/tests/mtd_raw/main.c b/tests/drivers/mtd_raw/main.c
similarity index 100%
rename from tests/mtd_raw/main.c
rename to tests/drivers/mtd_raw/main.c
diff --git a/tests/mtd_raw/tests/01-run.py b/tests/drivers/mtd_raw/tests/01-run.py
similarity index 100%
rename from tests/mtd_raw/tests/01-run.py
rename to tests/drivers/mtd_raw/tests/01-run.py
diff --git a/tests/saul/Makefile b/tests/drivers/saul/Makefile
similarity index 79%
rename from tests/saul/Makefile
rename to tests/drivers/saul/Makefile
index 7901e3d318..a7447f1e3a 100644
--- a/tests/saul/Makefile
+++ b/tests/drivers/saul/Makefile
@@ -1,4 +1,4 @@
-include ../Makefile.tests_common
+include ../Makefile.drivers_common
 
 # include and auto-initialize all available sensors
 USEMODULE += saul_default
diff --git a/tests/saul/README.md b/tests/drivers/saul/README.md
similarity index 100%
rename from tests/saul/README.md
rename to tests/drivers/saul/README.md
diff --git a/tests/saul/app.config.test b/tests/drivers/saul/app.config.test
similarity index 100%
rename from tests/saul/app.config.test
rename to tests/drivers/saul/app.config.test
diff --git a/tests/saul/main.c b/tests/drivers/saul/main.c
similarity index 100%
rename from tests/saul/main.c
rename to tests/drivers/saul/main.c
diff --git a/tests/saul_drivers/Makefile b/tests/drivers/saul_drivers/Makefile
similarity index 97%
rename from tests/saul_drivers/Makefile
rename to tests/drivers/saul_drivers/Makefile
index d2ec814baf..545255c8e7 100644
--- a/tests/saul_drivers/Makefile
+++ b/tests/drivers/saul_drivers/Makefile
@@ -1,5 +1,5 @@
 BOARD ?= stm32f4discovery
-include ../Makefile.tests_common
+include ../Makefile.drivers_common
 
 # Only build on a subset of boards (one per arch supported and
 # with enough features provided)
diff --git a/tests/saul_drivers/README.md b/tests/drivers/saul_drivers/README.md
similarity index 100%
rename from tests/saul_drivers/README.md
rename to tests/drivers/saul_drivers/README.md
diff --git a/tests/saul_drivers/main.c b/tests/drivers/saul_drivers/main.c
similarity index 100%
rename from tests/saul_drivers/main.c
rename to tests/drivers/saul_drivers/main.c
diff --git a/tests/touch_dev/Makefile b/tests/drivers/touch_dev/Makefile
similarity index 83%
rename from tests/touch_dev/Makefile
rename to tests/drivers/touch_dev/Makefile
index 442d00ef91..f211fdc689 100644
--- a/tests/touch_dev/Makefile
+++ b/tests/drivers/touch_dev/Makefile
@@ -1,5 +1,5 @@
 BOARD ?= stm32f429i-disc1
-include ../Makefile.tests_common
+include ../Makefile.drivers_common
 
 DISABLE_MODULE += test_utils_interactive_sync
 
diff --git a/tests/touch_dev/app.config.test b/tests/drivers/touch_dev/app.config.test
similarity index 100%
rename from tests/touch_dev/app.config.test
rename to tests/drivers/touch_dev/app.config.test
diff --git a/tests/touch_dev/main.c b/tests/drivers/touch_dev/main.c
similarity index 100%
rename from tests/touch_dev/main.c
rename to tests/drivers/touch_dev/main.c
diff --git a/tests/mutex_order/Makefile b/tests/mutex_order/Makefile
deleted file mode 100644
index 24bb481657..0000000000
--- a/tests/mutex_order/Makefile
+++ /dev/null
@@ -1,3 +0,0 @@
-include ../Makefile.tests_common
-
-include $(RIOTBASE)/Makefile.include
diff --git a/tests/rmutex/Makefile b/tests/rmutex/Makefile
deleted file mode 100644
index 24bb481657..0000000000
--- a/tests/rmutex/Makefile
+++ /dev/null
@@ -1,3 +0,0 @@
-include ../Makefile.tests_common
-
-include $(RIOTBASE)/Makefile.include
diff --git a/tests/sched_testing/Makefile b/tests/sched_testing/Makefile
deleted file mode 100644
index 24bb481657..0000000000
--- a/tests/sched_testing/Makefile
+++ /dev/null
@@ -1,3 +0,0 @@
-include ../Makefile.tests_common
-
-include $(RIOTBASE)/Makefile.include
diff --git a/tests/thread_basic/Makefile b/tests/thread_basic/Makefile
deleted file mode 100644
index 24bb481657..0000000000
--- a/tests/thread_basic/Makefile
+++ /dev/null
@@ -1,3 +0,0 @@
-include ../Makefile.tests_common
-
-include $(RIOTBASE)/Makefile.include
diff --git a/tests/thread_exit/Makefile b/tests/thread_exit/Makefile
deleted file mode 100644
index 24bb481657..0000000000
--- a/tests/thread_exit/Makefile
+++ /dev/null
@@ -1,3 +0,0 @@
-include ../Makefile.tests_common
-
-include $(RIOTBASE)/Makefile.include
diff --git a/tests/thread_flood/Makefile b/tests/thread_flood/Makefile
deleted file mode 100644
index 24bb481657..0000000000
--- a/tests/thread_flood/Makefile
+++ /dev/null
@@ -1,3 +0,0 @@
-include ../Makefile.tests_common
-
-include $(RIOTBASE)/Makefile.include
diff --git a/tests/thread_msg/Makefile b/tests/thread_msg/Makefile
deleted file mode 100644
index 24bb481657..0000000000
--- a/tests/thread_msg/Makefile
+++ /dev/null
@@ -1,3 +0,0 @@
-include ../Makefile.tests_common
-
-include $(RIOTBASE)/Makefile.include
diff --git a/tests/thread_msg_block_w_queue/Makefile b/tests/thread_msg_block_w_queue/Makefile
deleted file mode 100644
index 24bb481657..0000000000
--- a/tests/thread_msg_block_w_queue/Makefile
+++ /dev/null
@@ -1,3 +0,0 @@
-include ../Makefile.tests_common
-
-include $(RIOTBASE)/Makefile.include
diff --git a/tests/thread_msg_block_wo_queue/Makefile b/tests/thread_msg_block_wo_queue/Makefile
deleted file mode 100644
index 24bb481657..0000000000
--- a/tests/thread_msg_block_wo_queue/Makefile
+++ /dev/null
@@ -1,3 +0,0 @@
-include ../Makefile.tests_common
-
-include $(RIOTBASE)/Makefile.include
diff --git a/tests/thread_msg_seq/Makefile b/tests/thread_msg_seq/Makefile
deleted file mode 100644
index 24bb481657..0000000000
--- a/tests/thread_msg_seq/Makefile
+++ /dev/null
@@ -1,3 +0,0 @@
-include ../Makefile.tests_common
-
-include $(RIOTBASE)/Makefile.include