diff --git a/tests/gomach/Makefile b/tests/gnrc_gomach/Makefile
similarity index 100%
rename from tests/gomach/Makefile
rename to tests/gnrc_gomach/Makefile
diff --git a/tests/gomach/README.md b/tests/gnrc_gomach/README.md
similarity index 100%
rename from tests/gomach/README.md
rename to tests/gnrc_gomach/README.md
diff --git a/tests/gomach/main.c b/tests/gnrc_gomach/main.c
similarity index 100%
rename from tests/gomach/main.c
rename to tests/gnrc_gomach/main.c
diff --git a/tests/lwmac/Makefile b/tests/gnrc_lwmac/Makefile
similarity index 100%
rename from tests/lwmac/Makefile
rename to tests/gnrc_lwmac/Makefile
diff --git a/tests/lwmac/README.md b/tests/gnrc_lwmac/README.md
similarity index 100%
rename from tests/lwmac/README.md
rename to tests/gnrc_lwmac/README.md
diff --git a/tests/lwmac/main.c b/tests/gnrc_lwmac/main.c
similarity index 100%
rename from tests/lwmac/main.c
rename to tests/gnrc_lwmac/main.c