diff --git a/.azure-pipelines.yml b/.azure-pipelines.yml
index 2ca146c0fdf..b3794a956e8 100644
--- a/.azure-pipelines.yml
+++ b/.azure-pipelines.yml
@@ -169,8 +169,7 @@ jobs:
       options: $(container_option)
     steps:
       - script: |
-          ./tools/buildman/buildman --fetch-arch arm
-          export PATH=~/.buildman-toolchains/gcc-9.2.0-nolibc/arm-linux-gnueabi/bin/:$PATH
+          export PATH=/opt/gcc-11.1.0-nolibc/arm-linux-gnueabi/bin:$PATH
           test/nokia_rx51_test.sh
 
   - job: test_py
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 699ce991fb3..e7c65ebbcef 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -177,8 +177,7 @@ Run binman, buildman, dtoc, Kconfig and patman testsuites:
 Run tests for Nokia RX-51 (aka N900):
   stage: testsuites
   script:
-    - ./tools/buildman/buildman --fetch-arch arm;
-      export PATH=~/.buildman-toolchains/gcc-9.2.0-nolibc/arm-linux-gnueabi/bin/:$PATH;
+    - export PATH=/opt/gcc-11.1.0-nolibc/arm-linux-gnueabi/bin:$PATH;
       test/nokia_rx51_test.sh
 
 # Test sandbox with test.py