diff --git a/GNUmakefile b/GNUmakefile
index 9984626b7..fac142f8b 100644
--- a/GNUmakefile
+++ b/GNUmakefile
@@ -192,7 +192,7 @@ dev: GOOS=$(shell go env GOOS)
 dev: GOARCH=$(shell go env GOARCH)
 dev: GOPATH=$(shell go env GOPATH)
 dev: DEV_TARGET=pkg/$(GOOS)_$(GOARCH)$(if $(HAS_LXC),-lxc)/nomad
-dev: check ## Build for the current development platform
+dev: ## Build for the current development platform
 	@echo "==> Removing old development build..."
 	@rm -f $(PROJECT_ROOT)/$(DEV_TARGET)
 	@rm -f $(PROJECT_ROOT)/bin/nomad
diff --git a/scripts/travis-linux.sh b/scripts/travis-linux.sh
index 4687cc7ab..4c402b797 100644
--- a/scripts/travis-linux.sh
+++ b/scripts/travis-linux.sh
@@ -1,5 +1,7 @@
 #!/usr/bin/env bash
 
+set -o errexit
+
 apt-get update
 apt-get install -y liblxc1 lxc-dev lxc shellcheck
 apt-get install -y qemu
diff --git a/scripts/travis-mac-priv.sh b/scripts/travis-mac-priv.sh
index 80e2f0d51..99fd9f7fe 100755
--- a/scripts/travis-mac-priv.sh
+++ b/scripts/travis-mac-priv.sh
@@ -1,4 +1,6 @@
 #!/usr/bin/env bash
 
+set -o errexit
+
 bash ./scripts/travis-consul.sh
 bash ./scripts/travis-vault.sh
diff --git a/scripts/travis.sh b/scripts/travis.sh
index 1a6a8a5f0..037d21fc8 100755
--- a/scripts/travis.sh
+++ b/scripts/travis.sh
@@ -8,7 +8,7 @@ PING_LOOP_PID=$!
 trap 'kill ${PING_LOOP_PID}' EXIT HUP INT QUIT TERM
 
 make check
-make checkscripts
+if [[ "$TRAVIS_OS_NAME" == "linux" ]]; then make checkscripts ; fi
 make test
 TEST_OUTPUT=$?