diff --git a/.travis.yml b/.travis.yml
index dab96759..fb0d225c 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -8,7 +8,10 @@ jobs:
   - stage: Unit tests
     name: Linux (gcc 6)
     os: linux
+    dist: xenial
     env: COMPILER=g++-6
+    services:
+    - xvfb
     addons:
       apt:
         sources:
@@ -17,6 +20,7 @@ jobs:
         - g++-6
         - libudev-dev
         - libxrandr-dev
+        - libgl1-mesa-dev
     cache:
       directories:
       - $HOME/SFML-2.5.0_LINUX
@@ -28,6 +32,7 @@ jobs:
   - stage: Cross-platform tests
     name: Linux (gcc 4.9)
     os: linux
+    dist: xenial
     env: COMPILER=g++-4.9
     addons:
       apt:
@@ -37,6 +42,7 @@ jobs:
         - g++-4.9
         - libudev-dev
         - libxrandr-dev
+        - libgl1-mesa-dev
     cache:
       ccache: true
       directories:
diff --git a/tests/travis_linux_tests.sh b/tests/travis_linux_tests.sh
index 880d11f4..519281bb 100644
--- a/tests/travis_linux_tests.sh
+++ b/tests/travis_linux_tests.sh
@@ -3,8 +3,6 @@ set -eo pipefail
 export SFML_VERSION=2.5.0
 export SFML_ROOT=$HOME/SFML-${SFML_VERSION}_LINUX
 export BUILD_FOLDER=build_$CXX
-export DISPLAY=:99.0
-sh -e /etc/init.d/xvfb start
 
 if [[ ! -d "$SFML_ROOT/lib" ]]; then
   echo "$(tput setaf 3)Rebuilding SFML: no cache available$(tput sgr 0)"