Index: lib/esan/esan.cpp
===================================================================
--- lib/esan/esan.cpp
+++ lib/esan/esan.cpp
@@ -159,6 +159,7 @@
   }
   WhichTool = Tool;
   SanitizerToolName = "EfficiencySanitizer";
+  CacheBinaryName();
   initializeFlags();
 
   // Intercepting libc _exit or exit via COMMON_INTERCEPTOR_ON_EXIT only
Index: test/esan/TestCases/verbose-simple.c
===================================================================
--- test/esan/TestCases/verbose-simple.c
+++ test/esan/TestCases/verbose-simple.c
@@ -1,5 +1,5 @@
 // RUN: %clang_esan_frag -O0 %s -o %t 2>&1
-// RUN: %env_esan_opts=verbosity=1 %run %t 2>&1 | FileCheck %s
+// RUN: %env_esan_opts="verbosity=1 log_exe_name=1" %run %t 2>&1 | FileCheck %s
 
 int main(int argc, char **argv) {
   // CHECK:      in esan::initializeLibrary
@@ -8,6 +8,6 @@
   // CHECK-NEXT: Shadow #1: [124000000000-12c000000000) (512GB)
   // CHECK-NEXT: Shadow #2: [148000000000-150000000000) (512GB)
   // CHECK-NEXT: in esan::finalizeLibrary
-  // CHECK-NEXT: {{.*}}EfficiencySanitizer is not finished: nothing yet to report
+  // CHECK-NEXT: ==verbose-simple{{.*}}EfficiencySanitizer is not finished: nothing yet to report
   return 0;
 }