diff --git a/buildkite/bazelci.py b/buildkite/bazelci.py
index 3058746..d808006 100644
--- a/buildkite/bazelci.py
+++ b/buildkite/bazelci.py
@@ -279,9 +279,9 @@
                                      config.get("test_targets", None), bep_file)
       upload_failed_test_logs(bep_file, tmpdir)
   finally:
+    cleanup(bazel_binary)
     if tmpdir:
       shutil.rmtree(tmpdir)
-    cleanup(bazel_binary)
     if exit_code > -1:
       exit(exit_code)
 
@@ -345,6 +345,7 @@
     shell_command = "\n".join(cleanup_commands(platform))
     fail_if_nonzero(execute_command(shell_command, shell=True))
 
+
 def execute_shell_commands(commands):
   if not commands:
     return