diff --git a/boards/arm/cxd56xx/spresense/configs/rndis/defconfig b/boards/arm/cxd56xx/spresense/configs/rndis/defconfig
index 1324603e2db..5e685112bb9 100644
--- a/boards/arm/cxd56xx/spresense/configs/rndis/defconfig
+++ b/boards/arm/cxd56xx/spresense/configs/rndis/defconfig
@@ -12,8 +12,8 @@
 CONFIG_ARCH="arm"
 CONFIG_ARCH_BOARD="spresense"
 CONFIG_ARCH_BOARD_SPRESENSE=y
-CONFIG_ARCH_CHIP_CXD56XX=y
 CONFIG_ARCH_CHIP="cxd56xx"
+CONFIG_ARCH_CHIP_CXD56XX=y
 CONFIG_ARCH_STACKDUMP=y
 CONFIG_ARMV7M_USEBASEPRI=y
 CONFIG_BOARDCTL_RESET=y
@@ -45,6 +45,11 @@ CONFIG_MAX_TASKS=16
 CONFIG_MAX_WDOGPARMS=2
 CONFIG_MMCSD=y
 CONFIG_MMCSD_SDIO=y
+CONFIG_MTD_BYTE_WRITE=y
+CONFIG_MTD_PARTITION=y
+CONFIG_MTD_SMART=y
+CONFIG_MTD_SMART_ENABLE_CRC=y
+CONFIG_MTD_SMART_SECTOR_SIZE=4096
 CONFIG_NAME_MAX=256
 CONFIG_NET=y
 CONFIG_NETDB_DNSCLIENT=y
@@ -71,11 +76,6 @@ CONFIG_NET_STATISTICS=y
 CONFIG_NET_TCP=y
 CONFIG_NET_UDP=y
 CONFIG_NET_UDP_BINDTODEVICE=y
-CONFIG_MTD_BYTE_WRITE=y
-CONFIG_MTD_PARTITION=y
-CONFIG_MTD_SMART=y
-CONFIG_MTD_SMART_ENABLE_CRC=y
-CONFIG_MTD_SMART_SECTOR_SIZE=4096
 CONFIG_NFILE_DESCRIPTORS=8
 CONFIG_NFILE_STREAMS=8
 CONFIG_NSH_ARCHINIT=y
@@ -109,6 +109,8 @@ CONFIG_SYSTEM_NSH=y
 CONFIG_SYSTEM_NSH_CXXINITIALIZE=y
 CONFIG_SYSTEM_PING=y
 CONFIG_TELNET_CHARACTER_MODE=y
+CONFIG_TESTING_OSTEST=y
+CONFIG_TESTING_OSTEST_FPUSIZE=64
 CONFIG_UART1_SERIAL_CONSOLE=y
 CONFIG_USBDEV=y
 CONFIG_USBDEV_DMA=y
diff --git a/boards/arm/cxd56xx/spresense/configs/wifi/defconfig b/boards/arm/cxd56xx/spresense/configs/wifi/defconfig
index a49b5bf6937..37b46f48be3 100644
--- a/boards/arm/cxd56xx/spresense/configs/wifi/defconfig
+++ b/boards/arm/cxd56xx/spresense/configs/wifi/defconfig
@@ -107,6 +107,8 @@ CONFIG_SYSTEM_NSH=y
 CONFIG_SYSTEM_NSH_CXXINITIALIZE=y
 CONFIG_SYSTEM_NTPC=y
 CONFIG_SYSTEM_USBMSC=y
+CONFIG_TESTING_OSTEST=y
+CONFIG_TESTING_OSTEST_FPUSIZE=64
 CONFIG_UART1_SERIAL_CONSOLE=y
 CONFIG_USBDEV=y
 CONFIG_USBDEV_DMA=y
diff --git a/boards/arm/cxd56xx/spresense/src/cxd56_ostest.c b/boards/arm/cxd56xx/spresense/src/cxd56_ostest.c
index 94eaf2daea2..d9ca715903d 100644
--- a/boards/arm/cxd56xx/spresense/src/cxd56_ostest.c
+++ b/boards/arm/cxd56xx/spresense/src/cxd56_ostest.c
@@ -57,15 +57,15 @@
 /* Configuration ************************************************************/
 
 #undef HAVE_FPU
-#if defined(CONFIG_ARCH_FPU) && defined(CONFIG_EXAMPLES_OSTEST_FPUSIZE) && \
+#if defined(CONFIG_ARCH_FPU) && defined(CONFIG_TESTING_OSTEST_FPUSIZE) && \
     defined(CONFIG_SCHED_WAITPID) && !defined(CONFIG_ARMV7M_CMNVECTOR)
 #    define HAVE_FPU 1
 #endif
 
 #ifdef HAVE_FPU
 
-#if CONFIG_EXAMPLES_OSTEST_FPUSIZE != (4*SW_FPU_REGS)
-#  error "CONFIG_EXAMPLES_OSTEST_FPUSIZE has the wrong size"
+#if CONFIG_TESTING_OSTEST_FPUSIZE != (4*SW_FPU_REGS)
+#  error "CONFIG_TESTING_OSTEST_FPUSIZE has the wrong size"
 #endif
 
 /****************************************************************************
@@ -82,7 +82,7 @@ static uint32_t g_saveregs[XCPTCONTEXT_REGS];
  * Public Functions
  ****************************************************************************/
 
-/* Given an array of size CONFIG_EXAMPLES_OSTEST_FPUSIZE, this function will
+/* Given an array of size CONFIG_TESTING_OSTEST_FPUSIZE, this function will
  * return the current FPU registers.
  */
 
@@ -101,7 +101,7 @@ void arch_getfpu(FAR uint32_t *fpusave)
   leave_critical_section(flags);
 }
 
-/* Given two arrays of size CONFIG_EXAMPLES_OSTEST_FPUSIZE this function
+/* Given two arrays of size CONFIG_TESTING_OSTEST_FPUSIZE this function
  * will compare them and return true if they are identical.
  */