diff --git a/.travis.yml b/.travis.yml
index 861285ae2..b896a020c 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -16,17 +16,9 @@ env:
   - VIA="compile"
 
 install:
-  - "pip install -r requirements.txt"
-  - "pip install -e ."
-  - "mkdir -p corpora/en"
-  - "cd corpora/en"
-  - "wget --no-check-certificate http://wordnetcode.princeton.edu/3.0/WordNet-3.0.tar.gz"
-  - "tar -xzf WordNet-3.0.tar.gz"
-  - "mv WordNet-3.0 wordnet"
-  - "cd ../../"
-  - "mkdir models/"
-  - "python bin/init_model.py en lang_data/ corpora/ models/en"
+  - "travis.sh"
 
 script:
   - "pip install pytest"
-  - "SPACY_DATA=models/en python -m pytest spacy"
+  - if [[ "${VIA}" == "compile" ]]; then SPACY_DATA=models/en python -m pytest spacy; fi
+  - if [[ "${VIA}" == "pip" ]]; then python -m pytest spacy
diff --git a/travis.sh b/travis.sh
new file mode 100644
index 000000000..522700248
--- /dev/null
+++ b/travis.sh
@@ -0,0 +1,20 @@
+#!/bin/bash
+
+if [ "${TRAVIS_PULL_REQUEST}" = "false" && "${VIA}" == "pypi"]; then
+    rm -rf *
+    pip install spacy
+fi
+
+
+if "${VIA}" == "compile"]; then
+  pip install -r requirements.txt
+  pip install -e .
+  mkdir -p corpora/en
+  cd corpora/en
+  wget --no-check-certificate http://wordnetcode.princeton.edu/3.0/WordNet-3.0.tar.gz
+  tar -xzf WordNet-3.0.tar.gz
+  mv WordNet-3.0 wordnet
+  cd ../../
+  mkdir models/
+  python bin/init_model.py en lang_data/ corpora/ models/en
+fi