diff --git a/.travis.yml b/.travis.yml
index c80b8fce..562bae5a 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -3,7 +3,7 @@
 # URL: https://github.com/asrob-uc3m/robotDevastation
 
 language: cpp
-dist: trusty
+dist: xenial
 
 os:
   - linux
@@ -44,6 +44,9 @@ addons:
     - lcov
     - doxygen
 
+services:
+  - xvfb
+
 branches:
   except:
   - /^.*appveyor.*$/
@@ -104,11 +107,6 @@ before_script:
   - cmake --build . --target install
   - export YARP_DATA_DIRS=$PWD/install/share/rd:$YARP_DATA_DIRS
 
-  # SDL stuff
-  - "export DISPLAY=:99.0"
-  - "sh -e /etc/init.d/xvfb start"
-  - sleep 3 # give xvfb some time to start
-
 script:
   - bin/testDeadState
   - bin/testFSMBuilder