diff --git a/testing/cpuload/CMakeLists.txt b/system/cpuload/CMakeLists.txt
similarity index 92%
rename from testing/cpuload/CMakeLists.txt
rename to system/cpuload/CMakeLists.txt
index 60d8e2e6444..eb3d5a5565d 100644
--- a/testing/cpuload/CMakeLists.txt
+++ b/system/cpuload/CMakeLists.txt
@@ -1,5 +1,5 @@
 # ##############################################################################
-# apps/testing/cpuload/CMakeLists.txt
+# apps/system/cpuload/CMakeLists.txt
 #
 # SPDX-License-Identifier: Apache-2.0
 #
@@ -20,7 +20,7 @@
 #
 # ##############################################################################
 
-if(CONFIG_TESTING_CPULOAD)
+if(CONFIG_SYSTEM_CPULOAD)
   nuttx_add_application(
     NAME
     cpuload
@@ -29,7 +29,7 @@ if(CONFIG_TESTING_CPULOAD)
     STACKSIZE
     ${CONFIG_DEFAULT_TASK_STACKSIZE}
     MODULE
-    ${CONFIG_TESTING_CPULOAD}
+    ${CONFIG_SYSTEM_CPULOAD}
     SRCS
     cpuload_main.c)
 endif()
diff --git a/testing/cpuload/Kconfig b/system/cpuload/Kconfig
similarity index 88%
rename from testing/cpuload/Kconfig
rename to system/cpuload/Kconfig
index aab20e614d0..f0b895b4324 100644
--- a/testing/cpuload/Kconfig
+++ b/system/cpuload/Kconfig
@@ -3,6 +3,6 @@
 # see the file kconfig-language.txt in the NuttX tools repository.
 #
 
-config TESTING_CPULOAD
+config SYSTEM_CPULOAD
 	tristate "cpuload test"
 	default n
diff --git a/testing/cpuload/Make.defs b/system/cpuload/Make.defs
similarity index 89%
rename from testing/cpuload/Make.defs
rename to system/cpuload/Make.defs
index c43feb47912..e73223175b0 100644
--- a/testing/cpuload/Make.defs
+++ b/system/cpuload/Make.defs
@@ -1,5 +1,5 @@
 ############################################################################
-# apps/testing/cpuload/Make.defs
+# apps/system/cpuload/Make.defs
 #
 # SPDX-License-Identifier: Apache-2.0
 #
@@ -20,6 +20,6 @@
 #
 ############################################################################
 
-ifneq ($(CONFIG_TESTING_CPULOAD),)
-CONFIGURED_APPS += $(APPDIR)/testing/cpuload
+ifneq ($(CONFIG_SYSTEM_CPULOAD),)
+CONFIGURED_APPS += $(APPDIR)/testing/sched/cpuload
 endif
diff --git a/testing/cpuload/Makefile b/system/cpuload/Makefile
similarity index 94%
rename from testing/cpuload/Makefile
rename to system/cpuload/Makefile
index 45fcb82c266..5d7058e1c78 100644
--- a/testing/cpuload/Makefile
+++ b/system/cpuload/Makefile
@@ -1,5 +1,5 @@
 ############################################################################
-# apps/testing/cpuload/Makefile
+# apps/system/cpuload/Makefile
 #
 # SPDX-License-Identifier: Apache-2.0
 #
@@ -25,7 +25,7 @@ include $(APPDIR)/Make.defs
 PROGNAME  = cpuload
 PRIORITY  = 253
 STACKSIZE = $(CONFIG_DEFAULT_TASK_STACKSIZE)
-MODULE    = $(CONFIG_TESTING_CPULOAD)
+MODULE    = $(CONFIG_SYSTEM_CPULOAD)
 
 MAINSRC = cpuload_main.c
 
