diff --git a/testing/irtest/CMakeLists.txt b/system/irtest/CMakeLists.txt
similarity index 85%
rename from testing/irtest/CMakeLists.txt
rename to system/irtest/CMakeLists.txt
index 6975046ff2f..991352bf20d 100644
--- a/testing/irtest/CMakeLists.txt
+++ b/system/irtest/CMakeLists.txt
@@ -1,5 +1,5 @@
 # ##############################################################################
-# apps/testing/irtest/CMakeLists.txt
+# apps/system/irtest/CMakeLists.txt
 #
 # SPDX-License-Identifier: Apache-2.0
 #
@@ -20,19 +20,19 @@
 #
 # ##############################################################################
 
-if(CONFIG_TESTING_IRTEST)
+if(CONFIG_SYSTEM_IRTEST)
   file(GLOB CURRENT_SRCS *.cxx)
   list(REMOVE_ITEM CURRENT_SRCS main.cxx)
   set(SRCS main.cxx ${CURRENT_SRCS})
   nuttx_add_application(
     NAME
-    ${CONFIG_TESTING_IRTEST_PROGNAME}
+    ${CONFIG_SYSTEM_IRTEST_PROGNAME}
     PRIORITY
-    ${CONFIG_TESTING_IRTEST_PRIORITY}
+    ${CONFIG_SYSTEM_IRTEST_PRIORITY}
     STACKSIZE
-    ${CONFIG_TESTING_IRTEST_STACKSIZE}
+    ${CONFIG_SYSTEM_IRTEST_STACKSIZE}
     MODULE
-    ${CONFIG_TESTING_IRTEST}
+    ${CONFIG_SYSTEM_IRTEST}
     SRCS
     ${SRCS})
 endif()
diff --git a/testing/irtest/Kconfig b/system/irtest/Kconfig
similarity index 76%
rename from testing/irtest/Kconfig
rename to system/irtest/Kconfig
index 01e23d368ae..34743bb87bc 100644
--- a/testing/irtest/Kconfig
+++ b/system/irtest/Kconfig
@@ -3,35 +3,35 @@
 # see the file kconfig-language.txt in the NuttX tools repository.
 #
 
-config TESTING_IRTEST
+config SYSTEM_IRTEST
 	tristate "IR driver test"
 	default n
 	depends on DRIVERS_RC
 	---help---
 		Enable the IR driver test
 
-if TESTING_IRTEST
+if SYSTEM_IRTEST
 
-config TESTING_IRTEST_PROGNAME
+config SYSTEM_IRTEST_PROGNAME
 	string "Program name"
 	default "irtest"
 	---help---
 		This is the name of the program that will be used when the NSH ELF
 		program is installed.
 
-config TESTING_IRTEST_PRIORITY
+config SYSTEM_IRTEST_PRIORITY
 	int "IR driver test task priority"
 	default 100
 
-config TESTING_IRTEST_STACKSIZE
+config SYSTEM_IRTEST_STACKSIZE
 	int "IR driver test stack size"
 	default DEFAULT_TASK_STACKSIZE
 
-config TESTING_IRTEST_MAX_NIRDEV
+config SYSTEM_IRTEST_MAX_NIRDEV
 	int "The Maximum number of IR devices supported"
 	default 2
 
-config TESTING_IRTEST_MAX_SIRDATA
+config SYSTEM_IRTEST_MAX_SIRDATA
 	int "The Maximum size of sending data in unsigned int"
 	default 64
 
diff --git a/testing/irtest/Make.defs b/system/irtest/Make.defs
similarity index 93%
rename from testing/irtest/Make.defs
rename to system/irtest/Make.defs
index 4bd5f37e7da..f5588fcb22f 100644
--- a/testing/irtest/Make.defs
+++ b/system/irtest/Make.defs
@@ -1,5 +1,5 @@
 ############################################################################
-# apps/testing/irtest/Make.defs
+# apps/system/irtest/Make.defs
 #
 # SPDX-License-Identifier: Apache-2.0
 #
@@ -20,6 +20,6 @@
 #
 ############################################################################
 
-ifneq ($(CONFIG_TESTING_IRTEST),)
+ifneq ($(CONFIG_SYSTEM_IRTEST),)
 CONFIGURED_APPS += $(APPDIR)/testing/irtest
 endif
diff --git a/testing/irtest/Makefile b/system/irtest/Makefile
similarity index 84%
rename from testing/irtest/Makefile
rename to system/irtest/Makefile
index 28d7b20c11d..a4dc50a9ca3 100644
--- a/testing/irtest/Makefile
+++ b/system/irtest/Makefile
@@ -1,5 +1,5 @@
 ############################################################################
-# apps/testing/irtest/Makefile
+# apps/system/irtest/Makefile
 #
 # SPDX-License-Identifier: Apache-2.0
 #
@@ -22,10 +22,10 @@
 
 include $(APPDIR)/Make.defs
 
-PROGNAME  = $(CONFIG_TESTING_IRTEST_PROGNAME)
-PRIORITY  = $(CONFIG_TESTING_IRTEST_PRIORITY)
-STACKSIZE = $(CONFIG_TESTING_IRTEST_STACKSIZE)
-MODULE    = $(CONFIG_TESTING_IRTEST)
+PROGNAME  = $(CONFIG_SYSTEM_IRTEST_PROGNAME)
+PRIORITY  = $(CONFIG_SYSTEM_IRTEST_PRIORITY)
+STACKSIZE = $(CONFIG_SYSTEM_IRTEST_STACKSIZE)
+MODULE    = $(CONFIG_SYSTEM_IRTEST)
 
 MAINSRC   = main.cxx
 CXXSRCS   = $(filter-out $(MAINSRC), $(wildcard *.cxx))
