diff --git a/Makefile.include b/Makefile.include
index c744b5d358..8dd0ae1584 100644
--- a/Makefile.include
+++ b/Makefile.include
@@ -186,10 +186,6 @@ GLOBAL_GOALS += buildtest \
                 #
 
 ifneq (, $(filter $(GLOBAL_GOALS), $(MAKECMDGOALS)))
-  BOARD=none
-endif
-
-ifeq (none,$(BOARD))
   include $(RIOTMAKE)/info-global.inc.mk
   include $(RIOTMAKE)/buildtests.inc.mk
 else
@@ -950,7 +946,7 @@ ifneq ($(_BASELIBS_VALUE_BEFORE_USAGE),$(BASELIBS))
   $(error BASELIBS value changed)
 endif
 
-endif # BOARD=none
+endif
 
 # include RIOT_MAKEFILES_GLOBAL_POST configuration files
 # allows setting user specific system wide configuration parsed after the body