diff --git a/.travis.yml b/.travis.yml
index b0f50a6..842c761 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,5 +1,6 @@
 language: python
 python:
+    - "3.6"
     - "3.5"
     - "3.4"
     - "3.3"
diff --git a/setup.py b/setup.py
index 7d19226..b0f590c 100644
--- a/setup.py
+++ b/setup.py
@@ -42,6 +42,7 @@ __classifiers__ = [
     "Programming Language :: Python :: 3.3",
     "Programming Language :: Python :: 3.4",
     "Programming Language :: Python :: 3.5",
+    "Programming Language :: Python :: 3.6",
     "Programming Language :: Python :: Implementation :: PyPy",
 ]