diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 4cf603519b104..0e68cc8d49163 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -63,6 +63,12 @@ jobs:
           - name: x86_64-gnu-tools
             os: ubuntu-20.04-16core-64gb
             env: {}
+          - name: armhf-gnu
+            os: ubuntu-20.04-8core-32gb
+            env: {}
+          - name: arm-android
+            os: ubuntu-20.04-8core-32gb
+            env: {}
     timeout-minutes: 600
     runs-on: "${{ matrix.os }}"
     steps:
diff --git a/src/bootstrap/src/core/build_steps/test.rs b/src/bootstrap/src/core/build_steps/test.rs
index d0f36f99342fe..07534ca570654 100644
--- a/src/bootstrap/src/core/build_steps/test.rs
+++ b/src/bootstrap/src/core/build_steps/test.rs
@@ -2530,6 +2530,7 @@ impl Step for Crate {
             }
             _ => panic!("can only test libraries"),
         };
+        cargo.arg("-Zdoctest-xcompile");
 
         run_cargo_test(
             cargo,
diff --git a/src/ci/github-actions/ci.yml b/src/ci/github-actions/ci.yml
index 800d8920951bc..2ea012375b1a9 100644
--- a/src/ci/github-actions/ci.yml
+++ b/src/ci/github-actions/ci.yml
@@ -342,6 +342,12 @@ jobs:
           - name: x86_64-gnu-tools
             <<: *job-linux-16c
 
+          - name: armhf-gnu
+            <<: *job-linux-8c
+
+          - name: arm-android
+            <<: *job-linux-8c
+
   auto:
     <<: *base-ci-job
     name: auto - ${{ matrix.name }}