diff --git a/.github/workflows/modified_scripts_build.yml b/.github/workflows/modified_scripts_build.yml
index 900f927f..a3535930 100644
--- a/.github/workflows/modified_scripts_build.yml
+++ b/.github/workflows/modified_scripts_build.yml
@@ -207,7 +207,9 @@ jobs:
         python-version: ${{fromJson(needs.discover_modified_scripts.outputs.versions)}}
         os:
           - ubuntu-22.04
+          - ubuntu-22.04-arm
           - ubuntu-24.04
+          - ubuntu-24.04-arm
     runs-on: ${{ matrix.os }}
     steps:
       - uses: actions/checkout@v7
@@ -270,8 +272,7 @@ jobs:
       fail-fast: false
       matrix:
         python-version: ${{fromJson(needs.discover_modified_scripts.outputs.versions_cpython_only)}}
-        os: ["ubuntu-latest"]
-    runs-on: ${{ matrix.os }}
+    runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v7
       - run: |
diff --git a/.github/workflows/pyenv_tests.yml b/.github/workflows/pyenv_tests.yml
index ece8d2cc..d4043ced 100644
--- a/.github/workflows/pyenv_tests.yml
+++ b/.github/workflows/pyenv_tests.yml
@@ -14,7 +14,9 @@ jobs:
       matrix:
         os:
           - ubuntu-22.04
+          - ubuntu-22.04-arm
           - ubuntu-24.04
+          - ubuntu-24.04-arm
           - macos-14
           - macos-15
           - macos-15-intel
@@ -22,25 +24,22 @@ jobs:
     runs-on: ${{ matrix.os }}
     steps:
       - uses: actions/checkout@v7
-      - run: |
+      - name: Install prerequisites
+        run: |
           if test "$RUNNER_OS" == "macOS"; then
             brew install coreutils fish
           fi
-      - run: pwd
-      - env:
-          PYENV_ROOT: /home/runner/work/pyenv/pyenv
-        run: |
-          echo $PYENV_ROOT
-          echo "$PYENV_ROOT/shims:$PYENV_ROOT/bin" >> $GITHUB_PATH
-      - name: Run test on the host
+      - name: Run tests
         run: |
           make test
-      - name: Run test with docker
-        if: ${{ ! contains(matrix.os, 'macos') }}
-        run: |
-          make test-docker
       - env:
           PYENV_NATIVE_EXT: 1
         run: |
           (cd src; ./configure; make)
           bats/bin/bats test/{pyenv,hooks,versions}.bats
+  pyenv_tests_docker:
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v7
+      - run: |
+          make test-docker