diff --git a/.travis.yml b/.travis.yml
index 6714320662..c9c551ffb7 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -22,6 +22,9 @@ matrix:
     - python: 3.7
       dist: xenial
       sudo: true
+    - python: 3.8
+      dist: xenial
+      sudo: true
 
 cache: pip
 before_install:
diff --git a/setup.py b/setup.py
index c62ab875fc..247b8542d2 100644
--- a/setup.py
+++ b/setup.py
@@ -86,5 +86,6 @@ def find_version(*file_paths):
         'Programming Language :: Python :: 3.5',
         'Programming Language :: Python :: 3.6',
         'Programming Language :: Python :: 3.7',
+        'Programming Language :: Python :: 3.8',
     ]
 )
diff --git a/tox.ini b/tox.ini
index 17e3fb91a9..d18b11722a 100644
--- a/tox.ini
+++ b/tox.ini
@@ -1,5 +1,5 @@
 [tox]
-envlist = py26,py27,py33,py34,py35,py36
+envlist = py26,py27,py33,py34,py35,py36,py37,py38
 
 skipsdist = True