diff --git a/.travis.yml b/.travis.yml
index 5b069b3..3ce1a8b 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -4,6 +4,7 @@ python:
   - "2.7"
   - "3.4"
   - "3.5"
+  - "3.6"
 
 install:
     - pip install -r requirements.txt
diff --git a/setup.py b/setup.py
index f6f7a26..01dd791 100644
--- a/setup.py
+++ b/setup.py
@@ -35,5 +35,6 @@ def long_description():
         'Programming Language :: Python :: 2.7',
         'Programming Language :: Python :: 3.4',
         'Programming Language :: Python :: 3.5',
+        'Programming Language :: Python :: 3.6',
     ]
 )