diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index 30e6e11..d8106ed 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -7,22 +7,72 @@
             "strategy": {
                 "fail-fast": false,
                 "matrix": {
-                    "python": [
-                        "3.6",
-                        "3.7",
-                        "3.8",
-                        "3.9",
+                    "name": [
+                        "python-38",
+                        "python-39",
+                        "python-310",
+                        "python-311",
+                        "pep8",
+                        "py3pep8",
+                        "doc",
+                    ],
+                    "include": [
+                        {
+                            "name": "python-38",
+                            "python": "3.8",
+                            "toxenv": "py38",
+                        },
+                        {
+                            "name": "python-39",
+                            "python": "3.9",
+                            "toxenv": "py39",
+                        },
+                        {
+                            "name": "python-310",
+                            "python": "3.10",
+                            "toxenv": "py310",
+                        },
+                        {
+                            "name": "python-311",
+                            "python": "3.11",
+                            "toxenv": "py311",
+                        },
+                        {
+                            "name": "pep8",
+                            "python": "3.10",
+                            "toxenv": "pep8",
+                            "arch": "x64",
+                        },
+                        {
+                            "name": "py3pep8",
+                            "python": "3.10",
+                            "toxenv": "pep8",
+                            "arch": "x64",
+                        },
+                        {
+                            "name": "doc",
+                            "python": "3.10",
+                            "toxenv": "doc",
+                            "arch": "x64",
+                        },
                     ],
                 },
             },
             "steps": [
-                { "uses": "actions/checkout@v2" },
+                { "uses": "actions/checkout@v4" },
                 {
-                    "uses": "actions/setup-python@v2",
+                    "uses": "actions/setup-python@v5",
                     "with": { "python-version": "${{ matrix.python }}"},
                 },
+                { "run": "pip --version" },
                 { "run": "pip install tox" },
-                { "run": "tox" },
+                { "run": "tox --version" },
+                {
+                    "env": {
+                          "TOXENV": "${{matrix.toxenv}}"
+                    },
+                    "run": "tox",
+                },
             ],
         },
     },
diff --git a/setup.py b/setup.py
index 4b34fcc..8829c67 100644
--- a/setup.py
+++ b/setup.py
@@ -67,10 +67,10 @@ def read(fname):
         "License :: OSI Approved :: MIT License",
         "Operating System :: OS Independent",
         "Programming Language :: Python :: 3",
-        "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 :: Internet :: Proxy Servers",
     ],
 )
diff --git a/tox.ini b/tox.ini
index 9672cee..b2cf0b9 100644
--- a/tox.ini
+++ b/tox.ini
@@ -1,6 +1,6 @@
 [tox]
 minversion = 2.3.1
-envlist = py36,py37,py38,py39,pep8,py3pep8,doc
+envlist = py38,py39,py310,py311,pep8,py3pep8,doc
 skip_missing_interpreters = true
 
 [testenv]
@@ -43,5 +43,5 @@ exclude = .tox,*.egg,dist,build
 show-source = true
 max-line-length = 79
 application-import-names = kdcproxy
-# N815 is camelCase names; N813 is for changing case on import
-ignore = N815, N813
+# N815 is camelCase names; N813 is for changing case on import; N818 Exception name
+ignore = N815, N813, N818