diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml
index 6d1e406..1630c8b 100644
--- a/.github/workflows/tests.yml
+++ b/.github/workflows/tests.yml
@@ -6,7 +6,7 @@ jobs:
     runs-on: ubuntu-latest
     strategy:
       matrix:
-        python-version: [2.7, 3.5, 3.6, 3.7, 3.8, pypy2, pypy3]
+        python-version: [2.7, 3.5, 3.6, 3.7, 3.8, 3.9.0-rc - 3.9, pypy2, pypy3]
 
     steps:
       - uses: actions/checkout@v2
@@ -16,7 +16,7 @@ jobs:
           git submodule sync -q
           git submodule update --init
       - name: Set up Python ${{ matrix.python-version }}
-        uses: actions/setup-python@v1
+        uses: actions/setup-python@v2
         with:
           python-version: ${{ matrix.python-version }}
       - name: Install dependencies
diff --git a/.travis.yml b/.travis.yml
index 192dee5..6448cc8 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -6,6 +6,8 @@ python:
   - "3.5"
   - "3.6"
   - "3.7"
+  - "3.8"
+  - "3.9-dev"
   - "pypy2.7-6.0"
   - "pypy3.5-6.0"
 install: pip install tox-travis
diff --git a/tox.ini b/tox.ini
index 6234410..ef19e2c 100644
--- a/tox.ini
+++ b/tox.ini
@@ -1,5 +1,5 @@
 [tox]
-envlist = py27, py34, py35, py36, py37, pypy, pypy3
+envlist = py27, py34, py35, py36, py37, py38, py39, pypy, pypy3
 skip_missing_interpreters=true
 
 [travis]
@@ -8,6 +8,8 @@ skip_missing_interpreters=true
 3.5 = py35
 3.6 = py36
 3.7 = py37
+3.8 = py38
+3.9 = py39
 pypy = pypy
 pypy3 = pypy3