diff --git a/.travis.yml b/.travis.yml
index 8a02d11..3517c30 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -24,47 +24,49 @@
   - chmod +x /tmp/urchin/package/urchin
   - '[ -z "$WITHOUT_CURL" ] || sudo apt-get remove curl -y'
 script:
-  - export CXX=g++-4.8
-  - export CC=gcc-4.8
-  - export PATH=$(echo $PATH | sed 's/::/:/')
-  - export NVM_DIR="${TRAVIS_BUILD_DIR}"
   - 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
 env:
-  - SHELLCHECK=true
-  - SHELL=bash TEST_SUITE=install_script
-  - SHELL=sh TEST_SUITE=fast
-  - SHELL=dash TEST_SUITE=fast
-  - SHELL=bash TEST_SUITE=fast
-  - SHELL=zsh TEST_SUITE=fast
-#  - SHELL=ksh TEST_SUITE=fast
-  - SHELL=sh TEST_SUITE=sourcing
-  - SHELL=dash TEST_SUITE=sourcing
-  - SHELL=bash TEST_SUITE=sourcing
-  - SHELL=zsh TEST_SUITE=sourcing
-#  - SHELL=ksh TEST_SUITE=sourcing
-  - SHELL=sh TEST_SUITE=slow
-  - SHELL=dash TEST_SUITE=slow
-  - SHELL=bash TEST_SUITE=slow
-  - SHELL=zsh TEST_SUITE=slow
-#  - SHELL=ksh TEST_SUITE=slow
-  - SHELL=sh TEST_SUITE=installation_node
-#  - SHELL=sh TEST_SUITE=installation_node WITHOUT_CURL=1
-  - SHELL=dash TEST_SUITE=installation_node
-#  - SHELL=dash TEST_SUITE=installation_node WITHOUT_CURL=1
-  - SHELL=bash TEST_SUITE=installation_node
-#  - SHELL=bash TEST_SUITE=installation_node WITHOUT_CURL=1
-  - SHELL=zsh TEST_SUITE=installation_node
-#  - SHELL=zsh TEST_SUITE=installation_node WITHOUT_CURL=1
-#  - SHELL=ksh TEST_SUITE=installation_node
-#  - SHELL=ksh TEST_SUITE=installation_node WITHOUT_CURL=1
-  - SHELL=sh TEST_SUITE=installation_iojs
-#  - SHELL=sh TEST_SUITE=installation_iojs WITHOUT_CURL=1
-  - SHELL=dash TEST_SUITE=installation_iojs
-#  - SHELL=dash TEST_SUITE=installation_iojs WITHOUT_CURL=1
-  - SHELL=bash TEST_SUITE=installation_iojs
-#  - SHELL=bash TEST_SUITE=installation_iojs WITHOUT_CURL=1
-  - SHELL=zsh TEST_SUITE=installation_iojs
-#  - SHELL=zsh TEST_SUITE=installation_iojs WITHOUT_CURL=1
-#  - SHELL=ksh TEST_SUITE=installation_iojs
-#  - SHELL=ksh TEST_SUITE=installation_iojs WITHOUT_CURL=1
+  global:
+    - CXX=g++-4.8
+    - CC=gcc-4.8
+    - PATH=$(echo $PATH | sed 's/::/:/')
+    - NVM_DIR="${TRAVIS_BUILD_DIR}"
+  matrix:
+    - SHELLCHECK=true
+    - SHELL=bash TEST_SUITE=install_script
+    - SHELL=sh TEST_SUITE=fast
+    - SHELL=dash TEST_SUITE=fast
+    - SHELL=bash TEST_SUITE=fast
+    - SHELL=zsh TEST_SUITE=fast
+  #  - SHELL=ksh TEST_SUITE=fast
+    - SHELL=sh TEST_SUITE=sourcing
+    - SHELL=dash TEST_SUITE=sourcing
+    - SHELL=bash TEST_SUITE=sourcing
+    - SHELL=zsh TEST_SUITE=sourcing
+  #  - SHELL=ksh TEST_SUITE=sourcing
+    - SHELL=sh TEST_SUITE=slow
+    - SHELL=dash TEST_SUITE=slow
+    - SHELL=bash TEST_SUITE=slow
+    - SHELL=zsh TEST_SUITE=slow
+  #  - SHELL=ksh TEST_SUITE=slow
+    - SHELL=sh TEST_SUITE=installation_node
+  #  - SHELL=sh TEST_SUITE=installation_node WITHOUT_CURL=1
+    - SHELL=dash TEST_SUITE=installation_node
+  #  - SHELL=dash TEST_SUITE=installation_node WITHOUT_CURL=1
+    - SHELL=bash TEST_SUITE=installation_node
+  #  - SHELL=bash TEST_SUITE=installation_node WITHOUT_CURL=1
+    - SHELL=zsh TEST_SUITE=installation_node
+  #  - SHELL=zsh TEST_SUITE=installation_node WITHOUT_CURL=1
+  #  - SHELL=ksh TEST_SUITE=installation_node
+  #  - SHELL=ksh TEST_SUITE=installation_node WITHOUT_CURL=1
+    - SHELL=sh TEST_SUITE=installation_iojs
+  #  - SHELL=sh TEST_SUITE=installation_iojs WITHOUT_CURL=1
+    - SHELL=dash TEST_SUITE=installation_iojs
+  #  - SHELL=dash TEST_SUITE=installation_iojs WITHOUT_CURL=1
+    - SHELL=bash TEST_SUITE=installation_iojs
+  #  - SHELL=bash TEST_SUITE=installation_iojs WITHOUT_CURL=1
+    - SHELL=zsh TEST_SUITE=installation_iojs
+  #  - SHELL=zsh TEST_SUITE=installation_iojs WITHOUT_CURL=1
+  #  - SHELL=ksh TEST_SUITE=installation_iojs
+  #  - SHELL=ksh TEST_SUITE=installation_iojs WITHOUT_CURL=1