diff --git a/cpu/cortexm_common/Kconfig b/cpu/cortexm_common/Kconfig
index 13a67d2caa..8b9daa79c1 100644
--- a/cpu/cortexm_common/Kconfig
+++ b/cpu/cortexm_common/Kconfig
@@ -16,6 +16,7 @@ config CPU_ARCH_ARMV6M
     bool
     select HAS_ARCH_ARM
     select HAS_ARCH_32BIT
+    select HAS_NO_IDLE_THREAD
 
 config CPU_ARCH_ARMV7M
     bool
diff --git a/cpu/cortexm_common/Makefile.features b/cpu/cortexm_common/Makefile.features
index 7527c079d0..456647700f 100644
--- a/cpu/cortexm_common/Makefile.features
+++ b/cpu/cortexm_common/Makefile.features
@@ -33,9 +33,6 @@ else
   $(error Unkwnown cortexm core: $(CPU_CORE))
 endif
 
-# cortex-m3 and higher don't need the idle thread
-ifneq (,$(filter armv7m armv8m,$(CPU_ARCH)))
-  FEATURES_PROVIDED += no_idle_thread
-endif
+FEATURES_PROVIDED += no_idle_thread
 
 KCONFIG_ADD_CONFIG += $(RIOTCPU)/cortexm_common/cortexm_common.config