diff --git a/testing/irtest/cmd.cxx b/system/irtest/cmd.cxx
similarity index 88%
rename from testing/irtest/cmd.cxx
rename to system/irtest/cmd.cxx
index 867864a47b0..d61527df7d8 100644
--- a/testing/irtest/cmd.cxx
+++ b/system/irtest/cmd.cxx
@@ -1,5 +1,5 @@
 /****************************************************************************
- * apps/testing/irtest/cmd.cxx
+ * apps/system/irtest/cmd.cxx
  *
  * SPDX-License-Identifier: Apache-2.0
  *
@@ -46,7 +46,7 @@
 
 static pthread_mutex_t mutex = PTHREAD_MUTEX_INITIALIZER;
 static pthread_cond_t cond = PTHREAD_COND_INITIALIZER;
-static int g_irdevs[CONFIG_TESTING_IRTEST_MAX_NIRDEV];
+static int g_irdevs[CONFIG_SYSTEM_IRTEST_MAX_NIRDEV];
 
 /****************************************************************************
  * Private Functions
@@ -190,7 +190,7 @@ CMD1(open_device, const char *, file_name)
     }
 
   int index = 0;
-  for (; index < CONFIG_TESTING_IRTEST_MAX_NIRDEV; index++)
+  for (; index < CONFIG_SYSTEM_IRTEST_MAX_NIRDEV; index++)
     {
       if (g_irdevs[index] == -1)
         {
@@ -199,7 +199,7 @@ CMD1(open_device, const char *, file_name)
         }
     }
 
-  if (index == CONFIG_TESTING_IRTEST_MAX_NIRDEV)
+  if (index == CONFIG_SYSTEM_IRTEST_MAX_NIRDEV)
     {
       return ERROR;
     }
@@ -209,7 +209,7 @@ CMD1(open_device, const char *, file_name)
 
 CMD1(close_device, size_t, index)
 {
-  if (index >= CONFIG_TESTING_IRTEST_MAX_NIRDEV)
+  if (index >= CONFIG_SYSTEM_IRTEST_MAX_NIRDEV)
     {
       return ERROR;
     }
@@ -226,15 +226,15 @@ CMD1(close_device, size_t, index)
 
 CMD1(write_data, size_t, index)
 {
-  unsigned int data[CONFIG_TESTING_IRTEST_MAX_SIRDATA];
+  unsigned int data[CONFIG_SYSTEM_IRTEST_MAX_SIRDATA];
 
-  if (index >= CONFIG_TESTING_IRTEST_MAX_NIRDEV)
+  if (index >= CONFIG_SYSTEM_IRTEST_MAX_NIRDEV)
     {
       return ERROR;
     }
 
   int size = 0;
-  for (; size < CONFIG_TESTING_IRTEST_MAX_SIRDATA; size++)
+  for (; size < CONFIG_SYSTEM_IRTEST_MAX_SIRDATA; size++)
     {
       unsigned int tmp = get_next_arg < unsigned int > ();
       if (tmp == 0)
@@ -263,7 +263,7 @@ CMD1(write_data, size_t, index)
 
 CMD2(read_data, size_t, index, size_t, size)
 {
-  if (index >= CONFIG_TESTING_IRTEST_MAX_NIRDEV)
+  if (index >= CONFIG_SYSTEM_IRTEST_MAX_NIRDEV)
     {
       return ERROR;
     }
@@ -291,7 +291,7 @@ CMD2(read_data, size_t, index, size_t, size)
 
 CMD1(get_features, size_t, index)
 {
-  if (index >= CONFIG_TESTING_IRTEST_MAX_NIRDEV)
+  if (index >= CONFIG_SYSTEM_IRTEST_MAX_NIRDEV)
     {
       return ERROR;
     }
@@ -308,7 +308,7 @@ CMD1(get_features, size_t, index)
 
 CMD1(get_send_mode, size_t, index)
 {
-  if (index >= CONFIG_TESTING_IRTEST_MAX_NIRDEV)
+  if (index >= CONFIG_SYSTEM_IRTEST_MAX_NIRDEV)
     {
       return ERROR;
     }
@@ -325,7 +325,7 @@ CMD1(get_send_mode, size_t, index)
 
 CMD1(get_rec_mode, size_t, index)
 {
-  if (index >= CONFIG_TESTING_IRTEST_MAX_NIRDEV)
+  if (index >= CONFIG_SYSTEM_IRTEST_MAX_NIRDEV)
     {
       return ERROR;
     }
@@ -342,7 +342,7 @@ CMD1(get_rec_mode, size_t, index)
 
 CMD1(get_rec_resolution, size_t, index)
 {
-  if (index >= CONFIG_TESTING_IRTEST_MAX_NIRDEV)
+  if (index >= CONFIG_SYSTEM_IRTEST_MAX_NIRDEV)
     {
       return ERROR;
     }
@@ -359,7 +359,7 @@ CMD1(get_rec_resolution, size_t, index)
 
 CMD1(get_min_timeout, size_t, index)
 {
-  if (index >= CONFIG_TESTING_IRTEST_MAX_NIRDEV)
+  if (index >= CONFIG_SYSTEM_IRTEST_MAX_NIRDEV)
     {
       return ERROR;
     }
@@ -376,7 +376,7 @@ CMD1(get_min_timeout, size_t, index)
 
 CMD1(get_max_timeout, size_t, index)
 {
-  if (index >= CONFIG_TESTING_IRTEST_MAX_NIRDEV)
+  if (index >= CONFIG_SYSTEM_IRTEST_MAX_NIRDEV)
     {
       return ERROR;
     }
@@ -393,7 +393,7 @@ CMD1(get_max_timeout, size_t, index)
 
 CMD1(get_length, size_t, index)
 {
-  if (index >= CONFIG_TESTING_IRTEST_MAX_NIRDEV)
+  if (index >= CONFIG_SYSTEM_IRTEST_MAX_NIRDEV)
     {
       return ERROR;
     }
@@ -410,7 +410,7 @@ CMD1(get_length, size_t, index)
 
 CMD2(set_send_mode, size_t, index, unsigned int, mode)
 {
-  if (index >= CONFIG_TESTING_IRTEST_MAX_NIRDEV)
+  if (index >= CONFIG_SYSTEM_IRTEST_MAX_NIRDEV)
     {
       return ERROR;
     }
@@ -420,7 +420,7 @@ CMD2(set_send_mode, size_t, index, unsigned int, mode)
 
 CMD2(set_rec_mode, size_t, index, unsigned int, mode)
 {
-  if (index >= CONFIG_TESTING_IRTEST_MAX_NIRDEV)
+  if (index >= CONFIG_SYSTEM_IRTEST_MAX_NIRDEV)
     {
       return ERROR;
     }
@@ -430,7 +430,7 @@ CMD2(set_rec_mode, size_t, index, unsigned int, mode)
 
 CMD2(set_send_carrier, size_t, index, unsigned int, carrier)
 {
-  if (index >= CONFIG_TESTING_IRTEST_MAX_NIRDEV)
+  if (index >= CONFIG_SYSTEM_IRTEST_MAX_NIRDEV)
     {
       return ERROR;
     }
@@ -440,7 +440,7 @@ CMD2(set_send_carrier, size_t, index, unsigned int, carrier)
 
 CMD2(set_rec_carrier, size_t, index, unsigned int, carrier)
 {
-  if (index >= CONFIG_TESTING_IRTEST_MAX_NIRDEV)
+  if (index >= CONFIG_SYSTEM_IRTEST_MAX_NIRDEV)
     {
       return ERROR;
     }
@@ -450,7 +450,7 @@ CMD2(set_rec_carrier, size_t, index, unsigned int, carrier)
 
 CMD2(set_send_duty_cycle, size_t, index, unsigned int, duty_cycle)
 {
-  if (index >= CONFIG_TESTING_IRTEST_MAX_NIRDEV)
+  if (index >= CONFIG_SYSTEM_IRTEST_MAX_NIRDEV)
     {
       return ERROR;
     }
@@ -460,7 +460,7 @@ CMD2(set_send_duty_cycle, size_t, index, unsigned int, duty_cycle)
 
 CMD2(set_transmitter_mask, size_t, index, unsigned int, mask)
 {
-  if (index >= CONFIG_TESTING_IRTEST_MAX_NIRDEV)
+  if (index >= CONFIG_SYSTEM_IRTEST_MAX_NIRDEV)
     {
       return ERROR;
     }
@@ -470,7 +470,7 @@ CMD2(set_transmitter_mask, size_t, index, unsigned int, mask)
 
 CMD2(set_rec_timeout, size_t, index, unsigned int, timeout)
 {
-  if (index >= CONFIG_TESTING_IRTEST_MAX_NIRDEV)
+  if (index >= CONFIG_SYSTEM_IRTEST_MAX_NIRDEV)
     {
       return ERROR;
     }
@@ -480,7 +480,7 @@ CMD2(set_rec_timeout, size_t, index, unsigned int, timeout)
 
 CMD2(set_rec_timeout_reports, size_t, index, unsigned int, enable)
 {
-  if (index >= CONFIG_TESTING_IRTEST_MAX_NIRDEV)
+  if (index >= CONFIG_SYSTEM_IRTEST_MAX_NIRDEV)
     {
       return ERROR;
     }
@@ -490,7 +490,7 @@ CMD2(set_rec_timeout_reports, size_t, index, unsigned int, enable)
 
 CMD2(set_measure_carrier_mode, size_t, index, unsigned int, enable)
 {
-  if (index >= CONFIG_TESTING_IRTEST_MAX_NIRDEV)
+  if (index >= CONFIG_SYSTEM_IRTEST_MAX_NIRDEV)
     {
       return ERROR;
     }
@@ -500,7 +500,7 @@ CMD2(set_measure_carrier_mode, size_t, index, unsigned int, enable)
 
 CMD2(set_rec_carrier_range, size_t, index, unsigned int, carrier)
 {
-  if (index >= CONFIG_TESTING_IRTEST_MAX_NIRDEV)
+  if (index >= CONFIG_SYSTEM_IRTEST_MAX_NIRDEV)
     {
       return ERROR;
     }
@@ -514,7 +514,7 @@ CMD2(set_rec_carrier_range, size_t, index, unsigned int, carrier)
 
 void init_device()
 {
-  for (int i = 0; i < CONFIG_TESTING_IRTEST_MAX_NIRDEV; i++)
+  for (int i = 0; i < CONFIG_SYSTEM_IRTEST_MAX_NIRDEV; i++)
     g_irdevs[i] = -1;
 }
 
diff --git a/testing/irtest/cmd.hpp b/system/irtest/cmd.hpp
similarity index 97%
rename from testing/irtest/cmd.hpp
rename to system/irtest/cmd.hpp
index d1f96fcdf74..da4b07f571b 100644
--- a/testing/irtest/cmd.hpp
+++ b/system/irtest/cmd.hpp
@@ -1,5 +1,5 @@
 /****************************************************************************
- * apps/testing/irtest/cmd.hpp
+ * apps/system/irtest/cmd.hpp
  *
  * SPDX-License-Identifier: Apache-2.0
  *
@@ -20,8 +20,8 @@
  *
  ****************************************************************************/
 
