diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml
index 82c18889..ea11a2d6 100644
--- a/.github/workflows/ci.yaml
+++ b/.github/workflows/ci.yaml
@@ -18,10 +18,10 @@ jobs:
           - ubuntu-latest
           - windows-latest
         python-version:
-          - "3.6"
           - "3.7"
           - "3.8"
-          - "pypy-3.7"
+          - "3.9"
+          - "pypy-3.8"
     runs-on: ${{ matrix.os }}
     steps:
       - uses: actions/checkout@v2
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 55c0bafb..9edb37e5 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,6 +1,8 @@
 **unreleased**
 **v1.0.2-dev**
 - Housekeeping: migrated from travis+appveyor to GitHub Actions for CI, thanks @clbarnes
+- Drop Python3.6 support, thanks @clbarnes
+- Add Python3.9, thanks @clbarnes
 
 **v1.0.1**
 - Added: enable special characters in search/replace, thanks @mckelvin
diff --git a/tox.ini b/tox.ini
index 6a8208a7..b7ed368b 100644
--- a/tox.ini
+++ b/tox.ini
@@ -1,5 +1,5 @@
 [tox]
-envlist = py35, py36, py37, py38, pypy3
+envlist = py37, py38, py39, pypy3
 
 [testenv]
 passenv = HOME
@@ -16,8 +16,7 @@ python_files = test*.py
 
 [gh-actions]
 python =
-    2.7: py27
-    3.6: py36
     3.7: py37
     3.8: py38, mypy
-    pypy-3.7: pypy3
+    3.9: py38
+    pypy-3.8: pypy3