diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 31307c84ab..cc0826d8ed 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -39,7 +39,7 @@ jobs:
     - name: Set up Python
       uses: actions/setup-python@v2
       with:
-        python-version: 3.8
+        python-version: '3.10'
     - name: Lint with flake8
       run: |
         pip install flake8
@@ -51,27 +51,15 @@ jobs:
     strategy:
       matrix:
         include:
-            - os: ubuntu-20.04
-              python-version: '3.5'
-              toxenv: py35
-            - os: ubuntu-20.04
-              python-version: '3.6'
-              toxenv: py36
-            - os: ubuntu-20.04
-              python-version: '3.7'
-              toxenv: py37
-            - os: ubuntu-20.04
-              python-version: '3.8'
-              toxenv: py38
-            - os: ubuntu-20.04
+            - os: ubuntu-22.04
               python-version: '3.9'
               toxenv: py39
-            - os: ubuntu-20.04
+            - os: ubuntu-22.04
+              python-version: '3.10'
+              toxenv: py310
+            - os: macos-15
               python-version: '3.10'
               toxenv: py310
-            - os: macos-11
-              python-version: '3.7'
-              toxenv: py37
 
     env:
       # Configure pkg-config to use OpenSSL from Homebrew
@@ -79,7 +67,7 @@ jobs:
       TOXENV: ${{ matrix.toxenv }}
 
     runs-on: ${{ matrix.os }}
-    timeout-minutes: 40
+    timeout-minutes: 360
 
     steps:
     - uses: actions/checkout@v2
@@ -91,7 +79,7 @@ jobs:
       with:
         python-version: ${{ matrix.python-version }}
     - name: Cache pip
-      uses: actions/cache@v2
+      uses: actions/cache@v4
       with:
         path: ~/.cache/pip
         key: ${{ runner.os }}-pip-${{ hashFiles('requirements.d/development.lock.txt') }}
diff --git a/requirements.d/development.lock.txt b/requirements.d/development.lock.txt
index 1a2dd1185c..68224389ff 100644
--- a/requirements.d/development.lock.txt
+++ b/requirements.d/development.lock.txt
@@ -4,6 +4,7 @@ pip==20.3.4
 virtualenv==20.13.1
 tox==3.24.5
 pytest==6.1.2; python_version < '3.10'
+pytest==8.4.2; python_version >= '3.10'
 pytest-xdist==2.2.1
 pytest-cov==2.12.1
 pytest-benchmark==3.4.1
diff --git a/requirements.d/development.txt b/requirements.d/development.txt
index 7a60af9822..450a23b54c 100644
--- a/requirements.d/development.txt
+++ b/requirements.d/development.txt
@@ -3,7 +3,7 @@ setuptools_scm
 pip
 virtualenv
 tox
-pytest
+pytest < 9.0.0
 pytest-xdist
 pytest-cov
 pytest-benchmark