diff --git a/.travis.yml b/.travis.yml
index 42f485cf2..40aa38c9d 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -8,8 +8,10 @@ dist: trusty
 install:
   - yarn install
 script:
+  - yarn run generate
+  - ./node_modules/.bin/build --em.environment=$SIGNAL_ENV --config.mac.bundleVersion='$TRAVIS_BUILD_NUMBER' --publish=never
+  - grunt test-release:$TRAVIS_OS_NAME
   - yarn test
-  - yarn ci-build
 env:
   global:
     - SIGNAL_ENV: production
@@ -21,4 +23,4 @@ notifications:
 addons:
   artifacts:
     paths:
-      - $(ls ./dist/*.zip | tr "\n" ":")
+      - $(ls ./dist/*.* | tr "\n" ":")
diff --git a/Gruntfile.js b/Gruntfile.js
index 6d0a30ead..163c15b51 100644
--- a/Gruntfile.js
+++ b/Gruntfile.js
@@ -217,8 +217,8 @@ module.exports = function(grunt) {
         cmd: 'tx pull'
       }
     },
-    release: {
-      mac: {
+    'test-release': {
+      osx: {
         archive: 'mac/Signal.app/Contents/Resources/app.asar',
       },
       mas: {
diff --git a/appveyor.yml b/appveyor.yml
index 379a31561..f827b716b 100644
--- a/appveyor.yml
+++ b/appveyor.yml
@@ -10,14 +10,16 @@ install:
   - ps: Install-Product node 6 x64
   - yarn install
 
+build_script:
+  - yarn run generate
+  - ./node_modules/.bin/build --em.environment=%SIGNAL_ENV% --publish=never
+
 test_script:
+  - ./node_modules/.bin/grunt test-release:win
   - yarn test
 
-build_script:
-  - yarn ci-build
-
 artifacts:
-  - path: dist/*.zip
+  - path: dist/*.*
 
 environment:
   SIGNAL_ENV: production
diff --git a/package.json b/package.json
index 22c23f4dc..90bad87ec 100644
--- a/package.json
+++ b/package.json
@@ -39,7 +39,6 @@
     "icon-gen": "electron-icon-maker --input=images/icon_1024.png --output=./build",
     "generate": "npm run icon-gen && grunt",
     "build": "build --em.environment=$SIGNAL_ENV",
-    "ci-build": "npm run generate && npm run build -- --config.mac.bundleVersion='$TRAVIS_BUILD_NUMBER' --config.mac.target=zip --config.win.target=zip --config.linux.target=zip --publish=never",
     "dist": "npm run generate && npm run build",
     "pack": "npm run dist -- --dir",
     "pack-prod": "SIGNAL_ENV=production npm run pack",
@@ -72,6 +71,10 @@
         "zip"
       ],
       "artifactName": "${productName}-${version}.${ext}",
+      "target": [
+        "dmg",
+        "zip"
+      ],
       "bundleVersion": "1"
     },
     "win": {
@@ -83,11 +86,16 @@
         "bucket": "updates.signal.org",
         "path": "desktop",
         "acl": "public-read"
-      }
+      },
+      "target": [
+        "nsis",
+        "zip"
+      ]
     },
     "linux": {
       "target": [
-        "deb"
+        "deb",
+        "zip"
       ],
       "icon": "build/icons/png"
     },