diff --git a/configs/esp32-core/README.txt b/configs/esp32-core/README.txt
index 24327d74340..44206647690 100644
--- a/configs/esp32-core/README.txt
+++ b/configs/esp32-core/README.txt
@@ -663,12 +663,12 @@ NOTES:
       CONFIG_SMP_NCPUS=2
       CONFIG_SPINLOCK=y
 
-    The apps/examples/smp test is included:
+    The apps/testing/smp test is included:
 
-      CONFIG_EXAMPLES_SMP=y
-      CONFIG_EXAMPLES_SMP_NBARRIER_THREADS=8
-      CONFIG_EXAMPLES_SMP_PRIORITY=100
-      CONFIG_EXAMPLES_SMP_STACKSIZE=2048
+      CONFIG_TESTING_SMP=y
+      CONFIG_TESTING_SMP_NBARRIER_THREADS=8
+      CONFIG_TESTING_SMP_PRIORITY=100
+      CONFIG_TESTING_SMP_STACKSIZE=2048
 
     NOTES:
     1. See NOTES for the nsh configuration.
diff --git a/configs/esp32-core/smp/defconfig b/configs/esp32-core/smp/defconfig
index e1995095f88..28cc2d83df3 100644
--- a/configs/esp32-core/smp/defconfig
+++ b/configs/esp32-core/smp/defconfig
@@ -12,7 +12,6 @@ CONFIG_BUILTIN=y
 CONFIG_DEBUG_FEATURES=y
 CONFIG_DISABLE_POLL=y
 CONFIG_ESP32_UART0=y
-CONFIG_EXAMPLES_SMP=y
 CONFIG_EXPERIMENTAL=y
 CONFIG_FS_PROCFS=y
 CONFIG_HAVE_CXX=y
@@ -46,5 +45,6 @@ CONFIG_START_YEAR=2011
 CONFIG_SUPPRESS_CLOCK_CONFIG=y
 CONFIG_SYSTEM_NSH=y
 CONFIG_SYSTEM_NSH_CXXINITIALIZE=y
+CONFIG_TESTING_SMP=y
 CONFIG_UART0_SERIAL_CONSOLE=y
 CONFIG_USER_ENTRYPOINT="nsh_main"
diff --git a/configs/lc823450-xgevk/audio/defconfig b/configs/lc823450-xgevk/audio/defconfig
index 87807784a55..c83648283ca 100644
--- a/configs/lc823450-xgevk/audio/defconfig
+++ b/configs/lc823450-xgevk/audio/defconfig
@@ -33,7 +33,6 @@ CONFIG_EXAMPLES_I2SLOOP=y
 CONFIG_EXAMPLES_NXHELLO=y
 CONFIG_EXAMPLES_NXHELLO_BPP=1
 CONFIG_EXAMPLES_PIPE=y
-CONFIG_EXAMPLES_SMP=y
 CONFIG_FAT_LCNAMES=y
 CONFIG_FAT_LFN=y
 CONFIG_FAT_MAXFNAME=255
@@ -132,6 +131,7 @@ CONFIG_SYSTEM_USBMSC_DEVPATH2="/dev/mtdblock1"
 CONFIG_SYSTEM_USBMSC_NLUNS=2
 CONFIG_TASK_NAME_SIZE=24
 CONFIG_TESTING_OSTEST=y
+CONFIG_TESTING_SMP=y
 CONFIG_UART0_RXBUFSIZE=512
 CONFIG_UART0_SERIAL_CONSOLE=y
 CONFIG_UART0_TXBUFSIZE=2048
diff --git a/configs/lc823450-xgevk/nsh/defconfig b/configs/lc823450-xgevk/nsh/defconfig
index 1ebd1d45eba..3b3998a0cdc 100644
--- a/configs/lc823450-xgevk/nsh/defconfig
+++ b/configs/lc823450-xgevk/nsh/defconfig
@@ -28,7 +28,6 @@ CONFIG_EXAMPLES_HELLO=y
 CONFIG_EXAMPLES_NXHELLO=y
 CONFIG_EXAMPLES_NXHELLO_BPP=1
 CONFIG_EXAMPLES_PIPE=y
-CONFIG_EXAMPLES_SMP=y
 CONFIG_EXAMPLES_WATCHDOG=y
 CONFIG_FS_PROCFS=y
 CONFIG_FS_WRITABLE=y
@@ -121,6 +120,7 @@ CONFIG_SYSTEM_NSH=y
 CONFIG_SYSTEM_TIME64=y
 CONFIG_TASK_NAME_SIZE=24
 CONFIG_TESTING_OSTEST=y
+CONFIG_TESTING_SMP=y
 CONFIG_UART0_RXBUFSIZE=512
 CONFIG_UART0_SERIAL_CONSOLE=y
 CONFIG_UART0_TXBUFSIZE=2048
diff --git a/configs/lc823450-xgevk/rndis/defconfig b/configs/lc823450-xgevk/rndis/defconfig
index 2bef15b6aa8..8479d46e972 100644
--- a/configs/lc823450-xgevk/rndis/defconfig
+++ b/configs/lc823450-xgevk/rndis/defconfig
@@ -37,7 +37,6 @@ CONFIG_EXAMPLES_I2SLOOP=y
 CONFIG_EXAMPLES_NXHELLO=y
 CONFIG_EXAMPLES_NXHELLO_BPP=1
 CONFIG_EXAMPLES_PIPE=y
