diff --git a/testing/batterydump/Kconfig b/system/batterydump/Kconfig
similarity index 70%
rename from testing/batterydump/Kconfig
rename to system/batterydump/Kconfig
index 61d9b16e7..1e8e87ca2 100644
--- a/testing/batterydump/Kconfig
+++ b/system/batterydump/Kconfig
@@ -3,26 +3,26 @@
 # see the file kconfig-language.txt in the NuttX tools repository.
 #
 #
-config TESTING_BATTERYDUMP
-	tristate "Battery dump for test"
+config SYSTEM_BATTERYDUMP
+	tristate "Battery dump system tool"
 	default n
 	---help---
 		Enable the battery dump
 
-if TESTING_BATTERYDUMP
+if SYSTEM_BATTERYDUMP
 
-config TESTING_BATTERYDUMP_PROGNAME
+config SYSTEM_BATTERYDUMP_PROGNAME
 	string "Program name"
 	default "batterydump"
 	---help---
 		This is the name of the program that will be used when the NSH ELF
 		program is installed.
 
-config TESTING_BATTERYDUMP_PRIORITY
+config SYSTEM_BATTERYDUMP_PRIORITY
 	int "Battery dump task priority"
 	default 100
 
-config TESTING_BATTERYDUMP_STACKSIZE
+config SYSTEM_BATTERYDUMP_STACKSIZE
 	int "Battery dump stack size"
 	default DEFAULT_TASK_STACKSIZE
 
diff --git a/testing/batterydump/Make.defs b/system/batterydump/Make.defs
similarity index 88%
rename from testing/batterydump/Make.defs
rename to system/batterydump/Make.defs
index 4f5db37fd..07126ab10 100644
--- a/testing/batterydump/Make.defs
+++ b/system/batterydump/Make.defs
@@ -1,5 +1,5 @@
 ############################################################################
-# apps/testing/batterydump/Make.defs
+# apps/system/batterydump/Make.defs
 #
 # Licensed to the Apache Software Foundation (ASF) under one or more
 # contributor license agreements.  See the NOTICE file distributed with
@@ -18,6 +18,6 @@
 #
 ############################################################################
 
-ifneq ($(CONFIG_TESTING_BATTERYDUMP),)
-CONFIGURED_APPS += $(APPDIR)/testing/batterydump
+ifneq ($(CONFIG_SYSTEM_BATTERYDUMP),)
+CONFIGURED_APPS += $(APPDIR)/system/batterydump
 endif
diff --git a/testing/batterydump/Makefile b/system/batterydump/Makefile
similarity index 81%
rename from testing/batterydump/Makefile
rename to system/batterydump/Makefile
index 00549b141..5f4a4a1ad 100644
--- a/testing/batterydump/Makefile
+++ b/system/batterydump/Makefile
@@ -1,5 +1,5 @@
 ############################################################################
-# apps/testing/batterydump/Makefile
+# apps/system/batterydump/Makefile
 #
 # Licensed to the Apache Software Foundation (ASF) under one or more
 # contributor license agreements.  See the NOTICE file distributed with
@@ -20,10 +20,10 @@
 
 include $(APPDIR)/Make.defs
 
-PROGNAME  = $(CONFIG_TESTING_BATTERYDUMP_PROGNAME)
-PRIORITY  = $(CONFIG_TESTING_BATTERYDUMP_PRIORITY)
-STACKSIZE = $(CONFIG_TESTING_BATTERYDUMP_STACKSIZE)
-MODULE    = $(CONFIG_TESTING_BATTERYDUMP)
+PROGNAME  = $(CONFIG_SYSTEM_BATTERYDUMP_PROGNAME)
+PRIORITY  = $(CONFIG_SYSTEM_BATTERYDUMP_PRIORITY)
+STACKSIZE = $(CONFIG_SYSTEM_BATTERYDUMP_STACKSIZE)
+MODULE    = $(CONFIG_SYSTEM_BATTERYDUMP)
 
 MAINSRC = batterydump.c
 
diff --git a/testing/batterydump/batterydump.c b/system/batterydump/batterydump.c
similarity index 99%
rename from testing/batterydump/batterydump.c
rename to system/batterydump/batterydump.c
index 7ef02faa6..0649c0f6c 100644
--- a/testing/batterydump/batterydump.c
+++ b/system/batterydump/batterydump.c
@@ -1,5 +1,5 @@
 /****************************************************************************
- * apps/testing/batterydump/batterydump.c
+ * apps/system/batterydump/batterydump.c
  *
  * Licensed to the Apache Software Foundation (ASF) under one or more
  * contributor license agreements.  See the NOTICE file distributed with