diff --git a/test/Unit/lit.cfg b/test/Unit/lit.cfg
index 8dc7853d913..ba4cbc5d798 100644
--- a/test/Unit/lit.cfg
+++ b/test/Unit/lit.cfg
@@ -81,10 +81,3 @@ if config.enable_shared:
         shlibpath = os.pathsep + shlibpath
     shlibpath = config.shlibdir + shlibpath
     config.environment[config.shlibpath_var] = shlibpath
-
-# Setup paths to llvm-symbolizer for Sanitizer tools.
-llvm_tools_dir = getattr(config, 'llvm_tools_dir', None)
-if llvm_tools_dir:
-    llvm_symbolizer_path = os.path.join(llvm_tools_dir, 'llvm-symbolizer')
-    config.environment['ASAN_SYMBOLIZER_PATH'] = llvm_symbolizer_path
-    config.environment['MSAN_SYMBOLIZER_PATH'] = llvm_symbolizer_path
diff --git a/test/lit.cfg b/test/lit.cfg
index ce9ff1147cc..216e3c1aa0d 100644
--- a/test/lit.cfg
+++ b/test/lit.cfg
@@ -63,10 +63,6 @@ if llvm_obj_root is not None:
         lit.fatal('No LLVM tools dir set!')
     path = os.path.pathsep.join((llvm_tools_dir, config.environment['PATH']))
     config.environment['PATH'] = path
-    # Setup paths to llvm-symbolizer for Sanitizer tools.
-    llvm_symbolizer_path = os.path.join(llvm_tools_dir, 'llvm-symbolizer')
-    config.environment['ASAN_SYMBOLIZER_PATH'] = llvm_symbolizer_path
-    config.environment['MSAN_SYMBOLIZER_PATH'] = llvm_symbolizer_path
 
 # Propagate 'HOME' through the environment.
 if 'HOME' in os.environ: