diff --git a/.taskcluster.yml b/.taskcluster.yml
index 1f2d56f..c106471 100644
--- a/.taskcluster.yml
+++ b/.taskcluster.yml
@@ -33,8 +33,8 @@ tasks:
   in:
     $let:
       tests:
-        - image: 'python:3.6'
-          name: python:3.6 tests
+        - image: 'python:3.11'
+          name: python:3.11 tests
           command:
             - /bin/bash
             - '--login'
@@ -46,7 +46,7 @@ tasks:
               git checkout ${repo.ref} &&
               pip install -e . &&
               python setup.py test
-        - image: 'python:3.6'
+        - image: 'python:3.11'
           name: flake
           command:
             - /bin/bash
diff --git a/setup.py b/setup.py
index 789f129..6916086 100644
--- a/setup.py
+++ b/setup.py
@@ -26,7 +26,10 @@
     setup_requires=["pytest-runner", "flake8"],
     tests_require=["pytest", "pytest-mock", "pytest-asyncio>=0.18.0,<0.22", "flake8", "asyncmock"],
     classifiers=[
-        "Programming Language :: Python :: 3",
+        'Programming Language :: Python :: 3.8',
+        'Programming Language :: Python :: 3.9',
+        'Programming Language :: Python :: 3.10',
+        'Programming Language :: Python :: 3.11',
     ],
     entry_points={
         "console_scripts": [