diff --git a/.travis.yml b/.travis.yml
index e1989ea..b2ebc79 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -5,6 +5,7 @@ env: # These should match the tox env list
     - TOXENV=py33
     - TOXENV=py34
     - TOXENV=pypy
+    - TOXENV=pypy3
 install: pip install coveralls tox --use-mirrors
 script: tox
 after_success:
diff --git a/setup.py b/setup.py
index 662c497..d7f1baa 100644
--- a/setup.py
+++ b/setup.py
@@ -14,10 +14,13 @@ setup(
     platforms='linux',
     classifiers=[
         'License :: OSI Approved :: MIT License',
+        'Programming Language :: Python :: 2',
         'Programming Language :: Python :: 2.6',
         'Programming Language :: Python :: 2.7',
+        'Programming Language :: Python :: 3',
         'Programming Language :: Python :: 3.3',
         'Programming Language :: Python :: 3.4',
+        'Programming Language :: Python :: Implementation :: CPython',
         'Programming Language :: Python :: Implementation :: PyPy',
     ],
 
diff --git a/tox.ini b/tox.ini
index 4b043ba..b37a773 100644
--- a/tox.ini
+++ b/tox.ini
@@ -1,7 +1,7 @@
 [tox]
 project = pre_commit_hooks
 # These should match the travis env list
-envlist = py26,py27,py33,py34,pypy
+envlist = py26,py27,py33,py34,pypy,pypy3
 
 [testenv]
 install_command = pip install --use-wheel {opts} {packages}