diff --git a/buildkite/bazelci.py b/buildkite/bazelci.py
index ef506c7..57932ea 100644
--- a/buildkite/bazelci.py
+++ b/buildkite/bazelci.py
@@ -307,7 +307,7 @@
         for label, _ in failed:
             print(label)
     timed_out = test_logs_for_status(bep_file, status="TIMEOUT")
-    if failed:
+    if timed_out:
         print_expanded_group("Timed out Tests")
         for label, _ in timed_out:
             print(label)
@@ -397,9 +397,9 @@
 
 def remote_caching_flags(platform):
     common_flags = ["--experimental_strict_action_env", "--remote_timeout=10",
-                "--experimental_remote_spawn_cache",
-                "--experimental_remote_platform_override=properties:{name:\"platform\" value:\"" + platform + "\"}",
-                "--remote_http_cache=https://storage.googleapis.com/bazel-buildkite-cache"]
+                    "--experimental_remote_spawn_cache",
+                    "--experimental_remote_platform_override=properties:{name:\"platform\" value:\"" + platform + "\"}",
+                    "--remote_http_cache=https://storage.googleapis.com/bazel-buildkite-cache"]
     if platform in ["ubuntu1404", "ubuntu1604"]:
         return common_flags + ["--google_default_credentials"]
     elif platform == "macos":