diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index 7a04398..a6ce3f4 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -15,7 +15,7 @@ jobs:
     runs-on: ubuntu-latest
     strategy:
       matrix:
-        python-version: ['3.6', '3.7', '3.8', '3.9', '3.10']
+        python-version: ['3.7', '3.8', '3.9', '3.10', '3.11']
 
     steps:
     - uses: actions/checkout@v2
diff --git a/setup.py b/setup.py
index 82fb9f8..b41cd4c 100755
--- a/setup.py
+++ b/setup.py
@@ -73,11 +73,11 @@ def run_tests(self):
         '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',
         'Programming Language :: Python :: 3.10',
+        'Programming Language :: Python :: 3.11',
     ],
     'keywords': 'grafana yaml graphite prometheus influxdb',
     'cmdclass': {'test': Tox},
diff --git a/tox.ini b/tox.ini
index f2e7b44..6807756 100644
--- a/tox.ini
+++ b/tox.ini
@@ -1,13 +1,13 @@
 [tox]
-envlist = pep8, py{36,37,38,39,310}
+envlist = pep8, py{37,38,39,310,311}
 
 [gh-actions]
 python =
-    3.6: py36
     3.7: py37
     3.8: py38
     3.9: py39
     3.10: py310
+    3.11: py311
 
 [coverage:run]
 relative_files = True