diff --git a/.travis.yml b/.travis.yml
index 2eea4624b4f..b115b76bec5 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -12,8 +12,8 @@ branches:
 jobs:
   include:
     - stage: Lint & Test
+      script: ./hack/tf-lint.sh
       name: Terraform lint
-      script: docker run -v $(pwd):/data -t quay.io/coreos/tflint
     - script: ./hack/yaml-lint.sh
       name: YAML lint
     - script: ./hack/shellcheck.sh
diff --git a/hack/tf-lint.sh b/hack/tf-lint.sh
new file mode 100755
index 00000000000..6c04df04647
--- /dev/null
+++ b/hack/tf-lint.sh
@@ -0,0 +1,6 @@
+#!/bin/sh
+if [ "$IS_CONTAINER" != "" ]; then
+  tflint
+else
+  docker run -t --rm -v "$(pwd)":/data --env IS_CONTAINER='TRUE' --entrypoint sh quay.io/coreos/tflint ./hack/tf-lint.sh
+fi;