diff --git a/.travis.yml b/.travis.yml
index e97890f13..f99bf1a2f 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -3,7 +3,7 @@ sudo: required
 language: node_js
 
 node_js:
-- '4'
+- '6'
 
 cache:
   directories:
@@ -43,6 +43,7 @@ before_install:
 - if [ "$CROSSDOCK" = "1" ]; then make install_docker_ci ; fi
 # Install the Node version to test against
 - nvm install $TEST_NODE_VERSION
+# Switch back to build-time Node version
 - nvm use $TRAVIS_NODE_VERSION
 
 before_script:
@@ -50,10 +51,11 @@ before_script:
 - nvm use $TEST_NODE_VERSION
 - node --version
 - rm -rf ./node_modules package-lock.json
+- grep -v husky package.json > package.json-no-jusky
+- mv package.json-no-jusky package.json
 - npm install --no-optional
 - if nvm ls-remote --lts | grep "$(nvm current)"; then echo "running on a LTS node version, linting"; npm run lint; else echo "running on a non-LTS node version, skipping linting"; fi
 
-
 script:
 - if [ "$CROSSDOCK" != "1" ]; then make test-without-build; fi
 - if [ "$COVER" = "1" ]; then npm run coveralls; fi
diff --git a/Makefile b/Makefile
index 6ea3c462a..cc0d05dfa 100644
--- a/Makefile
+++ b/Makefile
@@ -1,5 +1,12 @@
 -include crossdock/rules.mk
 
+NODE_VER=$(shell node -v)
+ifeq ($(patsubst v6.%,v6,$(NODE_VER)), v6)
+	NODE_6=true
+else
+	NODE_6=false
+endif
+
 .PHONY: publish
 publish: build-node
 	npm version $(shell ./scripts/version_prompt.sh)
@@ -17,8 +24,13 @@ test-without-build:
 	npm run test-all
 	npm run check-license
 
+.PHONY: check-node-6
+check-node-6:
+	@$(NODE_6) || echo Build requires Node 6.x
+	@$(NODE_6) && echo Building using Node 6.x
+
 .PHONY: build-node
-build-node: node_modules
+build-node: check-node-6 node_modules
 	rm -rf ./dist/
 	node_modules/.bin/babel --presets env --plugins transform-class-properties --source-maps -d dist/src/ src/
 	node_modules/.bin/babel --presets env --plugins transform-class-properties --source-maps -d dist/test/ test/
diff --git a/package.json b/package.json
index 02d84771b..f91a7dfee 100644
--- a/package.json
+++ b/package.json
@@ -42,6 +42,7 @@
     "express": "^4.14.0",
     "flow-bin": "^0.30.0",
     "gulp-sourcemaps": "1.7.x",
+    "husky": "^0.14.3",
     "lint-staged": "^6.0.0",
     "lodash": "^4.15.0",
     "minimist": "1.2.0",