diff --git a/boards/x86/arduino_101/Kconfig.defconfig b/boards/x86/arduino_101/Kconfig.defconfig
index e347d8fd51b..97112b61af4 100644
--- a/boards/x86/arduino_101/Kconfig.defconfig
+++ b/boards/x86/arduino_101/Kconfig.defconfig
@@ -51,6 +51,12 @@ if FLASH && SPI
 config SPI_FLASH_W25QXXDV
 	def_bool y
 
+config SPI_0_CS_GPIO
+	def_bool y
+
+config SPI_0_CS_GPIO_PIN
+	default 24
+
 if SPI_FLASH_W25QXXDV
 
 config SPI_FLASH_W25QXXDV_SPI_NAME
diff --git a/tests/fs/fat_fs/prj.conf b/tests/fs/fat_fs/prj.conf
index 7b8aa46b711..3c5145c861b 100644
--- a/tests/fs/fat_fs/prj.conf
+++ b/tests/fs/fat_fs/prj.conf
@@ -5,5 +5,3 @@ CONFIG_FS_FAT_FLASH_DISK_W25QXXDV=y
 CONFIG_FLASH=y
 CONFIG_SPI=y
 CONFIG_GPIO=y
-CONFIG_SPI_CS_GPIO=y
-CONFIG_SPI_0_CS_GPIO_PIN=24