diff --git a/testing/cpuload/cpuload_main.c b/system/cpuload/cpuload_main.c
similarity index 98%
rename from testing/cpuload/cpuload_main.c
rename to system/cpuload/cpuload_main.c
index daa56dd8567..eadd6dd05b8 100644
--- a/testing/cpuload/cpuload_main.c
+++ b/system/cpuload/cpuload_main.c
@@ -1,5 +1,5 @@
 /****************************************************************************
- * apps/testing/cpuload/cpuload_main.c
+ * apps/testing/sched/cpuload/cpuload_main.c
  *
  * SPDX-License-Identifier: Apache-2.0
  *
diff --git a/testing/atomic/CMakeLists.txt b/testing/libc/atomic/CMakeLists.txt
similarity index 96%
rename from testing/atomic/CMakeLists.txt
rename to testing/libc/atomic/CMakeLists.txt
index 5ae8d006b33..e63ad4bc835 100644
--- a/testing/atomic/CMakeLists.txt
+++ b/testing/libc/atomic/CMakeLists.txt
@@ -1,5 +1,5 @@
 # ##############################################################################
-# apps/testing/atomic/CMakeLists.txt
+# apps/testing/libc/atomic/CMakeLists.txt
 #
 # SPDX-License-Identifier: Apache-2.0
 #
diff --git a/testing/atomic/Kconfig b/testing/libc/atomic/Kconfig
similarity index 100%
rename from testing/atomic/Kconfig
rename to testing/libc/atomic/Kconfig
diff --git a/testing/atomic/Make.defs b/testing/libc/atomic/Make.defs
similarity index 92%
rename from testing/atomic/Make.defs
rename to testing/libc/atomic/Make.defs
index be5f4eb465c..ab66bcb1968 100644
--- a/testing/atomic/Make.defs
+++ b/testing/libc/atomic/Make.defs
@@ -1,5 +1,5 @@
 ############################################################################
-# apps/testing/atomic/Make.defs
+# apps/testing/libc/atomic/Make.defs
 #
 # SPDX-License-Identifier: Apache-2.0
 #
@@ -21,5 +21,5 @@
 ############################################################################
 
 ifneq ($(CONFIG_TESTING_ATOMIC),)
-CONFIGURED_APPS += $(APPDIR)/testing/atomic
+CONFIGURED_APPS += $(APPDIR)/testing/sched/atomic
 endif
diff --git a/testing/atomic/Makefile b/testing/libc/atomic/Makefile
similarity index 97%
rename from testing/atomic/Makefile
rename to testing/libc/atomic/Makefile
index 19f4d48a3fd..2219ec39c3b 100644
--- a/testing/atomic/Makefile
+++ b/testing/libc/atomic/Makefile
@@ -1,5 +1,5 @@
 ############################################################################
-# apps/testing/atomic/Makefile
+# apps/testing/libc/atomic/Makefile
 #
 # SPDX-License-Identifier: Apache-2.0
 #
diff --git a/testing/atomic/atomic_main.c b/testing/libc/atomic/atomic_main.c
similarity index 99%
rename from testing/atomic/atomic_main.c
rename to testing/libc/atomic/atomic_main.c
index 7d3985fd99e..2ab64bf9dbf 100644
--- a/testing/atomic/atomic_main.c
+++ b/testing/libc/atomic/atomic_main.c
@@ -1,5 +1,5 @@
 /****************************************************************************
- * apps/testing/atomic/atomic_main.c
+ * apps/testing/libc/atomic/atomic_main.c
  *
  * SPDX-License-Identifier: Apache-2.0
  *
diff --git a/testing/sched/.gitignore b/testing/sched/.gitignore
new file mode 100644
index 00000000000..9e1d2593ee8
--- /dev/null
+++ b/testing/sched/.gitignore
@@ -0,0 +1 @@
+/Kconfig
diff --git a/testing/sched/CMakeLists.txt b/testing/sched/CMakeLists.txt
new file mode 100644
index 00000000000..08657891bca
--- /dev/null
+++ b/testing/sched/CMakeLists.txt
@@ -0,0 +1,24 @@
+# ##############################################################################
+# apps/testing/sched/CMakeLists.txt
+#
+# SPDX-License-Identifier: Apache-2.0
+#
+# Licensed to the Apache Software Foundation (ASF) under one or more contributor
+# license agreements.  See the NOTICE file distributed with this work for
+# additional information regarding copyright ownership.  The ASF licenses this
+# file to you under the Apache License, Version 2.0 (the "License"); you may not
+# use this file except in compliance with the License.  You may obtain a copy of
+# the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+# WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.  See the
+# License for the specific language governing permissions and limitations under
+# the License.
+#
+# ##############################################################################
+
+nuttx_add_subdirectory()
+nuttx_generate_kconfig(MENUDESC "sched")
diff --git a/testing/sched/Make.defs b/testing/sched/Make.defs
new file mode 100644
index 00000000000..f557eb75d8d
--- /dev/null
+++ b/testing/sched/Make.defs
@@ -0,0 +1,23 @@
+############################################################################
+# apps/testing/sched/Make.defs
+#
+# SPDX-License-Identifier: Apache-2.0
+#
+# Licensed to the Apache Software Foundation (ASF) under one or more
+# contributor license agreements.  See the NOTICE file distributed with
+# this work for additional information regarding copyright ownership.  The
+# ASF licenses this file to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance with the
+# License.  You may obtain a copy of the License at
+#
+#   http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+# WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.  See the
+# License for the specific language governing permissions and limitations
+# under the License.
+#
+############################################################################
+
+include $(wildcard $(APPDIR)/testing/sched/*/Make.defs)
diff --git a/testing/sched/Makefile b/testing/sched/Makefile
new file mode 100644
index 00000000000..0e8113b0669
--- /dev/null
+++ b/testing/sched/Makefile
@@ -0,0 +1,25 @@
+############################################################################
+# apps/testing/sched/Makefile
+#
+# SPDX-License-Identifier: Apache-2.0
+#
+# Licensed to the Apache Software Foundation (ASF) under one or more
+# contributor license agreements.  See the NOTICE file distributed with
+# this work for additional information regarding copyright ownership.  The
+# ASF licenses this file to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance with the
+# License.  You may obtain a copy of the License at
+#
+#   http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+# WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.  See the
+# License for the specific language governing permissions and limitations
+# under the License.
+#
+############################################################################
+
+MENUDESC = "sched"
+
+include $(APPDIR)/Directory.mk
diff --git a/testing/getprime/CMakeLists.txt b/testing/sched/getprime/CMakeLists.txt
similarity index 96%
rename from testing/getprime/CMakeLists.txt
rename to testing/sched/getprime/CMakeLists.txt
index 407ae9649f8..7cafff8250f 100644
--- a/testing/getprime/CMakeLists.txt
+++ b/testing/sched/getprime/CMakeLists.txt
@@ -1,5 +1,5 @@
 # ##############################################################################
