diff --git a/.travis.yml b/.travis.yml
index c6bd679981..4e4b1c0085 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -5,6 +5,9 @@ language: python
 
 matrix:
   include:
+    - python: 3.8
+      env:
+        - TOXENV=py38
     - python: 3.7
       env:
         - TOXENV=py37
diff --git a/DEVELOPMENT_GUIDE.rst b/DEVELOPMENT_GUIDE.rst
index c9f0d0294f..b0be211784 100755
--- a/DEVELOPMENT_GUIDE.rst
+++ b/DEVELOPMENT_GUIDE.rst
@@ -17,7 +17,7 @@ steps manually.
 
 1. Install Python Versions
 ~~~~~~~~~~~~~~~~~~~~~~~~~~
-Our officially supported Python versions are 2.7, 3.6, and 3.7. Follow the idioms from this `excellent cheatsheet`_ to
+Our officially supported Python versions are 2.7, 3.6, 3.7 and 3.8. Follow the idioms from this `excellent cheatsheet`_ to
 make sure your code is compatible with both Python 2.7 and 3 versions.
 
 Setup Python locally using `pyenv`_
diff --git a/setup.py b/setup.py
index 5928475c58..6956719239 100755
--- a/setup.py
+++ b/setup.py
@@ -77,6 +77,9 @@ def read_requirements(req='base.txt'):
         'Operating System :: OS Independent',
         'Programming Language :: Python',
         'Programming Language :: Python :: 2.7',
+        'Programming Language :: Python :: 3.6',
+        'Programming Language :: Python :: 3.7',
+        'Programming Language :: Python :: 3.8',
         'Topic :: Internet',
         'Topic :: Software Development :: Build Tools',
         'Topic :: Utilities'
diff --git a/tox.ini b/tox.ini
index 7a4d5af96e..6fc4e4feb8 100644
--- a/tox.ini
+++ b/tox.ini
@@ -4,7 +4,7 @@
 # and then run "tox" from this directory.
 
 [tox]
-envlist = py27, py36, py37
+envlist = py27, py36, py37, py38
 
 [testenv:py27]
 # Set this environment variable **only** for Python2.7. In Py >= 3.3, the hash seed property was set to a random