diff --git a/.travis.yml b/.travis.yml
index 0901f493..48d9bbe8 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,15 +1,13 @@
 language: python
 
-python:
-    - "3.7-dev"
-env:
-    - COVERAGE="no"
-
 matrix:
     include:
       - python: 3.6
+        env: COVERAGE="no"
+      - python: 3.7
         env: COVERAGE="yes"
-
+      - python: 3.8
+        env: COVERAGE="no"
 
 before_install:
     - pip install --upgrade pip setuptools
diff --git a/setup.py b/setup.py
index 3a895c6a..c307e6a8 100644
--- a/setup.py
+++ b/setup.py
@@ -127,6 +127,7 @@ def get_datafiles():
         "License :: OSI Approved :: BSD License",
         "Programming Language :: Python :: 3.6",
         "Programming Language :: Python :: 3.7",
+        "Programming Language :: Python :: 3.8",
         "Operating System :: MacOS :: MacOS X",
         "Operating System :: Microsoft :: Windows",
         "Operating System :: POSIX :: BSD :: FreeBSD",
diff --git a/tox.ini b/tox.ini
index eff7595c..d060a371 100644
--- a/tox.ini
+++ b/tox.ini
@@ -1,5 +1,5 @@
 [tox]
-envlist = py36, py37
+envlist = py36, py37, py38
 
 [testenv]
 commands = {envpython} setup.py test