diff --git a/.travis.yml b/.travis.yml
index 80117d4..c0ea705 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -23,7 +23,10 @@ matrix:
   - python: 3.5
     env:
       - "TOXENV=py35"
-  - python: 3.5
+  - python: 3.6
+    env:
+      - "TOXENV=py36"
+  - python: 3.6
     env:
       - "TOXENV=lint"
 
diff --git a/setup.py b/setup.py
index 8edebe2..b43d637 100644
--- a/setup.py
+++ b/setup.py
@@ -91,6 +91,7 @@ setup(
         'Programming Language :: Python :: 3.3',
         'Programming Language :: Python :: 3.4',
         'Programming Language :: Python :: 3.5',
+        'Programming Language :: Python :: 3.6',
         'Topic :: Internet :: WWW/HTTP :: Dynamic Content',
         'Topic :: Software Development :: Libraries :: Python Modules'
     ]
diff --git a/tox.ini b/tox.ini
index ef84916..ffd6aac 100644
--- a/tox.ini
+++ b/tox.ini
@@ -1,5 +1,5 @@
 [tox]
-envlist = py26, py27, py33, py34, py35, lint
+envlist = py26, py27, py33, py34, py35, py36, lint
 
 [testenv]
 commands =
@@ -23,6 +23,9 @@ recreate = True
 [testenv:py35]
 recreate = True
 
+[testenv:py36]
+recreate = True
+
 [testenv:lint]
 recreate = True
 commands =