diff --git a/.travis.yml b/.travis.yml
index bbc03d856ce..0a039c316a7 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -16,6 +16,7 @@ env:
     - TESTENV=py33
     - TESTENV=py34
     - TESTENV=py35
+    - TESTENV=py36
     - TESTENV=pypy
     - TESTENV=py27-pexpect
     - TESTENV=py27-xdist
diff --git a/appveyor.yml b/appveyor.yml
index a42aa16dc80..cc72b4b7053 100644
--- a/appveyor.yml
+++ b/appveyor.yml
@@ -15,6 +15,7 @@ environment:
   - TOXENV: "py33"
   - TOXENV: "py34"
   - TOXENV: "py35"
+  - TOXENV: "py36"
   - TOXENV: "pypy"
   - TOXENV: "py27-pexpect"
   - TOXENV: "py27-xdist"
diff --git a/tox.ini b/tox.ini
index f3494e8be72..a5dec3fdc5a 100644
--- a/tox.ini
+++ b/tox.ini
@@ -9,6 +9,7 @@ envlist=
      py33
      py34
      py35
+     py36
      pypy
      {py27,py35}-{pexpect,xdist,trial}
      py27-nobyte