diff --git a/binutils/testsuite/ChangeLog b/binutils/testsuite/ChangeLog
index 88b0d786ad..9efe4dcbf1 100644
--- a/binutils/testsuite/ChangeLog
+++ b/binutils/testsuite/ChangeLog
@@ -1,3 +1,12 @@
+2015-08-11  Alan Modra  <amodra@gmail.com>
+
+	* binutils-all/strip-12.s: Align .bss section.
+	* binutils-all/strip-12.d: Adjust.
+	* binutils-all/symbols-1.d: Allow extraneous symbols.
+	* binutils-all/symbols-2.d: Likewise, and V for weakened syms.
+	* binutils-all/symbols-3.d: Likewise.
+	* binutils-all/symbols-4.d: Likewise.
+
 2015-08-08  Hans-Peter Nilsson  <hp@axis.com>
 
 	* binutils-all/strip-12.s: Use ".section .bss" instead of ".bss"
diff --git a/binutils/testsuite/binutils-all/strip-12.d b/binutils/testsuite/binutils-all/strip-12.d
index a33faab2f6..e2ce4dc004 100644
--- a/binutils/testsuite/binutils-all/strip-12.d
+++ b/binutils/testsuite/binutils-all/strip-12.d
@@ -3,5 +3,5 @@
 #readelf: -S --wide
 
 #...
-  \[[ 0-9]+\] \.bss[ \t]+NOBITS[ \t0-9a-f]+WA[ \t]+0[ \t]+0[ \t]+1
+  \[[ 0-9]+\] \.bss[ \t]+NOBITS[ \t0-9a-f]+WA[ \t]+0[ \t]+0[ \t]+16
 #pass
diff --git a/binutils/testsuite/binutils-all/strip-12.s b/binutils/testsuite/binutils-all/strip-12.s
index 020cecc895..9a48f92b31 100644
--- a/binutils/testsuite/binutils-all/strip-12.s
+++ b/binutils/testsuite/binutils-all/strip-12.s
@@ -1,4 +1,5 @@
 	.section	.bss
+	.p2align 4
 	.space 8
 	.section	.debug_str,"MS",%progbits,1
 	.string	""
diff --git a/binutils/testsuite/binutils-all/symbols-1.d b/binutils/testsuite/binutils-all/symbols-1.d
index 41314bdc27..a2d8f55bc3 100644
--- a/binutils/testsuite/binutils-all/symbols-1.d
+++ b/binutils/testsuite/binutils-all/symbols-1.d
@@ -5,6 +5,7 @@
 #DUMPPROG: nm
 #nm: -n
 
+#...
 0+ D bar
 0+ d foa
 0+ d fob
diff --git a/binutils/testsuite/binutils-all/symbols-2.d b/binutils/testsuite/binutils-all/symbols-2.d
index 99950aaed5..68fa6737ec 100644
--- a/binutils/testsuite/binutils-all/symbols-2.d
+++ b/binutils/testsuite/binutils-all/symbols-2.d
@@ -5,10 +5,11 @@
 #DUMPPROG: nm
 #nm: -n
 
+#...
 0+ D bar
-0+ W foa
-0+ W fob
+0+ [VW] foa
+0+ [VW] fob
 0+ D foo
-0+ W foo1
-0+ W foo2
+0+ [VW] foo1
+0+ [VW] foo2
 
diff --git a/binutils/testsuite/binutils-all/symbols-3.d b/binutils/testsuite/binutils-all/symbols-3.d
index 9838e6785a..0815238a46 100644
--- a/binutils/testsuite/binutils-all/symbols-3.d
+++ b/binutils/testsuite/binutils-all/symbols-3.d
@@ -5,10 +5,11 @@
 #DUMPPROG: nm
 #nm: -n
 
+#...
 0+ D bar
-0+ W foa
-0+ W fob
+0+ [VW] foa
+0+ [VW] fob
 0+ d foo
-0+ W foo1
-0+ W foo2
+0+ [VW] foo1
+0+ [VW] foo2
 
diff --git a/binutils/testsuite/binutils-all/symbols-4.d b/binutils/testsuite/binutils-all/symbols-4.d
index bb984fdde2..7480b0de59 100644
--- a/binutils/testsuite/binutils-all/symbols-4.d
+++ b/binutils/testsuite/binutils-all/symbols-4.d
@@ -5,10 +5,11 @@
 #DUMPPROG: nm
 #nm: -n
 
+#...
 0+ D bar
-0+ W foa
-0+ W fob
+0+ [VW] foa
+0+ [VW] fob
 0+ D foo
-0+ W foo1
-0+ W foo2
+0+ [VW] foo1
+0+ [VW] foo2