diff --git a/tools/bots/test_matrix.json b/tools/bots/test_matrix.json
index f027651243f..35b4365710b 100644
--- a/tools/bots/test_matrix.json
+++ b/tools/bots/test_matrix.json
@@ -1377,6 +1377,7 @@
     },
     {
       "builders": [
+        "vm-kernel-precomp-nnbd-linux-debug-simriscv64",
         "vm-kernel-precomp-nnbd-linux-debug-x64",
         "vm-kernel-precomp-nnbd-linux-release-simarm64",
         "vm-kernel-precomp-nnbd-linux-release-simarm64c",
@@ -1946,6 +1947,7 @@
     {
       "builders": [
         "vm-kernel-nnbd-linux-debug-ia32",
+        "vm-kernel-nnbd-linux-debug-simriscv64",
         "vm-kernel-nnbd-linux-debug-x64",
         "vm-kernel-nnbd-linux-debug-x64c",
         "vm-kernel-nnbd-linux-release-ia32",
@@ -1962,9 +1964,9 @@
         "vm-kernel-nnbd-mac-release-arm64",
         "vm-kernel-nnbd-mac-release-x64",
         "vm-kernel-nnbd-mac-release-x64c",
-        "vm-kernel-nnbd-win-release-ia32",
         "vm-kernel-nnbd-win-debug-x64",
         "vm-kernel-nnbd-win-debug-x64c",
+        "vm-kernel-nnbd-win-release-ia32",
         "vm-kernel-nnbd-win-release-x64",
         "vm-kernel-nnbd-win-release-x64c"
       ],