diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index c0a44dbb2b..57211dc56f 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -123,7 +123,7 @@ jobs:
 
     strategy:
       matrix:
-        boards: [arm-01, arm-02, arm-03, arm-04, arm-05, arm-06, arm-07, arm-08, arm-09, arm-10, arm-11, arm-12, arm-13, other, risc-v, sim-01, sim-02, xtensa]
+        boards: [arm-01, arm-02, arm-03, arm-04, arm-05, arm-06, arm-07, arm-08, arm-09, arm-10, arm-11, arm-12, arm-13, other, risc-v-01, risc-v-02, sim-01, sim-02, xtensa-01, xtensa-02]
 
     steps:
       - name: Download Source Artifact
diff --git a/tools/ci/testlist/risc-v-01.dat b/tools/ci/testlist/risc-v-01.dat
new file mode 100644
index 0000000000..e59070121f
--- /dev/null
+++ b/tools/ci/testlist/risc-v-01.dat
@@ -0,0 +1 @@
+/risc-v/[a-e]*
diff --git a/tools/ci/testlist/risc-v.dat b/tools/ci/testlist/risc-v-02.dat
similarity index 62%
rename from tools/ci/testlist/risc-v.dat
rename to tools/ci/testlist/risc-v-02.dat
index ae84c4b363..20783e8e12 100644
--- a/tools/ci/testlist/risc-v.dat
+++ b/tools/ci/testlist/risc-v-02.dat
@@ -1,4 +1,4 @@
-/risc-v
+/risc-v/[f-s]*
 -,arty_a7:.+
 
 # Boards build by CMake
diff --git a/tools/ci/testlist/xtensa.dat b/tools/ci/testlist/xtensa-01.dat
similarity index 84%
rename from tools/ci/testlist/xtensa.dat
rename to tools/ci/testlist/xtensa-01.dat
index a82a1ee9b0..8d1f5fa4d2 100644
--- a/tools/ci/testlist/xtensa.dat
+++ b/tools/ci/testlist/xtensa-01.dat
@@ -1,4 +1,4 @@
-/xtensa
+/xtensa/esp32
 
 # We do not set ESPTOOL_BINDIR in this build
 -esp32-devkitc:qemu-openeth
diff --git a/tools/ci/testlist/xtensa-02.dat b/tools/ci/testlist/xtensa-02.dat
new file mode 100644
index 0000000000..5541451dfb
--- /dev/null
+++ b/tools/ci/testlist/xtensa-02.dat
@@ -0,0 +1,3 @@
+/xtensa/esp32s2
+
+/xtensa/esp32s3