diff --git a/.travis.yml b/.travis.yml
index 61d3d8806..41dd46154 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,14 +1,12 @@
 language: generic
 before_install:
     - sh package/linux/travis-decrypt-key
-    - if [ "${TRAVIS_OS_NAME}" = "osx" ]; then ( sudo Xvfb :99 -ac -screen 0 1024x768x8; echo ok )& fi
-    - if [ "${TRAVIS_OS_NAME}" = "linux" ]; then sh -e /etc/init.d/xvfb start; fi
 script:
     - bash package/linux/travis-setup.sh
     - mkdir build && cd build
     - cmake -DBOOST_ROOT=$BOOST_DIR -DSLIC3R_STATIC=ON ../src
     - cmake --build .
-    - ctest .
+    - xvfb-run ctest .
 branches:
   only:
   - master