diff --git a/circle.yml b/circle.yml
index 8efc7b8212f..208bad61022 100644
--- a/circle.yml
+++ b/circle.yml
@@ -77,7 +77,7 @@ test:
     - source scripts/circle-ci-android-setup.sh && retry3 ./scripts/run-android-instrumentation-tests.sh com.facebook.react.tests.gradle
 
     # JS and Android e2e test
-    - ./scripts/e2e-test.sh --packager --android
+    - source scripts/circle-ci-android-setup.sh && retry3 ./scripts/e2e-test.sh --packager --android
 
     # testing docs generation is not broken
     - cd website && node ./server/generate.js
diff --git a/scripts/e2e-test.sh b/scripts/e2e-test.sh
index acbd3824af1..52eff36f6e7 100755
--- a/scripts/e2e-test.sh
+++ b/scripts/e2e-test.sh
@@ -44,6 +44,7 @@ function cleanup {
   rm $MARKER_IOS
   rm $MARKER_ANDROID
   [ $SERVER_PID ] && kill -9 $SERVER_PID
+  exit $EXIT_CODE
 }
 trap cleanup EXIT