diff --git a/boards/arm/rp23xx/pimoroni-pico-2-plus/configs/xipfs-nxflat/defconfig b/boards/arm/rp23xx/pimoroni-pico-2-plus/configs/xipfs-nxflat/defconfig
new file mode 100644
index 00000000000..d1876a5ba47
--- /dev/null
+++ b/boards/arm/rp23xx/pimoroni-pico-2-plus/configs/xipfs-nxflat/defconfig
@@ -0,0 +1,54 @@
+#
+# This file is autogenerated: PLEASE DO NOT EDIT IT.
+#
+# You can use "make menuconfig" to make any modifications to the installed .config file.
+# You can then do "make savedefconfig" to generate a new defconfig file that includes your
+# modifications.
+#
+# CONFIG_NSH_ARGCAT is not set
+# CONFIG_NSH_CMDOPT_HEXDUMP is not set
+# CONFIG_NSH_DISABLE_DATE is not set
+# CONFIG_NSH_DISABLE_LOSMART is not set
+# CONFIG_STANDARD_SERIAL is not set
+CONFIG_ARCH="arm"
+CONFIG_ARCH_BOARD="pimoroni-pico-2-plus"
+CONFIG_ARCH_BOARD_COMMON=y
+CONFIG_ARCH_BOARD_PIMORONI_PICO_2_PLUS=y
+CONFIG_ARCH_CHIP="rp23xx"
+CONFIG_ARCH_CHIP_RP23XX=y
+CONFIG_ARCH_RAMVECTORS=y
+CONFIG_ARCH_STACKDUMP=y
+CONFIG_BOARDCTL_RESET=y
+CONFIG_BOARD_LOOPSPERMSEC=10450
+CONFIG_BUILTIN=y
+CONFIG_DEBUG_FULLOPT=y
+CONFIG_DEBUG_SYMBOLS=y
+CONFIG_DISABLE_POSIX_TIMERS=y
+CONFIG_EXAMPLES_HELLO=y
+CONFIG_EXAMPLES_NXFLATXIP=y
+CONFIG_FS_PROCFS=y
+CONFIG_FS_PROCFS_REGISTER=y
+CONFIG_FS_XIPFS=y
+CONFIG_FS_XIPFS_FAULT_INJECT=y
+CONFIG_INIT_ENTRYPOINT="nsh_main"
+CONFIG_LIBC_EXECFUNCS=y
+CONFIG_MTD=y
+CONFIG_NFILE_DESCRIPTORS_PER_BLOCK=6
+CONFIG_NSH_BUILTIN_APPS=y
+CONFIG_NSH_READLINE=y
+CONFIG_NXFLAT=y
+CONFIG_RAM_SIZE=532480
+CONFIG_RAM_START=0x20000000
+CONFIG_READLINE_CMD_HISTORY=y
+CONFIG_RP23XX_FLASH_MTD=y
+CONFIG_RR_INTERVAL=200
+CONFIG_SCHED_WAITPID=y
+CONFIG_START_DAY=9
+CONFIG_START_MONTH=2
+CONFIG_START_YEAR=2021
+CONFIG_SYSLOG_CONSOLE=y
+CONFIG_SYSTEM_NSH=y
+CONFIG_SYSTEM_XIPFS=y
+CONFIG_TESTING_FS_XIPFS=y
+CONFIG_TESTING_FS_XIPFS_MTD="/dev/rpflash"
+CONFIG_UART0_SERIAL_CONSOLE=y
diff --git a/boards/arm/rp23xx/pimoroni-pico-2-plus/configs/xipfs/defconfig b/boards/arm/rp23xx/pimoroni-pico-2-plus/configs/xipfs/defconfig
index d1876a5ba47..f60435da8b0 100644
--- a/boards/arm/rp23xx/pimoroni-pico-2-plus/configs/xipfs/defconfig
+++ b/boards/arm/rp23xx/pimoroni-pico-2-plus/configs/xipfs/defconfig
@@ -25,7 +25,6 @@ CONFIG_DEBUG_FULLOPT=y
 CONFIG_DEBUG_SYMBOLS=y
 CONFIG_DISABLE_POSIX_TIMERS=y
 CONFIG_EXAMPLES_HELLO=y
-CONFIG_EXAMPLES_NXFLATXIP=y
 CONFIG_FS_PROCFS=y
 CONFIG_FS_PROCFS_REGISTER=y
 CONFIG_FS_XIPFS=y
@@ -36,7 +35,6 @@ CONFIG_MTD=y
 CONFIG_NFILE_DESCRIPTORS_PER_BLOCK=6
 CONFIG_NSH_BUILTIN_APPS=y
 CONFIG_NSH_READLINE=y
-CONFIG_NXFLAT=y
 CONFIG_RAM_SIZE=532480
 CONFIG_RAM_START=0x20000000
 CONFIG_READLINE_CMD_HISTORY=y
diff --git a/tools/ci/testlist/arm-06.dat b/tools/ci/testlist/arm-06.dat
index 8aae949b04f..3d1bf786775 100644
--- a/tools/ci/testlist/arm-06.dat
+++ b/tools/ci/testlist/arm-06.dat
@@ -1,4 +1,6 @@
 /arm/r*,CONFIG_ARM_TOOLCHAIN_GNU_EABI
+# NXFLAT tools (mknxflat) are not available in the CI container
+-pimoroni-pico-2-plus:xipfs-nxflat
 
 # Boards build by CMake