diff --git a/.travis.yml b/.travis.yml
index fbdef1c..368dce1 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -7,6 +7,7 @@ python:
  - "3.6"
  - "3.7"
  - "3.8"
+ - "3.9-dev"
  #- "pypy"
 
 notifications:
diff --git a/setup.py b/setup.py
index 62bca9a..32c245b 100644
--- a/setup.py
+++ b/setup.py
@@ -35,6 +35,7 @@
         'Programming Language :: Python :: 3.6',
         'Programming Language :: Python :: 3.7',
         'Programming Language :: Python :: 3.8',
+        'Programming Language :: Python :: 3.9',
         'Programming Language :: Python :: Implementation :: CPython',
         'Programming Language :: Python :: Implementation :: PyPy',
     ]
diff --git a/tox.ini b/tox.ini
index aa514cc..07ff124 100644
--- a/tox.ini
+++ b/tox.ini
@@ -1,5 +1,5 @@
 [tox]
-envlist = py27, py33, py34, py35, py36, py37, py38, pypy
+envlist = py27, py33, py34, py35, py36, py37, py38, py39, pypy
 
 [testenv]
 deps =