diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
index 08a6b9b..20d94b4 100644
--- a/.github/workflows/test.yml
+++ b/.github/workflows/test.yml
@@ -8,9 +8,8 @@ jobs:
         # libcove doesn't support Windows.
         # https://github.com/OpenDataServices/lib-cove/issues/53
         # We also only use Linux servers, so don't test on Mac
-        # Need to use an older Ubuntu so Python 3.6 is available
-        os: [ubuntu-20.04]
-        python-version: [ 3.6, 3.7, 3.8, 3.9, "3.10", "3.11" ]
+        os: [ubuntu-22.04]
+        python-version: [ 3.8, 3.9, "3.10", "3.11" ]
         jsonref-version: ["==0.3", ">1"]
     steps:
     - uses: actions/checkout@v2
diff --git a/CHANGELOG.md b/CHANGELOG.md
index afdcf84..bfaf5c4 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -7,6 +7,10 @@ and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.
 
 ## [Unreleased]
 
+### Removed
+
+- Dropped support for Python 3.6 & 3.7, as these are now end of life.
+
 ## [0.31.0] - 2023-07-06
 
 ### Changed