diff --git a/sys/shell/commands/Kconfig b/sys/shell/commands/Kconfig
index f64e8077bb..667308ae7a 100644
--- a/sys/shell/commands/Kconfig
+++ b/sys/shell/commands/Kconfig
@@ -5,6 +5,11 @@
 # directory for more details.
 #
 
-config MODULE_SHELL_COMMANDS
+menuconfig MODULE_SHELL_COMMANDS
     bool "Basic shell commands"
     depends on MODULE_SHELL
+
+config MODULE_I2C_SCAN
+    bool "I2c scanner"
+    depends on MODULE_SHELL
+    depends on MODULE_PERIPH_I2C
diff --git a/tests/periph_i2c/Makefile b/tests/periph_i2c/Makefile
index 868bad2427..bafa06c4a2 100644
--- a/tests/periph_i2c/Makefile
+++ b/tests/periph_i2c/Makefile
@@ -5,6 +5,8 @@ FEATURES_REQUIRED = periph_i2c
 FEATURES_OPTIONAL = periph_i2c_reconfigure
 
 USEMODULE += shell
+USEMODULE += shell_commands
+USEMODULE += i2c_scan
 USEMODULE += xtimer
 
 # avoid running Kconfig by default
diff --git a/tests/periph_i2c/Makefile.ci b/tests/periph_i2c/Makefile.ci
index cd13c9e96d..0bd1b38ce6 100644
--- a/tests/periph_i2c/Makefile.ci
+++ b/tests/periph_i2c/Makefile.ci
@@ -5,4 +5,5 @@ BOARD_INSUFFICIENT_MEMORY := \
     arduino-uno \
     atmega328p \
     nucleo-l011k4 \
+    samd10-xmini \
     #
diff --git a/tests/periph_i2c/app.config.test b/tests/periph_i2c/app.config.test
index e3da3e8e15..47bbe4894c 100644
--- a/tests/periph_i2c/app.config.test
+++ b/tests/periph_i2c/app.config.test
@@ -1,5 +1,7 @@
 # this file enables modules defined in Kconfig. Do not use this file for
 # application configuration. This is only needed during migration.
+CONFIG_MODULE_I2C_SCAN=y
 CONFIG_MODULE_PERIPH_I2C=y
 CONFIG_MODULE_SHELL=y
+CONFIG_MODULE_SHELL_COMMANDS=y
 CONFIG_MODULE_XTIMER=y