diff --git a/.github/workflows/python-ci-tests.yml b/.github/workflows/python-ci-tests.yml
index e7fbb18..0ca1a43 100644
--- a/.github/workflows/python-ci-tests.yml
+++ b/.github/workflows/python-ci-tests.yml
@@ -9,7 +9,7 @@ jobs:
     runs-on: ubuntu-latest
     strategy:
       matrix:
-        python-version: [3.6, 3.7, 3.8, 3.9]
+        python-version: [3.7, 3.8, 3.9, '3.10']
 
     name: Python ${{ matrix.python-version }} Build
     steps:
diff --git a/setup.py b/setup.py
index 2bceede..f80d10d 100644
--- a/setup.py
+++ b/setup.py
@@ -40,10 +40,10 @@ def get_long_description():
         "Topic :: Security",
         "License :: OSI Approved :: BSD License",
         "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",
     ],
     keywords="taxii taxii2 server json cti cyber threat intelligence",
     packages=find_packages(exclude=["*.test", "*.test.data"]),
diff --git a/tox.ini b/tox.ini
index fb9be89..50e6a96 100644
--- a/tox.ini
+++ b/tox.ini
@@ -1,5 +1,5 @@
 [tox]
-envlist = py36,py37,py38,py39,packaging,pre-commit-check
+envlist = py37,py38,py39,py310,packaging,pre-commit-check
 
 [testenv]
 deps =
@@ -32,7 +32,7 @@ commands =
 
 [gh-actions]
 python =
-  3.6: py36
   3.7: py37
   3.8: py38
   3.9: py39, packaging, pre-commit-check
+  3.10: py310