diff --git a/setup.py b/setup.py
index 47d0156..37ffe65 100644
--- a/setup.py
+++ b/setup.py
@@ -17,6 +17,7 @@
     'Programming Language :: Python',
     'Programming Language :: Python :: 3',
     'Programming Language :: Python :: 3.5',
+    'Programming Language :: Python :: 3.6',
 )
 
 
diff --git a/tox.ini b/tox.ini
index ff3af8b..ed53e11 100644
--- a/tox.ini
+++ b/tox.ini
@@ -1,10 +1,11 @@
 [tox]
-envlist = py34, py35, flake8
+envlist = py34, py35, py36, flake8
 
 [testenv]
 basepython =
     py34: python3.4
     py35: python3.5
+    py36: python3.6
 commands = python setup.py test
 
 [testenv:flake8]