diff --git a/.circleci/env.sh b/.circleci/env.sh
index d882e494e75c5..88a4dbececf75 100755
--- a/.circleci/env.sh
+++ b/.circleci/env.sh
@@ -54,6 +54,7 @@ else
   setPublicVar SAUCE_USERNAME "angular-ci";
   setSecretVar SAUCE_ACCESS_KEY "9b988f434ff8-fbca-8aa4-4ae3-35442987";
 fi
+setPublicVar SAUCE_LOG_FILE /tmp/angular/sauce-connect.log
 setPublicVar SAUCE_READY_FILE /tmp/angular/sauce-connect-ready-file.lock
 setPublicVar SAUCE_PID_FILE /tmp/angular/sauce-connect-pid-file.lock
 setPublicVar SAUCE_TUNNEL_IDENTIFIER "angular-${CIRCLE_BUILD_NUM}-${CIRCLE_NODE_INDEX}"
diff --git a/scripts/saucelabs/start-tunnel.sh b/scripts/saucelabs/start-tunnel.sh
index ea9b2a77dc11f..fb06b758e871e 100755
--- a/scripts/saucelabs/start-tunnel.sh
+++ b/scripts/saucelabs/start-tunnel.sh
@@ -7,6 +7,11 @@ readonly currentDir=$(cd $(dirname $0); pwd)
 # Command arguments that will be passed to sauce-connect.
 sauceArgs=""
 
+if [[ ! -z "${SAUCE_LOG_FILE:-}" ]]; then
+  mkdir -p $(dirname ${SAUCE_LOG_FILE})
+  sauceArgs="${sauceArgs} --logfile ${SAUCE_LOG_FILE}"
+fi
+
 if [[ ! -z "${SAUCE_READY_FILE}" ]]; then
   sauceArgs="${sauceArgs} --readyfile ${SAUCE_READY_FILE}"
 fi
diff --git a/scripts/saucelabs/wait-for-tunnel.sh b/scripts/saucelabs/wait-for-tunnel.sh
index 416cc01216c93..feda9a85b6946 100755
--- a/scripts/saucelabs/wait-for-tunnel.sh
+++ b/scripts/saucelabs/wait-for-tunnel.sh
@@ -13,8 +13,10 @@ while [[ ! -f ${SAUCE_READY_FILE} ]]; do
   # Counter needs to be multiplied by two because the while loop only sleeps a half second.
   # This has been made in favor of better progress logging (printing dots every half second)
   if [ $counter -gt $[${SAUCE_READY_FILE_TIMEOUT} * 2] ]; then
+    echo "Timed out after ${SAUCE_READY_FILE_TIMEOUT} seconds waiting for tunnel ready file."
+    echo "Printing logfile output:"
     echo ""
-    echo "Timed out after ${SAUCE_READY_FILE_TIMEOUT} seconds waiting for tunnel ready file"
+    cat ${SAUCE_LOG_FILE}
     exit 5
   fi