diff --git a/tests/mcuboot/Makefile b/tests/bootloaders/mcuboot/Makefile
similarity index 79%
rename from tests/mcuboot/Makefile
rename to tests/bootloaders/mcuboot/Makefile
index 3fcbf4f06ff93..88255fe23be4e 100644
--- a/tests/mcuboot/Makefile
+++ b/tests/bootloaders/mcuboot/Makefile
@@ -1,6 +1,7 @@
 BOARD ?= nrf52dk
 
-include ../Makefile.tests_common
+RIOTBASE ?= $(CURDIR)/../../..
+include $(RIOTBASE)/tests/Makefile.tests_common
 
 BOARD_WHITELIST := nrf52dk
 
diff --git a/tests/mcuboot/README.md b/tests/bootloaders/mcuboot/README.md
similarity index 100%
rename from tests/mcuboot/README.md
rename to tests/bootloaders/mcuboot/README.md
diff --git a/tests/mcuboot/main.c b/tests/bootloaders/mcuboot/main.c
similarity index 100%
rename from tests/mcuboot/main.c
rename to tests/bootloaders/mcuboot/main.c
diff --git a/tests/riotboot/Makefile b/tests/bootloaders/riotboot/Makefile
similarity index 93%
rename from tests/riotboot/Makefile
rename to tests/bootloaders/riotboot/Makefile
index 47d59012c785d..12aaec514d383 100644
--- a/tests/riotboot/Makefile
+++ b/tests/bootloaders/riotboot/Makefile
@@ -29,5 +29,6 @@ BUILD_FILES += $(SLOT_RIOT_ELFS:%.elf=%.bin)
 # submitted along with the test jobs.
 TEST_EXTRA_FILES=$(SLOT_RIOT_ELFS)
 
-include ../Makefile.tests_common
+RIOTBASE ?= $(CURDIR)/../../..
+include $(RIOTBASE)/tests/Makefile.tests_common
 include $(RIOTBASE)/Makefile.include
diff --git a/tests/riotboot/Makefile.ci b/tests/bootloaders/riotboot/Makefile.ci
similarity index 100%
rename from tests/riotboot/Makefile.ci
rename to tests/bootloaders/riotboot/Makefile.ci
diff --git a/tests/riotboot/README.md b/tests/bootloaders/riotboot/README.md
similarity index 100%
rename from tests/riotboot/README.md
rename to tests/bootloaders/riotboot/README.md
diff --git a/tests/riotboot/main.c b/tests/bootloaders/riotboot/main.c
similarity index 100%
rename from tests/riotboot/main.c
rename to tests/bootloaders/riotboot/main.c
diff --git a/tests/riotboot/tests/01-run.py b/tests/bootloaders/riotboot/tests/01-run.py
similarity index 100%
rename from tests/riotboot/tests/01-run.py
rename to tests/bootloaders/riotboot/tests/01-run.py
diff --git a/tests/riotboot_flashwrite/Makefile b/tests/bootloaders/riotboot_flashwrite/Makefile
similarity index 95%
rename from tests/riotboot_flashwrite/Makefile
rename to tests/bootloaders/riotboot_flashwrite/Makefile
index d6dfebf0793f1..c0a536d932d4c 100644
--- a/tests/riotboot_flashwrite/Makefile
+++ b/tests/bootloaders/riotboot_flashwrite/Makefile
@@ -1,6 +1,7 @@
 DEVELHELP ?= 0
 BOARD ?= samr21-xpro
-include ../Makefile.tests_common
+RIOTBASE ?= $(CURDIR)/../../..
+include $(RIOTBASE)/tests/Makefile.tests_common
 
 # Include packages that pull up and auto-init the link layer.
 # NOTE: 6LoWPAN will be included if IEEE802.15.4 devices are present
diff --git a/tests/riotboot_flashwrite/Makefile.ci b/tests/bootloaders/riotboot_flashwrite/Makefile.ci
similarity index 100%
rename from tests/riotboot_flashwrite/Makefile.ci
rename to tests/bootloaders/riotboot_flashwrite/Makefile.ci
diff --git a/tests/riotboot_flashwrite/README.md b/tests/bootloaders/riotboot_flashwrite/README.md
similarity index 100%
rename from tests/riotboot_flashwrite/README.md
rename to tests/bootloaders/riotboot_flashwrite/README.md
diff --git a/tests/riotboot_flashwrite/coap_handler.c b/tests/bootloaders/riotboot_flashwrite/coap_handler.c
similarity index 100%
rename from tests/riotboot_flashwrite/coap_handler.c
rename to tests/bootloaders/riotboot_flashwrite/coap_handler.c
diff --git a/tests/riotboot_flashwrite/main.c b/tests/bootloaders/riotboot_flashwrite/main.c
similarity index 100%
rename from tests/riotboot_flashwrite/main.c
rename to tests/bootloaders/riotboot_flashwrite/main.c
diff --git a/tests/riotboot_hdr/Makefile b/tests/bootloaders/riotboot_hdr/Makefile
similarity index 65%
rename from tests/riotboot_hdr/Makefile
rename to tests/bootloaders/riotboot_hdr/Makefile
index 68cbbd8c116b6..c5a3672f7c114 100644
--- a/tests/riotboot_hdr/Makefile
+++ b/tests/bootloaders/riotboot_hdr/Makefile
@@ -1,4 +1,5 @@
-include ../Makefile.tests_common
+RIOTBASE ?= $(CURDIR)/../../..
+include $(RIOTBASE)/tests/Makefile.tests_common
 
 USEMODULE += riotboot_hdr
 USEMODULE += embunit
diff --git a/tests/riotboot_hdr/main.c b/tests/bootloaders/riotboot_hdr/main.c
similarity index 100%
rename from tests/riotboot_hdr/main.c
rename to tests/bootloaders/riotboot_hdr/main.c
diff --git a/tests/riotboot_hdr/tests/01-run.py b/tests/bootloaders/riotboot_hdr/tests/01-run.py
similarity index 100%
rename from tests/riotboot_hdr/tests/01-run.py
rename to tests/bootloaders/riotboot_hdr/tests/01-run.py