diff --git a/gold/ChangeLog b/gold/ChangeLog
index 1b9bb835b02da1a17b1288e97662821234a1ddfd..56e52dccbfa5d1ac23846461334db3ba64ed2640 100644
--- a/gold/ChangeLog
+++ b/gold/ChangeLog
@@ -1,3 +1,8 @@
+2016-06-29  Alan Modra  <amodra@gmail.com>
+
+	* testsuite/plugin_layout_with_alignment.c: Explicitly align all
+	variables.
+
 2016-06-29  Alan Modra  <amodra@gmail.com>
 
 	* testsuite/Makefile.am (copy_test_protected): Disable for powerpc.
diff --git a/gold/testsuite/plugin_layout_with_alignment.c b/gold/testsuite/plugin_layout_with_alignment.c
index 5d6ff1f7e2d74965704928592147c82a6662c6f8..2e057040b8e091a4ba204b2763d673408f3b64cb 100644
--- a/gold/testsuite/plugin_layout_with_alignment.c
+++ b/gold/testsuite/plugin_layout_with_alignment.c
@@ -26,44 +26,44 @@
 
 // --- Initialized .rodata items
 
-__attribute__ ((section(".rodata.v1_a2")))
+__attribute__ ((section(".rodata.v1_a2"), aligned(2)))
 const short rodata_item1 = 101;
 
-__attribute__ ((section(".rodata.v2_a1")))
+__attribute__ ((section(".rodata.v2_a1"), aligned(1)))
 const char rodata_item2 = 'a';
 
-__attribute__ ((section(".rodata.v3_a8")))
+__attribute__ ((section(".rodata.v3_a8"), aligned(8)))
 const double rodata_item3 = 777.777;
 
-__attribute__ ((section(".rodata.v4_a1")))
+__attribute__ ((section(".rodata.v4_a1"), aligned(1)))
 const char rodata_item4[7] = {'1', '2', '3', '4', '5', '6', '7'};
 
 // --- Initialized .data items
 
-__attribute__ ((section(".data.v1_a2")))
+__attribute__ ((section(".data.v1_a2"), aligned(2)))
 short rwdata_item1 = 101;
 
-__attribute__ ((section(".data.v2_a1")))
+__attribute__ ((section(".data.v2_a1"), aligned(1)))
 char rwdata_item2 = 'a';
 
-__attribute__ ((section(".data.v3_a8")))
+__attribute__ ((section(".data.v3_a8"), aligned(8)))
 double rwdata_item3 = 'b';
 
-__attribute__ ((section(".data.v4_a1")))
+__attribute__ ((section(".data.v4_a1"), aligned(1)))
 char rwdata_item4[3] = {'a', 'b', 'c'};
 
 // --- Uninitialized .data items
 
-__attribute__ ((section(".bss.v1_a2")))
+__attribute__ ((section(".bss.v1_a2"), aligned(2)))
 short bss_item1;
 
-__attribute__ ((section(".bss.v2_a1")))
+__attribute__ ((section(".bss.v2_a1"), aligned(1)))
 char bss_item2;
 
-__attribute__ ((section(".bss.v3_a8")))
+__attribute__ ((section(".bss.v3_a8"), aligned(8)))
 struct blah { union { double d; char c; } u; } bss_item3;
 
-__attribute__ ((section(".bss.v4_a1")))
+__attribute__ ((section(".bss.v4_a1"), aligned(1)))
 char bss_item4[3];
 
 int main (void)