diff --git a/.travis.yml b/.travis.yml
index 80a96b3e..6d254710 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -42,8 +42,11 @@ jobs:
       python: "3.8"
       env: TOXENV=py38
     - stage: test
-      python: "3.8"
-      env: TOXENV=py38-nooptionals
+      python: "3.9"
+      env: TOXENV=py39
+    - stage: test
+      python: "3.9"
+      env: TOXENV=py39-nooptionals
     - stage: test
       python: "pypy"
       env: TOXENV=pypy
diff --git a/setup.py b/setup.py
index bd601542..1894847b 100644
--- a/setup.py
+++ b/setup.py
@@ -46,6 +46,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",
         "Topic :: System :: Monitoring",
diff --git a/tox.ini b/tox.ini
index 5fefa3f7..21dd09fb 100644
--- a/tox.ini
+++ b/tox.ini
@@ -1,5 +1,5 @@
 [tox]
-envlist = coverage-clean,py26,py27,py34,py35,py36,py37,py38,pypy,pypy3,{py27,py38}-nooptionals,coverage-report,flake8,isort
+envlist = coverage-clean,py26,py27,py34,py35,py36,py37,py38,py39,pypy,pypy3,{py27,py39}-nooptionals,coverage-report,flake8,isort
 
 
 [base]
@@ -40,7 +40,7 @@ deps =
     futures
 commands = coverage run --parallel -m pytest {posargs}
 
-[testenv:py38-nooptionals]
+[testenv:py39-nooptionals]
 commands = coverage run --parallel -m pytest {posargs}
 
 [testenv:coverage-clean]