diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml
index e5a6f94..09aa735 100644
--- a/.github/workflows/ci.yaml
+++ b/.github/workflows/ci.yaml
@@ -13,19 +13,21 @@ jobs:
   test:
     name: Run client tests
     runs-on: ubuntu-latest
+    strategy:
+      matrix:
+        py_version: ['3.7', '3.8', '3.9', '3.10']
     steps:
     - name: Checkout commit
       uses: actions/checkout@v2
     - name: Install python
       uses: actions/setup-python@v2
       with:
-        python-version: '3.9.9'
+        python-version: ${{ matrix.py_version }}
     - name: Cache packages
       uses: actions/cache@v2.1.6
       with:
         path: ~/.cache/pip
-        key: ${{ runner.os }}-py-3.9-${{ hashFiles('requirements.txt') }}-${{ hashFiles('setup.py')
-          }}
+        key: ${{ runner.os }}-py-${{ matrix.py_version }}-${{ hashFiles('requirements.txt') }}-${{ hashFiles('setup.py') }}
     - name: Install dependencies
       uses: py-actions/py-dependency-install@v2
       with:
@@ -44,6 +46,7 @@ jobs:
         token: ${{ secrets.CODECOV_TOKEN }}
         file: .coverage.xml
         name: client-codecov
+        flags: py${{ matrix.py_version }}
   release:
     name: Release client
     runs-on: ubuntu-latest
@@ -58,7 +61,7 @@ jobs:
     - name: Install python
       uses: actions/setup-python@v2
       with:
-        python-version: 3.9.9
+        python-version: 3.9
     - name: Install dependencies
       run: |
         python -m pip install twine build
diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml
index 41723f5..c5d4a46 100644
--- a/.pre-commit-config.yaml
+++ b/.pre-commit-config.yaml
@@ -8,19 +8,18 @@ repos:
   rev: v1.3.0
   hooks:
   - id: yesqa
-- repo: https://github.com/sondrelg/pep585-upgrade
-  rev: v1.0
-  hooks:
-  - id: upgrade-type-hints
-    args:
-    - --futures=true
+# - repo: https://github.com/sondrelg/pep585-upgrade
+#   rev: v1.0
+#   hooks:
+#   - id: upgrade-type-hints
+#     args:
+#     - --futures=true
 - repo: https://github.com/Zac-HD/shed
   rev: 0.10.1
   hooks:
   - id: shed
     args:
     - --refactor
-    - --py39-plus
     types_or:
     - python
     - markdown
diff --git a/setup.cfg b/setup.cfg
index fec7159..8e1153a 100644
--- a/setup.cfg
+++ b/setup.cfg
@@ -11,7 +11,8 @@ classifiers =
 
 [options]
 zip_safe = False
-python_requires = >=3.9
+# Required for Neu.ro SDK
+python_requires = >=3.7
 include_package_data = True
 packages = find:
 install_requires =
diff --git a/tests/test_factories.py b/tests/test_factories.py
index fc819f0..c2515dc 100644
--- a/tests/test_factories.py
+++ b/tests/test_factories.py
@@ -1,3 +1,5 @@
+from __future__ import annotations
+
 from dataclasses import replace
 from datetime import datetime
 from decimal import Decimal