diff --git a/.github/workflows/test_matrix.json b/.github/workflows/test_matrix.json
index 7edb7a3bf..1a5943d2b 100644
--- a/.github/workflows/test_matrix.json
+++ b/.github/workflows/test_matrix.json
@@ -364,5 +364,28 @@
       "schedule",
       "workflow_dispatch"
     ]
+  },
+  {
+    "name": "MacOS 12 / Python 3.11 / Dask",
+    "os": "macos-12",
+    "python-version": "3.11",
+    "backend": "dask",
+    "experimental": false,
+    "trigger": [
+      "schedule",
+      "workflow_dispatch"
+    ]
+  },
+  {
+    "name": "MacOS 12 / Python 3.11 / Local",
+    "os": "macos-12",
+    "python-version": "3.11",
+    "backend": "local",
+    "experimental": false,
+    "trigger": [
+      "schedule",
+      "workflow_dispatch",
+      "pull_request"
+    ]
   }
 ]
diff --git a/CHANGELOG.md b/CHANGELOG.md
index fdf31f80b..21ed37d34 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -9,7 +9,9 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ### Operations
 
-- Respecting node version as specified in `.nvmrc` file for tests workflow
+
+- Added Python 3.11 to test suite
+- Respecting node version as specified in `.nvmrc` file for testworkflow
 - Bumped versions in pre-commit config
 - Added prettier for markdown files.
 - Reduce the number of pinned version numbers in the `setup.py`, `requirements.txt`, and `requirements-client.txt`
diff --git a/setup.py b/setup.py
index adc9426a2..fba15b66d 100644
--- a/setup.py
+++ b/setup.py
@@ -233,6 +233,7 @@ def find_sources(self):
         "Programming Language :: Python :: 3.8",
         "Programming Language :: Python :: 3.9",
         "Programming Language :: Python :: 3.10",
+        "Programming Language :: Python :: 3.11",
         "Topic :: Adaptive Technologies",
         "Topic :: Scientific/Engineering",
         "Topic :: Scientific/Engineering :: Interface Engine/Protocol Translator",