diff --git a/.travis.yml b/.travis.yml
index 819314fa0..3bdbcfbf7 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -8,6 +8,7 @@ before_install:
   - brew update
 install:
   - brew reinstall flow watchman xctool
+  - npm config set spin=false
   - npm install
 
 script:
diff --git a/scripts/e2e-test.sh b/scripts/e2e-test.sh
index 512c73c86..fa11e7816 100755
--- a/scripts/e2e-test.sh
+++ b/scripts/e2e-test.sh
@@ -13,9 +13,9 @@ TEMP=$(mktemp -d /tmp/react-native-XXXXXXXX)
 MARKER=$(mktemp $ROOT/Examples/SampleApp/XXXXXXXX)
 
 function cleanup {
-  kill -9 $SINOPIA_PID
-  mv ~/.npmrc.bak ~/.npmrc
   rm $MARKER
+  [ $SINOPIA_PID ] && kill -9 $SINOPIA_PID
+  [ -f ~/.npmrc.bak ] && mv ~/.npmrc.bak ~/.npmrc
 }
 trap cleanup EXIT
 
@@ -44,4 +44,4 @@ cd EndToEndTest
 
 # Make sure we installed local version of react-native
 ls `basename $MARKER` > /dev/null
-xctool -scheme EndToEndTest -sdk iphonesimulator8.2 test
+xctool -scheme EndToEndTest -sdk iphonesimulator8.1 test