diff --git a/compiler-rt/lib/hwasan/hwasan.cpp b/compiler-rt/lib/hwasan/hwasan.cpp
--- a/compiler-rt/lib/hwasan/hwasan.cpp
+++ b/compiler-rt/lib/hwasan/hwasan.cpp
@@ -86,8 +86,7 @@
     cf.clear_shadow_mmap_threshold = 4096 * (SANITIZER_ANDROID ? 2 : 8);
     // Sigtrap is used in error reporting.
     cf.handle_sigtrap = kHandleSignalExclusive;
-    // FIXME: enable once all false positives have been fixed.
-    cf.detect_leaks = false;
+    cf.detect_leaks = true;
 
 #if SANITIZER_ANDROID
     // Let platform handle other signals. It is better at reporting them then we
diff --git a/compiler-rt/test/asan/TestCases/Linux/leak_check_segv.cpp b/compiler-rt/test/lsan/TestCases/Linux/leak_check_segv.cpp
rename from compiler-rt/test/asan/TestCases/Linux/leak_check_segv.cpp
rename to compiler-rt/test/lsan/TestCases/Linux/leak_check_segv.cpp
--- a/compiler-rt/test/asan/TestCases/Linux/leak_check_segv.cpp
+++ b/compiler-rt/test/lsan/TestCases/Linux/leak_check_segv.cpp
@@ -1,5 +1,5 @@
 // Test that SIGSEGV during leak checking does not crash the process.
-// RUN: %clangxx_asan -O1 %s -o %t && not %run %t 2>&1 | FileCheck %s
+// RUN: %clangxx_lsan -O1 %s -o %t && not %run %t 2>&1 | FileCheck %s
 // REQUIRES: leak-detection
 #include <stdlib.h>
 #include <stdio.h>
diff --git a/compiler-rt/test/asan/TestCases/Linux/signal_during_stop_the_world.cpp b/compiler-rt/test/lsan/TestCases/Linux/signal_during_stop_the_world.cpp
rename from compiler-rt/test/asan/TestCases/Linux/signal_during_stop_the_world.cpp
rename to compiler-rt/test/lsan/TestCases/Linux/signal_during_stop_the_world.cpp
--- a/compiler-rt/test/asan/TestCases/Linux/signal_during_stop_the_world.cpp
+++ b/compiler-rt/test/lsan/TestCases/Linux/signal_during_stop_the_world.cpp
@@ -2,7 +2,7 @@
 // Historically StopTheWorld crashed because did not handle EINTR properly.
 // The test is somewhat convoluted, but that's what caused crashes previously.
 
-// RUN: %clangxx_asan -O1 %s -o %t && %run %t 2>&1 | FileCheck %s
+// RUN: %clangxx_lsan -O1 %s -o %t && %run %t 2>&1 | FileCheck %s
 
 #include <stdio.h>
 #include <stdlib.h>
diff --git a/compiler-rt/test/asan/TestCases/lsan_annotations.cpp b/compiler-rt/test/lsan/TestCases/lsan_annotations.cpp
rename from compiler-rt/test/asan/TestCases/lsan_annotations.cpp
rename to compiler-rt/test/lsan/TestCases/lsan_annotations.cpp
--- a/compiler-rt/test/asan/TestCases/lsan_annotations.cpp
+++ b/compiler-rt/test/lsan/TestCases/lsan_annotations.cpp
@@ -1,6 +1,6 @@
 // Check that LSan annotations work fine.
-// RUN: %clangxx_asan -O0 %s -o %t && %run %t
-// RUN: %clangxx_asan -O3 %s -o %t && %run %t
+// RUN: %clangxx_lsan -O0 %s -o %t && %run %t
+// RUN: %clangxx_lsan -O3 %s -o %t && %run %t
 
 #include <sanitizer/lsan_interface.h>
 #include <stdlib.h>
diff --git a/compiler-rt/test/asan/TestCases/lsan_crash.cpp b/compiler-rt/test/lsan/TestCases/lsan_crash.cpp
rename from compiler-rt/test/asan/TestCases/lsan_crash.cpp
rename to compiler-rt/test/lsan/TestCases/lsan_crash.cpp
--- a/compiler-rt/test/asan/TestCases/lsan_crash.cpp
+++ b/compiler-rt/test/lsan/TestCases/lsan_crash.cpp
@@ -1,4 +1,4 @@
-// RUN: %clangxx_asan -O2 %s --std=c++14 -o %t && %run %t
+// RUN: %clangxx_lsan -O2 %s --std=c++14 -o %t && %run %t
 
 #include <atomic>
 #include <memory>