diff --git a/setup.py b/setup.py
index ac283ece4..00913d858 100644
--- a/setup.py
+++ b/setup.py
@@ -36,7 +36,7 @@
         'Programming Language :: Python',
         'Operating System :: OS Independent',
         'Programming Language :: Python :: 2.7',
-        'Programming Language :: Python :: 3.3',
+        'Programming Language :: Python :: 3.6',
         'License :: OSI Approved :: MIT License',
     ],
     extras_require={
diff --git a/tox.ini b/tox.ini
index fff79d147..d2f1be577 100644
--- a/tox.ini
+++ b/tox.ini
@@ -2,7 +2,7 @@
 exclude = .tox,docs,build
 
 [tox]
-envlist = py26,py27,py33,py34,py35,pypy
+envlist = py26,py27,py33,py34,py35,py36,pypy
 
 [testenv]
 deps = -rrequirements-dev.txt