-# apps/testing/getprime/CMakeLists.txt
+# apps/testing/sched/getprime/CMakeLists.txt
 #
 # SPDX-License-Identifier: Apache-2.0
 #
diff --git a/testing/getprime/Kconfig b/testing/sched/getprime/Kconfig
similarity index 100%
rename from testing/getprime/Kconfig
rename to testing/sched/getprime/Kconfig
diff --git a/testing/getprime/Make.defs b/testing/sched/getprime/Make.defs
similarity index 91%
rename from testing/getprime/Make.defs
rename to testing/sched/getprime/Make.defs
index d990dc0ba81..7591f4bb17a 100644
--- a/testing/getprime/Make.defs
+++ b/testing/sched/getprime/Make.defs
@@ -1,5 +1,5 @@
 ############################################################################
-# apps/testing/getprime/Make.defs
+# apps/testing/sched/getprime/Make.defs
 #
 # SPDX-License-Identifier: Apache-2.0
 #
@@ -21,5 +21,5 @@
 ############################################################################
 
 ifneq ($(CONFIG_TESTING_GETPRIME),)
-CONFIGURED_APPS += $(APPDIR)/testing/getprime
+CONFIGURED_APPS += $(APPDIR)/testing/sched/getprime
 endif
diff --git a/testing/getprime/Makefile b/testing/sched/getprime/Makefile
similarity index 97%
rename from testing/getprime/Makefile
rename to testing/sched/getprime/Makefile
index b7605743c21..3a728b04d77 100644
--- a/testing/getprime/Makefile
+++ b/testing/sched/getprime/Makefile
@@ -1,5 +1,5 @@
 ############################################################################
-# apps/testing/getprime/Makefile
+# apps/testing/sched/getprime/Makefile
 #
 # SPDX-License-Identifier: Apache-2.0
 #
