diff --git a/.github/workflows/gh-ci.yaml b/.github/workflows/gh-ci.yaml
index df9a120f9fe..70419bf5ebf 100644
--- a/.github/workflows/gh-ci.yaml
+++ b/.github/workflows/gh-ci.yaml
@@ -28,17 +28,23 @@ jobs:
         fail-fast: false
         matrix:
           os: [ubuntu-latest, ]
-          python-version: [3.6, 3.7, 3.8]
+          python-version: [3.6, 3.7, 3.8, 3.9]
           run_type: [FULL, ]
           install_hole: [true, ]
           codecov: [true, ]
           include:
-            - name: macOS
+            - name: macOS_py39
               os: macOS-latest
-              python-version: 3.7
+              python-version: 3.9
               run_type: FULL
               install_hole: true
               codecov: true
+            - name: macOS_py36_min
+              os: macOS-latest
+              python-version: 3.6
+              run_type: MIN
+              install_hole: false
+              codecov: false
             - name: minimal-ubuntu
               os: ubuntu-latest
               python-version: 3.6
diff --git a/package/CHANGELOG b/package/CHANGELOG
index 4f8d7a76d59..3b1161ebbdc 100644
--- a/package/CHANGELOG
+++ b/package/CHANGELOG
@@ -103,6 +103,7 @@ Fixes
   * Fix syntax warning over comparison of literals using is (Issue #3066)
 
 Enhancements
+  * Adds python 3.9 support (Issue #2974, PR #3027, #3245)
   * Added an MDAnalysis shields.io badge to the README (Issue #3227, PR #3229)
   * Added sort method to the atomgroup (Issue #2976, PR #3188) 
   * ITPParser now reads [ atomtypes ] sections in ITP files, used for charges
diff --git a/package/setup.py b/package/setup.py
index 224ef9bd8e7..09ba962520c 100755
--- a/package/setup.py
+++ b/package/setup.py
@@ -577,6 +577,7 @@ def long_description(readme):
         'Programming Language :: Python :: 3.6',
         'Programming Language :: Python :: 3.7',
         'Programming Language :: Python :: 3.8',
+        'Programming Language :: Python :: 3.9',
         'Programming Language :: C',
         'Topic :: Scientific/Engineering',
         'Topic :: Scientific/Engineering :: Bio-Informatics',
diff --git a/testsuite/setup.py b/testsuite/setup.py
index 0bb0d73ca73..b799b52cbe0 100755
--- a/testsuite/setup.py
+++ b/testsuite/setup.py
@@ -104,6 +104,7 @@ def run(self):
         'Programming Language :: Python :: 3.6',
         'Programming Language :: Python :: 3.7',
         'Programming Language :: Python :: 3.8',
+        'Programming Language :: Python :: 3.9',
         'Programming Language :: C',
         'Topic :: Scientific/Engineering',
         'Topic :: Scientific/Engineering :: Bio-Informatics',