diff --git a/gas/ChangeLog b/gas/ChangeLog
index 7c59774f0a..83f4077a17 100644
--- a/gas/ChangeLog
+++ b/gas/ChangeLog
@@ -1,3 +1,10 @@
+2016-01-21  Nick Clifton  <nickc@redhat.com>
+
+	PR gas/19454
+	* testsuite/gas/arm/mapshort-elf.d: Fix expected output to cope
+	with arm-netbsdelf target.
+	* testsuite/gas/arm/blx-bl-convert.d: Skip for netbsdelf.
+
 2016-01-20  Nick Clifton  <nickc@redhat.com>
 
 	PR 19456
diff --git a/gas/testsuite/gas/arm/blx-bl-convert.d b/gas/testsuite/gas/arm/blx-bl-convert.d
index 37f0b67677..9c251631af 100644
--- a/gas/testsuite/gas/arm/blx-bl-convert.d
+++ b/gas/testsuite/gas/arm/blx-bl-convert.d
@@ -1,7 +1,7 @@
 #name: blx->bl convert under no -march/cpu
 #error-output: blx-bl-convert.l
 #objdump: -d
-#skip: *-*-pe *-wince-* *-*-coff *-*-vxworks
+#skip: *-*-pe *-wince-* *-*-coff *-*-vxworks *-*-netbsdelf
 
 .*:     file format .*
 
diff --git a/gas/testsuite/gas/arm/mapshort-elf.d b/gas/testsuite/gas/arm/mapshort-elf.d
index b02aa395f4..38cd0e8a2d 100644
--- a/gas/testsuite/gas/arm/mapshort-elf.d
+++ b/gas/testsuite/gas/arm/mapshort-elf.d
@@ -22,8 +22,7 @@ SYMBOL TABLE:
 0+1c l       .text	00000000 \$d
 0+1f l       .text	00000000 bar
 0+00 l       .data	00000000 wibble
-0+00 l       .data	00000000 \$d
-# The ELF based port does not generate a .ARM.attributes symbol
+#...
 
 Disassembly of section .text: