diff --git a/.travis.yml b/.travis.yml
index fa107f05..45903817 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,7 +1,47 @@
-{
-  "os": "osx",
-  "language": "node_js",
-  "sudo": false,
-  "node_js": "node",
-  "script": "npm run release"
-}
+osx_image: xcode7.3
+
+sudo: required
+dist: trusty
+
+language: c
+
+matrix:
+  include:
+    - os: osx
+    - os: linux
+      env: CC=clang CXX=clang++ npm_config_clang=1
+      compiler: clang
+
+cache:
+  directories:
+  - node_modules
+  - app/node_modules
+  - $HOME/.electron
+  - $HOME/.cache
+
+addons:
+  apt:
+    packages:
+      - libgnome-keyring-dev
+      - icnsutils
+      - graphicsmagick
+      - xz-utils
+      - rpm
+      - bsdtar
+
+before_install:
+  - mkdir -p /tmp/git-lfs && curl -L https://github.com/github/git-lfs/releases/download/v1.2.1/git-lfs-$([ "$TRAVIS_OS_NAME" == "linux" ] && echo "linux" || echo "darwin")-amd64-1.2.1.tar.gz | tar -xz -C /tmp/git-lfs --strip-components 1 && /tmp/git-lfs/git-lfs pull
+  - if [[ "$TRAVIS_OS_NAME" == "linux" ]]; then export DISPLAY=:99.0; sh -e /etc/init.d/xvfb start; sleep 3; fi
+
+install:
+- nvm install 6
+- npm install electron-builder@next # force install next version to test electron-builder
+- npm install
+- npm prune
+
+script:
+- npm run release
+
+branches:
+  except:
+    - "/^v\\d+\\.\\d+\\.\\d+$/"
diff --git a/package.json b/package.json
index d91a165b..08c92211 100644
--- a/package.json
+++ b/package.json
@@ -109,7 +109,7 @@
     "start": "concurrently --kill-others --raw \"npm run dev\" \"electron app\"",
     "dev": "webpack -w",
     "build": "NODE_ENV=production webpack",
-    "test": "npm run pack && xo && ava",
+    "test": "npm run dist && xo && ava",
     "prepublish": "npm test",
     "prepush": "npm test",
     "postinstall": "install-app-deps",