diff --git a/bolt/test/AArch64/asm-func-debug.test b/bolt/test/AArch64/asm-func-debug.test
--- a/bolt/test/AArch64/asm-func-debug.test
+++ b/bolt/test/AArch64/asm-func-debug.test
@@ -3,7 +3,7 @@
 #
 # The input test case foo() contains nops that we remove.
 
-RUN: %clang %cflags -no-pie -g %p/../Inputs/asm_foo.s %p/../Inputs/asm_main.c -o %t.exe
+RUN: %clang %cflags -no-pie -gdwarf-4 %p/../Inputs/asm_foo.s %p/../Inputs/asm_main.c -o %t.exe
 RUN: llvm-bolt %t.exe -o %t -update-debug-sections
 RUN: llvm-dwarfdump -all %t | FileCheck %s
 
diff --git a/bolt/test/X86/asm-func-debug.test b/bolt/test/X86/asm-func-debug.test
--- a/bolt/test/X86/asm-func-debug.test
+++ b/bolt/test/X86/asm-func-debug.test
@@ -3,7 +3,7 @@
 #
 # The input test case foo() contains nops that we remove.
 
-RUN: %clang -g %cflags -no-pie %p/../Inputs/asm_foo.s %p/../Inputs/asm_main.c -o %t.exe
+RUN: %clang -gdwarf-4 %cflags -no-pie %p/../Inputs/asm_foo.s %p/../Inputs/asm_main.c -o %t.exe
 RUN: llvm-bolt %t.exe -o %t -update-debug-sections
 RUN: llvm-dwarfdump -all %t | FileCheck %s
 
diff --git a/bolt/test/lit.cfg.py b/bolt/test/lit.cfg.py
--- a/bolt/test/lit.cfg.py
+++ b/bolt/test/lit.cfg.py
@@ -66,8 +66,8 @@
 llvm_config.config.available_features.add('ld.lld')
 llvm_config.add_tool_substitutions([ToolSubst(r'ld\.lld', command=ld_lld)])
 
-config.substitutions.append(('%cflags', '-gdwarf-4'))
-config.substitutions.append(('%cxxflags', '-gdwarf-4'))
+config.substitutions.append(('%cflags', ''))
+config.substitutions.append(('%cxxflags', ''))
 
 link_fdata_cmd = os.path.join(config.test_source_root, 'link_fdata.py')