diff --git a/.travis.yml b/.travis.yml
index 85c77d4..b243645 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -25,8 +25,7 @@ install:
   - chmod +x /tmp/urchin/package/urchin
   - '[ -z "$WITHOUT_CURL" ] || sudo apt-get remove curl -y'
 script:
-  - if [ -n "${SHELLCHECK-}" ]; then shellcheck -s bash nvm.sh && shellcheck -s sh nvm.sh && shellcheck -s dash nvm.sh && shellcheck -s ksh nvm.sh && shellcheck -s bash install.sh ; fi
-  - if [ -z "${SHELLCHECK-}" ]; then make TEST_SUITE=$TEST_SUITE URCHIN=/tmp/urchin/package/urchin test-$SHELL ; fi
+  - if [ -n "${SHELLCHECK-}" ]; then ./shellcheck.sh ; else make TEST_SUITE=$TEST_SUITE URCHIN=/tmp/urchin/package/urchin test-$SHELL ; fi
 env:
   global:
     - CXX=g++-4.8
diff --git a/shellcheck.sh b/shellcheck.sh
new file mode 100755
index 0000000..a7e9839
--- /dev/null
+++ b/shellcheck.sh
@@ -0,0 +1,11 @@
+#!/usr/bin/env bash
+
+for shell in bash sh dash ksh
+do
+  shellcheck -s "${shell}" nvm.sh
+done
+
+for bash_script in install.sh
+do
+  shellcheck -s bash "${bash_script}"
+done