diff --git a/.travis.yml b/.travis.yml
index a1a73fd4b..e4a951e69 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -14,19 +14,19 @@ sudo: false
 
 env:
   matrix:
-    - export NODE_VERSION="4" TARGET_ARCH="x64"
-    - export NODE_VERSION="6.5" TARGET_ARCH="x64"
+    - export NODE_VERSION="stable" TARGET_ARCH="x64"
     - export NODE_VERSION="7.4" TARGET_ARCH="x64"
+    - export NODE_VERSION="6.5" TARGET_ARCH="x64"
 
 matrix:
   fast_finish: true
   include:
     - os: linux
-      env: export NODE_VERSION="4" TARGET_ARCH="ia32"
-    - os: linux
-      env: export NODE_VERSION="6.5" TARGET_ARCH="ia32"
+      env: export NODE_VERSION="stable" TARGET_ARCH="ia32"
     - os: linux
       env: export NODE_VERSION="7.4" TARGET_ARCH="ia32"
+    - os: linux
+      env: export NODE_VERSION="6.5" TARGET_ARCH="ia32"
 
 git:
   depth: 1
@@ -67,7 +67,7 @@ before_install:
     fi
 
 install:
-  - npm install;
+  - travis_retry npm install;
 
 # This is a random private key used purely for testing.
 before_script:
@@ -82,9 +82,9 @@ before_script:
 
 script:
     if [ -z "$TRAVIS_TAG" ] && [ $TRAVIS_OS_NAME == "linux" ] && [ $NODE_VERSION == "6" ]; then
-      npm test && npm run cov && npm run coveralls;
+      travis_retry npm test && npm run cov && npm run coveralls;
     else
-      npm test;
+      travis_retry npm test;
     fi
 
 after_success:
diff --git a/appveyor.yml b/appveyor.yml
index de193e255..29c146a61 100644
--- a/appveyor.yml
+++ b/appveyor.yml
@@ -27,9 +27,9 @@ environment:
   GYP_MSVS_VERSION: 2013
   matrix:
     # Node.js
-    - nodejs_version: "4"
-    - nodejs_version: "6"
+    - nodejs_version: "stable"
     - nodejs_version: "7"
+    - nodejs_version: "6"
 
 matrix:
   fast_finish: true
@@ -40,12 +40,12 @@ install:
   - ps: Start-Process c:\projects\nodegit\vendor\pageant.exe c:\projects\nodegit\vendor\private.ppk
   - npm install -g npm
   - cmd: npm install -g node-gyp
-  - npm install
+  - appveyor-retry call npm install
 
 test_script:
   - node --version
   - npm --version
-  - cmd: npm test
+  - appveyor-retry call npm test
 
 on_success:
   - IF %APPVEYOR_REPO_TAG%==true npm install -g node-pre-gyp