diff --git a/tools/ci/cibuild.sh b/tools/ci/cibuild.sh
index 93b42986c5f8e..c2120f6dcb574 100755
--- a/tools/ci/cibuild.sh
+++ b/tools/ci/cibuild.sh
@@ -337,10 +337,10 @@ function riscv-gcc-toolchain {
         ;;
     esac
     cd "${tools}"
-    wget --quiet https://github.com/xpack-dev-tools/riscv-none-elf-gcc-xpack/releases/download/v12.3.0-2/xpack-riscv-none-elf-gcc-12.3.0-2-${flavor}.tar.gz
-    tar zxf xpack-riscv-none-elf-gcc-12.3.0-2-${flavor}.tar.gz
-    mv xpack-riscv-none-elf-gcc-12.3.0-2 riscv-none-elf-gcc
-    rm xpack-riscv-none-elf-gcc-12.3.0-2-${flavor}.tar.gz
+    wget --quiet https://github.com/xpack-dev-tools/riscv-none-elf-gcc-xpack/releases/download/v13.2.0-2/xpack-riscv-none-elf-gcc-13.2.0-2-${flavor}.tar.gz
+    tar zxf xpack-riscv-none-elf-gcc-13.2.0-2-${flavor}.tar.gz
+    mv xpack-riscv-none-elf-gcc-13.2.0-2 riscv-none-elf-gcc
+    rm xpack-riscv-none-elf-gcc-13.2.0-2-${flavor}.tar.gz
   fi
 
   command riscv-none-elf-gcc --version
diff --git a/tools/ci/docker/linux/Dockerfile b/tools/ci/docker/linux/Dockerfile
index ab622d0e8f0c9..85a2da3e0a924 100644
--- a/tools/ci/docker/linux/Dockerfile
+++ b/tools/ci/docker/linux/Dockerfile
@@ -192,7 +192,7 @@ RUN cd /tools/renesas-tools/build/gcc && \
 FROM nuttx-toolchain-base AS nuttx-toolchain-riscv
 # Download the latest RISCV GCC toolchain prebuilt by xPack
 RUN mkdir riscv-none-elf-gcc && \
-  curl -s -L "https://github.com/xpack-dev-tools/riscv-none-elf-gcc-xpack/releases/download/v12.3.0-2/xpack-riscv-none-elf-gcc-12.3.0-2-linux-x64.tar.gz" \
+  curl -s -L "https://github.com/xpack-dev-tools/riscv-none-elf-gcc-xpack/releases/download/v13.2.0-2/xpack-riscv-none-elf-gcc-13.2.0-2-linux-x64.tar.gz" \
   | tar -C riscv-none-elf-gcc --strip-components 1 -xz
 
 ###############################################################################
diff --git a/tools/ci/testlist/macos.dat b/tools/ci/testlist/macos.dat
index e175bcf78dadc..30bd0905f9c9b 100644
--- a/tools/ci/testlist/macos.dat
+++ b/tools/ci/testlist/macos.dat
@@ -26,7 +26,7 @@
 # RISC-V
 
 /risc-v/bl602/bl602evb/configs/wifi
-
+/risc-v/esp32c3/esp32c3-devkit/configs/cxx
 /risc-v/esp32c3/esp32c3-devkit/configs/wifi
 
 # x86_64-elf-gcc from homebrew doesn't seem to