diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
index dcb7e8c..186c85d 100644
--- a/.github/workflows/main.yml
+++ b/.github/workflows/main.yml
@@ -16,7 +16,13 @@ jobs:
     strategy:
       matrix:
         os: [ubuntu-latest, windows-latest]
-        python: ["3.8", "3.9", "3.10", "3.11"] # "3.6", "3.7" are EOL
+        python: ["3.7", "3.8", "3.9", "3.10", "3.11"]
+
+        include:
+          - os: [ubuntu-20.04]
+            python: ["3.6"]
+          - os: [windows-2019]
+            python: ["3.6"]
 
     steps:
       - uses: actions/checkout@v3
diff --git a/setup.py b/setup.py
index 53c9032..d28444a 100644
--- a/setup.py
+++ b/setup.py
@@ -47,5 +47,8 @@
         'Programming Language :: Python :: 3.6',
         'Programming Language :: Python :: 3.7',
         'Programming Language :: Python :: 3.8',
+        'Programming Language :: Python :: 3.9',
+        'Programming Language :: Python :: 3.10',
+        'Programming Language :: Python :: 3.11',
         'Topic :: Software Development :: Libraries :: Python Modules',
     ])
diff --git a/tox.ini b/tox.ini
index 73d69a2..4ca8b21 100644
--- a/tox.ini
+++ b/tox.ini
@@ -1,7 +1,7 @@
 [tox]
 minversion = 3.14.3
 skipdist = True
-envlist = py3{6,7,8,9,10},flake8,cover,docs
+envlist = py3{6,7,8,9,1,11},flake8,cover,docs
 
 [testenv]
 setenv = VIRTUAL_ENV={envdir}