diff --git a/testlist/arm-01.dat b/testlist/arm-01.dat
index 4101ca3..b22a084 100644
--- a/testlist/arm-01.dat
+++ b/testlist/arm-01.dat
@@ -1,13 +1 @@
-/arm/a1x,CONFIG_ARMV7M_TOOLCHAIN_GNU_EABIL
-
-/arm/am335x,CONFIG_ARMV7M_TOOLCHAIN_GNU_EABIL
-
-/arm/c5471,CONFIG_ARMV7M_TOOLCHAIN_GNU_EABIL
-
-/arm/cxd56xx,CONFIG_ARMV7M_TOOLCHAIN_GNU_EABIL
-
-/arm/dm320,CONFIG_ARMV7M_TOOLCHAIN_GNU_EABIL
-
-/arm/efm32,CONFIG_ARMV7M_TOOLCHAIN_GNU_EABIL
-
-/arm/imx6,CONFIG_ARMV7M_TOOLCHAIN_GNU_EABIL
+/arm/[a-h]*,CONFIG_ARMV7M_TOOLCHAIN_GNU_EABIL
diff --git a/testlist/arm-02.dat b/testlist/arm-02.dat
index f03806e..1562c2d 100644
--- a/testlist/arm-02.dat
+++ b/testlist/arm-02.dat
@@ -1,9 +1,3 @@
-/arm/imxrt,CONFIG_ARMV7M_TOOLCHAIN_GNU_EABIL
+/arm/[i-k]*,CONFIG_ARMV7M_TOOLCHAIN_GNU_EABIL
 -imxrt1050-evk:libcxxtest
 -imxrt1060-evk:libcxxtest
-
-/arm/kinetis,CONFIG_ARMV7M_TOOLCHAIN_GNU_EABIL
-
-/arm/kl,CONFIG_ARMV7M_TOOLCHAIN_GNU_EABIL
-
-/arm/lc823450,CONFIG_ARMV7M_TOOLCHAIN_GNU_EABIL
diff --git a/testlist/arm-04.dat b/testlist/arm-04.dat
index 532f290..de8f686 100644
--- a/testlist/arm-04.dat
+++ b/testlist/arm-04.dat
@@ -1,3 +1,5 @@
+/arm/lc823450,CONFIG_ARMV7M_TOOLCHAIN_GNU_EABIL
+
 /arm/lpc214x,CONFIG_ARMV7M_TOOLCHAIN_GNU_EABIL
 
 /arm/lpc2378,CONFIG_ARMV7M_TOOLCHAIN_GNU_EABIL
@@ -7,14 +9,3 @@
 /arm/lpc43xx,CONFIG_ARMV7M_TOOLCHAIN_GNU_EABIL
 
 /arm/lpc54xx,CONFIG_ARMV7M_TOOLCHAIN_GNU_EABIL
-
-/arm/max326xx,CONFIG_ARMV7M_TOOLCHAIN_GNU_EABIL
-
-/arm/moxart,CONFIG_ARMV7M_TOOLCHAIN_GNU_EABIL
--moxa:nsh
-
-/arm/nrf52,CONFIG_ARMV7M_TOOLCHAIN_GNU_EABIL
-
-/arm/nuc1xx,CONFIG_ARMV7M_TOOLCHAIN_GNU_EABIL
-
-/arm/rp2040,CONFIG_ARMV7M_TOOLCHAIN_GNU_EABIL
diff --git a/testlist/arm-05.dat b/testlist/arm-05.dat
index 588d3ae..e79de83 100644
--- a/testlist/arm-05.dat
+++ b/testlist/arm-05.dat
@@ -1,5 +1,6 @@
+/arm/[m-r]*,CONFIG_ARMV7M_TOOLCHAIN_GNU_EABIL
+-moxa:nsh
+
 /arm/s32k1xx,CONFIG_ARMV7M_TOOLCHAIN_GNU_EABIL
 
 /arm/sam34,CONFIG_ARMV7M_TOOLCHAIN_GNU_EABIL
-
-/arm/sama5,CONFIG_ARMV7M_TOOLCHAIN_GNU_EABIL
diff --git a/testlist/arm-06.dat b/testlist/arm-06.dat
index 4e836d1..c733d4c 100644
--- a/testlist/arm-06.dat
+++ b/testlist/arm-06.dat
@@ -1,17 +1,7 @@
+/arm/sama5,CONFIG_ARMV7M_TOOLCHAIN_GNU_EABIL
+
 /arm/samd2l2,CONFIG_ARMV7M_TOOLCHAIN_GNU_EABIL
 
 /arm/samd5e5,CONFIG_ARMV7M_TOOLCHAIN_GNU_EABIL
 
 /arm/samv7,CONFIG_ARMV7M_TOOLCHAIN_GNU_EABIL
