diff --git a/llvm/test/CodeGen/AArch64/dbg-declare-tag-offset.ll b/llvm/test/CodeGen/AArch64/dbg-declare-tag-offset.ll
--- a/llvm/test/CodeGen/AArch64/dbg-declare-tag-offset.ll
+++ b/llvm/test/CodeGen/AArch64/dbg-declare-tag-offset.ll
@@ -1,17 +1,16 @@
-; RUN: llc -o - %s | FileCheck %s
+; RUN: llc -filetype=obj -o - %s | llvm-dwarfdump - | FileCheck %s
 
 target triple="aarch64--"
 
-; CHECK: .Linfo_string4:
-; CHECK-NEXT: .asciz "a"
-; CHECK: .Linfo_string6:
-; CHECK-NEXT: .asciz "b"
+; CHECK:      DW_TAG_variable
+; CHECK-NOT:  DW_TAG
+; CHECK:        DW_AT_LLVM_tag_offset (0x01)
+; CHECK-NEXT:   DW_AT_name    ("a")
 
-; CHECK: .byte 1 // DW_AT_LLVM_tag_offset
-; CHECK: .word .Linfo_string4 // DW_AT_name
-
-; CHECK: .byte 2 // DW_AT_LLVM_tag_offset
-; CHECK: .word .Linfo_string6 // DW_AT_name
+; CHECK:      DW_TAG_variable
+; CHECK-NOT:  DW_TAG
+; CHECK:        DW_AT_LLVM_tag_offset (0x02)
+; CHECK-NEXT:   DW_AT_name    ("b")
 
 define void @f() !dbg !6 {
 entry:
diff --git a/llvm/test/CodeGen/AArch64/dbg-value-tag-offset.ll b/llvm/test/CodeGen/AArch64/dbg-value-tag-offset.ll
--- a/llvm/test/CodeGen/AArch64/dbg-value-tag-offset.ll
+++ b/llvm/test/CodeGen/AArch64/dbg-value-tag-offset.ll
@@ -1,17 +1,17 @@
-; RUN: llc -o - %s | FileCheck %s
+; RUN: llc -filetype=obj -o - %s | llvm-dwarfdump - | FileCheck %s
 
 target datalayout = "e-m:e-i8:8:32-i16:16:32-i64:64-i128:128-n32:64-S128"
 target triple = "aarch64-unknown-linux-android24"
 
-; CHECK: .Linfo_string5:
-; CHECK-NEXT: .asciz "y"
-; CHECK: .Linfo_string7:
-; CHECK-NEXT: .asciz "x"
+; CHECK:      DW_TAG_variable
+; CHECK-NOT:  DW_TAG
+; CHECK:        DW_AT_LLVM_tag_offset (0x80)
+; CHECK-NEXT:   DW_AT_name    ("y")
 
-; CHECK:      .byte   128                     // DW_AT_LLVM_tag_offset
-; CHECK-NEXT: .word   .Linfo_string5          // DW_AT_name
-; CHECK:      .byte   0                       // DW_AT_LLVM_tag_offset
-; CHECK-NEXT: .word   .Linfo_string7          // DW_AT_name
+; CHECK:      DW_TAG_variable
+; CHECK-NOT:  DW_TAG
+; CHECK:        DW_AT_LLVM_tag_offset (0x00)
+; CHECK-NEXT:   DW_AT_name    ("x")
 
 define dso_local void @f() !dbg !14 {
   %1 = alloca i32, align 4