diff --git a/circle.yml b/circle.yml
index f7f5298..1aadb5c 100644
--- a/circle.yml
+++ b/circle.yml
@@ -54,10 +54,10 @@
           # Sauce Connect randomly fails so try twice https://git.io/vPN8v
           time sc-*-linux/bin/sc --user $SAUCE_USERNAME --api-key $SAUCE_ACCESS_KEY \
             --readyfile ~/sauce_is_ready
-          test -e ~/sauce_is_ready && exit
+          test -e ~/sauce_was_ready && exit
           time sc-*-linux/bin/sc --user $SAUCE_USERNAME --api-key $SAUCE_ACCESS_KEY \
             --readyfile ~/sauce_is_ready
-          test -e ~/sauce_is_ready && exit
+          test -e ~/sauce_was_ready && exit
           echo 'ERROR: Exited twice without creating readyfile' \
             | tee /dev/stderr > ~/sauce_is_ready
           exit 1
@@ -97,7 +97,7 @@
 
     # Wait for tunnel to be ready (`make server` and the trivial Node server
     # are much faster, no need to wait for them)
-    - while [ ! -e ~/sauce_is_ready ]; do sleep 1; done; test -z "$(<~/sauce_is_ready)"
+    - while [ ! -e ~/sauce_is_ready ]; do sleep 1; done; touch ~/sauce_was_ready; test -z "$(<~/sauce_is_ready)"
 
     # Start taking screenshots in the background while the unit tests are running
     - ? |-