diff --git a/npm/.npmignore b/npm/.npmignore
index fe67adfa7c33..de77ba146f1b 100644
--- a/npm/.npmignore
+++ b/npm/.npmignore
@@ -1,2 +1,8 @@
 dist/
 path.txt
+.npmignore
+.travis.yml
+appveyor.yml
+CONTRIBUTING.md
+issue_template.md
+test/
diff --git a/npm/.travis.yml b/npm/.travis.yml
index 991d04b6e227..1d8c1a38f11e 100644
--- a/npm/.travis.yml
+++ b/npm/.travis.yml
@@ -1,5 +1,15 @@
+os:
+- linux
+- osx
 language: node_js
 node_js:
-  - '0.10'
-  - '0.12'
-  - 'iojs'
+- '0.10'
+- '0.12'
+- '4'
+- '5'
+- '6'
+branches:
+  only:
+  - master
+install:
+  - npm --silent install
diff --git a/npm/README.md b/npm/README.md
index 8657b4c083b6..b649e2beee88 100644
--- a/npm/README.md
+++ b/npm/README.md
@@ -1,6 +1,7 @@
 # electron-prebuilt
 
-[![build status](http://img.shields.io/travis/electron-userland/electron-prebuilt.svg?style=flat)](http://travis-ci.org/electron-userland/electron-prebuilt)
+[![Travis build status](http://img.shields.io/travis/electron-userland/electron-prebuilt.svg?style=flat)](http://travis-ci.org/electron-userland/electron-prebuilt)
+[![AppVeyor build status](https://ci.appveyor.com/api/projects/status/qd978ky9axl8m1m1?svg=true)](https://ci.appveyor.com/project/Atom/electron-prebuilt)
 
 [![badge](https://nodei.co/npm/electron-prebuilt.png?downloads=true)](https://www.npmjs.com/package/electron-prebuilt)
 
diff --git a/npm/appveyor.yml b/npm/appveyor.yml
new file mode 100644
index 000000000000..abe461df8e8a
--- /dev/null
+++ b/npm/appveyor.yml
@@ -0,0 +1,25 @@
+build: off
+
+branches:
+  only:
+    - master
+
+environment:
+  matrix:
+  - nodejs_version: "0.10"
+  - nodejs_version: "0.12"
+  - nodejs_version: "4"
+  - nodejs_version: "5"
+  - nodejs_version: "6"
+
+skip_tags: true
+
+install:
+  - ps: Install-Product node $env:nodejs_version
+  - npm install npm
+  - .\node_modules\.bin\npm install
+
+test_script:
+  - node --version
+  - .\node_modules\.bin\npm --version
+  - .\node_modules\.bin\npm test
diff --git a/npm/install.js b/npm/install.js
index 5ec84203b8b8..e6a273a5ad33 100755
--- a/npm/install.js
+++ b/npm/install.js
@@ -36,7 +36,13 @@ if (installedVersion === version && fs.existsSync(path.join(__dirname, paths[pla
 }
 
 // downloads if not cached
-download({version: version, platform: process.env.npm_config_platform, arch: process.env.npm_config_arch, strictSSL: process.env.npm_config_strict_ssl === 'true'}, extractFile)
+download({
+  version: version,
+  platform: process.env.npm_config_platform,
+  arch: process.env.npm_config_arch,
+  strictSSL: process.env.npm_config_strict_ssl === 'true',
+  quiet: process.env.npm_config_loglevel === 'silent'
+}, extractFile)
 
 // unzips and makes path.txt point at the correct executable
 function extractFile (err, zipPath) {
diff --git a/npm/package.json b/npm/package.json
index 8e14ca2bd567..cf1b6fd5d1c8 100644
--- a/npm/package.json
+++ b/npm/package.json
@@ -6,8 +6,8 @@
   "scripts": {
     "cache-clean": "rm -rf ~/.electron && rm -rf dist",
     "postinstall": "node install.js",
-    "pretest": "npm run cache-clean && node install.js",
-    "test": "standard && tape test/*.js"
+    "pretest": "npm run cache-clean && npm --silent run postinstall",
+    "test": "tape test/*.js && standard"
   },
   "bin": {
     "electron": "cli.js"
@@ -15,11 +15,11 @@
   "main": "index.js",
   "dependencies": {
     "extract-zip": "^1.0.3",
-    "electron-download": "^2.0.0"
+    "electron-download": "^3.0.0"
   },
   "devDependencies": {
     "home-path": "^0.1.1",
-    "path-exists": "^1.0.0",
+    "path-exists": "^2.0.0",
     "standard": "^5.4.1",
     "tape": "^3.0.1"
   },
@@ -31,4 +31,4 @@
   "keywords": [
     "electron"
   ]
-}
\ No newline at end of file
+}