diff --git a/Makefile.dep b/Makefile.dep
index 3c9a0a1a0d..fe41873223 100644
--- a/Makefile.dep
+++ b/Makefile.dep
@@ -534,7 +534,6 @@ endif
 
 ifneq (,$(filter arduino,$(USEMODULE)))
   FEATURES_REQUIRED += arduino
-  FEATURES_REQUIRED += cpp
   USEMODULE += xtimer
 endif
 
diff --git a/boards/common/arduino-atmega/Makefile.features b/boards/common/arduino-atmega/Makefile.features
index 7b4cdf7eb9..d139b8c537 100644
--- a/boards/common/arduino-atmega/Makefile.features
+++ b/boards/common/arduino-atmega/Makefile.features
@@ -7,7 +7,9 @@ FEATURES_PROVIDED += periph_timer
 FEATURES_PROVIDED += periph_uart
 
 # Various other features (if any)
-FEATURES_PROVIDED += arduino
+ifeq (,$(filter jiminy-mega256rfr2,$(BOARD)))
+  FEATURES_PROVIDED += arduino
+endif
 
 # The board MPU family (used for grouping by the CI system)
 FEATURES_MCU_GROUP = avr8