diff --git a/.travis.yml b/.travis.yml
index 5eb0568..0569e45 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -5,6 +5,7 @@ python:
 - '3.3'
 - '3.4'
 - '3.5'
+- '3.6'
 - pypy
 install:
 - pip install coveralls
diff --git a/setup.py b/setup.py
index 03a1ddd..d088ffb 100644
--- a/setup.py
+++ b/setup.py
@@ -47,5 +47,6 @@
         'Programming Language :: Python :: 3.2',
         'Programming Language :: Python :: 3.3',
         'Programming Language :: Python :: 3.4',
+        'Programming Language :: Python :: 3.6',
     ]
 )
diff --git a/tox.ini b/tox.ini
index f5219fb..7672332 100644
--- a/tox.ini
+++ b/tox.ini
@@ -1,5 +1,5 @@
 [tox]
-envlist = flake8,py26,py27,py35
+envlist = flake8,py26,py27,py35,py36
 
 [flake8]
 ; E501: line too long (X > 79 characters)
@@ -32,3 +32,6 @@ basepython = python2.7
 
 [testenv:py35]
 basepython = python3.5
+
+[testenv:py36]
+basepython = python3.6