Index: llvm/test/tools/llvm-readobj/ELF/dyn-symbols.test
===================================================================
--- llvm/test/tools/llvm-readobj/ELF/dyn-symbols.test
+++ llvm/test/tools/llvm-readobj/ELF/dyn-symbols.test
@@ -308,16 +308,10 @@
     AddressAlign: 0x4
     Info:         0x2
     Entries:
-      - Version:    1
-        Flags:      0
-        VersionNdx: 2
-        Hash:       0
+      - VersionNdx: 2
         Names:
           - Default
-      - Version:    1
-        Flags:      0
-        VersionNdx: 3
-        Hash:       0
+      - VersionNdx: 3
         Names:
           - NonDefault
 DynamicSymbols:
Index: llvm/test/tools/llvm-readobj/ELF/verdef-invalid.test
===================================================================
--- llvm/test/tools/llvm-readobj/ELF/verdef-invalid.test
+++ llvm/test/tools/llvm-readobj/ELF/verdef-invalid.test
@@ -107,11 +107,7 @@
     Link:    .dynstr
     Info:    0x1
     Entries:
-      - Version:    1
-        Flags:      0
-        VersionNdx: 0
-        Hash:       0
-        Names:
+      - Names:
           - FOO
     ShSize: 1
 DynamicSymbols:
@@ -137,11 +133,7 @@
     Link:    .dynstr
     Info:    0x1
     Entries:
-      - Version:    1
-        Flags:      0
-        VersionNdx: 0
-        Hash:       0
-        Names:
+      - Names:
           - FOO
     ShSize: 21
 DynamicSymbols:
@@ -181,11 +173,7 @@
     Link:    .strtab
     Info:    0x1
     Entries:
-      - Version:    1
-        Flags:      0
-        VersionNdx: 0
-        Hash:       0
-        Names:
+      - Names:
           - FOO
   - Name: .strtab
     Type: SHT_STRTAB
@@ -213,11 +201,7 @@
     Link: .dynstr
     Info: 0x1
     Entries:
-      - Version:    1
-        Flags:      0
-        VersionNdx: 0
-        Hash:       0
-        Names:
+      - Names:
           - FOO
 DynamicSymbols:
   - Name: foo
@@ -266,10 +250,7 @@
     Link: .dynstr
     Info: 0x1
     Entries:
-      - Version:    0xfefe
-        Flags:      0
-        VersionNdx: 0
-        Hash:       0
+      - Version: 0xfefe
         Names: []
 DynamicSymbols:
   - Name: foo
Index: llvm/test/tools/llvm-readobj/ELF/versioninfo.test
===================================================================
--- llvm/test/tools/llvm-readobj/ELF/versioninfo.test
+++ llvm/test/tools/llvm-readobj/ELF/versioninfo.test
@@ -27,38 +27,23 @@
     AddressAlign: 0x0000000000000004
     Info:         0x0000000000000006
     Entries:
-      - Version:    1
-        Flags:      0
-        VersionNdx: 0
-        Hash:       0
-        Names:
+      - Names:
           - VERSION1
-      - Version:    1
-        Flags:      1
-        VersionNdx: 0
-        Hash:       0
+      - Flags: 1
         Names:
           - VERSION1
-      - Version:    1
-        Flags:      2
-        VersionNdx: 0
-        Hash:       0
+      - Flags: 2
         Names:
           - VERSION1
-      - Version:    1
-        Flags:      4
-        VersionNdx: 0
-        Hash:       0
+      - Flags: 4
         Names:
           - VERSION1
-      - Version:    1
-        Flags:      7
+      - Flags:      7
         VersionNdx: 2
         Hash:       175630257
         Names:
           - VERSION1
-      - Version:    1
-        Flags:      8
+      - Flags:      8
         VersionNdx: 3
         Hash:       175630258
         Names: