diff --git a/.github/workflows/test-and-deploy.yml b/.github/workflows/test-and-deploy.yml
index 25408ac0..ba8b6990 100644
--- a/.github/workflows/test-and-deploy.yml
+++ b/.github/workflows/test-and-deploy.yml
@@ -17,7 +17,7 @@ jobs:
     timeout-minutes: 20
     strategy:
       matrix:
-        python-version: [ '2.7', '3.5', '3.6', '3.7', '3.8', '3.9', '3.10', '3.11' ]
+        python-version: [ '2.7', '3.5', '3.6', '3.7', '3.8', '3.9', '3.10', '3.11', '3.12' , '3.13']
     env:
       DOCKER_LOGIN: ${{ secrets.DOCKER_USERNAME && secrets.DOCKER_AUTH_TOKEN }}
     steps:
diff --git a/Makefile b/Makefile
index fb61004c..96161106 100644
--- a/Makefile
+++ b/Makefile
@@ -6,13 +6,11 @@ venv: clean
 	virtualenv --python=python venv
 
 install: venv
+	. venv/bin/activate; pip install -r test/requirements.txt
 	. venv/bin/activate; python setup.py install
 	. venv/bin/activate; pip install -r requirements.txt
 
-test-install: install
-	. venv/bin/activate; pip install -r test/requirements.txt
-
-test: test-install
+test: install
 	. venv/bin/activate; coverage run -m unittest discover -s test/unit
 
 test-integ: test
diff --git a/setup.py b/setup.py
index 41f11e58..7c797ae6 100644
--- a/setup.py
+++ b/setup.py
@@ -41,5 +41,7 @@ def getRequires():
         'Programming Language :: Python :: 3.9',
         'Programming Language :: Python :: 3.10',
         'Programming Language :: Python :: 3.11',
+        'Programming Language :: Python :: 3.12',
+        'Programming Language :: Python :: 3.13',
     ]
 )
diff --git a/test/requirements.txt b/test/requirements.txt
index 859c2456..40552deb 100644
--- a/test/requirements.txt
+++ b/test/requirements.txt
@@ -5,3 +5,4 @@ coverage
 mock
 itsdangerous==1.1.0
 markupsafe==1.1.1
+setuptools
diff --git a/tox.ini b/tox.ini
index 926a3c9d..8f4f2db9 100644
--- a/tox.ini
+++ b/tox.ini
@@ -4,7 +4,7 @@
 # and then run "tox" from this directory.
 
 [tox]
-envlist = py27, py34, py35, py36, py37
+envlist = py27, py34, py35, py36, py37, py38, py39, py310, py311, py312, py313
 
 [testenv]
 commands = coverage erase
@@ -39,3 +39,33 @@ basepython = python3.6
 commands = {[testenv]commands}
 deps = {[testenv]deps}
 basepython = python3.7
+
+[testenv:py38]
+commands = {[testenv]commands}
+deps = {[testenv]deps}
+basepython = python3.8
+
+[testenv:py39]
+commands = {[testenv]commands}
+deps = {[testenv]deps}
+basepython = python3.9
+
+[testenv:py310]
+commands = {[testenv]commands}
+deps = {[testenv]deps}
+basepython = python3.10
+
+[testenv:py311]
+commands = {[testenv]commands}
+deps = {[testenv]deps}
+basepython = python3.11
+
+[testenv:py312]
+commands = {[testenv]commands}
+deps = {[testenv]deps}
+basepython = python3.12
+
+[testenv:py313]
+commands = {[testenv]commands}
+deps = {[testenv]deps}
+basepython = python3.13