diff --git a/arch/arm/src/armv6-m/Kconfig b/arch/arm/src/armv6-m/Kconfig
index e7dcef9bf1..bd44674dfe 100644
--- a/arch/arm/src/armv6-m/Kconfig
+++ b/arch/arm/src/armv6-m/Kconfig
@@ -3,7 +3,7 @@
 # see the file kconfig-language.txt in the NuttX tools repository.
 #
 
-comment "ARMV6M Configuration Options"
+comment "ARMv6-M Configuration Options"
 
 choice
 	prompt "Toolchain Selection"
diff --git a/arch/arm/src/armv7-a/Kconfig b/arch/arm/src/armv7-a/Kconfig
index 318defd135..6ed729f537 100644
--- a/arch/arm/src/armv7-a/Kconfig
+++ b/arch/arm/src/armv7-a/Kconfig
@@ -158,7 +158,7 @@ config ARMV7A_TOOLCHAIN_GNU_OABI
 	---help---
 		This option should work for any GNU toolchain configured for arm-elf-.
 
-endchoice # ARMV7A_HAVE_L2CC
+endchoice # Toolchain Selection
 
 config ARMV7A_OABI_TOOLCHAIN
 	bool "OABI (vs EABI)"
diff --git a/arch/arm/src/armv7-m/Kconfig b/arch/arm/src/armv7-m/Kconfig
index 61d89f7eeb..6625e37e1d 100644
--- a/arch/arm/src/armv7-m/Kconfig
+++ b/arch/arm/src/armv7-m/Kconfig
@@ -3,7 +3,7 @@
 # see the file kconfig-language.txt in the NuttX tools repository.
 #
 
-comment "ARMV7M Configuration Options"
+comment "ARMv7-M Configuration Options"
 
 config ARMV7M_HAVE_ICACHE
 	bool
diff --git a/arch/arm/src/armv8-m/Kconfig b/arch/arm/src/armv8-m/Kconfig
index 51b968a7a2..c868c59de9 100644
--- a/arch/arm/src/armv8-m/Kconfig
+++ b/arch/arm/src/armv8-m/Kconfig
@@ -3,7 +3,7 @@
 # see the file kconfig-language.txt in the NuttX tools repository.
 #
 
-comment "ARMV8M Configuration Options"
+comment "ARMv8-M Configuration Options"
 
 config ARMV8M_HAVE_ICACHE
 	bool
diff --git a/tools/ci/testlist/arm-01.dat b/tools/ci/testlist/arm-01.dat
index b22a0842a0..8ef1b5a72e 100644
--- a/tools/ci/testlist/arm-01.dat
+++ b/tools/ci/testlist/arm-01.dat
@@ -1 +1,3 @@
-/arm/[a-h]*,CONFIG_ARMV7M_TOOLCHAIN_GNU_EABIL
+/arm/[a]*,CONFIG_ARMV7A_TOOLCHAIN_GNU_EABIL
+
+/arm/[b-h]*,CONFIG_ARMV7M_TOOLCHAIN_GNU_EABIL