diff --git a/gold/ChangeLog b/gold/ChangeLog
index 3cb9f3715b..3b77230422 100644
--- a/gold/ChangeLog
+++ b/gold/ChangeLog
@@ -1,3 +1,10 @@
+2015-10-28  Marcin Kościelnicki  <koriakin@0x04.net>
+
+	* testsuite/binary_test.cc: Add __attribute__((aligned(1))).
+	* testsuite/script_test_12a.c: Likewise.
+	* testsuite/script_test_1a.cc: Likewise.
+	* testsuite/script_test_2.cc: Likewise.
+
 2015-10-28  Marcin Kościelnicki  <koriakin@0x04.net>
 
 	* testsuite/debug_msg.sh: Accept more fuzz in line numbers.
diff --git a/gold/testsuite/binary_test.cc b/gold/testsuite/binary_test.cc
index 4ee9868973..6b516fc5f0 100644
--- a/gold/testsuite/binary_test.cc
+++ b/gold/testsuite/binary_test.cc
@@ -28,9 +28,9 @@
 #include <cstring>
 #include <stdint.h>
 
-extern char _binary_binary_txt_start[];
-extern char _binary_binary_txt_end[];
-extern char _binary_binary_txt_size[];
+extern char _binary_binary_txt_start[] __attribute__((__aligned__(1)));
+extern char _binary_binary_txt_end[] __attribute__((__aligned__(1)));
+extern char _binary_binary_txt_size[] __attribute__((__aligned__(1)));
 
 int
 main(int, char**)
diff --git a/gold/testsuite/script_test_12a.c b/gold/testsuite/script_test_12a.c
index 6540027d27..85887a4396 100644
--- a/gold/testsuite/script_test_12a.c
+++ b/gold/testsuite/script_test_12a.c
@@ -51,7 +51,7 @@
 
 extern int test_array_start;
 extern int test_array_end;
-extern char interleaved;
+extern char interleaved __attribute__((__aligned__(1)));
 
 int
 main(void)
diff --git a/gold/testsuite/script_test_1a.cc b/gold/testsuite/script_test_1a.cc
index 648b42a2da..56dd2a9aa8 100644
--- a/gold/testsuite/script_test_1a.cc
+++ b/gold/testsuite/script_test_1a.cc
@@ -24,7 +24,14 @@
 
 #include "script_test_1.h"
 
-extern char a, b, c, d, e, f, g;
+extern char
+  a __attribute__((__aligned__(1))),
+  b __attribute__((__aligned__(1))),
+  c __attribute__((__aligned__(1))),
+  d __attribute__((__aligned__(1))),
+  e __attribute__((__aligned__(1))),
+  f __attribute__((__aligned__(1))),
+  g __attribute__((__aligned__(1)));
 int sym = 3;
 int common_sym;
 
diff --git a/gold/testsuite/script_test_2.cc b/gold/testsuite/script_test_2.cc
index 80ca246775..9fcacb0429 100644
--- a/gold/testsuite/script_test_2.cc
+++ b/gold/testsuite/script_test_2.cc
@@ -28,15 +28,15 @@
 #include <cstring>
 #include <stdint.h>
 
-extern char start_test_area[];
-extern char start_test_area_1[];
-extern char start_data[];
-extern char end_data[];
-extern char start_fill[];
-extern char end_fill[];
-extern char end_test_area[];
-extern char test_addr[];
-extern char test_addr_alias[];
+extern char start_test_area[] __attribute__((__aligned__(1)));
+extern char start_test_area_1[] __attribute__((__aligned__(1)));
+extern char start_data[] __attribute__((__aligned__(1)));
+extern char end_data[] __attribute__((__aligned__(1)));
+extern char start_fill[] __attribute__((__aligned__(1)));
+extern char end_fill[] __attribute__((__aligned__(1)));
+extern char end_test_area[] __attribute__((__aligned__(1)));
+extern char test_addr[] __attribute__((__aligned__(1)));
+extern char test_addr_alias[] __attribute__((__aligned__(1)));
 
 int
 main(int, char**)