diff --git a/setup.cfg b/setup.cfg
index 113f6b7..45d5db7 100644
--- a/setup.cfg
+++ b/setup.cfg
@@ -13,8 +13,6 @@ classifier =
     License :: OSI Approved :: Apache Software License
     Operating System :: POSIX :: Linux
     Programming Language :: Python
-    Programming Language :: Python :: 2
-    Programming Language :: Python :: 2.7
     Programming Language :: Python :: 3
     Programming Language :: Python :: 3.3
     Programming Language :: Python :: 3.4
diff --git a/tox.ini b/tox.ini
index 85d8bb6..e5baf7f 100644
--- a/tox.ini
+++ b/tox.ini
@@ -1,6 +1,6 @@
 [tox]
 minversion = 1.6
-envlist = pep8,py35,py27,listapitests
+envlist = pep8,py35,py36,listapitests
 skipsdist = True
 
 [testenv]