-#ifndef __APPS_TESTING_IRTEST_CMD_HPP
-#define __APPS_TESTING_IRTEST_CMD_HPP
+#ifndef __APPS_SYSTEM_IRTEST_CMD_HPP
+#define __APPS_SYSTEM_IRTEST_CMD_HPP
 
 /****************************************************************************
  * Included Files
@@ -179,4 +179,4 @@ inline float get_next_arg()
 
 void init_device();
 
-#endif /* __APPS_TESTING_IRTEST_CMD_H */
+#endif /* __APPS_SYSTEM_IRTEST_CMD_H */
diff --git a/testing/irtest/enum.cxx b/system/irtest/enum.cxx
similarity index 98%
rename from testing/irtest/enum.cxx
rename to system/irtest/enum.cxx
index 1c3b58afdf4..912817c0f63 100644
--- a/testing/irtest/enum.cxx
+++ b/system/irtest/enum.cxx
@@ -1,5 +1,5 @@
 /****************************************************************************
- * apps/testing/irtest/enum.cxx
+ * apps/system/irtest/enum.cxx
  *
  * SPDX-License-Identifier: Apache-2.0
  *
diff --git a/testing/irtest/enum.hpp b/system/irtest/enum.hpp
similarity index 94%
rename from testing/irtest/enum.hpp
rename to system/irtest/enum.hpp
index 77c7120216b..98788000a73 100644
--- a/testing/irtest/enum.hpp
+++ b/system/irtest/enum.hpp
@@ -1,5 +1,5 @@
 /****************************************************************************
- * apps/testing/irtest/enum.hpp
+ * apps/system/irtest/enum.hpp
  *
  * SPDX-License-Identifier: Apache-2.0
  *
@@ -20,8 +20,8 @@
  *
  ****************************************************************************/
 
