diff --git a/.travis.yml b/.travis.yml
index bd496ce4a771..6bdf028d3fdd 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,6 +1,7 @@
 language: node_js
 node_js:
   - "6"
+  - "7"
 cache:
   directories:
     - node_modules
diff --git a/deploy/deploy.sh b/deploy/deploy.sh
index e26e86a7ea40..8212742a6ab8 100644
--- a/deploy/deploy.sh
+++ b/deploy/deploy.sh
@@ -3,26 +3,37 @@
 
 set -e
 
-# Only run tests for PRs
-if [ "$TRAVIS_PULL_REQUEST" != "false" ]; then
-  echo "deploy.sh: This is a PR build - only running tests"
+function tests {
   npm run test-docs
   VERSIONED=false npm run web-dist
   exit 0
+}
+
+function build {
+  npm run docs
+  VERSIONED=false npm run web-dist
+}
+
+# For PRs or Node 7, only run tests
+if [ "$TRAVIS_PULL_REQUEST" != "false" ]; then
+  echo -e "\e[36m\e[4m\e[1mThis is a PR build - only running tests"
+  tests
+fi
+if [ "$TRAVIS_NODE_VERSION" != "6" ]; then
+  echo -e "\e[36m\e[4m\e[1mThis is a Node v$TRAVIS_NODE_VERSION build - only running tests"
+  tests
 fi
 
 # Figure out the source of the build
 if [ -n "$TRAVIS_TAG" ]; then
-  echo "deploy.sh: This is a tag build for $TRAVIS_TAG"
+  echo -e "\e[36m\e[4m\e[1mThis is a tag build for $TRAVIS_TAG"
   SOURCE=$TRAVIS_TAG
 else
-  echo "deploy.sh: This is a branch build for $TRAVIS_BRANCH"
+  echo -e "\e[36m\e[4m\e[1mThis is a branch build for $TRAVIS_BRANCH"
   SOURCE=$TRAVIS_BRANCH
 fi
 
-# Build everything
-npm run docs
-VERSIONED=false npm run web-dist
+build
 
 # Initialise some useful variables
 REPO=`git config remote.origin.url`