diff --git a/testing/getprime/getprime_main.c b/testing/sched/getprime/getprime_main.c
similarity index 99%
rename from testing/getprime/getprime_main.c
rename to testing/sched/getprime/getprime_main.c
index 710f07dac28..bee2509be4b 100644
--- a/testing/getprime/getprime_main.c
+++ b/testing/sched/getprime/getprime_main.c
@@ -1,5 +1,5 @@
 /****************************************************************************
- * apps/testing/getprime/getprime_main.c
+ * apps/testing/sched/getprime/getprime_main.c
  *
  * SPDX-License-Identifier: Apache-2.0
  *
diff --git a/testing/smp/CMakeLists.txt b/testing/sched/smp/CMakeLists.txt
similarity index 96%
rename from testing/smp/CMakeLists.txt
rename to testing/sched/smp/CMakeLists.txt
index ada0bceb154..0848fc605dc 100644
--- a/testing/smp/CMakeLists.txt
+++ b/testing/sched/smp/CMakeLists.txt
@@ -1,5 +1,5 @@
 # ##############################################################################
-# apps/testing/smp/CMakeLists.txt
+# apps/testing/sched/smp/CMakeLists.txt
 #
 # SPDX-License-Identifier: Apache-2.0
 #
diff --git a/testing/smp/Kconfig b/testing/sched/smp/Kconfig
similarity index 100%
rename from testing/smp/Kconfig
rename to testing/sched/smp/Kconfig
diff --git a/testing/smp/Make.defs b/testing/sched/smp/Make.defs
similarity index 92%
rename from testing/smp/Make.defs
rename to testing/sched/smp/Make.defs
index 78a315d54c8..2f6d49e7af1 100644
--- a/testing/smp/Make.defs
+++ b/testing/sched/smp/Make.defs
@@ -1,5 +1,5 @@
 ############################################################################
-# apps/testing/smp/Make.defs
+# apps/testing/sched/smp/Make.defs
 #
 # SPDX-License-Identifier: Apache-2.0
 #
@@ -21,5 +21,5 @@
 ############################################################################
 
 ifneq ($(CONFIG_TESTING_SMP),)
-CONFIGURED_APPS += $(APPDIR)/testing/smp
+CONFIGURED_APPS += $(APPDIR)/testing/sched/smp
 endif
diff --git a/testing/smp/Makefile b/testing/sched/smp/Makefile
similarity index 97%
rename from testing/smp/Makefile
rename to testing/sched/smp/Makefile
index dd36b1c38bd..e9287d0dd61 100644
--- a/testing/smp/Makefile
+++ b/testing/sched/smp/Makefile
@@ -1,5 +1,5 @@
 ############################################################################
-# apps/testing/smp/Makefile
+# apps/testing/sched/smp/Makefile
 #
 # SPDX-License-Identifier: Apache-2.0
 #
diff --git a/testing/smp/smp_main.c b/testing/sched/smp/smp_main.c
similarity index 99%
rename from testing/smp/smp_main.c
rename to testing/sched/smp/smp_main.c
index c5fedcb740d..8c3b94e7e6c 100644
--- a/testing/smp/smp_main.c
+++ b/testing/sched/smp/smp_main.c
@@ -1,5 +1,5 @@
 /****************************************************************************
- * apps/testing/smp/smp_main.c
+ * apps/testing/sched/smp/smp_main.c
  *
  * SPDX-License-Identifier: Apache-2.0
  *
diff --git a/testing/timerjitter/CMakeLists.txt b/testing/sched/timerjitter/CMakeLists.txt
similarity index 96%
rename from testing/timerjitter/CMakeLists.txt
rename to testing/sched/timerjitter/CMakeLists.txt
index 41a369aa2f0..dc84086eb4e 100644
--- a/testing/timerjitter/CMakeLists.txt
+++ b/testing/sched/timerjitter/CMakeLists.txt
@@ -1,5 +1,5 @@
 # ##############################################################################
-# apps/testing/timerjitter/CMakeLists.txt
+# apps/testing/sched/timerjitter/CMakeLists.txt
 #
 # SPDX-License-Identifier: Apache-2.0
 #
diff --git a/testing/timerjitter/Kconfig b/testing/sched/timerjitter/Kconfig
similarity index 100%
rename from testing/timerjitter/Kconfig
rename to testing/sched/timerjitter/Kconfig
diff --git a/testing/timerjitter/Make.defs b/testing/sched/timerjitter/Make.defs
similarity index 91%
rename from testing/timerjitter/Make.defs
rename to testing/sched/timerjitter/Make.defs
index f5ee5351890..a27647e4d28 100644
--- a/testing/timerjitter/Make.defs
+++ b/testing/sched/timerjitter/Make.defs
@@ -1,5 +1,5 @@
 ############################################################################
-# apps/testing/timerjitter/Make.defs
+# apps/testing/sched/timerjitter/Make.defs
 #
 # SPDX-License-Identifier: Apache-2.0
 #
@@ -21,5 +21,5 @@
 ############################################################################
 
 ifneq ($(CONFIG_TESTING_TIMERJITTER),)
-CONFIGURED_APPS += $(APPDIR)/testing/timerjitter
+CONFIGURED_APPS += $(APPDIR)/testing/sched/timerjitter
 endif
diff --git a/testing/timerjitter/Makefile b/testing/sched/timerjitter/Makefile
similarity index 96%
rename from testing/timerjitter/Makefile
rename to testing/sched/timerjitter/Makefile
index 993f06fff7f..65052cabb0a 100644
--- a/testing/timerjitter/Makefile
+++ b/testing/sched/timerjitter/Makefile
@@ -1,5 +1,5 @@
 ############################################################################
-# apps/testing/timerjitter/Makefile
+# apps/testing/sched/timerjitter/Makefile
 #
 # SPDX-License-Identifier: Apache-2.0
 #
diff --git a/testing/timerjitter/timerjitter.c b/testing/sched/timerjitter/timerjitter.c
similarity index 99%
rename from testing/timerjitter/timerjitter.c
rename to testing/sched/timerjitter/timerjitter.c
index 3e335339127..ad956cd4ca9 100644
--- a/testing/timerjitter/timerjitter.c
+++ b/testing/sched/timerjitter/timerjitter.c
@@ -1,5 +1,5 @@
 /****************************************************************************
- * apps/testing/timerjitter/timerjitter.c
+ * apps/testing/sched/timerjitter/timerjitter.c
  *
  * SPDX-License-Identifier: Apache-2.0
  *