diff --git a/.travis.yml b/.travis.yml
index b31d0f6211d..b9328355985 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -20,12 +20,7 @@ jobs:
         '{extends: default, rules: {line-length: {level: warning, max: 120}}}' 
         ./examples/ ./installer/
       name: YAML lint
-    - script: >
-        docker run -v $(pwd):/workdir:ro
-        --entrypoint sh quay.io/coreos/shellcheck-alpine:v0.5.0
-        -c 'for file in $(find /workdir/ -type f -name "*.sh"); do
-        if ! shellcheck --format=gcc $file; then export FAILED=true; fi; done;
-        if [ "$FAILED" != "" ]; then exit 1; fi'
+    - script: ./hack/shellcheck.sh
       name: shellcheck
     - script: "docker run -v $PWD:/go/src/github.com/openshift/installer -w /go/src/github.com/openshift/installer quay.io/coreos/golang-testing go vet ./installer/..."
       name: Go vet
diff --git a/hack/shellcheck.sh b/hack/shellcheck.sh
new file mode 100755
index 00000000000..509a6d97293
--- /dev/null
+++ b/hack/shellcheck.sh
@@ -0,0 +1,6 @@
+#!/bin/sh
+if [ "$IS_CONTAINER" != "" ]; then
+  find "${1:-.}" -type f -name '*.sh' -exec shellcheck --format=gcc {} \+
+else
+  docker run -e IS_CONTAINER='TRUE' --rm -v "$(pwd)":/workdir:ro --entrypoint sh quay.io/coreos/shellcheck-alpine:v0.5.0 /workdir/hack/shellcheck.sh /workdir;
+fi;