diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 807dd91..c2efc91 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -8,22 +8,34 @@ on:
 
 jobs:
   pre-commit:
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-22.04
     steps:
-      - uses: actions/checkout@v2
-      - uses: actions/setup-python@v2
+      - uses: actions/checkout@v3
+      - uses: actions/setup-python@v4
       - uses: pre-commit/action@v2.0.2
 
   tests:
     name: "Python ${{ matrix.python-version }}"
-    runs-on: "ubuntu-latest"
+    runs-on: ${{ matrix.machine }}
     strategy:
       fail-fast: false
       matrix:
-        python-version: ["3.7", "3.8", "3.9", "3.10", "3.11"]
+        include:
+          - python-version: "3.6"
+            machine: ubuntu-20.04
+          - python-version: "3.7"
+            machine: ubuntu-22.04
+          - python-version: "3.8"
+            machine: ubuntu-22.04
+          - python-version: "3.9"
+            machine: ubuntu-22.04
+          - python-version: "3.10"
+            machine: ubuntu-22.04
+          - python-version: "3.11"
+            machine: ubuntu-22.04
     steps:
-      - uses: "actions/checkout@v2"
-      - uses: "actions/setup-python@v2"
+      - uses: "actions/checkout@v3"
+      - uses: "actions/setup-python@v4"
         with:
           python-version: "${{ matrix.python-version }}"
       - name: "Install dependencies"
diff --git a/pyproject.toml b/pyproject.toml
index 76fb2db..ad13fe4 100644
--- a/pyproject.toml
+++ b/pyproject.toml
@@ -18,7 +18,7 @@ dependencies = [
     "pydantic",
     "wrapt",
 ]
-requires-python = ">=3.7"
+requires-python = ">=3.6"
 
 [project.optional-dependencies]
 test = [
diff --git a/tox.ini b/tox.ini
index 6b20c25..b5c9761 100644
--- a/tox.ini
+++ b/tox.ini
@@ -1,5 +1,6 @@
 [gh-actions]
 python =
+    3.6: py36
     3.7: py37, typing
     3.8: py38, typing
     3.9: py39, typing, pypi-description
@@ -10,6 +11,7 @@ python =
 [tox]
 isolated_build = True
 envlist =
+    py36
     py37
     py38
     py39