diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml
index 800d486..cff9133 100644
--- a/.github/workflows/ci.yaml
+++ b/.github/workflows/ci.yaml
@@ -10,15 +10,12 @@ jobs:
       strategy:
         matrix:
           os: [macos-latest, ubuntu-22.04, windows-latest]
-          python: ['3.8', '3.9', '3.10', '3.11', '3.12']
-          include:
-          - os: ubuntu-20.04
-            python: '3.6'
+          python: [ '3.9', '3.10', '3.11', '3.12']
       name: osrf_pycommon tests
       runs-on: ${{matrix.os}}
 
       steps:
-      - uses: actions/checkout@v4
+      - uses: actions/checkout@v5
       - name: Set up Python ${{matrix.python}}
         uses: actions/setup-python@v5
         with:
diff --git a/setup.py b/setup.py
index 663e244..fe001fb 100644
--- a/setup.py
+++ b/setup.py
@@ -1,7 +1,6 @@
 from setuptools import find_packages
 from setuptools import setup
 
-
 install_requires = [
     'importlib-metadata;python_version<"3.8"',
 ]
@@ -27,7 +26,7 @@
             'pytest',
         ],
     },
-    python_requires='>=3.5',
+    python_requires='>=3.9',
     zip_safe=True,
     author='William Woodall',
     author_email='william@osrfoundation.org',
@@ -42,5 +41,4 @@
     description="Commonly needed Python modules, "
                 "used by Python software developed at OSRF",
     license='Apache 2.0',
-    test_suite='tests',
 )