Index: lld/test/ELF/full-shutdown.s
===================================================================
--- /dev/null
+++ lld/test/ELF/full-shutdown.s
@@ -0,0 +1,7 @@
+// REQUIRES: x86
+// RUN: llvm-mc -filetype=obj -triple=x86_64-pc-linux %s -o %t.o
+// RUN: ld.lld %t.o -o %t.exe --full-shutdown
+
+.global _start
+_start:
+  ret
Index: lld/test/ELF/lto/timepasses.ll
===================================================================
--- lld/test/ELF/lto/timepasses.ll
+++ lld/test/ELF/lto/timepasses.ll
@@ -1,8 +1,6 @@
-; We use lld -flavor gnu because llvm-lit will append --full-shutdown to
-; the ld.lld invocation.
 ; REQUIRES: x86
 ; RUN: llvm-as %s -o %t.o
-; RUN: lld -flavor gnu %t.o -o %t.so -shared -mllvm -time-passes 2>&1 | FileCheck %s
+; RUN: ld.lld %t.o -o %t.so -shared -mllvm -time-passes 2>&1 | FileCheck %s
 
 target datalayout = "e-m:e-i64:64-f80:128-n8:16:32:64-S128"
 target triple = "x86_64-unknown-linux-gnu"
Index: llvm/utils/lit/lit/llvm/config.py
===================================================================
--- llvm/utils/lit/lit/llvm/config.py
+++ llvm/utils/lit/lit/llvm/config.py
@@ -465,9 +465,6 @@
         self.with_environment('PATH', tool_dirs, append_path=True)
         self.with_environment('LD_LIBRARY_PATH', lib_dirs, append_path=True)
 
-        self.config.substitutions.append(
-            (r"\bld.lld\b", 'ld.lld --full-shutdown'))
-
         tool_patterns = ['lld', 'ld.lld', 'lld-link', 'ld64.lld', 'wasm-ld']
 
         self.add_tool_substitutions(tool_patterns, tool_dirs)