diff --git a/.travis.yml b/.travis.yml
index 596678236..a966a9f12 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -29,6 +29,10 @@ matrix:
 
 sudo: false
 
+before_script:
+  - export DISPLAY=:99.0
+  - sh -e /etc/init.d/xvfb start
+
 install:
   - echo $CC
   - echo $CXX
@@ -52,3 +56,4 @@ addons:
     - g++-4.8
     - git
     - libgnome-keyring-dev
+    - xvfb
diff --git a/build/Gruntfile.coffee b/build/Gruntfile.coffee
index e00010834..6d24d6270 100644
--- a/build/Gruntfile.coffee
+++ b/build/Gruntfile.coffee
@@ -362,7 +362,7 @@ module.exports = (grunt) ->
   ciTasks = ['output-disk-space', 'download-electron', 'build']
   ciTasks.push('dump-symbols') if process.platform isnt 'win32'
   ciTasks.push('set-version', 'lint', 'generate-asar')
-  ciTasks.push('test') if process.platform is 'darwin'
+  ciTasks.push('test') if process.platform isnt 'win32'
 
   unless process.env.TRAVIS
     ciTasks.push('codesign')