diff --git a/.travis.yml b/.travis.yml
index 3fb16c9f9..aa23e7287 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -4,6 +4,7 @@ python:
   - "3.3"
   - "3.4"
   - "3.5"
+  - "3.6"
   - "pypy"
   - "pypy3"
 branches:
diff --git a/setup.py b/setup.py
index 77973c948..b82b557cb 100644
--- a/setup.py
+++ b/setup.py
@@ -53,4 +53,5 @@ with codecs.open('README.rst', 'r', 'utf-8') as fd:
               'Programming Language :: Python :: 3.3',
               'Programming Language :: Python :: 3.4',
               'Programming Language :: Python :: 3.5',
+              'Programming Language :: Python :: 3.6'
           ],)