-CONFIG_EXAMPLES_SMP=y
 CONFIG_FAT_LCNAMES=y
 CONFIG_FAT_LFN=y
 CONFIG_FAT_MAXFNAME=255
@@ -185,6 +184,7 @@ CONFIG_SYSTEM_TIME64=y
 CONFIG_TASK_NAME_SIZE=24
 CONFIG_TELNET_CHARACTER_MODE=y
 CONFIG_TESTING_OSTEST=y
+CONFIG_TESTING_SMP=y
 CONFIG_UART0_RXBUFSIZE=512
 CONFIG_UART0_SERIAL_CONSOLE=y
 CONFIG_UART0_TXBUFSIZE=2048
diff --git a/configs/lc823450-xgevk/usb/defconfig b/configs/lc823450-xgevk/usb/defconfig
index 16efc8cd5d5..43382ed8da8 100644
--- a/configs/lc823450-xgevk/usb/defconfig
+++ b/configs/lc823450-xgevk/usb/defconfig
@@ -29,7 +29,6 @@ CONFIG_EXAMPLES_HELLO=y
 CONFIG_EXAMPLES_NXHELLO=y
 CONFIG_EXAMPLES_NXHELLO_BPP=1
 CONFIG_EXAMPLES_PIPE=y
-CONFIG_EXAMPLES_SMP=y
 CONFIG_EXAMPLES_WATCHDOG=y
 CONFIG_FAT_LCNAMES=y
 CONFIG_FAT_LFN=y
@@ -130,6 +129,7 @@ CONFIG_SYSTEM_USBMSC_DEVPATH2="/dev/mtdblock1"
 CONFIG_SYSTEM_USBMSC_NLUNS=2
 CONFIG_TASK_NAME_SIZE=24
 CONFIG_TESTING_OSTEST=y
+CONFIG_TESTING_SMP=y
 CONFIG_UART0_RXBUFSIZE=512
 CONFIG_UART0_SERIAL_CONSOLE=y
 CONFIG_UART0_TXBUFSIZE=2048
diff --git a/configs/sabre-6quad/README.txt b/configs/sabre-6quad/README.txt
index a187ded885c..522e5f8b907 100644
--- a/configs/sabre-6quad/README.txt
+++ b/configs/sabre-6quad/README.txt
@@ -725,7 +725,7 @@ Configuration sub-directories
   ---
     This is a configuration of testing the SMP configuration.  It is
     essentially equivalent to the nsh configuration except has SMP enabled
-    and supports apps/examples/smp.
+    and supports apps/testing/smp.
 
     Sample output of the SMP test is show below (Configuration all 4 CPUs
     but with data cache disabled):
diff --git a/configs/sabre-6quad/smp/defconfig b/configs/sabre-6quad/smp/defconfig
index 94c595af270..6d456d57e1c 100644
--- a/configs/sabre-6quad/smp/defconfig
+++ b/configs/sabre-6quad/smp/defconfig
@@ -14,7 +14,6 @@ CONFIG_BOARD_LOOPSPERMSEC=99369
 CONFIG_BOOT_RUNFROMSDRAM=y
 CONFIG_BUILTIN=y
 CONFIG_DEV_ZERO=y
-CONFIG_EXAMPLES_SMP=y
 CONFIG_FS_PROCFS=y
 CONFIG_HAVE_CXX=y
 CONFIG_HAVE_CXXINITIALIZE=y
@@ -48,5 +47,6 @@ CONFIG_START_YEAR=2016
 CONFIG_SYMTAB_ORDEREDBYNAME=y
 CONFIG_SYSTEM_NSH=y
 CONFIG_SYSTEM_NSH_CXXINITIALIZE=y
+CONFIG_TESTING_SMP=y
 CONFIG_UART1_SERIAL_CONSOLE=y
 CONFIG_USER_ENTRYPOINT="nsh_main"
diff --git a/configs/sam4cmp-db/nsh/defconfig b/configs/sam4cmp-db/nsh/defconfig
index 95c88f73a5c..fefa960ace5 100644
--- a/configs/sam4cmp-db/nsh/defconfig
+++ b/configs/sam4cmp-db/nsh/defconfig
@@ -10,7 +10,6 @@ CONFIG_BUILTIN=y
 CONFIG_DEBUG_SYMBOLS=y
 CONFIG_DISABLE_ENVIRON=y
 CONFIG_DISABLE_POLL=y
-CONFIG_EXAMPLES_SMP=y
 CONFIG_FS_PROCFS=y
 CONFIG_MAX_WDOGPARMS=2
 CONFIG_NFILE_DESCRIPTORS=8
@@ -36,6 +35,7 @@ CONFIG_START_YEAR=2013
 CONFIG_SYSTEM_NSH=y
 CONFIG_TASK_NAME_SIZE=24
 CONFIG_TESTING_OSTEST=y
+CONFIG_TESTING_SMP=y
 CONFIG_UART0_SERIAL_CONSOLE=y
 CONFIG_USER_ENTRYPOINT="nsh_main"
 CONFIG_WDOG_INTRESERVE=0