diff --git a/.github/workflows/ci-tests.yml b/.github/workflows/ci-tests.yml
index 37f0d86cd..4ef27902a 100644
--- a/.github/workflows/ci-tests.yml
+++ b/.github/workflows/ci-tests.yml
@@ -22,29 +22,11 @@ jobs:
                     - "3.12"
                     - "pypy-3.8"
                 os:
-                    - "ubuntu-20.04"
-                    - "windows-2022"
-                    - "macos-11"
-                architecture:
-                    - x64
-                    - x86
+                    - "ubuntu-latest"
+                    - "windows-latest"
+                    - "macos-latest"
 
-                include:
-                    # Only run coverage on ubuntu-20.04, except on pypy3
-                    - os: "ubuntu-20.04"
-                      pytest-args: "--cov"
-                    - os: "ubuntu-20.04"
-                      py: "pypy-3.8"
-                      pytest-args: ""
-
-                exclude:
-                    # Linux and macOS don't have x86 python
-                    - os: "ubuntu-20.04"
-                      architecture: x86
-                    - os: "macos-11"
-                      architecture: x86
-
-        name: "Python: ${{ matrix.py }}-${{ matrix.architecture }} on ${{ matrix.os }}"
+        name: "Python: ${{ matrix.py }} on ${{ matrix.os }}"
         runs-on: ${{ matrix.os }}
         steps:
             - uses: actions/checkout@v4
@@ -52,12 +34,11 @@ jobs:
               uses: actions/setup-python@v5
               with:
                   python-version: ${{ matrix.py }}
-                  architecture: ${{ matrix.architecture }}
             - run: pip install tox
             - name: Running tox
               run: tox -e py -- ${{ matrix.pytest-args }}
     coverage:
-        runs-on: ubuntu-20.04
+        runs-on: ubuntu-latest
         name: Validate coverage
         steps:
             - uses: actions/checkout@v4
@@ -65,11 +46,10 @@ jobs:
               uses: actions/setup-python@v5
               with:
                   python-version: 3.12
-                  architecture: x64
             - run: pip install tox
             - run: tox -e py312-cover,coverage
     docs:
-        runs-on: ubuntu-20.04
+        runs-on: ubuntu-latest
         name: Build the documentation
         steps:
             - uses: actions/checkout@v4
@@ -77,11 +57,10 @@ jobs:
               uses: actions/setup-python@v5
               with:
                   python-version: 3.8
-                  architecture: x64
             - run: pip install tox
             - run: tox -e docs
     lint:
-        runs-on: ubuntu-20.04
+        runs-on: ubuntu-latest
         name: Lint the package
         steps:
             - uses: actions/checkout@v4
@@ -89,6 +68,5 @@ jobs:
               uses: actions/setup-python@v5
               with:
                   python-version: 3.8
-                  architecture: x64
             - run: pip install tox
             - run: tox -e lint