-
-/arm/stm32/axoloti,CONFIG_ARMV7M_TOOLCHAIN_GNU_EABIL
-
-/arm/stm32/b-g474e-dpow1,CONFIG_ARMV7M_TOOLCHAIN_GNU_EABIL
-
-/arm/stm32/clicker2-stm32,CONFIG_ARMV7M_TOOLCHAIN_GNU_EABIL
-
-/arm/stm32/cloudctrl,CONFIG_ARMV7M_TOOLCHAIN_GNU_EABIL
-
-/arm/stm32/fire-stm32v2,CONFIG_ARMV7M_TOOLCHAIN_GNU_EABIL
-
-/arm/stm32/hymini-stm32v,CONFIG_ARMV7M_TOOLCHAIN_GNU_EABIL
diff --git a/testlist/arm-07.dat b/testlist/arm-07.dat
index 5816e7b..c531b45 100644
--- a/testlist/arm-07.dat
+++ b/testlist/arm-07.dat
@@ -1,25 +1,7 @@
-/arm/stm32/maple,CONFIG_ARMV7M_TOOLCHAIN_GNU_EABIL
+/arm/stm32/[a-m]*,CONFIG_ARMV7M_TOOLCHAIN_GNU_EABIL
 
-/arm/stm32/mikroe-stm32f4,CONFIG_ARMV7M_TOOLCHAIN_GNU_EABIL
+/arm/stm32/nucleo-f1*,CONFIG_ARMV7M_TOOLCHAIN_GNU_EABIL
 
-/arm/stm32/nucleo-f103rb,CONFIG_ARMV7M_TOOLCHAIN_GNU_EABIL
+/arm/stm32/nucleo-f2*,CONFIG_ARMV7M_TOOLCHAIN_GNU_EABIL
 
-/arm/stm32/nucleo-f207zg,CONFIG_ARMV7M_TOOLCHAIN_GNU_EABIL
-
-/arm/stm32/nucleo-f302r8,CONFIG_ARMV7M_TOOLCHAIN_GNU_EABIL
-
-/arm/stm32/nucleo-f303re,CONFIG_ARMV7M_TOOLCHAIN_GNU_EABIL
-
-/arm/stm32/nucleo-f303ze,CONFIG_ARMV7M_TOOLCHAIN_GNU_EABIL
-
-/arm/stm32/nucleo-f334r8,CONFIG_ARMV7M_TOOLCHAIN_GNU_EABIL
-
-/arm/stm32/nucleo-f410rb,CONFIG_ARMV7M_TOOLCHAIN_GNU_EABIL
-
-/arm/stm32/nucleo-f412zg,CONFIG_ARMV7M_TOOLCHAIN_GNU_EABIL
-
-/arm/stm32/nucleo-f446re,CONFIG_ARMV7M_TOOLCHAIN_GNU_EABIL
-
-/arm/stm32/nucleo-f4x1re,CONFIG_ARMV7M_TOOLCHAIN_GNU_EABIL
-
-/arm/stm32/nucleo-l152re,CONFIG_ARMV7M_TOOLCHAIN_GNU_EABIL
+/arm/stm32/nucleo-f30*,CONFIG_ARMV7M_TOOLCHAIN_GNU_EABIL
diff --git a/testlist/arm-08.dat b/testlist/arm-08.dat
index 773b1a2..ac945ac 100644
--- a/testlist/arm-08.dat
+++ b/testlist/arm-08.dat
@@ -1,20 +1,9 @@
-/arm/stm32/olimexino-stm32,CONFIG_ARMV7M_TOOLCHAIN_GNU_EABIL
+/arm/stm32/nucleo-f33*,CONFIG_ARMV7M_TOOLCHAIN_GNU_EABIL
 
-/arm/stm32/olimex-stm32-e407,CONFIG_ARMV7M_TOOLCHAIN_GNU_EABIL
+/arm/stm32/nucleo-f4*,CONFIG_ARMV7M_TOOLCHAIN_GNU_EABIL
 
-/arm/stm32/olimex-stm32-h405,CONFIG_ARMV7M_TOOLCHAIN_GNU_EABIL
+/arm/stm32/nucleo-g*,CONFIG_ARMV7M_TOOLCHAIN_GNU_EABIL
 
-/arm/stm32/olimex-stm32-h407,CONFIG_ARMV7M_TOOLCHAIN_GNU_EABIL
+/arm/stm32/nucleo-l*,CONFIG_ARMV7M_TOOLCHAIN_GNU_EABIL
 
