diff --git a/.travis.yml b/.travis.yml
index 506f3779b..52fbf02ae 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,17 +1,24 @@
 language: python
-python: 3.5
 sudo: false
 branches:
   only:
     - master
     - /^\d\.\d+$/
     - /^\d\.\d+\.\d+(rc\d+|dev\d+)?$/
-env:
- - TOXENV=py27
- - TOXENV=jessie
- - TOXENV=py33
- - TOXENV=py35
- - TOXENV=docs
+matrix:
+  include:
+    - python: 2.7
+      env: TOXENV=py27
+    - python: 2.7
+      env: TOXENV=jessie
+    - python: 3.3
+      env: TOXENV=py33
+    - python: 3.5
+      env: TOXENV=py35
+    - python: 3.6
+      env: TOXENV=py36
+    - python: 3.6
+      env: TOXENV=docs
 install:
  - pip install -U tox twine wheel codecov
 script: tox
diff --git a/setup.py b/setup.py
index f673b1dc4..388cf0dec 100644
--- a/setup.py
+++ b/setup.py
@@ -36,6 +36,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',
         'Topic :: Software Development :: Libraries :: Application Frameworks',
         'Topic :: Software Development :: Libraries :: Python Modules',
diff --git a/tox.ini b/tox.ini
index 812302b4c..bdc14a128 100644
--- a/tox.ini
+++ b/tox.ini
@@ -70,6 +70,10 @@ deps = {[testenv:py33]deps}
 basepython = python3.5
 deps = {[testenv:py33]deps}
 
+[testenv:py36]
+basepython = python3.6
+deps = {[testenv:py33]deps}
+
 [docs]
 changedir = docs
 deps =