diff --git a/appveyor.yml b/appveyor.yml
index 6a22ea18..41fc2df6 100644
--- a/appveyor.yml
+++ b/appveyor.yml
@@ -5,22 +5,27 @@ environment:
   - TOXENV: "py26-pytest28"
   - TOXENV: "py26-pytest29"
   - TOXENV: "py26-pytest30"
+  - TOXENV: "py26-pytest31"
   - TOXENV: "py27-pytest27"
   - TOXENV: "py27-pytest28"
   - TOXENV: "py27-pytest29"
   - TOXENV: "py27-pytest30"
+  - TOXENV: "py27-pytest31"
   - TOXENV: "py34-pytest27"
   - TOXENV: "py34-pytest28"
   - TOXENV: "py34-pytest29"
   - TOXENV: "py34-pytest30"
+  - TOXENV: "py34-pytest31"
   - TOXENV: "py35-pytest27"
   - TOXENV: "py35-pytest28"
   - TOXENV: "py35-pytest29"
   - TOXENV: "py35-pytest30"
+  - TOXENV: "py35-pytest31"
   - TOXENV: "py36-pytest27"
   - TOXENV: "py36-pytest28"
   - TOXENV: "py36-pytest29"
   - TOXENV: "py36-pytest30"
+  - TOXENV: "py36-pytest31"
   - TOXENV: "py27-pytest28-pexpect"
   - TOXENV: "py35-pytest28-pexpect"
   - TOXENV: "flakes"
diff --git a/tox.ini b/tox.ini
index e7be4d9d..7bb36b98 100644
--- a/tox.ini
+++ b/tox.ini
@@ -1,7 +1,7 @@
 [tox]
 # if you change the envlist, please update .travis.yml file as well
 envlist=
-  py{26,27,34,35,36}-pytest{27,28,29,30}
+  py{26,27,34,35,36}-pytest{27,28,29,30,31}
   py{27,35}-pytest28-pexpect
   flakes
   readme
@@ -18,6 +18,7 @@ deps =
   pytest28: pytest~=2.8.7
   pytest29: pytest~=2.9.2
   pytest30: pytest~=3.0.5
+  pytest31: pytest~=3.1.2
   pexpect: pexpect
 platform=
   pexpect: linux|darwin