diff --git a/.travis.yml b/.travis.yml
index b405c31..2a74125 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -8,6 +8,10 @@ matrix:
             python: 3.6
         -   env: TOXENV=pypy
             python: pypy-5.7.1
+        -   env: TOXENV=py36-pytest-master
+            python: 3.6
+        -   env: TOXENV=py36-pytest-features
+            python: 3.6
         -   env:
             -   TOXENV=push
             -   secure: "AEAcy7+XgLUgpW7T8Qccmf39su1PVVoZEov+v9e1cPXdUEvZK2C96AdrHFIsc4J5x8kfU7doUM6sxxaLxVPNR0nyxbTckRq3r70YNlCn43VzyCHzAHQ4pZI/Pr+ys6jlAjXQjCfWrm1ttS0X7zyuBSJwRn7mnKkzKt19QHa8AoXD2hx78AjvVkHlLKm/TKBPCcPbAyTZjfaMsaSBmgyjv8l6q+Hw2E6j20M2FsjGIVtucV1zGUwYjZQSCQjzdzZUCjPYfFuUfV+0/UFCUe1dGvsA/hc3G9ZBN4CYfPNQzwB0wqaTyaR9aQVyDj2QRpYu2Nl0O4SPjmh5xOBJGQc6OjjqrlRrL7BVF+ZvfdwUe1Tf8fj3iC2tNIb1qywZuFVF5xmVsVo23Cm2gvnZdaCk48PAGXi555icBDjpzfypO/0PUANyx26rmbJ/Dadc/802aoCAx8L/BapO7efidT+TYtpW9WEa5VqnNiLMth7oJAacTGNvdoOxXLZV91gS2mofcPNC2x5BWu5/SM3mxoo8MVzF0PEXarLRaE6M8aHRAEawJfMwtyOCypDD018AjTYw+ca7eSV/f7yU8SQuRQxfEanVN1LN9DeBJ0L28DQxC7+lwosdbxQd3SxgPjWbGS2LobCTZ9+gJAWr8ohTK8uXZl3amY6Ve04sGuC0R3vWnQk="
diff --git a/pygments_pytest.py b/pygments_pytest.py
index d9159d1..026476a 100644
--- a/pygments_pytest.py
+++ b/pygments_pytest.py
@@ -38,7 +38,7 @@ def filename_line(self, match):
         'progress_line': [
             (r'^[^ ]+ (?=[^ \n]+ +\[)', pygments.token.Text),
             (r'PASSED|\.', Color.Green),
-            (r'SKIPPED|XPASS|xfail|s|X|x', Color.Yellow),
+            (r'SKIPPED|XPASS|XFAIL|xfail|s|X|x', Color.Yellow),
             (r'ERROR|FAILED|E|F', Color.Red),
             (r'\[ *\d+%\]', Color.Cyan),
             (r' +', pygments.token.Text),
diff --git a/tox.ini b/tox.ini
index 450211e..c50af80 100644
--- a/tox.ini
+++ b/tox.ini
@@ -1,6 +1,6 @@
 [tox]
 # These should match the travis env list
-envlist = py27,py35,py36,pypy
+envlist = py27,py35,py36,pypy,py36-pytest-master,py36-pytest-features
 
 [testenv]
 deps = -rrequirements-dev.txt
@@ -11,6 +11,16 @@ commands =
     pre-commit install -f --install-hooks
     pre-commit run --all-files
 
+[testenv:py36-pytest-master]
+commands =
+    pip install --upgrade git+https://github.com/pytest-dev/pytest@master
+    {[testenv]commands}
+
+[testenv:py36-pytest-features]
+commands =
+    pip install --upgrade git+https://github.com/pytest-dev/pytest@features
+    {[testenv]commands}
+
 [testenv:push]
 passenv = TRAVIS_* GH_TOKEN
 commands =