diff --git a/.travis.yml b/.travis.yml
index 378976586..e5fed42a2 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -3,12 +3,13 @@ rvm:
   - ree
 
 before_script:
+  - "sudo cp config/ci/xvfb /etc/init.d/xvfb"
+  - "sh -e /etc/init.d/xvfb start"
   - "sass --update public/stylesheets/sass/:public/stylesheets/"
   - "cp config/database.yml.example config/database.yml"
   - "rake db:create"
   - "rake db:schema:load"
   - "rspec spec --tag fixture"
-  - "sh -e /etc/init.d/xvfb start"
 script: "bundle exec rake travis"
 env: "TRAVIS=true"
 notifications:
diff --git a/config/ci/xvfb b/config/ci/xvfb
new file mode 100644
index 000000000..0809a83a9
--- /dev/null
+++ b/config/ci/xvfb
@@ -0,0 +1,28 @@
+# Copyright (c) 2010, Diaspora Inc.  This file is
+# licensed under the Affero General Public License version 3 or later.  See
+# the COPYRIGHT file.
+
+XVFB=/usr/bin/Xvfb
+XVFBARGS=":99 -ac -screen 0 1024x768x16"
+PIDFILE=/root/cucumber_xvfb_99.pid
+case "$1" in
+  start)
+    echo -n "Starting virtual X frame buffer: Xvfb"
+    /sbin/start-stop-daemon --start --quiet --pidfile $PIDFILE --make-pidfile --background --exec $XVFB -- $XVFBARGS
+    echo "."
+    ;;
+  stop)
+    echo -n "Stopping virtual X frame buffer: Xvfb"
+    /sbin/start-stop-daemon --stop --quiet --pidfile $PIDFILE
+    rm -f $PIDFILE
+    echo "."
+    ;;
+  restart)
+    $0 stop
+    $0 start
+    ;;
+  *)
+  echo "Usage: /etc/init.d/xvfb {start|stop|restart}"
+  exit 1
+esac
+exit 0
\ No newline at end of file