diff --git a/.github/workflows/zulip-tests.yml b/.github/workflows/zulip-tests.yml
index 921fd33c6..7337af9d9 100644
--- a/.github/workflows/zulip-tests.yml
+++ b/.github/workflows/zulip-tests.yml
@@ -32,7 +32,7 @@ jobs:
       fail-fast: false
       matrix:
         os: [ubuntu-latest, windows-latest]
-        python-version: ["3.8", "3.9", "3.10"]
+        python-version: ["3.8", "3.9", "3.10", "3.11"]
 
     steps:
       - uses: actions/checkout@v2
diff --git a/zulip/setup.py b/zulip/setup.py
index c80566720..9138338a7 100755
--- a/zulip/setup.py
+++ b/zulip/setup.py
@@ -45,6 +45,7 @@ def recur_expand(target_root: Any, dir: Any) -> Generator[Tuple[str, List[str]],
         "Programming Language :: Python :: 3.8",
         "Programming Language :: Python :: 3.9",
         "Programming Language :: Python :: 3.10",
+        "Programming Language :: Python :: 3.11",
     ],
     python_requires=">=3.8",
     url="https://www.zulip.org/",
diff --git a/zulip_bots/setup.py b/zulip_bots/setup.py
index adb2dae56..3fe124a91 100644
--- a/zulip_bots/setup.py
+++ b/zulip_bots/setup.py
@@ -37,6 +37,7 @@
         "Programming Language :: Python :: 3.8",
         "Programming Language :: Python :: 3.9",
         "Programming Language :: Python :: 3.10",
+        "Programming Language :: Python :: 3.11",
     ],
     python_requires=">=3.8",
     url="https://www.zulip.org/",
diff --git a/zulip_botserver/setup.py b/zulip_botserver/setup.py
index 27559dc73..d606aaa2f 100644
--- a/zulip_botserver/setup.py
+++ b/zulip_botserver/setup.py
@@ -25,6 +25,7 @@
         "Programming Language :: Python :: 3.8",
         "Programming Language :: Python :: 3.9",
         "Programming Language :: Python :: 3.10",
+        "Programming Language :: Python :: 3.11",
     ],
     python_requires=">=3.8",
     url="https://www.zulip.org/",