diff --git a/.travis.yml b/.travis.yml
index 97c578aa..1d569a76 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -16,6 +16,9 @@ matrix:
       env: TOXENV=py37
       dist: xenial
       sudo: true
+    - python: pypy3
+      env: TOXENV=pypy3
+      dist: xenial
     - python: 3.8-dev
       env: TOXENV=py38-dev
       dist: xenial
diff --git a/setup.py b/setup.py
index 31d173f6..8d79fb7a 100644
--- a/setup.py
+++ b/setup.py
@@ -26,6 +26,8 @@ CLASSIFIERS = [
     'Programming Language :: Python :: 3.6',
     'Programming Language :: Python :: 3.7',
     'Programming Language :: Python :: 3 :: Only',
+    'Programming Language :: Python :: Implementation :: CPython',
+    'Programming Language :: Python :: Implementation :: PyPy',
     'Topic :: Internet',
     'Topic :: Utilities',
     'Topic :: Software Development :: Libraries :: Python Modules',
diff --git a/tox.ini b/tox.ini
index 47249d6e..96388fa7 100644
--- a/tox.ini
+++ b/tox.ini
@@ -1,5 +1,5 @@
 [tox]
-envlist = py34, py35, py36, py37, py38-dev, pypy, lint
+envlist = py34, py35, py36, py37, py38-dev, pypy3, lint
 skipsdist = True
 
 [testenv]