diff --git a/.travis.yml b/.travis.yml
index b56804c3..f7af5ffe 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -9,10 +9,9 @@ python:
 install: pip install tox-travis setuptools_scm
 matrix:
   include:
-  # note: please use "tox --listenvs" to populate the build matrix
-  - python: "3.5"
+  - python: "3.6"
     env: TOXENV=flakes
-  - python: "3.5"
+  - python: "3.6"
     env: TOXENV=readme
 
 script: tox
diff --git a/appveyor.yml b/appveyor.yml
index 139b0e05..f80350a0 100644
--- a/appveyor.yml
+++ b/appveyor.yml
@@ -2,19 +2,29 @@ environment:
   matrix:
   # note: please use "tox --listenvs" to populate the build matrix
   - TOXENV: "py26-pytest30"
+  - TOXENV: "py26-pytest31"
+  - TOXENV: "py26-pytestmaster"
   - TOXENV: "py27-pytest30"
+  - TOXENV: "py27-pytest31"
+  - TOXENV: "py27-pytestmaster"
   - TOXENV: "py34-pytest30"
+  - TOXENV: "py34-pytest31"
+  - TOXENV: "py34-pytestmaster"
   - TOXENV: "py35-pytest30"
+  - TOXENV: "py35-pytest31"
+  - TOXENV: "py35-pytestmaster"
   - TOXENV: "py36-pytest30"
-  - TOXENV: "py27-pytest30-pexpect"
-  - TOXENV: "py35-pytest30-pexpect"
+  - TOXENV: "py36-pytest31"
+  - TOXENV: "py36-pytestmaster"
+  - TOXENV: "py27-pytest31-pexpect"
+  - TOXENV: "py35-pytest31-pexpect"
   - TOXENV: "flakes"
   - TOXENV: "readme"
 
 install:
-  - C:\Python35\python -m pip install tox setuptools_scm
+  - C:\Python36\python -m pip install tox setuptools_scm
 
 build: false  # Not a C# project, build stuff at the test step instead.
 
 test_script:
-  - C:\Python35\python -m tox
+  - C:\Python36\python -m tox
diff --git a/tox.ini b/tox.ini
index 4bae876d..4576db44 100644
--- a/tox.ini
+++ b/tox.ini
@@ -1,8 +1,8 @@
 [tox]
 # if you change the envlist, please update .travis.yml file as well
 envlist=
-  py{26,27,34,35,36}-pytest{30}
-  py{27,35}-pytest{30}-pexpect
+  py{26,27,34,35,36}-pytest{30,31,master}
+  py{27,35}-pytest{31}-pexpect
   flakes
   readme
 
@@ -14,7 +14,9 @@ deps =
   pycmd
   # to avoid .eggs
   setuptools_scm
-  pytest30: pytest~=3.0.5
+  pytest30: pytest~=3.0.0
+  pytest31: pytest~=3.1.0
+  pytestmaster: git+https://github.com/pytest-dev/pytest@master
   pexpect: pexpect
 platform=
   pexpect: linux|darwin