diff --git a/README.asciidoc b/README.asciidoc
index 3d7c4a276..a4632f27e 100644
--- a/README.asciidoc
+++ b/README.asciidoc
@@ -148,8 +148,8 @@ Contributors, sorted by the number of commits in descending order:
 * Alexander Cogneau
 * Martin Tournoij
 * Raphael Pierzina
-* Joel Torstensson
 * Felix Van der Jeugt
+* Joel Torstensson
 * Claude
 * Patric Schmitz
 * meles5
diff --git a/tests/conftest.py b/tests/conftest.py
index 29e383996..ed617b854 100644
--- a/tests/conftest.py
+++ b/tests/conftest.py
@@ -172,7 +172,7 @@ def pytest_configure(config):
         try:
             disp = xvfbwrapper.Xvfb(width=800, height=600, colordepth=16)
             disp.start()
-        except FileNotFoundError:
+        except EnvironmentError:
             # We run without Xvfb if it's unavailable.
             pass
         else: