diff --git a/doc/doxygen/src/creating-modules.md b/doc/doxygen/src/creating-modules.md
index 0182efc8a8..732a08e57d 100644
--- a/doc/doxygen/src/creating-modules.md
+++ b/doc/doxygen/src/creating-modules.md
@@ -82,7 +82,7 @@ External modules can optionally define the following files:
             module `foo` must be located in `<PATH_IN_EXTERNAL_MODULE_DIRS>/foo`.
 
 An example can be found in
-[`tests/external_module_dirs`](https://github.com/RIOT-OS/RIOT/tree/master/tests/external_module_dirs)
+[`tests/build_system/external_module_dirs`](https://github.com/RIOT-OS/RIOT/tree/master/tests/build_system/external_module_dirs)
 
 Pseudomodules                                                  {#pseudomodules}
 =============
diff --git a/doc/doxygen/src/kconfig/kconfig.md b/doc/doxygen/src/kconfig/kconfig.md
index 2e63cd66d2..3e3286dce4 100644
--- a/doc/doxygen/src/kconfig/kconfig.md
+++ b/doc/doxygen/src/kconfig/kconfig.md
@@ -86,7 +86,7 @@ applied. Note that if any dependency issue occurs, warnings will be generated
 ## Application configuration with Kconfig                 {#app-config-kconfig}
 To expose application-specific configuration options a `Kconfig` file can
 be placed in the application's folder. For an example of this you can check
-the [tests/kconfig](https://github.com/RIOT-OS/RIOT/tree/master/tests/kconfig)
+the [tests/build_system/kconfig](https://github.com/RIOT-OS/RIOT/tree/master/tests/build_system/kconfig)
 application.
 
 ## Configuration via environment variables                {#env-config-kconfig}
diff --git a/doc/doxygen/src/porting-boards.md b/doc/doxygen/src/porting-boards.md
index 395315bd0e..f1e177a752 100644
--- a/doc/doxygen/src/porting-boards.md
+++ b/doc/doxygen/src/porting-boards.md
@@ -379,7 +379,7 @@ In this case some special considerations must be taken with the makefiles:
   `include $(RIOTBOARD)/foo-parent/Makefile.*include*`
 
 An example can be found in
-[`tests/external_board_native`](https://github.com/RIOT-OS/RIOT/tree/master/tests/external_board_native)
+[`tests/build_system/external_board_native`](https://github.com/RIOT-OS/RIOT/tree/master/tests/build_system/external_board_native)
 
 # Tools                                                          {#boards-tools}