diff --git a/.travis.yml b/.travis.yml
index e10837f..39948ff 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -31,6 +31,8 @@ matrix:
       env: TOXENV=pypy3
     - python: pypy
       env: TOXENV=pypy
+    - python: 3.6-dev
+      env: TOXENV=py36dev
   allow_failures:
     - env: TOXENV=pypy
     - env: TOXENV=pypy3
diff --git a/tox.ini b/tox.ini
index 6347575..1cfc777 100644
--- a/tox.ini
+++ b/tox.ini
@@ -1,5 +1,5 @@
 [tox]
-envlist = py27, py36, py35, py34, pypy, pypy3
+envlist = py27, py36, py35, py34, pypy, pypy3, py36dev
 recreate = False
 
 [testenv]