diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
index 3b29971..5a054c3 100644
--- a/.github/workflows/test.yml
+++ b/.github/workflows/test.yml
@@ -8,9 +8,10 @@ jobs:
     runs-on: ubuntu-latest
     strategy:
       fail-fast: false
+      max-parallel: 5
       matrix:
-        python-version: ['3.6', '3.7', '3.8', '3.9', '3.10', 'pypy-3.8']
-        django-version: ['3.2', '4.0']
+        python-version: ['3.7', '3.8', '3.9', '3.10', 'pypy-3.8']
+        django-version: ['3.2', '4.0', 'main']
         include:
           # Tox configuration for QA environment
           - python-version: '3.8'
@@ -29,11 +30,12 @@ jobs:
             django-version: 'main'
             experimental: true
         exclude:
-          # Exclude Django 4.0 for Python 3.6 and 3.7
-          - python-version: '3.6'
-            django-version: '4.0'
+          # Exclude Django 4.0 for Python 3.7
           - python-version: '3.7'
             django-version: '4.0'
+          # Exclude Django 2.2 for Python 3.10
+          - python-version: '3.10'
+            django-version: '2.2'
 
     steps:
     - uses: actions/checkout@v2
diff --git a/axes/management/commands/axes_reset_user.py b/axes/management/commands/axes_reset_user.py
index 5f24875..654525b 120000
--- a/axes/management/commands/axes_reset_user.py
+++ b/axes/management/commands/axes_reset_user.py
@@ -1 +1 @@
-axes_reset_username.py
\ No newline at end of file
+axes_reset_username.py
diff --git a/pyproject.toml b/pyproject.toml
index 16e7a6b..d8b8b66 100644
--- a/pyproject.toml
+++ b/pyproject.toml
@@ -10,13 +10,13 @@ DJANGO_SETTINGS_MODULE = "tests.settings"
 legacy_tox_ini = """
 [tox]
 envlist =
-    py{36,37,38,39,310}-dj32
-    py{38,39,310}-dj{4.0, main}
-    py38-djqa
+    py{37,38,39,310,py3}-dj32
+    py{38,39,310,py3}-dj40
+    py{38,39,310}-djmain
+    py310-djqa
 
 [gh-actions]
 python =
-    3.6: py36
     3.7: py37
     3.8: py38
     3.9: py39
@@ -41,17 +41,17 @@ usedevelop = true
 commands = pytest
 setenv =
     PYTHONDONTWRITEBYTECODE=1
-
 # Django development version is allowed to fail the test matrix
-[testenv:py{38,39,py3}-djmain]
-ignore_errors = true
-ignore_outcome = true
+ignore_outcome =
+    djmain: True
+ignore_errors =
+    djmain: True
 
 # QA runs type checks, linting, and code formatting checks
-[testenv:py38-djqa]
+[testenv:py310-djqa]
 deps = -r requirements-qa.txt
 commands =
     mypy axes
     prospector
-    black -t py36 --check --diff axes
+    black -t py38 --check --diff axes
 """
diff --git a/setup.py b/setup.py
index 6d8ef3a..317a3f9 100644
--- a/setup.py
+++ b/setup.py
@@ -52,7 +52,6 @@ setup(
         "Operating System :: OS Independent",
         "Programming Language :: Python",
         "Programming Language :: Python :: 3",
-        "Programming Language :: Python :: 3.6",
         "Programming Language :: Python :: 3.7",
         "Programming Language :: Python :: 3.8",
         "Programming Language :: Python :: 3.9",