-#ifndef __APPS_TESTING_IRTEST_ENUM_HPP
-#define __APPS_TESTING_IRTEST_ENUM_HPP
+#ifndef __APPS_SYSTEM_IRTEST_ENUM_HPP
+#define __APPS_SYSTEM_IRTEST_ENUM_HPP
 
 /****************************************************************************
  * Included Files
@@ -71,4 +71,4 @@ struct enum_type
 
 extern const struct enum_type *g_enum_table[];
 
-#endif /* __APPS_TESTING_IRTEST_ENUM_H */
+#endif /* __APPS_SYSTEM_IRTEST_ENUM_H */
diff --git a/testing/irtest/main.cxx b/system/irtest/main.cxx
similarity index 98%
rename from testing/irtest/main.cxx
rename to system/irtest/main.cxx
index 9ea7a144745..d8534aae6a7 100644
--- a/testing/irtest/main.cxx
+++ b/system/irtest/main.cxx
@@ -1,5 +1,5 @@
 /****************************************************************************
- * apps/testing/irtest/main.cxx
+ * apps/system/irtest/main.cxx
  *
  * SPDX-License-Identifier: Apache-2.0
  *
diff --git a/testing/monkey/CMakeLists.txt b/system/monkey/CMakeLists.txt
similarity index 87%
rename from testing/monkey/CMakeLists.txt
rename to system/monkey/CMakeLists.txt
index d3649c24f90..ec7ab1e9184 100644
--- a/testing/monkey/CMakeLists.txt
+++ b/system/monkey/CMakeLists.txt
@@ -1,5 +1,5 @@
 # ##############################################################################
-# apps/testing/monkey/CMakeLists.txt
+# apps/system/monkey/CMakeLists.txt
 #
 # SPDX-License-Identifier: Apache-2.0
 #
@@ -20,7 +20,7 @@
 #
 # ##############################################################################
 
-if(CONFIG_TESTING_MONKEY)
+if(CONFIG_SYSTEM_MONKEY)
   file(GLOB CURRENT_SRCS *.c)
   list(REMOVE_ITEM CURRENT_SRCS monkey_main.c)
   set(SRCS monkey_main.c ${CURRENT_SRCS})
@@ -28,11 +28,11 @@ if(CONFIG_TESTING_MONKEY)
     NAME
     monkey
     PRIORITY
-    ${CONFIG_TESTING_MONKEY_PRIORITY}
+    ${CONFIG_SYSTEM_MONKEY_PRIORITY}
     STACKSIZE
-    ${CONFIG_TESTING_MONKEY_STACKSIZE}
+    ${CONFIG_SYSTEM_MONKEY_STACKSIZE}
     MODULE
-    ${CONFIG_TESTING_MONKEY}
+    ${CONFIG_SYSTEM_MONKEY}
     SRCS
     ${SRCS})
 endif()
diff --git a/testing/monkey/Kconfig b/system/monkey/Kconfig
similarity index 72%
rename from testing/monkey/Kconfig
rename to system/monkey/Kconfig
index 10f511a85bc..9c84a040f7d 100644
--- a/testing/monkey/Kconfig
+++ b/system/monkey/Kconfig
@@ -3,24 +3,24 @@
 # see the file kconfig-language.txt in the NuttX tools repository.
 #
 
-menuconfig TESTING_MONKEY
+menuconfig SYSTEM_MONKEY
 	tristate "Monkey test"
 	select UINPUT_TOUCH
 	select UINPUT_BUTTONS
 	select LIBC_PRINT_EXTENSION
 	default n
 
-if TESTING_MONKEY
+if SYSTEM_MONKEY
 
-config TESTING_MONKEY_PRIORITY
+config SYSTEM_MONKEY_PRIORITY
 	int "Task priority"
 	default 110
 
-config TESTING_MONKEY_STACKSIZE
+config SYSTEM_MONKEY_STACKSIZE
 	int "Stack size"
 	default 4096
 
-config TESTING_MONKEY_REC_DIR_PATH
+config SYSTEM_MONKEY_REC_DIR_PATH
 	string "Recorder directory path"
 	default "/data/monkey"
 
diff --git a/testing/monkey/Make.defs b/system/monkey/Make.defs
similarity index 89%
rename from testing/monkey/Make.defs
rename to system/monkey/Make.defs
index dbad681de85..21e780a7713 100644
--- a/testing/monkey/Make.defs
+++ b/system/monkey/Make.defs
@@ -1,5 +1,5 @@
 ############################################################################
-# apps/testing/monkey/Make.defs
+# apps/system/monkey/Make.defs
 #
 # SPDX-License-Identifier: Apache-2.0
 #
@@ -20,6 +20,6 @@
 #
 ############################################################################
 
-ifneq ($(CONFIG_TESTING_MONKEY),)
-CONFIGURED_APPS += $(APPDIR)/testing/monkey
+ifneq ($(CONFIG_SYSTEM_MONKEY),)
+CONFIGURED_APPS += $(APPDIR)/system/monkey
 endif
diff --git a/testing/monkey/Makefile b/system/monkey/Makefile
similarity index 88%
rename from testing/monkey/Makefile
rename to system/monkey/Makefile
index 0f572a3545f..e7a26a16f18 100644
--- a/testing/monkey/Makefile
+++ b/system/monkey/Makefile
@@ -1,5 +1,5 @@
 ############################################################################
-# apps/testing/monkey/Makefile
+# apps/system/monkey/Makefile
 #
 # SPDX-License-Identifier: Apache-2.0
 #
@@ -25,9 +25,9 @@ include $(APPDIR)/Make.defs
 # Monkey test example
 
 PROGNAME = monkey
-PRIORITY = $(CONFIG_TESTING_MONKEY_PRIORITY)
-STACKSIZE = $(CONFIG_TESTING_MONKEY_STACKSIZE)
-MODULE = $(CONFIG_TESTING_MONKEY)
+PRIORITY = $(CONFIG_SYSTEM_MONKEY_PRIORITY)
+STACKSIZE = $(CONFIG_SYSTEM_MONKEY_STACKSIZE)
+MODULE = $(CONFIG_SYSTEM_MONKEY)
 
 MAINSRC = monkey_main.c
 
diff --git a/testing/monkey/monkey.c b/system/monkey/monkey.c
similarity index 99%
rename from testing/monkey/monkey.c
rename to system/monkey/monkey.c
index 770c59d51e0..30a92aaa6fc 100644
--- a/testing/monkey/monkey.c
+++ b/system/monkey/monkey.c
@@ -1,5 +1,5 @@
 /****************************************************************************
- * apps/testing/monkey/monkey.c
+ * apps/system/monkey/monkey.c
  *
  * SPDX-License-Identifier: Apache-2.0
  *
diff --git a/testing/monkey/monkey.h b/system/monkey/monkey.h
similarity index 95%
rename from testing/monkey/monkey.h
rename to system/monkey/monkey.h
index b53771a1c2b..b86c0d122f4 100644
--- a/testing/monkey/monkey.h
+++ b/system/monkey/monkey.h
@@ -1,5 +1,5 @@
 /****************************************************************************
- * apps/testing/monkey/monkey.h
+ * apps/system/monkey/monkey.h
  *
  * SPDX-License-Identifier: Apache-2.0
  *
@@ -20,8 +20,8 @@
  *
  ****************************************************************************/
 
-#ifndef __APPS_TESTING_MONKEY_MONKEY_H
-#define __APPS_TESTING_MONKEY_MONKEY_H
+#ifndef __APPS_SYSTEM_MONKEY_MONKEY_H
+#define __APPS_SYSTEM_MONKEY_MONKEY_H
 
 /****************************************************************************
  * Included Files
@@ -97,4 +97,4 @@ bool monkey_set_recorder_path(FAR struct monkey_s *monkey,
 }
 #endif
 
-#endif /* __APPS_TESTING_MONKEY_MONKEY_H */
+#endif /* __APPS_SYSTEM_MONKEY_MONKEY_H */
diff --git a/testing/monkey/monkey_assert.h b/system/monkey/monkey_assert.h
similarity index 89%
rename from testing/monkey/monkey_assert.h
rename to system/monkey/monkey_assert.h
index 51d4fd07ced..e11773b858e 100644
--- a/testing/monkey/monkey_assert.h
+++ b/system/monkey/monkey_assert.h
@@ -1,5 +1,5 @@
 /****************************************************************************
- * apps/testing/monkey/monkey_assert.h
+ * apps/system/monkey/monkey_assert.h
  *
  * SPDX-License-Identifier: Apache-2.0
  *
@@ -20,8 +20,8 @@
  *
  ****************************************************************************/
 
