diff --git a/.travis.yml b/.travis.yml
index ddff691a..b44ec90a 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -44,3 +44,7 @@ jobs:
       env: TOXENV=py38
     - python: 3.8
       env: TOXENV=py38-functional
+    - python: 3.9
+      env: TOXENV=py39
+    - python: 3.9
+      env: TOXENV=py39-functional
diff --git a/tox.ini b/tox.ini
index 2d92c46e..71c4d2d8 100644
--- a/tox.ini
+++ b/tox.ini
@@ -1,6 +1,8 @@
 [tox]
 skipsdist = True
-envlist = py27, py35, py36, py37
+envlist =
+   py27, py3{5,6,7,8,9}
+   py27-functional, py3{5,6,7,8,9}-functional
 
 [testenv]
 passenv = TOXENV CI TRAVIS TRAVIS_*