diff --git a/.travis.yml b/.travis.yml
index 16b46b7..f63bfeb 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,6 +1,15 @@
 sudo: false
 language: node_js
 node_js:
-  - '5'
-  - '4'
-  - '0.10'
+  - "0.10"
+  - "0.12"
+  - "4"
+  - "5"
+  - "iojs"
+before_install:
+  - if [ "$TRAVIS_NODE_VERSION" = "0.10" ]; then npm install -g npm@2; fi
+matrix:
+  fast_finish: true
+cache:
+  directories:
+    - node_modules
diff --git a/appveyor.yml b/appveyor.yml
index 7ad5008..a196c5e 100644
--- a/appveyor.yml
+++ b/appveyor.yml
@@ -1,28 +1,44 @@
-# AppVeyor file
 # http://www.appveyor.com/docs/appveyor-yml
 
-version: "{build}"
-
 clone_depth: 10
 
+version: "{build}"
+
+# What combinations to test
 environment:
   matrix:
-    - nodejs_version: "5"
-    - nodejs_version: "4"
     - nodejs_version: "0.10"
+      platform: x86
+    - nodejs_version: "0.12"
+      platform: x86
+    - nodejs_version: "4"
+      platform: x64
+    - nodejs_version: "4"
+      platform: x86
+    - nodejs_version: "5"
+      platform: x86
 
 install:
-  - ps: Install-Product node $env:nodejs_version
+  - ps: Install-Product node $env:nodejs_version $env:platform
+  - ps: >-
+      if ($env:nodejs_version -eq "0.10") {
+        npm -g install npm@2
+        $env:PATH="$env:APPDATA\npm;$env:PATH"
+      }
   - npm install
 
-build: off
-
 test_script:
+  # Output useful info for debugging
   - node --version && npm --version
-  - npm test
+  # We test multiple Windows shells because of prior stdout buffering issues
+  # filed against Grunt. https://github.com/joyent/node/issues/3584
+  - ps: "npm test # PowerShell" # Pass comment to PS for easier debugging
+  - cmd: npm test
+
+build: off
 
 matrix:
   fast_finish: true
 
 cache:
-  - 'node_modules -> package.json'              # local npm modules
+  - node_modules -> package.json