-#ifndef __APPS_TESTING_MONKEY_MONKEY_ASSERT_H
-#define __APPS_TESTING_MONKEY_MONKEY_ASSERT_H
+#ifndef __APPS_SYSTEM_MONKEY_MONKEY_ASSERT_H
+#define __APPS_SYSTEM_MONKEY_MONKEY_ASSERT_H
 
 /****************************************************************************
  * Included Files
@@ -36,4 +36,4 @@
 #define MONKEY_ASSERT(expr)     DEBUGASSERT(expr)
 #define MONKEY_ASSERT_NULL(ptr) MONKEY_ASSERT(ptr != NULL)
 
-#endif /* __APPS_TESTING_MONKEY_MONKEY_ASSERT_H */
+#endif /* __APPS_SYSTEM_MONKEY_MONKEY_ASSERT_H */
diff --git a/testing/monkey/monkey_dev.c b/system/monkey/monkey_dev.c
similarity index 99%
rename from testing/monkey/monkey_dev.c
rename to system/monkey/monkey_dev.c
index 7f196684028..ce3d8e05be6 100644
--- a/testing/monkey/monkey_dev.c
+++ b/system/monkey/monkey_dev.c
@@ -1,5 +1,5 @@
 /****************************************************************************
- * apps/testing/monkey/monkey_dev.c
+ * apps/system/monkey/monkey_dev.c
  *
  * SPDX-License-Identifier: Apache-2.0
  *
diff --git a/testing/monkey/monkey_dev.h b/system/monkey/monkey_dev.h
similarity index 95%
rename from testing/monkey/monkey_dev.h
rename to system/monkey/monkey_dev.h
index b7b61944e4f..dc5dfb7c29b 100644
--- a/testing/monkey/monkey_dev.h
+++ b/system/monkey/monkey_dev.h
@@ -1,5 +1,5 @@
 /****************************************************************************
- * apps/testing/monkey/monkey_dev.h
+ * apps/system/monkey/monkey_dev.h
  *
  * SPDX-License-Identifier: Apache-2.0
  *
@@ -20,8 +20,8 @@
  *
  ****************************************************************************/
 
-#ifndef __APPS_TESTING_MONKEY_MONKEY_DEV_H
-#define __APPS_TESTING_MONKEY_MONKEY_DEV_H
+#ifndef __APPS_SYSTEM_MONKEY_MONKEY_DEV_H
+#define __APPS_SYSTEM_MONKEY_MONKEY_DEV_H
 
 /****************************************************************************
  * Included Files
@@ -96,4 +96,4 @@ int monkey_dev_get_available(FAR struct monkey_dev_s *devs[], int dev_num);
 }
 #endif
 
-#endif /* __APPS_TESTING_MONKEY_MONKEY_DEV_H */
+#endif /* __APPS_SYSTEM_MONKEY_MONKEY_DEV_H */
diff --git a/testing/monkey/monkey_event.c b/system/monkey/monkey_event.c
similarity index 99%
rename from testing/monkey/monkey_event.c
rename to system/monkey/monkey_event.c
index 745d452468a..fc0149bf312 100644
--- a/testing/monkey/monkey_event.c
+++ b/system/monkey/monkey_event.c
@@ -1,5 +1,5 @@
 /****************************************************************************
- * apps/testing/monkey/monkey_event.c
+ * apps/system/monkey/monkey_event.c
  *
  * SPDX-License-Identifier: Apache-2.0
  *
diff --git a/testing/monkey/monkey_event.h b/system/monkey/monkey_event.h
similarity index 94%
rename from testing/monkey/monkey_event.h
rename to system/monkey/monkey_event.h
index 60ff88ac072..905b4fe6149 100644
--- a/testing/monkey/monkey_event.h
+++ b/system/monkey/monkey_event.h
@@ -1,5 +1,5 @@
 /****************************************************************************
- * apps/testing/monkey/monkey_event.h
+ * apps/system/monkey/monkey_event.h
  *
  * SPDX-License-Identifier: Apache-2.0
  *
@@ -20,8 +20,8 @@
  *
  ****************************************************************************/
 
-#ifndef __APPS_TESTING_MONKEY_EVENT_H
-#define __APPS_TESTING_MONKEY_EVENT_H
+#ifndef __APPS_SYSTEM_MONKEY_EVENT_H
+#define __APPS_SYSTEM_MONKEY_EVENT_H
 
 /****************************************************************************
  * Included Files
@@ -76,4 +76,4 @@ bool monkey_event_exec(FAR struct monkey_s *monkey,
 }
 #endif
 
-#endif /* __APPS_TESTING_MONKEY_EVENT_H */
+#endif /* __APPS_SYSTEM_MONKEY_EVENT_H */
diff --git a/testing/monkey/monkey_log.c b/system/monkey/monkey_log.c
similarity index 98%
rename from testing/monkey/monkey_log.c
rename to system/monkey/monkey_log.c
index cd3aaa3d653..2eab51d2a5b 100644
--- a/testing/monkey/monkey_log.c
+++ b/system/monkey/monkey_log.c
@@ -1,5 +1,5 @@
 /****************************************************************************
- * apps/testing/monkey/monkey_log.c
+ * apps/system/monkey/monkey_log.c
  *
  * SPDX-License-Identifier: Apache-2.0
  *
diff --git a/testing/monkey/monkey_log.h b/system/monkey/monkey_log.h
similarity index 95%
rename from testing/monkey/monkey_log.h
rename to system/monkey/monkey_log.h
index 4071e4c95f8..e798d887cc4 100644
--- a/testing/monkey/monkey_log.h
+++ b/system/monkey/monkey_log.h
@@ -1,5 +1,5 @@
 /****************************************************************************
- * apps/testing/monkey/monkey_log.h
+ * apps/system/monkey/monkey_log.h
  *
  * SPDX-License-Identifier: Apache-2.0
  *
@@ -20,8 +20,8 @@
  *
  ****************************************************************************/
 
