diff --git a/.travis.yml b/.travis.yml
index 65014cd..9d831a3 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -6,6 +6,8 @@ python:
   - "3.4"
   - "3.5"
   - "3.6"
+  - "3.7"
+  - "3.8"
   - "nightly"
 matrix:
   allow_failures:
diff --git a/setup.py b/setup.py
index 3aa8294..49c11ce 100644
--- a/setup.py
+++ b/setup.py
@@ -33,6 +33,8 @@
         'Programming Language :: Python :: 3.4',
         'Programming Language :: Python :: 3.5',
         'Programming Language :: Python :: 3.6',
+        'Programming Language :: Python :: 3.7',
+        'Programming Language :: Python :: 3.8',
         'Topic :: Communications',
         'Topic :: Internet'
     ],
diff --git a/tox.ini b/tox.ini
index e959bf2..a00e051 100644
--- a/tox.ini
+++ b/tox.ini
@@ -9,6 +9,7 @@ envlist =
     py35,
     py36,
     py37,
+    py38,
     coverage,
     flake8,
     check-manifest