diff --git a/.travis.yml b/.travis.yml
index 731343e2..184d3d4d 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,38 +1,44 @@
 sudo: false
 language: python
-python:
-    - '2.6'
-    - '2.7'
-    - '3.3'
-    - '3.4'
-    - '3.5'
-    - '3.6'
-    - pypy
-    - nightly
-
-# command to install dependencies
-install: "pip install -U tox"
-
-# command to run tests
-env:
-  matrix:
-    - TOXENV=py-pytest28
-    - TOXENV=py-pytest29
-    - TOXENV=py-pytest30
 
 matrix:
   include:
-    - python: '2.7'
-      env: TOXENV=check
     - python: '3.6'
       env: TOXENV=check
+    - python: '3.6'
+      env: TOXENV=docs
+    - python: '2.6'
+      env: TOXENV=py26-pytestrelease
     - python: '2.7'
-      env: TOXENV=benchmark
+      env: TOXENV=py27-pytestrelease
+    - python: '3.3'
+      env: TOXENV=py33-pytestrelease
+    - python: '3.4'
+      env: TOXENV=py34-pytestrelease
+    - python: '3.5'
+      env: TOXENV=py35-pytestrelease
+    - python: '3.6'
+      env: TOXENV=py36-pytestrelease
+    - python: 'pypy'
+      env: TOXENV=pypy-pytestrelease
+    - python: 'nightly'
+      env: TOXENV=py37-pytestrelease
+    - python: '2.7'
+      env: TOXENV=py27-pytestmaster
+    - python: '2.7'
+      env: TOXENV=py27-pytestfeatures
+    - python: '3.6'
+      env: TOXENV=py36-pytestmaster
+    - python: '3.6'
+      env: TOXENV=py36-pytestfeatures
     - python: '3.6'
       env: TOXENV=benchmark
 
+install:
+  - pip install -U tox
+
 script:
- - tox --recreate -e $TOXENV
+  - tox
 
 notifications:
   irc:
diff --git a/appveyor.yml b/appveyor.yml
index d6026ebe..c1b2fee2 100644
--- a/appveyor.yml
+++ b/appveyor.yml
@@ -1,3 +1,18 @@
+environment:
+  matrix:
+  # note: please use "tox --listenvs" to populate the build matrix below
+  - TOXENV: "check"
+  - TOXENV: "docs"
+  - TOXENV: "py26-pytestrelease"
+  - TOXENV: "py27-pytestrelease"
+  - TOXENV: "py34-pytestrelease"
+  - TOXENV: "py35-pytestrelease"
+  - TOXENV: "py36-pytestrelease"
+  - TOXENV: "pypy-pytestrelease"
+  - TOXENV: "py27-pytestmaster"
+  - TOXENV: "py27-pytestfeatures"
+  - TOXENV: "py36-pytestmaster"
+  - TOXENV: "py36-pytestfeatures"
 
 install:
   - echo Installed Pythons
@@ -18,4 +33,3 @@ build: false  # Not a C# project, build stuff at the test step instead.
 
 test_script:
   - C:\Python35\python -m tox
-  
\ No newline at end of file
diff --git a/tox.ini b/tox.ini
index 29921dfe..a564bbe9 100644
--- a/tox.ini
+++ b/tox.ini
@@ -1,12 +1,12 @@
 [tox]
-envlist=check,py{26,27,34,35,36,py}-pytest{28,29,30}
+envlist=check,docs,py{26,27,34,35,36,py}-pytestrelease,py{27,36}-pytest{master,features}
 
 [testenv]
 commands=py.test {posargs:testing/}
 deps=
-  pytest28: pytest~=2.8.0
-  pytest29: pytest~=2.9.0
-  pytest30: pytest~=3.0.0
+  pytestrelease: pytest
+  pytestmaster: git+https://github.com/pytest-dev/pytest.git@master
+  pytestfeatures: git+https://github.com/pytest-dev/pytest.git@features
 
 [testenv:benchmark]
 commands=py.test {posargs:testing/benchmark.py}