diff --git a/.travis.yml b/.travis.yml
index 0556b050fd..929a103d02 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -5,6 +5,7 @@ python:
   - "3.3"
   - "3.4"
   - "3.5"
+  - "3.6"
 sudo: false
 before_install:
   - if [ "$TRAVIS_PULL_REQUEST" != "false" ] && [ "$TRAVIS_BRANCH" == "master" ]; then
diff --git a/setup.py b/setup.py
index 8f7aa2d4d7..b4664d6ac6 100644
--- a/setup.py
+++ b/setup.py
@@ -55,5 +55,6 @@ def get_version():
         'Programming Language :: Python :: 3.3',
         'Programming Language :: Python :: 3.4',
         'Programming Language :: Python :: 3.5',
+        'Programming Language :: Python :: 3.6',
     ],
 )
diff --git a/tox.ini b/tox.ini
index 062af501c0..48da853b69 100644
--- a/tox.ini
+++ b/tox.ini
@@ -1,5 +1,5 @@
 [tox]
-envlist = py26,py27,py33,py34,py35
+envlist = py26,py27,py33,py34,py35,py36
 
 # Comment to build sdist and install into virtualenv
 # This is helpful to test installation but takes extra time