diff --git a/bootloaders/riotboot/Makefile b/bootloaders/riotboot/Makefile
index 9e8f33036f..c2695e8073 100644
--- a/bootloaders/riotboot/Makefile
+++ b/bootloaders/riotboot/Makefile
@@ -15,7 +15,7 @@ CFLAGS += -DRIOTBOOT
 # Disable unused modules
 CFLAGS += -DNDEBUG -DLOG_LEVEL=LOG_NONE
 DISABLE_MODULE += core_init core_msg core_panic
-DISABLE_MODULE += auto_init
+DISABLE_MODULE += auto_init auto_init_%
 
 # avoid using stdio
 USEMODULE += stdio_null
diff --git a/makefiles/dependencies_debug.inc.mk b/makefiles/dependencies_debug.inc.mk
index e8cb46db19..a6f9bd7d43 100644
--- a/makefiles/dependencies_debug.inc.mk
+++ b/makefiles/dependencies_debug.inc.mk
@@ -39,12 +39,17 @@ DEPENDENCY_DEBUG_OUTPUT_DIR ?= $(CURDIR)
 
 # Save variables that are used for parsing dependencies
 _DEPS_DEBUG_VARS += BOARD CPU CPU_MODEL CPU_FAM
-_DEPS_DEBUG_VARS += FEATURES_PROVIDED _FEATURES_PROVIDED_SORTED FEATURES_REQUIRED _FEATURES_REQUIRED_SORTED FEATURES_OPTIONAL FEATURES_USED FEATURES_MISSING FEATURES_CONFLICT FEATURES_CONFLICTING
+_DEPS_DEBUG_VARS += FEATURES_PROVIDED _FEATURES_PROVIDED_SORTED
+_DEPS_DEBUG_VARS += FEATURES_REQUIRED _FEATURES_REQUIRED_SORTED
+_DEPS_DEBUG_VARS += FEATURES_REQUIRED_ANY _FEATURES_REQUIRED_ANY_SORTED
+_DEPS_DEBUG_VARS += FEATURES_OPTIONAL FEATURES_USED FEATURES_MISSING
+_DEPS_DEBUG_VARS += FEATURES_CONFLICT FEATURES_CONFLICTING
 _DEPS_DEBUG_VARS += USEMODULE DEFAULT_MODULE DISABLE_MODULE
 DEPS_DEBUG_VARS ?= $(_DEPS_DEBUG_VARS)
 
 _FEATURES_PROVIDED_SORTED = $(sort $(FEATURES_PROVIDED))
 _FEATURES_REQUIRED_SORTED = $(sort $(FEATURES_REQUIRED))
+_FEATURES_REQUIRED_ANY_SORTED = $(sort $(FEATURES_REQUIRED_ANY))
 
 file_save_dependencies_variables = $(call file_save_variable,$(DEPENDENCY_DEBUG_OUTPUT_DIR)/$1_$(BOARD),$(DEPS_DEBUG_VARS))
 # Remove file before to be sure appending is started with an empty file
diff --git a/makefiles/features_check.inc.mk b/makefiles/features_check.inc.mk
index b24c0bda76..62ba37beda 100644
--- a/makefiles/features_check.inc.mk
+++ b/makefiles/features_check.inc.mk
@@ -39,13 +39,19 @@ FEATURES_REQUIRED_ONE_OUT_OF := $(foreach item,\
 
 # Features that are required by the application but not provided by the BSP
 # Having features missing may case the build to fail.
-FEATURES_MISSING := $(sort $(filter-out $(FEATURES_PROVIDED),$(FEATURES_REQUIRED) $(FEATURES_REQUIRED_ONE_OUT_OF)))
+FEATURES_MISSING := $(sort \
+                      $(filter-out $(FEATURES_PROVIDED),\
+                        $(FEATURES_REQUIRED) $(FEATURES_REQUIRED_ONE_OUT_OF)))
 
 # Features that are used for an application
-FEATURES_USED := $(sort $(FEATURES_REQUIRED) $(FEATURES_REQUIRED_ONE_OUT_OF) $(FEATURES_OPTIONAL_USED))
+FEATURES_USED := $(sort $(FEATURES_REQUIRED) \
+                        $(FEATURES_REQUIRED_ONE_OUT_OF) \
+                        $(FEATURES_OPTIONAL_USED))
 
 # Used features that conflict when used together
-FEATURES_CONFLICTING := $(sort $(foreach conflict,$(FEATURES_CONFLICT),$(call _features_conflicting,$(conflict))))
+FEATURES_CONFLICTING := $(sort $(foreach conflict,\
+                                 $(FEATURES_CONFLICT),\
+                                 $(call _features_conflicting,$(conflict))))
 
 # Return conflicting features from the conflict string feature1:feature2
 #   $1: feature1:feature2
diff --git a/tests/minimal/Makefile b/tests/minimal/Makefile
index 233f8add8e..ac6ae278a7 100644
--- a/tests/minimal/Makefile
+++ b/tests/minimal/Makefile
@@ -3,7 +3,7 @@ include ../Makefile.tests_common
 
 CFLAGS += -DNDEBUG -DLOG_LEVEL=LOG_NONE
 
-DISABLE_MODULE += auto_init
+DISABLE_MODULE += auto_init auto_init_%
 DISABLE_MODULE += test_utils_interactive_sync
 
 USEMODULE += stdio_null
diff --git a/tests/unittests/Makefile b/tests/unittests/Makefile
index ea6fe6db21..848c2fbc36 100644
--- a/tests/unittests/Makefile
+++ b/tests/unittests/Makefile
@@ -11,7 +11,7 @@ else
   UNIT_TESTS := $(filter tests-%, $(MAKECMDGOALS))
 endif
 
-DISABLE_MODULE += auto_init
+DISABLE_MODULE += auto_init auto_init_%
 
 # boards using arduino bootloader require auto_init to
 # automatically initialize stdio over USB. Without this, the bootloader