diff --git a/llvm/test/tools/llvm-objdump/X86/disassemble-code-data-mix.s b/llvm/test/tools/llvm-objdump/X86/disassemble-code-data-mix.s
index 8e8822aaa0f2..08c61ca51bca 100644
--- a/llvm/test/tools/llvm-objdump/X86/disassemble-code-data-mix.s
+++ b/llvm/test/tools/llvm-objdump/X86/disassemble-code-data-mix.s
@@ -1,4 +1,4 @@
-// RUN: llvm-mc %s -filetype=obj -triple=x86_64-pc-linux | llvm-objdump -d - | FileCheck %s
+// RUN: llvm-mc %s -filetype=obj -triple=x86_64-pc-linux | llvm-objdump -d - | FileCheck --strict-whitespace --match-full-lines %s
         .text
         .globl  foo
         .type   foo, @function
@@ -14,6 +14,5 @@ foo:
 bar:
         .string "test string"
 
-// CHECK:        b:        74 65 73 74 20 73 74 72         test str
-// CHECK-NEXT:  13:        69 6e 67 00                     ing.
-
+// CHECK:       b: 74 65 73 74 20 73 74 72         test str
+// CHECK-NEXT:      13: 69 6e 67 00                     ing.
diff --git a/llvm/tools/llvm-objdump/llvm-objdump.cpp b/llvm/tools/llvm-objdump/llvm-objdump.cpp
index fcb419d05c8b..22167f15e14d 100644
--- a/llvm/tools/llvm-objdump/llvm-objdump.cpp
+++ b/llvm/tools/llvm-objdump/llvm-objdump.cpp
@@ -996,10 +996,8 @@ static void dumpELFData(uint64_t SectionAddr, uint64_t Index, uint64_t End,
   int NumBytes = 0;
 
   for (; Index < End; ++Index) {
-    if (NumBytes == 0) {
+    if (NumBytes == 0)
       outs() << format("%8" PRIx64 ":", SectionAddr + Index);
-      outs() << "\t";
-    }
     Byte = Bytes.slice(Index)[0];
     outs() << format(" %02x", Byte);
     AsciiData[NumBytes] = isPrint(Byte) ? Byte : '.';