diff --git a/binutils/testsuite/ChangeLog b/binutils/testsuite/ChangeLog
index 604c824bcb..9e200f0bf9 100644
--- a/binutils/testsuite/ChangeLog
+++ b/binutils/testsuite/ChangeLog
@@ -1,3 +1,11 @@
+2012-02-14  Alan Modra  <amodra@gmail.com>
+
+	* binutils-all/dw2-decodedline.S: Always have whitespace before
+	directives.
+	* binutils-all/version.s: Likewise.
+	* binutils-all/objdump.exp (dw2-decodedline): Don't run for
+	hppa64*-*-hpux*, i370-*-*, i960-*-*.
+
 2012-02-11  Kai Tietz  <ktietz@redhat.com>
 
 	* binutils-all/version.def: New file.
diff --git a/binutils/testsuite/binutils-all/dw2-decodedline.S b/binutils/testsuite/binutils-all/dw2-decodedline.S
index 3656e6237e..a54bdcfba1 100644
--- a/binutils/testsuite/binutils-all/dw2-decodedline.S
+++ b/binutils/testsuite/binutils-all/dw2-decodedline.S
@@ -2,13 +2,13 @@
 	.file 1 "dw2-decodedline.c"
 	.file 2 "directory/file1.c"
 	.text
-.globl f1
+	.globl f1
 	.type	f1, %function
 f1:
 	.loc 2 1 0
 	nop
 	.size	f1, .-f1
-.globl main
+	.globl main
 	.type	main, %function
 main:
 	.loc 1 2 0
diff --git a/binutils/testsuite/binutils-all/objdump.exp b/binutils/testsuite/binutils-all/objdump.exp
index 1e2afa61d0..e0ee45f1a6 100644
--- a/binutils/testsuite/binutils-all/objdump.exp
+++ b/binutils/testsuite/binutils-all/objdump.exp
@@ -207,6 +207,9 @@ if { ![is_elf_format] } then {
 # of DWARF2 line debug information.
 
 if { ![is_elf_format]
+     || [istarget "hppa64*-*-hpux*"]
+     || [istarget "i370-*-*"]
+     || [istarget "i960-*-*"]
      || [istarget "ia64*-*-*"]
      || [istarget "mcore-*-*"]
      || [istarget "moxie-*-*"]
diff --git a/binutils/testsuite/binutils-all/version.s b/binutils/testsuite/binutils-all/version.s
index 8e2e5960fe..66a0566b6a 100644
--- a/binutils/testsuite/binutils-all/version.s
+++ b/binutils/testsuite/binutils-all/version.s
@@ -1 +1 @@
-.version "Version 1.0"
+ .version "Version 1.0"