diff --git a/setup.cfg b/setup.cfg
index acafbc5..e8bb254 100644
--- a/setup.cfg
+++ b/setup.cfg
@@ -15,9 +15,12 @@ classifier =
     Programming Language :: Python
     Programming Language :: Python :: 2
     Programming Language :: Python :: 2.7
-    Programming Language :: Python :: 2.6
     Programming Language :: Python :: 3
     Programming Language :: Python :: 3.4
+    Programming Language :: Python :: 3.5
+    Programming Language :: Python :: 3.6
+    Programming Language :: Python :: Implementation :: CPython
+    Programming Language :: Python :: Implementation :: PyPy
     Topic :: Software Development :: Testing
 test_suite = requests_mock.tests
 
diff --git a/tox.ini b/tox.ini
index 33d2606..7849611 100644
--- a/tox.ini
+++ b/tox.ini
@@ -1,5 +1,5 @@
 [tox]
-envlist = py34,py27,pypy,pep8
+envlist = py36,py35,py34,py27,pypy,pep8
 
 [testenv]
 setenv =