-#ifndef __APPS_TESTING_MONKEY_MONKEY_LOG_H
-#define __APPS_TESTING_MONKEY_MONKEY_LOG_H
+#ifndef __APPS_SYSTEM_MONKEY_MONKEY_LOG_H
+#define __APPS_SYSTEM_MONKEY_MONKEY_LOG_H
 
 /****************************************************************************
  * Included Files
@@ -105,4 +105,4 @@ enum monkey_log_level_type_e monkey_log_get_level(void);
 }
 #endif
 
-#endif /* __APPS_TESTING_MONKEY_MONKEY_LOG_H */
+#endif /* __APPS_SYSTEM_MONKEY_MONKEY_LOG_H */
diff --git a/testing/monkey/monkey_main.c b/system/monkey/monkey_main.c
similarity index 99%
rename from testing/monkey/monkey_main.c
rename to system/monkey/monkey_main.c
index 1ee6945deff..f3d665c4f25 100644
--- a/testing/monkey/monkey_main.c
+++ b/system/monkey/monkey_main.c
@@ -1,5 +1,5 @@
 /****************************************************************************
- * apps/testing/monkey/monkey_main.c
+ * apps/system/monkey/monkey_main.c
  *
  * SPDX-License-Identifier: Apache-2.0
  *
@@ -330,7 +330,7 @@ static FAR struct monkey_s *monkey_init(
     {
       monkey_set_mode(monkey, MONKEY_MODE_RECORD);
       if (!monkey_set_recorder_path(monkey,
-                                    CONFIG_TESTING_MONKEY_REC_DIR_PATH))
+                                    CONFIG_SYSTEM_MONKEY_REC_DIR_PATH))
         {
           goto failed;
         }
diff --git a/testing/monkey/monkey_proc.c b/system/monkey/monkey_proc.c
similarity index 99%
rename from testing/monkey/monkey_proc.c
rename to system/monkey/monkey_proc.c
index 8040401fee4..d410e025e33 100644
--- a/testing/monkey/monkey_proc.c
+++ b/system/monkey/monkey_proc.c
@@ -1,5 +1,5 @@
 /****************************************************************************
- * apps/testing/monkey/monkey_proc.c
+ * apps/system/monkey/monkey_proc.c
  *
  * SPDX-License-Identifier: Apache-2.0
  *
diff --git a/testing/monkey/monkey_recorder.c b/system/monkey/monkey_recorder.c
similarity index 99%
rename from testing/monkey/monkey_recorder.c
rename to system/monkey/monkey_recorder.c
index cc497e8f8c1..500ec95e668 100644
--- a/testing/monkey/monkey_recorder.c
+++ b/system/monkey/monkey_recorder.c
@@ -1,5 +1,5 @@
 /****************************************************************************
- * apps/testing/monkey/monkey_recorder.c
+ * apps/system/monkey/monkey_recorder.c
  *
  * SPDX-License-Identifier: Apache-2.0
  *
diff --git a/testing/monkey/monkey_recorder.h b/system/monkey/monkey_recorder.h
similarity index 95%
rename from testing/monkey/monkey_recorder.h
rename to system/monkey/monkey_recorder.h
index 756e1a870c0..2848538f28d 100644
--- a/testing/monkey/monkey_recorder.h
+++ b/system/monkey/monkey_recorder.h
@@ -1,5 +1,5 @@
 /****************************************************************************
- * apps/testing/monkey/monkey_recorder.h
+ * apps/system/monkey/monkey_recorder.h
  *
  * SPDX-License-Identifier: Apache-2.0
  *
@@ -20,8 +20,8 @@
  *
  ****************************************************************************/
 
-#ifndef __APPS_TESTING_MONKEY_MONKEY_RECORDER_H
-#define __APPS_TESTING_MONKEY_MONKEY_RECORDER_H
+#ifndef __APPS_SYSTEM_MONKEY_MONKEY_RECORDER_H
+#define __APPS_SYSTEM_MONKEY_MONKEY_RECORDER_H
 
 /****************************************************************************
  * Included Files
@@ -109,4 +109,4 @@ enum monkey_recorder_res_e monkey_recorder_reset(
 }
 #endif
 
-#endif /* __APPS_TESTING_MONKEY_MONKEY_RECORDER_H */
+#endif /* __APPS_SYSTEM_MONKEY_MONKEY_RECORDER_H */
diff --git a/testing/monkey/monkey_type.h b/system/monkey/monkey_type.h
similarity index 94%
rename from testing/monkey/monkey_type.h
rename to system/monkey/monkey_type.h
index ed4f8684f99..e919f67d929 100644
--- a/testing/monkey/monkey_type.h
+++ b/system/monkey/monkey_type.h
@@ -1,5 +1,5 @@
 /****************************************************************************
- * apps/testing/monkey/monkey_type.h
+ * apps/system/monkey/monkey_type.h
  *
  * SPDX-License-Identifier: Apache-2.0
  *
@@ -20,8 +20,8 @@
  *
  ****************************************************************************/
 
-#ifndef __APPS_TESTING_MONKEY_MONKEY_TYPE_H
-#define __APPS_TESTING_MONKEY_MONKEY_TYPE_H
+#ifndef __APPS_SYSTEM_MONKEY_MONKEY_TYPE_H
+#define __APPS_SYSTEM_MONKEY_MONKEY_TYPE_H
 
 /****************************************************************************
  * Included Files
@@ -131,4 +131,4 @@ struct monkey_s
   } playback_ctx;
 };
 
-#endif /* __APPS_TESTING_MONKEY_MONKEY_TYPE_H */
+#endif /* __APPS_SYSTEM_MONKEY_MONKEY_TYPE_H */
diff --git a/testing/monkey/monkey_utils.c b/system/monkey/monkey_utils.c
similarity index 99%
rename from testing/monkey/monkey_utils.c
rename to system/monkey/monkey_utils.c
index 5e54731ac3d..c785b504301 100644
--- a/testing/monkey/monkey_utils.c
+++ b/system/monkey/monkey_utils.c
@@ -1,5 +1,5 @@
 /****************************************************************************
- * apps/testing/monkey/monkey_utils.c
+ * apps/system/monkey/monkey_utils.c
  *
  * SPDX-License-Identifier: Apache-2.0
  *
diff --git a/testing/monkey/monkey_utils.h b/system/monkey/monkey_utils.h
similarity index 95%
rename from testing/monkey/monkey_utils.h
rename to system/monkey/monkey_utils.h
index d559600a366..618c0c3a562 100644
--- a/testing/monkey/monkey_utils.h
+++ b/system/monkey/monkey_utils.h
@@ -1,5 +1,5 @@
 /****************************************************************************
- * apps/testing/monkey/monkey_utils.h
+ * apps/system/monkey/monkey_utils.h
  *
  * SPDX-License-Identifier: Apache-2.0
  *
@@ -20,8 +20,8 @@
  *
  ****************************************************************************/
 
-#ifndef __APPS_TESTING_MONKEY_MONKEY_UTILS_H
-#define __APPS_TESTING_MONKEY_MONKEY_UTILS_H
+#ifndef __APPS_SYSTEM_MONKEY_MONKEY_UTILS_H
+#define __APPS_SYSTEM_MONKEY_MONKEY_UTILS_H
 
 /****************************************************************************
  * Included Files
@@ -105,4 +105,4 @@ FAR const char *monkey_event_type2name(enum monkey_event_e event);
 }
 #endif
 
-#endif /* __APPS_TESTING_MONKEY_MONKEY_UTILS_H */
+#endif /* __APPS_SYSTEM_MONKEY_MONKEY_UTILS_H */
diff --git a/testing/resmonitor/CMakeLists.txt b/system/resmonitor/CMakeLists.txt
similarity index 75%
rename from testing/resmonitor/CMakeLists.txt
rename to system/resmonitor/CMakeLists.txt
index ca110234196..57fb3ece8ee 100644
--- a/testing/resmonitor/CMakeLists.txt
+++ b/system/resmonitor/CMakeLists.txt
@@ -1,5 +1,5 @@
 # ##############################################################################
-# apps/testing/resmonitor/CMakeLists.txt
+# apps/system/resmonitor/CMakeLists.txt
 #
 # SPDX-License-Identifier: Apache-2.0
 #
@@ -20,27 +20,27 @@
 #
 # ##############################################################################
 
-if(CONFIG_TESTING_RESMONITOR)
+if(CONFIG_SYSTEM_RESMONITOR)
   nuttx_add_application(
     NAME
     showinfo
     SRCS
     showinfo.c
     STACKSIZE
-    ${CONFIG_TESTING_RESMONITOR_STACKSIZE}
+    ${CONFIG_SYSTEM_RESMONITOR_STACKSIZE}
     PRIORITY
-    ${CONFIG_TESTING_RESMONITOR_PRIORITY})
+    ${CONFIG_SYSTEM_RESMONITOR_PRIORITY})
 
