diff --git a/.travis.yml b/.travis.yml
index ed84b6a8..7cc4200e 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -9,6 +9,7 @@ python:
   - "3.3"
   - "3.4"
   - "3.5"
+  - "3.6"
   - "pypy"
   - "pypy3"
 install:
diff --git a/setup.py b/setup.py
index 8f1b6640..5c24e77c 100755
--- a/setup.py
+++ b/setup.py
@@ -25,6 +25,7 @@
           "Programming Language :: Python :: 3.3",
           "Programming Language :: Python :: 3.4",
           "Programming Language :: Python :: 3.5",
+          "Programming Language :: Python :: 3.6",
       ],
       install_requires=['six'],
       )