diff --git a/.travis.yml b/.travis.yml
index b4e82fcb..c70b24b8 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -6,6 +6,7 @@ python:
     - "3.3"
     - "3.4"
     - "3.5"
+    - "3.6"
     - "pypy"
 
 env:
diff --git a/setup.py b/setup.py
index 0560e67b..7ae76e18 100755
--- a/setup.py
+++ b/setup.py
@@ -31,5 +31,6 @@
           "Programming Language :: Python :: 3.3",
           "Programming Language :: Python :: 3.4",
           "Programming Language :: Python :: 3.5",
+          "Programming Language :: Python :: 3.6",
           "Programming Language :: Python :: Implementation :: CPython",
           "Programming Language :: Python :: Implementation :: PyPy"])