-  if(CONFIG_TESTING_RESMONITOR_FILL)
+  if(CONFIG_SYSTEM_RESMONITOR_FILL)
     nuttx_add_application(
       NAME
       filldisk
       SRCS
       filldisk.c
       STACKSIZE
-      ${CONFIG_TESTING_RESMONITOR_STACKSIZE}
+      ${CONFIG_SYSTEM_RESMONITOR_STACKSIZE}
       PRIORITY
-      ${CONFIG_TESTING_RESMONITOR_PRIORITY})
+      ${CONFIG_SYSTEM_RESMONITOR_PRIORITY})
 
     nuttx_add_application(
       NAME
@@ -48,9 +48,9 @@ if(CONFIG_TESTING_RESMONITOR)
       SRCS
       fillcpu.c
       STACKSIZE
-      ${CONFIG_TESTING_RESMONITOR_STACKSIZE}
+      ${CONFIG_SYSTEM_RESMONITOR_STACKSIZE}
       PRIORITY
-      ${CONFIG_TESTING_RESMONITOR_PRIORITY})
+      ${CONFIG_SYSTEM_RESMONITOR_PRIORITY})
 
     nuttx_add_application(
       NAME
@@ -58,8 +58,8 @@ if(CONFIG_TESTING_RESMONITOR)
       SRCS
       fillmem.c
       STACKSIZE
-      ${CONFIG_TESTING_RESMONITOR_STACKSIZE}
+      ${CONFIG_SYSTEM_RESMONITOR_STACKSIZE}
       PRIORITY
-      ${CONFIG_TESTING_RESMONITOR_PRIORITY})
+      ${CONFIG_SYSTEM_RESMONITOR_PRIORITY})
   endif()
 endif()
diff --git a/testing/resmonitor/Kconfig b/system/resmonitor/Kconfig
similarity index 74%
rename from testing/resmonitor/Kconfig
rename to system/resmonitor/Kconfig
index 5b577bf5859..3cfaf617c3b 100644
--- a/testing/resmonitor/Kconfig
+++ b/system/resmonitor/Kconfig
@@ -3,24 +3,24 @@
 # see the file kconfig-language.txt in the NuttX tools repository.
 #
 
-config TESTING_RESMONITOR
+config SYSTEM_RESMONITOR
 	bool "enable resource monitor [showinfo]"
 	default n
 	---help---
 		Enable resource show with specific duration.
 		Should not use with LOW_RESOURCE_TEST at the same time.
 
-if TESTING_RESMONITOR
+if SYSTEM_RESMONITOR
 
-config TESTING_RESMONITOR_PRIORITY
+config SYSTEM_RESMONITOR_PRIORITY
 	int "Task priority"
 	default 100
 
-config TESTING_RESMONITOR_STACKSIZE
+config SYSTEM_RESMONITOR_STACKSIZE
 	int "Stack size"
 	default 4096
 
-config TESTING_RESMONITOR_FILL
+config SYSTEM_RESMONITOR_FILL
 	bool "[filldisk/fillcpu/fillmem]"
 	default n
 
diff --git a/testing/sensortest/Make.defs b/system/resmonitor/Make.defs
similarity index 88%
rename from testing/sensortest/Make.defs
rename to system/resmonitor/Make.defs
index 50603af5cb2..6e1285f41b5 100644
--- a/testing/sensortest/Make.defs
+++ b/system/resmonitor/Make.defs
@@ -1,5 +1,5 @@
 ############################################################################
-# apps/testing/sensortest/Make.defs
+# apps/system/resmonitor/Make.defs
 #
 # SPDX-License-Identifier: Apache-2.0
 #
@@ -20,6 +20,6 @@
 #
 ############################################################################
 
-ifneq ($(CONFIG_TESTING_SENSORTEST),)
-CONFIGURED_APPS += $(APPDIR)/testing/sensortest
+ifneq ($(CONFIG_SYSTEM_RESMONITOR),)
+CONFIGURED_APPS += $(APPDIR)/system/resmonitor
 endif
diff --git a/testing/resmonitor/Makefile b/system/resmonitor/Makefile
similarity index 85%
rename from testing/resmonitor/Makefile
rename to system/resmonitor/Makefile
index b61abd1f34e..366cdefc384 100644
--- a/testing/resmonitor/Makefile
+++ b/system/resmonitor/Makefile
@@ -1,5 +1,5 @@
 ############################################################################
-# apps/testing/resmonitor/Makefile
+# apps/system/resmonitor/Makefile
 #
 # SPDX-License-Identifier: Apache-2.0
 #
@@ -22,14 +22,14 @@
 
 include $(APPDIR)/Make.defs
 
-PRIORITY = $(CONFIG_TESTING_RESMONITOR_PRIORITY)
-STACKSIZE = $(CONFIG_TESTING_RESMONITOR_STACKSIZE)
-MODULE = $(CONFIG_TESTING_RESMONITOR)
+PRIORITY = $(CONFIG_SYSTEM_RESMONITOR_PRIORITY)
+STACKSIZE = $(CONFIG_SYSTEM_RESMONITOR_STACKSIZE)
+MODULE = $(CONFIG_SYSTEM_RESMONITOR)
 
 PROGNAME += showinfo
 MAINSRC += $(CURDIR)/showinfo.c
 
-ifeq ($(CONFIG_TESTING_RESMONITOR_FILL),y)
+ifeq ($(CONFIG_SYSTEM_RESMONITOR_FILL),y)
 PROGNAME += filldisk
 MAINSRC += $(CURDIR)/filldisk.c
 PROGNAME += fillcpu
