diff --git a/boards/common/arduino-atmega/Makefile.features b/boards/common/arduino-atmega/Makefile.features
index ec1f08f1764c6651cf70f99deb1bb7d8fb6ba0f5..d47ec4565fab579ca8c806ace58f0d646e1b839f 100644
--- a/boards/common/arduino-atmega/Makefile.features
+++ b/boards/common/arduino-atmega/Makefile.features
@@ -11,6 +11,3 @@ ifeq (,$(filter jiminy-mega256rfr2,$(BOARD)))
   FEATURES_PROVIDED += arduino
   FEATURES_PROVIDED += periph_pwm
 endif
-
-# The board MPU family (used for grouping by the CI system)
-FEATURES_MCU_GROUP = avr8
diff --git a/boards/jiminy-mega256rfr2/Makefile.features b/boards/jiminy-mega256rfr2/Makefile.features
index 358ba448f54b1f7dbfb3746fbd8437144bf132e9..5ad360ac35c958d8fe4706c6cecb38d9e3850da8 100644
--- a/boards/jiminy-mega256rfr2/Makefile.features
+++ b/boards/jiminy-mega256rfr2/Makefile.features
@@ -1,10 +1,8 @@
+# This board is based on an atmega CPU, thus import the features from it
 include $(RIOTBOARD)/common/arduino-atmega/Makefile.features
 
 # Put defined MCU peripherals here (in alphabetical order)
 # Peripherals are defined in common/arduino-atmega/Makefile.features
 # Add only additional Peripherals
 
-# The board MPU family (used for grouping by the CI system)
-FEATURES_MCU_GROUP = avr6
-
-include $(RIOTCPU)/atmega256rfr2/Makefile.features
+-include $(RIOTCPU)/atmega256rfr2/Makefile.features
diff --git a/boards/mega-xplained/Makefile.features b/boards/mega-xplained/Makefile.features
index 7a8d6d41bfcc2eae061e0f7ac08cafa99343ab2e..56b30867786e50d328183ba6463094709a986669 100644
--- a/boards/mega-xplained/Makefile.features
+++ b/boards/mega-xplained/Makefile.features
@@ -8,7 +8,4 @@ FEATURES_PROVIDED += periph_uart
 
 # Various other features (if any)
 
-# The board MPU family (used for grouping by the CI system)
-FEATURES_MCU_GROUP = avr8
-
-include $(RIOTCPU)/atmega1284p/Makefile.features
+-include $(RIOTCPU)/atmega1284p/Makefile.features
diff --git a/boards/waspmote-pro/Makefile.features b/boards/waspmote-pro/Makefile.features
index c4cd23b26486b19105ef4998fbda5e50f5ccd47b..86895b34bbf5ba0d27fcaef0c921b050a3ce65d5 100644
--- a/boards/waspmote-pro/Makefile.features
+++ b/boards/waspmote-pro/Makefile.features
@@ -8,7 +8,4 @@ FEATURES_PROVIDED += periph_uart
 
 # Various other features (if any)
 
-# The board MPU family (used for grouping by the CI system)
-FEATURES_MCU_GROUP = avr8
-
-include $(RIOTCPU)/atmega1281/Makefile.features
+-include $(RIOTCPU)/atmega1281/Makefile.features