diff --git a/.travis.yml b/.travis.yml
index 2832910fb..07b7b3c18 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,12 +1,14 @@
 sudo: false
+dist: trusty
 language: python
 python:
-  - "3.5"
+  - "3.6"
 env:
   matrix:
     - TOX_ENV=py27
     - TOX_ENV=py34
     - TOX_ENV=py35
+    - TOX_ENV=py36
     - TOX_ENV=flake8
 cache: pip
 install:
diff --git a/tox.ini b/tox.ini
index 1a7fa65fa..38ac756b3 100644
--- a/tox.ini
+++ b/tox.ini
@@ -1,6 +1,6 @@
 [tox]
 envlist=
-    py{27,34,35},
+    py{27,34,35,36},
     flake8
 skipsdist=true
 
@@ -22,6 +22,7 @@ basepython =
     py27: python2.7
     py34: python3.4
     py35: python3.5
+    py36: python3.6
 
 [testenv:flake8]
 basepython=python