diff --git a/.travis.yml b/.travis.yml
index 6bdf5d0f..42513e8f 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -14,19 +14,18 @@ env:
   - TRAVIS_NODE_VERSION="0.8"
   - TRAVIS_NODE_VERSION="0.10"
   - TRAVIS_NODE_VERSION="0.12"
-  - TRAVIS_NODE_VERSION="iojs-1"
-  - TRAVIS_NODE_VERSION="iojs-2"
   - TRAVIS_NODE_VERSION="iojs-3"
+  - TRAVIS_NODE_VERSION="4"
 notifications:
   email:
     - rod@vagg.org
 install:
-  - rm -rf ~/.nvm && git clone https://github.com/creationix/nvm.git ~/.nvm && source ~/.nvm/nvm.sh && nvm install $TRAVIS_NODE_VERSION
+  - rm -rf ~/.nvm && git clone https://github.com/creationix/nvm.git ~/.nvm && (cd ~/.nvm && git checkout `git describe --abbrev=0 --tags`) && source ~/.nvm/nvm.sh && nvm install $TRAVIS_NODE_VERSION
   - npm install npm
   - mv node_modules npm
   - npm/.bin/npm --version
   - if [[ $TRAVIS_OS_NAME == "linux" ]]; then export CXX=g++-4.8; fi
   - $CXX --version
   - npm/.bin/npm install
-  - if [[ $TRAVIS_NODE_VERSION == "0.8" ]]; then node_modules/.bin/node-gyp rebuild --directory test; else node_modules/.bin/pangyp rebuild --directory test; fi
+  - node_modules/.bin/node-gyp rebuild --directory test
 script: node_modules/.bin/tap --gc test/js/*-test.js
diff --git a/appveyor.yml b/appveyor.yml
index 1378d310..d23774ae 100644
--- a/appveyor.yml
+++ b/appveyor.yml
@@ -7,21 +7,18 @@ environment:
     - nodejs_version: "0.8"
     - nodejs_version: "0.10"
     - nodejs_version: "0.12"
-  # io.js
-    - nodejs_version: "1"
-    - nodejs_version: "2"
     - nodejs_version: "3"
+    - nodejs_version: "4"
 
 # Install scripts. (runs after repo cloning)
 install:
   # Get the latest stable version of Node 0.STABLE.latest
-  - ps: if($env:nodejs_version -eq "0.8") {Install-Product node $env:nodejs_version}
-  - ps: if($env:nodejs_version -ne "0.8") {Update-NodeJsInstallation (Get-NodeJsLatestBuild $env:nodejs_version)}
+  - ps: {Install-Product node $env:nodejs_version}
   - IF %nodejs_version% LSS 1 npm -g install npm
   - IF %nodejs_version% LSS 1 set PATH=%APPDATA%\npm;%PATH%
   # Typical npm stuff.
   - npm install
-  - IF %nodejs_version% EQU 0.8 (node node_modules\node-gyp\bin\node-gyp.js rebuild --msvs_version=2013 --directory test) ELSE (npm run rebuild-tests)
+  - npm run rebuild-tests
 
 # Post-install test scripts.
 test_script:
@@ -29,7 +26,7 @@ test_script:
   - node --version
   - npm --version
   # run tests
-  - IF %nodejs_version% LSS 1 (npm test) ELSE (iojs node_modules\tap\bin\tap.js --gc test/js/*-test.js)
+  - IF %nodejs_version% LSS 1 (npm test) ELSE (IF %nodejs_version% LSS 4 (iojs node_modules\tap\bin\tap.js --gc test/js/*-test.js) ELSE (node node_modules\tap\bin\tap.js --gc test/js/*-test.js))
 
 # Don't actually build.
 build: off
diff --git a/package.json b/package.json
index 07fdb0a2..3f3c9154 100644
--- a/package.json
+++ b/package.json
@@ -9,7 +9,7 @@
   },
   "scripts": {
     "test": "tap --gc test/js/*-test.js",
-    "rebuild-tests": "pangyp rebuild --msvs_version=2013 --directory test",
+    "rebuild-tests": "node-gyp rebuild --msvs_version=2013 --directory test",
     "docs": "doc/.build.sh"
   },
   "contributors": [
@@ -26,7 +26,6 @@
     "commander": "^2.8.1",
     "glob": "^5.0.14",
     "node-gyp": "~3.0.1",
-    "pangyp": "~2.2.0",
     "tap": "~0.7.1",
     "xtend": "~4.0.0"
   },
diff --git a/test/binding.gyp b/test/binding.gyp
index e3d3f6c5..dfc1765e 100644
--- a/test/binding.gyp
+++ b/test/binding.gyp
@@ -22,8 +22,9 @@
       , "sources"     : [ "cpp/news.cpp" ]
     }
   , {
-        "target_name" : "morenews"
-      , "sources"     : [ "cpp/morenews.cpp" ]
+        "target_name"         : "morenews"
+      , "win_delay_load_hook" : "false"
+      , "sources"             : [ "cpp/morenews.cpp" ]
     }
   , {
         "target_name" : "returnvalue"