diff --git a/compiler-rt/lib/asan/lit_tests/lit.cfg b/compiler-rt/lib/asan/lit_tests/lit.cfg
index c215651debca6220001de77c9a84e9053b665c7e..71b284f417c5eadbe9d74faeda3d0267598c6b76 100644
--- a/compiler-rt/lib/asan/lit_tests/lit.cfg
+++ b/compiler-rt/lib/asan/lit_tests/lit.cfg
@@ -67,10 +67,7 @@ config.substitutions.append( ("%clangxx_asan ", (" " + config.clang + " " +
                                                 clang_asan_cxxflags + " ")) )
 
 # Setup path to external LLVM symbolizer to run AddressSanitizer output tests.
-llvm_tools_dir = getattr(config, 'llvm_tools_dir', None)
-if llvm_tools_dir:
-  config.environment['ASAN_SYMBOLIZER_PATH'] = os.path.join(
-       llvm_tools_dir, "llvm-symbolizer")
+config.environment['ASAN_SYMBOLIZER_PATH'] = config.llvm_symbolizer_path
 
 # Define CHECK-%os to check for OS-dependent output.
 config.substitutions.append( ('CHECK-%os', ("CHECK-" + config.host_os)))
diff --git a/compiler-rt/lib/lit.common.cfg b/compiler-rt/lib/lit.common.cfg
index dd67295e9428c76d3488ea948e7490f8c2a598ce..b19d68708e9c416908bbc85d25d47f2fe0374a9c 100644
--- a/compiler-rt/lib/lit.common.cfg
+++ b/compiler-rt/lib/lit.common.cfg
@@ -40,6 +40,9 @@ if (not llvm_tools_dir) or (not os.path.exists(llvm_tools_dir)):
 path = os.path.pathsep.join((llvm_tools_dir, config.environment['PATH']))
 config.environment['PATH'] = path
 
+# Define path to external llvm-symbolizer tool.
+config.llvm_symbolizer_path  = os.path.join(llvm_tools_dir, "llvm-symbolizer")
+
 # Use ugly construction to explicitly prohibit "clang", "clang++" etc.
 # in RUN lines.
 config.substitutions.append(
diff --git a/compiler-rt/lib/lsan/lit_tests/lit.common.cfg b/compiler-rt/lib/lsan/lit_tests/lit.common.cfg
index cf5ccd50932debf4ebd2335214c86210125e2bf9..dfae8db4c890f34117f8403197bf3e56ba048d70 100644
--- a/compiler-rt/lib/lsan/lit_tests/lit.common.cfg
+++ b/compiler-rt/lib/lsan/lit_tests/lit.common.cfg
@@ -12,10 +12,6 @@ def get_required_attr(config, attr_name):
               "to lit.site.cfg " % attr_name)
   return attr_value
 
-# Setup path to external LLVM symbolizer to run LeakSanitizer output tests.
-llvm_tools_dir = get_required_attr(config, 'llvm_tools_dir')
-config.llvm_symbolizer_path  = os.path.join(llvm_tools_dir, "llvm-symbolizer")
-
 # Setup source root.
 lsan_lit_src_root = get_required_attr(config, 'lsan_lit_src_root')
 config.test_source_root = os.path.join(lsan_lit_src_root, 'TestCases')
diff --git a/compiler-rt/lib/msan/lit_tests/lit.cfg b/compiler-rt/lib/msan/lit_tests/lit.cfg
index e047a261a9fe35f6c535cf51319119ee10d1efa8..0a39626a3c4f7e0be7605d2782c5c12ccce15440 100644
--- a/compiler-rt/lib/msan/lit_tests/lit.cfg
+++ b/compiler-rt/lib/msan/lit_tests/lit.cfg
@@ -63,10 +63,7 @@ config.substitutions.append( ("%clangxx_msan ",
                               " ") )
 
 # Setup path to external LLVM symbolizer to run MemorySanitizer output tests.
-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['MSAN_SYMBOLIZER_PATH'] = llvm_symbolizer_path
+config.environment['MSAN_SYMBOLIZER_PATH'] = config.llvm_symbolizer_path
 
 # Default test suffixes.
 config.suffixes = ['.c', '.cc', '.cpp']
diff --git a/compiler-rt/lib/tsan/lit_tests/lit.cfg b/compiler-rt/lib/tsan/lit_tests/lit.cfg
index 6dc465437fdced35c7ecdff43194f06911e2f20a..af78828bd67b07cb1220754366ac3d0042ee7b84 100644
--- a/compiler-rt/lib/tsan/lit_tests/lit.cfg
+++ b/compiler-rt/lib/tsan/lit_tests/lit.cfg
@@ -50,11 +50,8 @@ if llvm_src_root is None:
 
 # Setup environment variables for running ThreadSanitizer.
 tsan_options = "atexit_sleep_ms=0"
-# Get path to external LLVM symbolizer to run ThreadSanitizer output tests.
-llvm_tools_dir = getattr(config, 'llvm_tools_dir', None)
-if llvm_tools_dir:
-  llvm_symbolizer_path = os.path.join(llvm_tools_dir, "llvm-symbolizer")
-  tsan_options += " " + "external_symbolizer_path=" + llvm_symbolizer_path
+# Set path to external LLVM symbolizer to run ThreadSanitizer output tests.
+tsan_options += " " + "external_symbolizer_path=" + config.llvm_symbolizer_path
 
 config.environment['TSAN_OPTIONS'] = tsan_options