diff --git a/.github/workflows/testing.yml b/.github/workflows/testing.yml
index 01630e5..f7895c9 100644
--- a/.github/workflows/testing.yml
+++ b/.github/workflows/testing.yml
@@ -26,12 +26,15 @@ jobs:
     strategy:
       matrix:
         os: [ubuntu-latest, macos-latest, windows-latest]
-        python-version: [2.7, 3.5, 3.6, 3.7, 3.8]
+        python-version: [2.7, 3.5, 3.6, 3.7, 3.8, 3.9]
+        no-coverage: [0]
         include:
           - os: ubuntu-latest
-            python-version: pypy2
+            python-version: pypy-2.7
+            no-coverage: 1
           - os: ubuntu-latest
-            python-version: pypy3
+            python-version: pypy-3.6
+            no-coverage: 1
     steps:
       - uses: actions/checkout@v2
       - name: Set up Python Env
@@ -45,10 +48,12 @@ jobs:
           make init
       - name: Run Tests
         env:
-          PYTHONHASHSEED: "0"
+          NOCOV: ${{ matrix.no-coverage }}
         run: |
           make test
       - name: Upload to Coveralls
+        # pypy + concurrenct=gevent not supported in coveragepy. See https://github.com/nedbat/coveragepy/issues/560
+        if: matrix.no-coverage == 0
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
           COVERALLS_PARALLEL: true
diff --git a/Makefile b/Makefile
index 3e7b0ec..914f5ac 100644
--- a/Makefile
+++ b/Makefile
@@ -18,9 +18,15 @@ help:
 init:
 	pip install -r dev_requirements.txt
 
+COVOPTS = --cov-config .coveragerc --cov=vdf
+
+ifeq ($(NOCOV), 1)
+	COVOPTS =
+endif
+
 test:
 	rm -f .coverage vdf/*.pyc tests/*.pyc
-	PYTHONHASHSEED=0 python -m pytest --tb=short --cov-config .coveragerc --cov=vdf tests
+	PYTHONHASHSEED=0 pytest --tb=short $(COVOPTS) tests
 
 pylint:
 	pylint -r n -f colorized vdf || true
diff --git a/setup.py b/setup.py
index 1b7803e..b40cf4b 100644
--- a/setup.py
+++ b/setup.py
@@ -26,13 +26,12 @@
         'Natural Language :: English',
         'Operating System :: OS Independent',
         'Programming Language :: Python :: 2.7',
-        'Programming Language :: Python :: 3',
-        'Programming Language :: Python :: 3.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 :: Implementation :: PyPy',
     ],
     keywords='valve keyvalue vdf tf2 dota2 csgo',