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,12 +3,12 @@
 #
 # The input test case foo() contains nops that we remove.
 
-RUN: %clang %cflags -no-pie -gdwarf-4 %p/../Inputs/asm_foo.s %p/../Inputs/asm_main.c -o %t.exe
+RUN: %clang %cflags -gdwarf-5 -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
 
 # Check ranges were created/updated for asm compile unit
-CHECK:       0x0000000b: DW_TAG_compile_unit
+CHECK:       0x0000000c: DW_TAG_compile_unit
 CHECK-NEXT:       DW_AT_stmt_list (0x00000000)
 CHECK-NEXT:       DW_AT_low_pc (0x0000000000000000)
 CHECK-NEXT:       DW_AT_ranges
@@ -22,5 +22,5 @@
 CHECK-NEXT:   [0x0000000000[[#ADDR]], 0x0000000000[[#ADDR+4]])
 
 # Check line number info was updated
-CHECK:       0x0000000000[[#ADDR]]   13      0      1   0             0  is_stmt
-CHECK-NEXT:  0x0000000000[[#ADDR+4]] 13      0      1   0             0  is_stmt end_sequence
+CHECK:       0x0000000000[[#ADDR]]   13      0      0   0             0  is_stmt
+CHECK-NEXT:  0x0000000000[[#ADDR+4]] 13      0      0   0             0  is_stmt end_sequence
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,12 +3,12 @@
 #
 # The input test case foo() contains nops that we remove.
 
-RUN: %clang -gdwarf-4 %cflags -no-pie %p/../Inputs/asm_foo.s %p/../Inputs/asm_main.c -o %t.exe
+RUN: %clang %cflags -gdwarf-5 -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
 
 # Check ranges were created/updated for asm compile unit
-CHECK:       0x0000000b: DW_TAG_compile_unit
+CHECK:       0x0000000c: DW_TAG_compile_unit
 CHECK-NEXT:       DW_AT_stmt_list (0x00000000)
 CHECK-NEXT:       DW_AT_low_pc (0x0000000000000000)
 CHECK-NEXT:       DW_AT_ranges
@@ -22,5 +22,5 @@
 CHECK-NEXT:   [0x0000000000[[#ADDR]], 0x0000000000[[#ADDR+1]])
 
 # Check line number info was updated
-CHECK:       0x0000000000[[#ADDR]]   13      0      1   0             0  is_stmt
-CHECK-NEXT:  0x0000000000[[#ADDR+1]] 13      0      1   0             0  is_stmt end_sequence
+CHECK:       0x0000000000[[#ADDR]]   13      0      0   0             0  is_stmt
+CHECK-NEXT:  0x0000000000[[#ADDR+1]] 13      0      0   0             0  is_stmt end_sequence