diff --git a/.murdock b/.murdock
index 92abae6cd5..f3374d5da3 100755
--- a/.murdock
+++ b/.murdock
@@ -128,7 +128,7 @@ tests/drivers/s*
 tests/drivers/t*
 tests/drivers/u*
 tests/drivers/v*
-tests/external_board_dirs
+tests/build_system/external_board_dirs
 tests/periph/*
 tests/pkg/elk
 tests/pkg/uzlib
diff --git a/examples/gnrc_minimal/Makefile b/examples/gnrc_minimal/Makefile
index 6398f5496d..dccd151fb3 100644
--- a/examples/gnrc_minimal/Makefile
+++ b/examples/gnrc_minimal/Makefile
@@ -34,7 +34,7 @@ CFLAGS += -DCONFIG_GNRC_NETIF_IPV6_ADDRS_NUMOF=2 \
 # Change this to 0 show compiler invocation lines by default:
 QUIET ?= 1
 
-EXTERNAL_BOARD_DIRS += $(RIOTBASE)/tests/external_board_dirs/esp-ci-boards
+EXTERNAL_BOARD_DIRS += $(RIOTBASE)/tests/build_system/external_board_dirs/esp-ci-boards
 
 include $(RIOTBASE)/Makefile.include
 
diff --git a/examples/gnrc_networking/Makefile b/examples/gnrc_networking/Makefile
index df2cb0ddcc..b4f919eddf 100644
--- a/examples/gnrc_networking/Makefile
+++ b/examples/gnrc_networking/Makefile
@@ -68,7 +68,7 @@ endif
 # Change this to 0 show compiler invocation lines by default:
 QUIET ?= 1
 
-EXTERNAL_BOARD_DIRS += $(RIOTBASE)/tests/external_board_dirs/esp-ci-boards
+EXTERNAL_BOARD_DIRS += $(RIOTBASE)/tests/build_system/external_board_dirs/esp-ci-boards
 
 include $(RIOTBASE)/Makefile.include
 
diff --git a/tests/drivers/ws281x/Makefile b/tests/drivers/ws281x/Makefile
index 6d3d81e6e9..008d0033a1 100644
--- a/tests/drivers/ws281x/Makefile
+++ b/tests/drivers/ws281x/Makefile
@@ -12,7 +12,7 @@ USEMODULE += xtimer
 # is clocked at 14.7456 MHz :-/
 BOARD_BLACKLIST := waspmote-pro
 
-EXTERNAL_BOARD_DIRS += $(RIOTBASE)/tests/external_board_dirs/esp-ci-boards
+EXTERNAL_BOARD_DIRS += $(RIOTBASE)/tests/build_system/external_board_dirs/esp-ci-boards
 
 include $(RIOTBASE)/Makefile.include
 
diff --git a/tests/pkg/nimble_esp_wifi_coexist/Makefile b/tests/pkg/nimble_esp_wifi_coexist/Makefile
index 3e16bcd58b..b67ebf43bf 100644
--- a/tests/pkg/nimble_esp_wifi_coexist/Makefile
+++ b/tests/pkg/nimble_esp_wifi_coexist/Makefile
@@ -60,7 +60,7 @@ DEVELHELP ?= 1
 # Change this to 0 show compiler invocation lines by default:
 QUIET ?= 1
 
-EXTERNAL_BOARD_DIRS += $(RIOTBASE)/tests/external_board_dirs/esp-ci-boards
+EXTERNAL_BOARD_DIRS += $(RIOTBASE)/tests/build_system/external_board_dirs/esp-ci-boards
 
 include $(RIOTBASE)/Makefile.include