diff --git a/azure-pipeline.yml b/azure-pipeline.yml
index fae48b0..06bf90b 100644
--- a/azure-pipeline.yml
+++ b/azure-pipeline.yml
@@ -32,6 +32,9 @@ jobs:
         Python311:
           python.version: '3.11'
           tox_env: 'py311'
+        Python312:
+          python.version: '3.12'
+          tox_env: 'py312'
     steps:
       - task: UsePythonVersion@0
         displayName: 'Use Python $(python.version)'
diff --git a/setup.py b/setup.py
index b2df524..82d54c6 100644
--- a/setup.py
+++ b/setup.py
@@ -42,6 +42,7 @@
         'Programming Language :: Python :: 3.9',
         'Programming Language :: Python :: 3.10',
         'Programming Language :: Python :: 3.11',
+        'Programming Language :: Python :: 3.12',
         'License :: OSI Approved :: MIT License',
     ],
     packages=['knack', 'knack.testsdk'],
diff --git a/tox.ini b/tox.ini
index d4153bd..717ff19 100644
--- a/tox.ini
+++ b/tox.ini
@@ -1,5 +1,5 @@
 [tox]
-envlist = py38,py39,py310,py311
+envlist = py38,py39,py310,py311,py312
 [testenv]
 deps = -rrequirements.txt
 commands=