diff --git a/.travis.yml b/.travis.yml
index 9c6aee1..eeccb04 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -21,6 +21,11 @@ env:
   - TOXENV=py35-pytest27
   - TOXENV=py35-pytest28
   - TOXENV=py35-pytest29
+  - TOXENV=py35-pytest30
+  - TOXENV=py36-pytest27
+  - TOXENV=py36-pytest28
+  - TOXENV=py36-pytest29
+  - TOXENV=py36-pytest30
   - TOXENV=py27-pytest28-pexpect
   - TOXENV=py35-pytest28-pexpect
   - TOXENV=flakes
diff --git a/tox.ini b/tox.ini
index e40ff80..e7be4d9 100644
--- a/tox.ini
+++ b/tox.ini
@@ -1,10 +1,10 @@
 [tox]
 # if you change the envlist, please update .travis.yml file as well
 envlist=
-  py{26,27,34,35}-pytest{27,28,29,30}
+  py{26,27,34,35,36}-pytest{27,28,29,30}
   py{27,35}-pytest28-pexpect
   flakes
-  readme  
+  readme
 
 
 [testenv]
@@ -20,7 +20,7 @@ deps =
   pytest30: pytest~=3.0.5
   pexpect: pexpect
 platform=
-  pexpect: linux|darwin    
+  pexpect: linux|darwin
 commands=
   # always clean to avoid code unmarshal mismatch on old python/pytest
   py.cleanup -aq