diff --git a/.travis.yml b/.travis.yml
index 2e11c55a..2dd03872 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -3,12 +3,18 @@ matrix:
   include:
     - python: 3.8
       env: TOXENV=lint
+    - python: 3.8
+      env: TOXENV=docs-lint
     - python: 3.5
       env: TOXENV=py35
     - python: 3.6
       env: TOXENV=py36
     - python: 3.7
       env: TOXENV=py37
+    - python: 3.8
+      env: TOXENV=py38
+    - python: 3.9
+      env: TOXENV=py39
     - python: pypy3
       env:
         - TOXENV=pypy3
@@ -17,10 +23,6 @@ matrix:
         # wheels for gevent on PyPI.
         - GEVENTSETUP_EMBED_CARES=no
       dist: xenial
-    - python: 3.8
-      env: TOXENV=py38
-    - python: 3.8
-      env: TOXENV=docs-lint
 install: pip install -U tox coverage
 # TODO: https://github.com/tox-dev/tox/issues/149
 script: tox --recreate
diff --git a/tox.ini b/tox.ini
index d4db4dc0..6000eb61 100644
--- a/tox.ini
+++ b/tox.ini
@@ -1,5 +1,5 @@
 [tox]
-envlist = py35, py36, py37, py38, pypy3, lint
+envlist = py35, py36, py37, py38, py39, pypy3, lint
 skipsdist = True
 
 [testenv]