diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
index 4f25569..e0c0dc5 100644
--- a/.github/workflows/main.yml
+++ b/.github/workflows/main.yml
@@ -8,7 +8,7 @@ jobs:
 
     strategy:
       matrix:
-        python-version: ["2.7", "3.5", "3.6", "3.7", "3.8", "3.9", "3.10"]
+        python-version: ["2.7", "3.5", "3.6", "3.7", "3.8", "3.9", "3.10", "3.11"]
 
     steps:
       - uses: actions/checkout@v2
@@ -32,7 +32,7 @@ jobs:
           cd build/dist/pytz/tests
           python test_docs.py -vv
       - name: zdump Tests
-        if: ${{ matrix.python-version == '3.10' }}
+        if: ${{ matrix.python-version == '3.11' }}
         run: |
           python gen_tests.py
           python test_zdump.py -vv
diff --git a/Makefile b/Makefile
index 6738cf5..cc4c5fd 100644
--- a/Makefile
+++ b/Makefile
@@ -17,6 +17,7 @@ PYTHON37=python3.7
 PYTHON38=python3.8
 PYTHON39=python3.9
 PYTHON310=python3.10
+PYTHON311=python3.11
 PYTHON2=/usr/bin/python2
 PYTHON3=/usr/bin/python3
 PYTHON=${PYTHON3}
@@ -82,7 +83,8 @@ test_lazy: .stamp-tzinfo
 	    && ${PYTHON37} test_lazy.py ${TESTARGS} \
 	    && ${PYTHON38} test_lazy.py ${TESTARGS} \
 	    && ${PYTHON39} test_lazy.py ${TESTARGS} \
-	    && ${PYTHON310} test_lazy.py ${TESTARGS}
+	    && ${PYTHON310} test_lazy.py ${TESTARGS} \
+	    && ${PYTHON311} test_lazy.py ${TESTARGS}
 
 test_tzinfo: .stamp-tzinfo
 	cd build/dist/pytz/tests \
@@ -99,7 +101,8 @@ test_tzinfo: .stamp-tzinfo
 	    && ${PYTHON37} test_tzinfo.py ${TESTARGS} \
 	    && ${PYTHON38} test_tzinfo.py ${TESTARGS} \
 	    && ${PYTHON39} test_tzinfo.py ${TESTARGS} \
-	    && ${PYTHON310} test_tzinfo.py ${TESTARGS}
+	    && ${PYTHON310} test_tzinfo.py ${TESTARGS} \
+	    && ${PYTHON311} test_tzinfo.py ${TESTARGS}
 
 test_docs: .stamp-tzinfo
 	cd build/dist/pytz/tests \
@@ -110,7 +113,7 @@ test_zdump: dist
 	${PYTHON3} gen_tests.py ${TARGET} && \
 	${PYTHON3} test_zdump.py ${TESTARGS} && \
 	${PYTHON2} test_zdump.py ${TESTARGS} && \
-	${PYTHON310} test_zdump.py ${TESTARGS}
+	${PYTHON311} test_zdump.py ${TESTARGS}
 
 build/dist/test_zdump.py: .stamp-zoneinfo
 
diff --git a/src/setup.py b/src/setup.py
index 9620dba..24f7f37 100644
--- a/src/setup.py
+++ b/src/setup.py
@@ -63,6 +63,7 @@
         'Programming Language :: Python :: 3.8',
         'Programming Language :: Python :: 3.9',
         'Programming Language :: Python :: 3.10',
+        'Programming Language :: Python :: 3.11',
         'Topic :: Software Development :: Libraries :: Python Modules',
     ],
 )