diff --git a/.travis.yml b/.travis.yml
index 523d7a0..6c875e2 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -4,11 +4,6 @@
 
 matrix:
   include:
-    - python: 3.9-dev
-      dist: bionic
-#    - python: 3.9
-#      dist: bionic
-#      env: OPTIONAL=1
     - python: 3.8
     - python: 3.7
     - python: 3.6
diff --git a/HISTORY.rst b/HISTORY.rst
index 7b5accf..8df2df1 100644
--- a/HISTORY.rst
+++ b/HISTORY.rst
@@ -4,7 +4,7 @@
 
 2.3.0 (????-??-??)
 ------------------
-* Python 3.6+ only, support for Python 3.5 has been dropped
+* Add Python 3.9 support, drop Python 3.5 support
 * Fix a file descriptor leak on subprocess execution
 
 2.2.0 (2020-09-07)
diff --git a/tox.ini b/tox.ini
index fc76a2d..3dcc731 100644
--- a/tox.ini
+++ b/tox.ini
@@ -1,9 +1,8 @@
 [tox]
-envlist = py36, py37, py38, py39, flake8
+envlist = py36, py37, py38, flake8
 
 [travis]
 python =
-    3.9: py39
     3.8: py38
     3.7: py37
     3.6: py36