diff --git a/0.10/Dockerfile b/0.10/Dockerfile
index 0420e017f..618eb3838 100644
--- a/0.10/Dockerfile
+++ b/0.10/Dockerfile
@@ -6,7 +6,7 @@ FROM buildpack-deps:jessie
 RUN gpg --keyserver pool.sks-keyservers.net --recv-keys 7937DFD2AB06298B2293C3187D33FF9D0246406D 114F43EE0176B71C7BC219DD50A3051F888C628D
 
 ENV NODE_VERSION 0.10.38
-ENV NPM_VERSION 2.8.4
+ENV NPM_VERSION 2.9.0
 
 RUN curl -SLO "http://nodejs.org/dist/v$NODE_VERSION/node-v$NODE_VERSION-linux-x64.tar.gz" \
 	&& curl -SLO "http://nodejs.org/dist/v$NODE_VERSION/SHASUMS256.txt.asc" \
diff --git a/0.10/slim/Dockerfile b/0.10/slim/Dockerfile
index bc6f90607..02d4a3664 100644
--- a/0.10/slim/Dockerfile
+++ b/0.10/slim/Dockerfile
@@ -6,7 +6,7 @@ FROM debian:jessie
 RUN gpg --keyserver pool.sks-keyservers.net --recv-keys 7937DFD2AB06298B2293C3187D33FF9D0246406D 114F43EE0176B71C7BC219DD50A3051F888C628D
 
 ENV NODE_VERSION 0.10.38
-ENV NPM_VERSION 2.8.4
+ENV NPM_VERSION 2.9.0
 
 RUN buildDeps='curl' \
 	&& set -x \
diff --git a/0.10/wheezy/Dockerfile b/0.10/wheezy/Dockerfile
index c4e08aece..cb73bd765 100644
--- a/0.10/wheezy/Dockerfile
+++ b/0.10/wheezy/Dockerfile
@@ -6,7 +6,7 @@ FROM buildpack-deps:wheezy
 RUN gpg --keyserver pool.sks-keyservers.net --recv-keys 7937DFD2AB06298B2293C3187D33FF9D0246406D 114F43EE0176B71C7BC219DD50A3051F888C628D
 
 ENV NODE_VERSION 0.10.38
-ENV NPM_VERSION 2.8.4
+ENV NPM_VERSION 2.9.0
 
 RUN curl -SLO "http://nodejs.org/dist/v$NODE_VERSION/node-v$NODE_VERSION-linux-x64.tar.gz" \
 	&& curl -SLO "http://nodejs.org/dist/v$NODE_VERSION/SHASUMS256.txt.asc" \
diff --git a/0.12/Dockerfile b/0.12/Dockerfile
index 21ca12e04..bd29daf2e 100644
--- a/0.12/Dockerfile
+++ b/0.12/Dockerfile
@@ -6,7 +6,7 @@ FROM buildpack-deps:jessie
 RUN gpg --keyserver pool.sks-keyservers.net --recv-keys 7937DFD2AB06298B2293C3187D33FF9D0246406D 114F43EE0176B71C7BC219DD50A3051F888C628D
 
 ENV NODE_VERSION 0.12.2
-ENV NPM_VERSION 2.8.4
+ENV NPM_VERSION 2.9.0
 
 RUN curl -SLO "http://nodejs.org/dist/v$NODE_VERSION/node-v$NODE_VERSION-linux-x64.tar.gz" \
 	&& curl -SLO "http://nodejs.org/dist/v$NODE_VERSION/SHASUMS256.txt.asc" \
diff --git a/0.12/slim/Dockerfile b/0.12/slim/Dockerfile
index c8f192113..8ccb6e047 100644
--- a/0.12/slim/Dockerfile
+++ b/0.12/slim/Dockerfile
@@ -6,7 +6,7 @@ FROM debian:jessie
 RUN gpg --keyserver pool.sks-keyservers.net --recv-keys 7937DFD2AB06298B2293C3187D33FF9D0246406D 114F43EE0176B71C7BC219DD50A3051F888C628D
 
 ENV NODE_VERSION 0.12.2
-ENV NPM_VERSION 2.8.4
+ENV NPM_VERSION 2.9.0
 
 RUN buildDeps='curl' \
 	&& set -x \
