diff --git a/.travis.yml b/.travis.yml
index cabf184aa78..42d4448a901 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -10,12 +10,4 @@ before_install:
   - gem install xcpretty
   - pod install --repo-update
 
-script: set -o pipefail && xcodebuild -workspace FirebaseUI.xcworkspace
-  -scheme FirebaseUI
-  -sdk iphonesimulator
-  -destination 'platform=iOS Simulator,name=iPhone 7'
-  build
-  test
-  ONLY_ACTIVE_ARCH=YES
-  CODE_SIGNING_REQUIRED=NO
-  | xcpretty
+script: ./test.sh
diff --git a/test.sh b/test.sh
new file mode 100755
index 00000000000..96b9dac5450
--- /dev/null
+++ b/test.sh
@@ -0,0 +1,29 @@
+#!/usr/bin/env bash
+
+set -o pipefail && xcodebuild \
+  -workspace FirebaseUI.xcworkspace \
+  -scheme FirebaseUI \
+  -sdk iphonesimulator \
+  -destination 'platform=iOS Simulator,name=iPhone 7' \
+  build \
+  test \
+  ONLY_ACTIVE_ARCH=YES \
+  CODE_SIGNING_REQUIRED=NO\
+  | xcpretty
+
+RESULT=$?
+if [ $RESULT == 65 ]; then
+  echo "xcodebuild exited with 65, retrying"
+  set -o pipefail && xcodebuild \
+    -workspace FirebaseUI.xcworkspace \
+    -scheme FirebaseUI \
+    -sdk iphonesimulator \
+    -destination 'platform=iOS Simulator,name=iPhone 7' \
+    build \
+    test \
+    ONLY_ACTIVE_ARCH=YES \
+    CODE_SIGNING_REQUIRED=NO\
+    | xcpretty
+else
+  exit $RESULT
+fi