diff --git a/.travis.yml b/.travis.yml
index bbc03d856..c4699ec4b 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -32,6 +32,9 @@ matrix:
   allow_failures:
     # py35-trial failing on Linux: #1989
     - env: TESTENV=py35-trial
+  include:
+    - env: TESTENV=py36
+      python: '3.6-dev'
 
 script: tox --recreate -e $TESTENV
 
diff --git a/tox.ini b/tox.ini
index f3494e8be..a5dec3fdc 100644
--- a/tox.ini
+++ b/tox.ini
@@ -9,6 +9,7 @@ envlist=
      py33
      py34
      py35
+     py36
      pypy
      {py27,py35}-{pexpect,xdist,trial}
      py27-nobyte