diff --git a/.travis.yml b/.travis.yml
index e7d9b833..941bde84 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,3 +1,4 @@
+dist: xenial
 sudo: false
 language: python
 cache: pip
@@ -6,6 +7,9 @@ python:
   - 3.4
   - 3.5
   - 3.6
+  - 3.7
+  - pypy2.7-6.0
+  - pypy3.5-6.0
 install:
   - pip install -r requirements.txt
   - pip install requests-mock
diff --git a/setup.py b/setup.py
index 07ac0a0b..2e5fec03 100644
--- a/setup.py
+++ b/setup.py
@@ -59,6 +59,9 @@ def readall(path):
         'Programming Language :: Python :: 3.4',
         'Programming Language :: Python :: 3.5',
         'Programming Language :: Python :: 3.6',
+        'Programming Language :: Python :: 3.7',
+        'Programming Language :: Python :: Implementation :: CPython',
+        'Programming Language :: Python :: Implementation :: PyPy',
     ],
     zip_safe=False,
     tests_require=[
diff --git a/tox.ini b/tox.ini
index 2cb582d4..e8116663 100644
--- a/tox.ini
+++ b/tox.ini
@@ -1,5 +1,5 @@
 [tox]
-envlist = py27, py34, py35, py36, pypy
+envlist = py27, py34, py35, py36, py37, pypy, pypy3
 
 [testenv]
 deps=