diff --git a/0.12/wheezy/Dockerfile b/0.12/wheezy/Dockerfile
index 661d4a3e6..b4907ccaa 100644
--- a/0.12/wheezy/Dockerfile
+++ b/0.12/wheezy/Dockerfile
@@ -6,7 +6,7 @@ FROM buildpack-deps:wheezy
 RUN gpg --keyserver pool.sks-keyservers.net --recv-keys 7937DFD2AB06298B2293C3187D33FF9D0246406D 114F43EE0176B71C7BC219DD50A3051F888C628D
 
 ENV NODE_VERSION 0.12.2
-ENV NPM_VERSION 2.8.4
+ENV NPM_VERSION 2.9.0
 
 RUN curl -SLO "http://nodejs.org/dist/v$NODE_VERSION/node-v$NODE_VERSION-linux-x64.tar.gz" \
 	&& curl -SLO "http://nodejs.org/dist/v$NODE_VERSION/SHASUMS256.txt.asc" \
diff --git a/0.8/Dockerfile b/0.8/Dockerfile
index 0883f1f96..fe0de669e 100644
--- a/0.8/Dockerfile
+++ b/0.8/Dockerfile
@@ -6,7 +6,7 @@ FROM buildpack-deps:jessie
 RUN gpg --keyserver pool.sks-keyservers.net --recv-keys 7937DFD2AB06298B2293C3187D33FF9D0246406D 114F43EE0176B71C7BC219DD50A3051F888C628D
 
 ENV NODE_VERSION 0.8.28
-ENV NPM_VERSION 2.8.4
+ENV NPM_VERSION 2.9.0
 
 RUN curl -SLO "http://nodejs.org/dist/v$NODE_VERSION/node-v$NODE_VERSION-linux-x64.tar.gz" \
 	&& curl -SLO "http://nodejs.org/dist/v$NODE_VERSION/SHASUMS256.txt.asc" \
diff --git a/0.8/slim/Dockerfile b/0.8/slim/Dockerfile
index 37d0da32c..653667752 100644
--- a/0.8/slim/Dockerfile
+++ b/0.8/slim/Dockerfile
@@ -6,7 +6,7 @@ FROM debian:jessie
 RUN gpg --keyserver pool.sks-keyservers.net --recv-keys 7937DFD2AB06298B2293C3187D33FF9D0246406D 114F43EE0176B71C7BC219DD50A3051F888C628D
 
 ENV NODE_VERSION 0.8.28
-ENV NPM_VERSION 2.8.4
+ENV NPM_VERSION 2.9.0
 
 RUN buildDeps='curl' \
 	&& set -x \
diff --git a/0.8/wheezy/Dockerfile b/0.8/wheezy/Dockerfile
index 24b3b9413..012ad119b 100644
--- a/0.8/wheezy/Dockerfile
+++ b/0.8/wheezy/Dockerfile
@@ -6,7 +6,7 @@ FROM buildpack-deps:wheezy
 RUN gpg --keyserver pool.sks-keyservers.net --recv-keys 7937DFD2AB06298B2293C3187D33FF9D0246406D 114F43EE0176B71C7BC219DD50A3051F888C628D
 
 ENV NODE_VERSION 0.8.28
-ENV NPM_VERSION 2.8.4
+ENV NPM_VERSION 2.9.0
 
 RUN curl -SLO "http://nodejs.org/dist/v$NODE_VERSION/node-v$NODE_VERSION-linux-x64.tar.gz" \
 	&& curl -SLO "http://nodejs.org/dist/v$NODE_VERSION/SHASUMS256.txt.asc" \
diff --git a/test-build.sh b/test-build.sh
new file mode 100755
index 000000000..af96e7d77
--- /dev/null
+++ b/test-build.sh
@@ -0,0 +1,37 @@
+#!/usr/bin/env bash
+#
+# Run a test build for all images.
+
+set -uo pipefail
+IFS=$'\n\t'
+
+DOCKERFILES=$(find . -name Dockerfile)
+
+info() {
+  printf "%s\n" "$@"
+}
+
+fatal() {
+  printf "**********\n"
+  printf "%s\n" "$@"
+  printf "**********\n"
+  exit 1
+}
+
+for DOCKERFILE in $DOCKERFILES ; do
+  TAG=$(echo $DOCKERFILE | sed 's/Dockerfile//g')
+  info "=========="
+  info "Building $TAG..."
+  docker build -q $TAG
+  if [[ $? -gt 0 ]]; then
+    fatal "Build of $TAG failed!"
+  else
+    info "Build of $TAG succeeded"
+  fi
+done
+
+info "All builds successful!"
+info "Dockerfiles:"
+info "$DOCKERFILES"
+
+exit 0