diff --git a/.travis.yml b/.travis.yml
index f9677fd..4afd955 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -8,21 +8,6 @@ env:
     - SHELL=zsh
 matrix:
   fast_finish: true
-script:
-  - |
-    $SHELL --version
-    if [ "$SHELL" = "zsh" ]; then
-      cat > $HOME/.zshenv <<END
-        disable -r end
-        setopt sh_word_split
-    END
-
-    fi
-    if ${LINT:-false}; then
-      shellcheck -s sh bin/shpec  # 'sh' refers to POSIX
-    else
-      $SHELL bin/shpec
-    fi
 cache: apt
 before_install:
   - |
@@ -38,8 +23,9 @@ before_install:
       done
       )
     }
-    install_shell(){
-      echo "Install $SHELL"
+
+    install_shell() {
+      echo "Installing $SHELL"
       sudo apt-get update -qq
       sudo apt-get install -y $SHELL
     }
@@ -50,3 +36,18 @@ before_install:
     elif ! type $SHELL > /dev/null; then
       install_shell
     fi
+install:
+  - |
+    sudo make install
+
+    if [ "$SHELL" = "zsh" ]; then
+      . shpec.plugin.zsh
+    fi
+script:
+  - |
+    $SHELL --version
+    if ${LINT:-false}; then
+      shellcheck -s sh bin/shpec  # 'sh' refers to POSIX
+    else
+      $SHELL -c shpec
+    fi