diff --git a/clang/test/Layout/itanium-pack-and-align.cpp b/clang/test/Layout/itanium-pack-and-align.cpp
--- a/clang/test/Layout/itanium-pack-and-align.cpp
+++ b/clang/test/Layout/itanium-pack-and-align.cpp
@@ -16,11 +16,11 @@
 // CHECK:          0 | struct T
 // CHECK-NEXT:          0 |   char x
 // CHECK-NEXT:          1 |   int y
-// CHECK-NEXT:            | [sizeof=8, dsize=8, align=8,
-// CHECK-NEXT:            |  nvsize=8, nvalign=8]
+// CHECK-NEXT:            | [sizeof=8, dsize=8, align=8,{{( preferredalign=8,)?}}
+// CHECK-NEXT:            |  nvsize=8, nvalign=8{{(, preferrednvalign=8)?}}]
 
 // CHECK:          0 | struct S
 // CHECK-NEXT:          0 |   char x
 // CHECK-NEXT:          1 |   int y
-// CHECK-NEXT:            | [sizeof=8, dsize=8, align=8,
-// CHECK-NEXT:            |  nvsize=8, nvalign=8]
+// CHECK-NEXT:            | [sizeof=8, dsize=8, align=8,{{( preferredalign=8,)?}}
+// CHECK-NEXT:            |  nvsize=8, nvalign=8{{(, preferrednvalign=8)?}}]
diff --git a/clang/test/Layout/itanium-union-bitfield.cpp b/clang/test/Layout/itanium-union-bitfield.cpp
--- a/clang/test/Layout/itanium-union-bitfield.cpp
+++ b/clang/test/Layout/itanium-union-bitfield.cpp
@@ -18,12 +18,11 @@
 // CHECK:*** Dumping AST Record Layout
 // CHECK-NEXT:     0 | union A
 // CHECK-NEXT: 0:0-2 |   int f1
-// CHECK-NEXT:       | [sizeof=4, dsize=1, align=4
-// CHECK-NEXT:       |  nvsize=1, nvalign=4]
+// CHECK-NEXT:       | [sizeof=4, dsize=1, align=4{{(, preferredalign=4,)?}}
+// CHECK-NEXT:       |  nvsize=1, nvalign=4{{(, preferrednvalign=4)?}}]
 
 // CHECK:*** Dumping AST Record Layout
 // CHECK-NEXT:      0 | union B
 // CHECK-NEXT: 0:0-34 |   char f1
-// CHECK-NEXT:        | [sizeof=8, dsize=5, align=4
-// CHECK-NEXT:        |  nvsize=5, nvalign=4]
-
+// CHECK-NEXT:        | [sizeof=8, dsize=5, align=4{{(, preferredalign=4,)?}}
+// CHECK-NEXT:        |  nvsize=5, nvalign=4{{(, preferrednvalign=4)?}}]