diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
index 7c1229a..239b184 100644
--- a/.github/workflows/main.yml
+++ b/.github/workflows/main.yml
@@ -7,8 +7,8 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        python-version: [2.7, 3.4, 3.5, 3.6, 3.7, 3.8, 3.9, "3.10"]
-        os: [ubuntu-18.04, windows-2019]
+        python-version: [2.7, 3.6, 3.7, 3.8, 3.9, "3.10", 3.11]
+        os: [ubuntu-20.04, windows-2019]
 
     runs-on: ${{ matrix.os }}
 
diff --git a/CHANGES.rst b/CHANGES.rst
index 16b401b..ffde31c 100644
--- a/CHANGES.rst
+++ b/CHANGES.rst
@@ -2,7 +2,7 @@
 -------------------------
 
 - Support for some older Python versions has been dropped.  On Python 3,
-  Py65 now requires Python 3.4 or later.  On Python 2, Py65 now requires
+  Py65 now requires Python 3.6 or later.  On Python 2, Py65 now requires
   Python 2.7.
 
 - Fixed a bug with character input that would cause characters to be
diff --git a/setup.py b/setup.py
index 9148fa5..bb21750 100644
--- a/setup.py
+++ b/setup.py
@@ -7,7 +7,7 @@ PY3 = py_version[0] == 3
 
 if PY3:
     if py_version < (3, 4):
-        raise RuntimeError('On Python 3, Py65 requires Python 3.4 or later')
+        raise RuntimeError('On Python 3, Py65 requires Python 3.6 or later')
 else:
     if py_version < (2, 7):
         raise RuntimeError('On Python 2, Py65 requires Python 2.7 or later')
@@ -27,10 +27,12 @@ CLASSIFIERS = [
     'Programming Language :: Python :: 2',
     'Programming Language :: Python :: 2.7',
     'Programming Language :: Python :: 3',
-    'Programming Language :: Python :: 3.4',
-    'Programming Language :: Python :: 3.5',
     'Programming Language :: Python :: 3.6',
     'Programming Language :: Python :: 3.7',
+    'Programming Language :: Python :: 3.8',
+    'Programming Language :: Python :: 3.9',
+    'Programming Language :: Python :: 3.10',
+    'Programming Language :: Python :: 3.11',
     'Programming Language :: Assembly',
     'Topic :: Software Development :: Assemblers',
     'Topic :: Software Development :: Disassemblers',