diff --git a/boards/f4vi1/Kconfig b/boards/f4vi1/Kconfig
index 57d055ab9e..0fd48939ff 100644
--- a/boards/f4vi1/Kconfig
+++ b/boards/f4vi1/Kconfig
@@ -21,4 +21,11 @@ config BOARD_F4VI1
     select BOARD_HAS_HSE
     select BOARD_HAS_LSE
 
+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/f4vi1/Makefile.features b/boards/f4vi1/Makefile.features
index 941f156e30..3ba2fc3e8f 100644
--- a/boards/f4vi1/Makefile.features
+++ b/boards/f4vi1/Makefile.features
@@ -5,6 +5,3 @@ CPU_MODEL = stm32f415rg
 # Put defined MCU peripherals here (in alphabetical order)
 FEATURES_PROVIDED += periph_timer
 FEATURES_PROVIDED += periph_uart
-
-# f4vi1 provides a custom default Kconfig clock configuration
-KCONFIG_BOARD_CONFIG += $(RIOTBOARD)/f4vi1/clock.config
diff --git a/boards/f4vi1/clock.config b/boards/f4vi1/clock.config
deleted file mode 100644
index 5ce6d857d5..0000000000
--- a/boards/f4vi1/clock.config
+++ /dev/null
@@ -1,4 +0,0 @@
-# f4vi1 provides a 16MHz HSE so they need a custom PLL config
-# to remain in 180MHz max clock.
-CONFIG_CUSTOM_PLL_PARAMS=y
-CONFIG_CLOCK_PLL_N=90