-/arm/stm32/olimex-stm32-p107,CONFIG_ARMV7M_TOOLCHAIN_GNU_EABIL
-
-/arm/stm32/olimex-stm32-p207,CONFIG_ARMV7M_TOOLCHAIN_GNU_EABIL
-
-/arm/stm32/olimex-stm32-p407,CONFIG_ARMV7M_TOOLCHAIN_GNU_EABIL
-
-/arm/stm32/omnibusf4,CONFIG_ARMV7M_TOOLCHAIN_GNU_EABIL
-
-/arm/stm32/photon,CONFIG_ARMV7M_TOOLCHAIN_GNU_EABIL
-
-/arm/stm32/shenzhou,CONFIG_ARMV7M_TOOLCHAIN_GNU_EABIL
--shenzhou:thttpd
+/arm/stm32/olimex-*,CONFIG_ARMV7M_TOOLCHAIN_GNU_EABIL
diff --git a/testlist/arm-09.dat b/testlist/arm-09.dat
index 95667c2..2771070 100644
--- a/testlist/arm-09.dat
+++ b/testlist/arm-09.dat
@@ -1,7 +1,14 @@
+/arm/stm32/olimexino-stm32,CONFIG_ARMV7M_TOOLCHAIN_GNU_EABIL
+
+/arm/stm32/omnibusf4,CONFIG_ARMV7M_TOOLCHAIN_GNU_EABIL
+
+/arm/stm32/photon,CONFIG_ARMV7M_TOOLCHAIN_GNU_EABIL
+
+/arm/stm32/shenzhou,CONFIG_ARMV7M_TOOLCHAIN_GNU_EABIL
+-shenzhou:thttpd
+
 /arm/stm32/stm3210e-eval,CONFIG_ARMV7M_TOOLCHAIN_GNU_EABIL
 
 /arm/stm32/stm3220g-eval,CONFIG_ARMV7M_TOOLCHAIN_GNU_EABIL
 
 /arm/stm32/stm3240g-eval,CONFIG_ARMV7M_TOOLCHAIN_GNU_EABIL
-
-/arm/stm32/stm32butterfly2,CONFIG_ARMV7M_TOOLCHAIN_GNU_EABIL
diff --git a/testlist/arm-10.dat b/testlist/arm-10.dat
index 3a41cac..c30d5ba 100644
--- a/testlist/arm-10.dat
+++ b/testlist/arm-10.dat
@@ -1,9 +1,15 @@
+/arm/stm32/stm32_tiny,CONFIG_ARMV7M_TOOLCHAIN_GNU_EABIL
+
+/arm/stm32/stm32butterfly2,CONFIG_ARMV7M_TOOLCHAIN_GNU_EABIL
+
 /arm/stm32/stm32f103-minimum,CONFIG_ARMV7M_TOOLCHAIN_GNU_EABIL
 
 /arm/stm32/stm32f334-disco,CONFIG_ARMV7M_TOOLCHAIN_GNU_EABIL
 
 /arm/stm32/stm32f3discovery,CONFIG_ARMV7M_TOOLCHAIN_GNU_EABIL
 
+/arm/stm32/stm32f411-minimum,CONFIG_ARMV7M_TOOLCHAIN_GNU_EABIL
+
 /arm/stm32/stm32f411e-disco,CONFIG_ARMV7M_TOOLCHAIN_GNU_EABIL
 
 /arm/stm32/stm32f429i-disco,CONFIG_ARMV7M_TOOLCHAIN_GNU_EABIL
diff --git a/testlist/arm-11.dat b/testlist/arm-11.dat
index 645fef4..2d8f223 100644
--- a/testlist/arm-11.dat
+++ b/testlist/arm-11.dat
@@ -7,6 +7,4 @@
 
 /arm/stm32/stm32vldiscovery,CONFIG_ARMV7M_TOOLCHAIN_GNU_EABIL
 
-/arm/stm32/stm32_tiny,CONFIG_ARMV7M_TOOLCHAIN_GNU_EABIL
-
 /arm/stm32/viewtool-stm32f107,CONFIG_ARMV7M_TOOLCHAIN_GNU_EABIL
diff --git a/testlist/arm-12.dat b/testlist/arm-12.dat
index 6c31f07..5fcca30 100644
--- a/testlist/arm-12.dat
+++ b/testlist/arm-12.dat
@@ -1,5 +1,3 @@
-/arm/stm32f0l0g0,CONFIG_ARMV7M_TOOLCHAIN_GNU_EABIL
+/arm/stm32f*,CONFIG_ARMV7M_TOOLCHAIN_GNU_EABIL
 
-/arm/stm32f7,CONFIG_ARMV7M_TOOLCHAIN_GNU_EABIL
-
-/arm/stm32h7,CONFIG_ARMV7M_TOOLCHAIN_GNU_EABIL
+/arm/stm32h*,CONFIG_ARMV7M_TOOLCHAIN_GNU_EABIL
diff --git a/testlist/arm-13.dat b/testlist/arm-13.dat
index 00242a1..3d48e0a 100644
--- a/testlist/arm-13.dat
+++ b/testlist/arm-13.dat
@@ -1,12 +1,10 @@
-/arm/stm32l4,CONFIG_ARMV7M_TOOLCHAIN_GNU_EABIL
+/arm/stm32l*,CONFIG_ARMV7M_TOOLCHAIN_GNU_EABIL
 
-/arm/tiva,CONFIG_ARMV7M_TOOLCHAIN_GNU_EABIL
+/arm/str71x,CONFIG_ARMV7M_TOOLCHAIN_GNU_EABIL
+
+/arm/[t-z]*,CONFIG_ARMV7M_TOOLCHAIN_GNU_EABIL
 -eagle100:nxflat
 -eagle100:thttpd
 -launchxl-cc1310:nsh
-
-/arm/tms570,CONFIG_ARMV7M_TOOLCHAIN_GNU_EABIL
 -launchxl-tms57004:nsh
 -tms570ls31x-usb-kit:nsh
-
-/arm/xmc4,CONFIG_ARMV7M_TOOLCHAIN_GNU_EABIL