diff --git a/.coveragerc_py36 b/.coveragerc_py310
similarity index 100%
rename from .coveragerc_py36
rename to .coveragerc_py310
diff --git a/.coveragerc_py37 b/.coveragerc_py38
similarity index 100%
rename from .coveragerc_py37
rename to .coveragerc_py38
diff --git a/.coveragerc_py27 b/.coveragerc_py39
similarity index 69%
rename from .coveragerc_py27
rename to .coveragerc_py39
index dfbfd3e..96bb72b 100644
--- a/.coveragerc_py27
+++ b/.coveragerc_py39
@@ -5,13 +5,13 @@ timid = True
 [report]
 exclude_lines =
     pragma: no cover
-    pragma: py2 no cover
-    if six.PY3
-    elif six.PY3
+    pragma: py3 no cover
+    if six.PY2
+    elif six.PY2
 
 partial_branches =
     pragma: no cover
-    pragma: py2 no cover
+    pragma: py3 no cover
     if six.PY3
     elif six.PY3
 
diff --git a/buildspec-release.yml b/buildspec-release.yml
index ebe8ef6..31c4e54 100644
--- a/buildspec-release.yml
+++ b/buildspec-release.yml
@@ -22,7 +22,7 @@ phases:
       - tox -e black-check
 
       # run unit tests
-      - tox -e py36,py37 -- test/unit
+      - tox -e py38,py39,py310 -- test/unit
 
       # build dummy container
       - python3 setup.py sdist
@@ -37,7 +37,7 @@ phases:
       - cd ../..
 
       # run local integration tests
-      - IGNORE_COVERAGE=- tox -e py36,py37 -- test/integration/local
+      - IGNORE_COVERAGE=- tox -e py38,py39,py310 -- test/integration/local
 
       # publish the release to github
       - git-release --publish
diff --git a/buildspec.yml b/buildspec.yml
index 12a62bf..12b6fc3 100644
--- a/buildspec.yml
+++ b/buildspec.yml
@@ -20,7 +20,7 @@ phases:
       - tox -e twine
 
       # run unit tests
-      - tox -e py36,py37 -- test/unit
+      - tox -e py38,py39,py310 -- test/unit
 
       # build dummy container
       - python setup.py sdist
@@ -35,4 +35,4 @@ phases:
       - cd ../..
 
       # run local integration tests
-      - IGNORE_COVERAGE=- tox -e py36,py37 -- test/integration/local
+      - IGNORE_COVERAGE=- tox -e py38,py39,py310 -- test/integration/local
diff --git a/setup.py b/setup.py
index 4ac36c4..d52467f 100644
--- a/setup.py
+++ b/setup.py
@@ -56,8 +56,9 @@ def read_version():
         "Natural Language :: English",
         "License :: OSI Approved :: Apache Software License",
         "Programming Language :: Python",
-        "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",
     ],
     install_requires=required_packages,
     extras_require={
diff --git a/tox.ini b/tox.ini
index 0fc890f..332bc30 100644
--- a/tox.ini
+++ b/tox.ini
@@ -4,7 +4,7 @@
 # and then run "tox" from this directory.
 
 [tox]
-envlist = black-format,flake8,pylint,twine,py36,py37
+envlist = black-format,flake8,pylint,twine,py38,py39,py310
 
 skip_missing_interpreters = False