diff --git a/.travis.yml b/.travis.yml
index 45f941b999..2e77833ffe 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -2,6 +2,8 @@ language: python
 cache: pip
 matrix:
   include:
+    - python: 3.9
+      env: TOXENV=py39
     - python: 3.8
       env: TOXENV=py38
     - python: 3.7
diff --git a/setup.cfg b/setup.cfg
index d0072f02ae..64a900e5f5 100644
--- a/setup.cfg
+++ b/setup.cfg
@@ -22,6 +22,7 @@ classifiers =
     Programming Language :: Python :: 3.6
     Programming Language :: Python :: 3.7
     Programming Language :: Python :: 3.8
+    Programming Language :: Python :: 3.9
     Intended Audience :: Developers
     Intended Audience :: System Administrators
     Topic :: Software Development :: Testing
diff --git a/tox.ini b/tox.ini
index eebce4f50b..4edc98ac05 100644
--- a/tox.ini
+++ b/tox.ini
@@ -1,5 +1,5 @@
 [tox]
-envlist = py{36,37,38}
+envlist = py{36,37,38,39}
 
 [flake8]
 ignore = E741,F401,W503,E402,E501,E731,E713