diff --git a/src/stm32/Kconfig b/src/stm32/Kconfig
index c467a7224760..037e37bbe949 100644
--- a/src/stm32/Kconfig
+++ b/src/stm32/Kconfig
@@ -211,9 +211,7 @@ config CLOCK_FREQ
 
 config FLASH_SIZE
     hex
-    prompt "Flash size" if MACH_STM32F031
-    default 0x4000 if MACH_STM32F031
-    default 0x8000 if MACH_STM32F042
+    default 0x8000 if MACH_STM32F031 || MACH_STM32F042
     default 0x20000 if MACH_STM32F070 || MACH_STM32F072
     default 0x10000 if MACH_STM32F103 || MACH_STM32L412 # Flash size of stm32f103x8 (64KiB)
     default 0x40000 if MACH_STM32F2 || MACH_STM32F401 || MACH_STM32H723
diff --git a/src/stm32/stm32f0_i2c.c b/src/stm32/stm32f0_i2c.c
index ffe1c684d0a5..597b48460eb7 100644
--- a/src/stm32/stm32f0_i2c.c
+++ b/src/stm32/stm32f0_i2c.c
@@ -22,8 +22,8 @@ struct i2c_info {
   DECL_CONSTANT_STR("BUS_PINS_i2c1_PF1_PF0", "PF1,PF0");
   DECL_ENUMERATION("i2c_bus", "i2c1_PB8_PB9", 2);
   DECL_CONSTANT_STR("BUS_PINS_i2c1_PB8_PB9", "PB8,PB9");
-  DECL_ENUMERATION("i2c_bus", "i2c1_PB7_PB8", 3);
-  DECL_CONSTANT_STR("BUS_PINS_i2c1_PB7_PB8", "PB7,PB8");
+  DECL_ENUMERATION("i2c_bus", "i2c1_PB8_PB7", 3);
+  DECL_CONSTANT_STR("BUS_PINS_i2c1_PB8_PB7", "PB8,PB7");
   // Deprecated "i2c1a" style mappings
   DECL_ENUMERATION("i2c_bus", "i2c1", 0);
   DECL_CONSTANT_STR("BUS_PINS_i2c1", "PB6,PB7");
@@ -95,7 +95,7 @@ static const struct i2c_info i2c_bus[] = {
     { I2C1, GPIO('B', 6), GPIO('B', 7), GPIO_FUNCTION(1) },
     { I2C1, GPIO('F', 1), GPIO('F', 0), GPIO_FUNCTION(1) },
     { I2C1, GPIO('B', 8), GPIO('B', 9), GPIO_FUNCTION(1) },
-    { I2C1, GPIO('B', 7), GPIO('B', 8), GPIO_FUNCTION(1) },
+    { I2C1, GPIO('B', 8), GPIO('B', 7), GPIO_FUNCTION(1) },
 #elif CONFIG_MACH_STM32F7
     { I2C1, GPIO('B', 6), GPIO('B', 7), GPIO_FUNCTION(1) },
 #elif CONFIG_MACH_STM32G0
diff --git a/test/configs/stm32f031.config b/test/configs/stm32f031.config
index a8c95cfe7d70..1ad81a38e518 100644
--- a/test/configs/stm32f031.config
+++ b/test/configs/stm32f031.config
@@ -1,4 +1,4 @@
-# Base config file for STM32F031x4 (16KB) boards with serial on PA14/PA15
+# Base config file for STM32F031 boards with serial on PA14/PA15
 CONFIG_MACH_STM32=y
 CONFIG_MACH_STM32F031=y
 CONFIG_LOW_LEVEL_OPTIONS=y
diff --git a/test/configs/stm32f031x6.config b/test/configs/stm32f031x6.config
deleted file mode 100644
index f425666353e2..000000000000
--- a/test/configs/stm32f031x6.config
+++ /dev/null
@@ -1,11 +0,0 @@
-# Base config file for STM32F031x6 (32KB) boards with serial on PA14/PA15
-CONFIG_MACH_STM32=y
-CONFIG_MACH_STM32F031=y
-CONFIG_LOW_LEVEL_OPTIONS=y
-CONFIG_STM32_SERIAL_USART2_ALT_PA15_PA14=y
-CONFIG_STM32_CLOCK_REF_INTERNAL=y
-CONFIG_STM32_FLASH_START_0000=y
-CONFIG_WANT_DISPLAYS=n
-CONFIG_FLASH_SIZE=0x8000
-CONFIG_WANT_GPIO_BITBANGING=y
-CONFIG_HAVE_GPIO_I2C=y