diff --git a/testing/resmonitor/fillcpu.c b/system/resmonitor/fillcpu.c
similarity index 99%
rename from testing/resmonitor/fillcpu.c
rename to system/resmonitor/fillcpu.c
index dddf9da5c38..f7101a5b78e 100644
--- a/testing/resmonitor/fillcpu.c
+++ b/system/resmonitor/fillcpu.c
@@ -1,5 +1,5 @@
 /****************************************************************************
- * apps/testing/resmonitor/fillcpu.c
+ * apps/system/resmonitor/fillcpu.c
  *
  * SPDX-License-Identifier: Apache-2.0
  *
diff --git a/testing/resmonitor/filldisk.c b/system/resmonitor/filldisk.c
similarity index 99%
rename from testing/resmonitor/filldisk.c
rename to system/resmonitor/filldisk.c
index 4e7b9e618a7..de550b47e36 100644
--- a/testing/resmonitor/filldisk.c
+++ b/system/resmonitor/filldisk.c
@@ -1,5 +1,5 @@
 /****************************************************************************
- * apps/testing/resmonitor/filldisk.c
+ * apps/system/resmonitor/filldisk.c
  *
  * SPDX-License-Identifier: Apache-2.0
  *
diff --git a/testing/resmonitor/fillmem.c b/system/resmonitor/fillmem.c
similarity index 99%
rename from testing/resmonitor/fillmem.c
rename to system/resmonitor/fillmem.c
index c301d401f01..c97ddde43d0 100644
--- a/testing/resmonitor/fillmem.c
+++ b/system/resmonitor/fillmem.c
@@ -1,5 +1,5 @@
 /****************************************************************************
- * apps/testing/resmonitor/fillmem.c
+ * apps/system/resmonitor/fillmem.c
  *
  * SPDX-License-Identifier: Apache-2.0
  *
diff --git a/testing/resmonitor/showinfo.c b/system/resmonitor/showinfo.c
similarity index 99%
rename from testing/resmonitor/showinfo.c
rename to system/resmonitor/showinfo.c
index fe535334beb..27f016dee45 100644
--- a/testing/resmonitor/showinfo.c
+++ b/system/resmonitor/showinfo.c
@@ -1,5 +1,5 @@
 /****************************************************************************
- * apps/testing/resmonitor/showinfo.c
+ * apps/system/resmonitor/showinfo.c
  *
  * SPDX-License-Identifier: Apache-2.0
  *
diff --git a/testing/sensortest/CMakeLists.txt b/system/sensortest/CMakeLists.txt
similarity index 82%
rename from testing/sensortest/CMakeLists.txt
rename to system/sensortest/CMakeLists.txt
index a95134c8838..79e016850a6 100644
--- a/testing/sensortest/CMakeLists.txt
+++ b/system/sensortest/CMakeLists.txt
@@ -1,5 +1,5 @@
 # ##############################################################################
-# apps/testing/sensortest/CMakeLists.txt
+# apps/system/sensortest/CMakeLists.txt
 #
 # SPDX-License-Identifier: Apache-2.0
 #
@@ -20,16 +20,16 @@
 #
 # ##############################################################################
 
-if(CONFIG_TESTING_SENSORTEST)
+if(CONFIG_SYSTEM_SENSORTEST)
   nuttx_add_application(
     NAME
-    ${CONFIG_TESTING_SENSORTEST_PROGNAME}
+    ${CONFIG_SYSTEM_SENSORTEST_PROGNAME}
     PRIORITY
-    ${CONFIG_TESTING_SENSORTEST_PRIORITY}
+    ${CONFIG_SYSTEM_SENSORTEST_PRIORITY}
     STACKSIZE
-    ${CONFIG_TESTING_SENSORTEST_STACKSIZE}
+    ${CONFIG_SYSTEM_SENSORTEST_STACKSIZE}
     MODULE
-    ${CONFIG_TESTING_SENSORTEST}
+    ${CONFIG_SYSTEM_SENSORTEST}
     SRCS
     sensortest.c)
 endif()
diff --git a/testing/sensortest/Kconfig b/system/sensortest/Kconfig
similarity index 77%
rename from testing/sensortest/Kconfig
rename to system/sensortest/Kconfig
index 7344ebe2e41..8f54695ed70 100644
--- a/testing/sensortest/Kconfig
+++ b/system/sensortest/Kconfig
@@ -3,27 +3,27 @@
 # see the file kconfig-language.txt in the NuttX tools repository.
 #
 
-config TESTING_SENSORTEST
+config SYSTEM_SENSORTEST
 	tristate "Sensor driver test"
 	default n
 	depends on SENSORS
 	---help---
 		Enable the Sensor driver test
 
-if TESTING_SENSORTEST
+if SYSTEM_SENSORTEST
 
-config TESTING_SENSORTEST_PROGNAME
+config SYSTEM_SENSORTEST_PROGNAME
 	string "Program name"
 	default "sensortest"
 	---help---
 		This is the name of the program that will be used when the NSH ELF
 		program is installed.
 
-config TESTING_SENSORTEST_PRIORITY
+config SYSTEM_SENSORTEST_PRIORITY
 	int "Sensor driver test task priority"
 	default 100
 
-config TESTING_SENSORTEST_STACKSIZE
+config SYSTEM_SENSORTEST_STACKSIZE
 	int "Sensor driver test stack size"
 	default DEFAULT_TASK_STACKSIZE
 
diff --git a/testing/resmonitor/Make.defs b/system/sensortest/Make.defs
similarity index 88%
rename from testing/resmonitor/Make.defs
rename to system/sensortest/Make.defs
index 886d7b0e9d2..b34f28028cd 100644
--- a/testing/resmonitor/Make.defs
+++ b/system/sensortest/Make.defs
@@ -1,5 +1,5 @@
 ############################################################################
-# apps/testing/resmonitor/Make.defs
+# apps/system/sensortest/Make.defs
 #
 # SPDX-License-Identifier: Apache-2.0
 #
@@ -20,6 +20,6 @@
 #
 ############################################################################
 
-ifneq ($(CONFIG_TESTING_RESMONITOR),)
-CONFIGURED_APPS += $(APPDIR)/testing/resmonitor
+ifneq ($(CONFIG_SYSTEM_SENSORTEST),)
+CONFIGURED_APPS += $(APPDIR)/system/sensortest
 endif
diff --git a/testing/sensortest/Makefile b/system/sensortest/Makefile
similarity index 82%
rename from testing/sensortest/Makefile
rename to system/sensortest/Makefile
index 6ecde141018..34631a86357 100644
--- a/testing/sensortest/Makefile
+++ b/system/sensortest/Makefile
@@ -1,5 +1,5 @@
 ############################################################################
-# apps/testing/sensortest/Makefile
+# apps/system/sensortest/Makefile
 #
 # SPDX-License-Identifier: Apache-2.0
 #
@@ -22,10 +22,10 @@
 
 include $(APPDIR)/Make.defs
 
-PROGNAME  = $(CONFIG_TESTING_SENSORTEST_PROGNAME)
-PRIORITY  = $(CONFIG_TESTING_SENSORTEST_PRIORITY)
-STACKSIZE = $(CONFIG_TESTING_SENSORTEST_STACKSIZE)
-MODULE    = $(CONFIG_TESTING_SENSORTEST)
+PROGNAME  = $(CONFIG_SYSTEM_SENSORTEST_PROGNAME)
+PRIORITY  = $(CONFIG_SYSTEM_SENSORTEST_PRIORITY)
+STACKSIZE = $(CONFIG_SYSTEM_SENSORTEST_STACKSIZE)
+MODULE    = $(CONFIG_SYSTEM_SENSORTEST)
 
 MAINSRC = sensortest.c
 
diff --git a/testing/sensortest/sensortest.c b/system/sensortest/sensortest.c
similarity index 99%
rename from testing/sensortest/sensortest.c
rename to system/sensortest/sensortest.c
index 8576862e2f0..925dac24030 100644
--- a/testing/sensortest/sensortest.c
+++ b/system/sensortest/sensortest.c
@@ -1,5 +1,5 @@
 /****************************************************************************
- * apps/testing/sensortest/sensortest.c
+ * apps/system/sensortest/sensortest.c
  *
  * SPDX-License-Identifier: Apache-2.0
  *