diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml
index 3b78abb9..2f53c118 100644
--- a/.github/workflows/tests.yml
+++ b/.github/workflows/tests.yml
@@ -20,11 +20,15 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        os: ["ubuntu-20.04"]
-        python-version: ["3.6", "3.7", "3.12"]
+        os: ["ubuntu-22.04"]
+        python-version: [
+          "3.7",
+          "3.12",
+          "3.13",
+        ]
         include:
           - os: "macos-latest"
-            python-version: "3.12"
+            python-version: "3.13"
           - os: "windows-latest"
             python-version: "3.11"
     env:
diff --git a/CHANGES.rst b/CHANGES.rst
index 485f41f4..fadf5a8f 100644
--- a/CHANGES.rst
+++ b/CHANGES.rst
@@ -6,6 +6,7 @@ mqttwarn changelog
 in progress
 ===========
 
+- CI: Validated on Python 3.13
 
 2023-10-15 0.35.0
 =================
diff --git a/setup.py b/setup.py
index 1075769c..84e6ad78 100644
--- a/setup.py
+++ b/setup.py
@@ -208,6 +208,7 @@
         "Programming Language :: Python :: 3.10",
         "Programming Language :: Python :: 3.11",
         "Programming Language :: Python :: 3.12",
+        "Programming Language :: Python :: 3.13",
         "Topic :: Communications",
         "Topic :: Education",
         "Topic :: Internet",