diff --git a/boards/msbiot/Kconfig b/boards/msbiot/Kconfig
index 7a94c4e974..4eba4726cd 100644
--- a/boards/msbiot/Kconfig
+++ b/boards/msbiot/Kconfig
@@ -30,4 +30,12 @@ config BOARD_MSBIOT
     select HAVE_MPU9150
     select HAVE_SAUL_GPIO
 
+config CLOCK_PLL_M
+    default 16
+
+config CLOCK_PLL_N
+    default 336 if MODULE_PERIPH_USBDEV && TEST_KCONFIG
+    default 360
+
+
 source "$(RIOTBOARD)/common/stm32/Kconfig"
diff --git a/boards/msbiot/Makefile.features b/boards/msbiot/Makefile.features
index 55ac53bdfc..aaefd4fcad 100644
--- a/boards/msbiot/Makefile.features
+++ b/boards/msbiot/Makefile.features
@@ -10,6 +10,3 @@ FEATURES_PROVIDED += periph_pwm
 FEATURES_PROVIDED += periph_spi
 FEATURES_PROVIDED += periph_timer
 FEATURES_PROVIDED += periph_uart
-
-# msbiot provides a custom default Kconfig clock configuration
-KCONFIG_BOARD_CONFIG += $(RIOTBOARD)/msbiot/clock.config
diff --git a/boards/msbiot/clock.config b/boards/msbiot/clock.config
deleted file mode 100644
index dbd3b7b887..0000000000
--- a/boards/msbiot/clock.config
+++ /dev/null
@@ -1,5 +0,0 @@
-# msbiot provides a 16MHz HSE so its needs a custom PLL config to output a
-# 180MHz clock.
-CONFIG_CUSTOM_PLL_PARAMS=y
-CONFIG_CLOCK_PLL_M=16
-CONFIG_CLOCK_PLL_N=360