diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml
index da5f230e..4071f476 100644
--- a/.github/workflows/tests.yml
+++ b/.github/workflows/tests.yml
@@ -3,18 +3,20 @@ on:
     branches:
       - main
       - develop
+      - tests
   pull_request:
 
 jobs:
   tests:
-    name: ${{ matrix.os }}-${{ matrix.compiler }}-${{ matrix.version }}-python-${{ matrix.python-version }}-${{ matrix.castxml-epic }}
+    name: ${{ matrix.os }}-${{ matrix.arch }}-${{ matrix.compiler }}-${{ matrix.version }}-python-${{ matrix.python-version }}-${{ matrix.castxml-epic }}
     runs-on: ${{ matrix.os }}
 
     strategy:
       fail-fast: false
       matrix:
         include:
-          - os: ubuntu-20.04
+          - os: ubuntu-22.04
+            arch: x86_64
             compiler: gcc
             version: "9"
             python-version: "3.9"
@@ -22,7 +24,8 @@ jobs:
             castxml-epic: 0
             cppstd: "-std=c++98"
 
-          - os: ubuntu-20.04
+          - os: ubuntu-22.04
+            arch: x86_64
             compiler: gcc
             version: "9"
             python-version: "3.10"
@@ -30,7 +33,8 @@ jobs:
             castxml-epic: 0
             cppstd: "-std=c++98"
 
-          - os: ubuntu-20.04
+          - os: ubuntu-22.04
+            arch: x86_64
             compiler: gcc
             version: "9"
             python-version: "3.11"
@@ -38,7 +42,8 @@ jobs:
             castxml-epic: 0
             cppstd: "-std=c++98"
 
-          - os: ubuntu-20.04
+          - os: ubuntu-22.04
+            arch: x86_64
             compiler: gcc
             version: "9"
             python-version: "3.12"
@@ -46,7 +51,8 @@ jobs:
             castxml-epic: 0
             cppstd: "-std=c++98"
 
-          - os: ubuntu-20.04
+          - os: ubuntu-22.04
+            arch: x86_64
             compiler: gcc
             version: "9"
             python-version: "3.13"
@@ -54,7 +60,8 @@ jobs:
             castxml-epic: 0
             cppstd: "-std=c++98"
 
-          - os: ubuntu-20.04
+          - os: ubuntu-22.04
+            arch: x86_64
             compiler: gcc
             version: "9"
             python-version: "3.13"
@@ -62,7 +69,71 @@ jobs:
             castxml-epic: 1
             cppstd: "-std=c++98"
 
-          - os: ubuntu-20.04
+          - os: ubuntu-22.04
+            arch: x86_64
+            compiler: gcc
+            version: "9"
+            python-version: "3.13"
+            castxml: "castxml"
+            castxml-epic: 1
+            cppstd: "-std=c++11"
+            
+          - os: ubuntu-22.04-arm
+            arch: aarch64
+            compiler: gcc
+            version: "9"
+            python-version: "3.9"
+            castxml: "castxml"
+            castxml-epic: 0
+            cppstd: "-std=c++98"
+
+          - os: ubuntu-22.04-arm
+            arch: aarch64
+            compiler: gcc
+            version: "9"
+            python-version: "3.10"
+            castxml: "castxml"
+            castxml-epic: 0
+            cppstd: "-std=c++98"
+
+          - os: ubuntu-22.04-arm
+            arch: aarch64
+            compiler: gcc
+            version: "9"
+            python-version: "3.11"
+            castxml: "castxml"
+            castxml-epic: 0
+            cppstd: "-std=c++98"
+
+          - os: ubuntu-22.04-arm
+            arch: aarch64
+            compiler: gcc
+            version: "9"
+            python-version: "3.12"
+            castxml: "castxml"
+            castxml-epic: 0
+            cppstd: "-std=c++98"
+
+          - os: ubuntu-22.04-arm
+            arch: aarch64
+            compiler: gcc
+            version: "9"
+            python-version: "3.13"
+            castxml: "castxml"
+            castxml-epic: 0
+            cppstd: "-std=c++98"
+
+          - os: ubuntu-22.04-arm
+            arch: aarch64
+            compiler: gcc
+            version: "9"
+            python-version: "3.13"
+            castxml: "castxml"
+            castxml-epic: 1
+            cppstd: "-std=c++98"
+
+          - os: ubuntu-22.04-arm
+            arch: aarch64
             compiler: gcc
             version: "9"
             python-version: "3.13"
@@ -79,9 +150,9 @@ jobs:
             cppstd: "-std=c++98"
 
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
       - name: Set up Python ${{ matrix.python-version }}
-        uses: actions/setup-python@v4
+        uses: actions/setup-python@v5
         with:
           python-version: ${{ matrix.python-version }}
       - name: Display Python version
@@ -92,7 +163,7 @@ jobs:
       - name: Run pycodestyle
         run: pycodestyle . --exclude=docs
       - name: Setup castxml for Linux
-        if: matrix.os == 'ubuntu-20.04' && matrix.castxml == 'castxml'
+        if: matrix.os == 'ubuntu-22.04' && matrix.castxml == 'castxml'
         run: |
           wget -q -O - https://data.kitware.com/api/v1/file/hashsum/sha512/bdbb67a10c5f8d1b738cd19cb074f409d4803e8077cb8c1072ef4eaf738fa871a73643f9c8282d58cae28d188df842c82ad6620b6d590b0396a0172a27438dce/download | tar zxf - -C ~/
       - name: Setup castxml for Mac