diff --git a/gas/ChangeLog b/gas/ChangeLog
index 8e0fe65bb7c..7d1d6024ec7 100644
--- a/gas/ChangeLog
+++ b/gas/ChangeLog
@@ -1,3 +1,18 @@
+2016-05-11  Nick Clifton  <nickc@redhat.com>
+
+	* gas/arm/archv8m-cmse-msr-main.d: 
+
+2016-05-10  Alexander Fomin  <alexander.fomin@intel.com>
+
+	* testsuite/gas/i386/i386.exp: Run RDPID tests.
+	* testsuite/gas/i386/prefix.d: Adjust.
+	* testsuite/gas/i386/rdpid.s: New test.
+	* testsuite/gas/i386/rdpid.d: Ditto.
+	* testsuite/gas/i386/rdpid-intel.d: Ditto.
+	* testsuite/gas/i386/x86-64-rdpid.s: Ditto.
+	* testsuite/gas/i386/x86-64-rdpid.d: Ditto.
+	* testsuite/gas/i386/x86-64-rdpid-intel.d: Ditto.
+
 2016-05-10  Alexander Fomin  <alexander.fomin@intel.com>
 
 	* config/tc-i386.c (cpu_arch): Add RDPID.
diff --git a/gas/testsuite/ChangeLog b/gas/testsuite/ChangeLog
deleted file mode 100644
index b3a95ff39ec..00000000000
--- a/gas/testsuite/ChangeLog
+++ /dev/null
@@ -1,25 +0,0 @@
-2016-05-10  Alexander Fomin  <alexander.fomin@intel.com>
-
-	* gas/i386/i386.exp: Run RDPID tests.
-	* gas/i386/prefix.d: Adjust.
-	* gas/i386/rdpid.s: New test.
-	* gas/i386/rdpid.d: Ditto.
-	* gas/i386/rdpid-intel.d: Ditto.
-	* gas/i386/x86-64-rdpid.s: Ditto.
-	* gas/i386/x86-64-rdpid.d: Ditto.
-	* gas/i386/x86-64-rdpid-intel.d: Ditto.
-
-For older changes see ChangeLog-2015
-
-Copyright (C) 2016 Free Software Foundation, Inc.
-
-Copying and distribution of this file, with or without modification,
-are permitted in any medium without royalty provided the copyright
-notice and this notice are preserved.
-
-Local Variables:
-mode: change-log
-left-margin: 8
-fill-column: 74
-version-control: never
-End:
diff --git a/gas/testsuite/gas/arm/archv8m-cmse-base.d b/gas/testsuite/gas/arm/archv8m-cmse-base.d
index d8e4d33f821..ba6ff3ac9b9 100644
--- a/gas/testsuite/gas/arm/archv8m-cmse-base.d
+++ b/gas/testsuite/gas/arm/archv8m-cmse-base.d
@@ -2,6 +2,7 @@
 #source: archv8m-cmse.s
 #as: -march=armv8-m.base
 #objdump: -dr --prefix-addresses --show-raw-insn
+#skip: *-*-*coff *-*-pe *-*-wince *-*-*aout* *-*-netbsd *-*-riscix*
 
 .*: +file format .*arm.*
 
diff --git a/gas/testsuite/gas/arm/archv8m-cmse-main-1.d b/gas/testsuite/gas/arm/archv8m-cmse-main-1.d
index ef247c5e44d..f4937df3186 100644
--- a/gas/testsuite/gas/arm/archv8m-cmse-main-1.d
+++ b/gas/testsuite/gas/arm/archv8m-cmse-main-1.d
@@ -2,6 +2,7 @@
 #source: archv8m-cmse.s
 #as: -march=armv8-m.main
 #objdump: -dr --prefix-addresses --show-raw-insn
+#skip: *-*-*coff *-*-pe *-*-wince *-*-*aout* *-*-netbsd *-*-riscix*
 
 .*: +file format .*arm.*
 
diff --git a/gas/testsuite/gas/arm/archv8m-cmse-main-2.d b/gas/testsuite/gas/arm/archv8m-cmse-main-2.d
index ad9076666c1..0aa67e44220 100644
--- a/gas/testsuite/gas/arm/archv8m-cmse-main-2.d
+++ b/gas/testsuite/gas/arm/archv8m-cmse-main-2.d
@@ -2,6 +2,7 @@
 #source: archv8m-cmse-main.s
 #as: -march=armv8-m.main
 #objdump: -dr --prefix-addresses --show-raw-insn
+#skip: *-*-*coff *-*-pe *-*-wince *-*-*aout* *-*-netbsd *-*-riscix*
 
 .*: +file format .*arm.*
 
diff --git a/gas/testsuite/gas/arm/archv8m-cmse-msr-base.d b/gas/testsuite/gas/arm/archv8m-cmse-msr-base.d
index 837767717d0..ded24ef19db 100644
--- a/gas/testsuite/gas/arm/archv8m-cmse-msr-base.d
+++ b/gas/testsuite/gas/arm/archv8m-cmse-msr-base.d
@@ -2,6 +2,7 @@
 #source: archv8m-cmse-msr.s
 #as: -march=armv8-m.base
 #objdump: -dr --prefix-addresses --show-raw-insn
+#skip: *-*-*coff *-*-pe *-*-wince *-*-*aout* *-*-netbsd *-*-riscix*
 
 .*: +file format .*arm.*
 
diff --git a/gas/testsuite/gas/arm/archv8m-cmse-msr-main.d b/gas/testsuite/gas/arm/archv8m-cmse-msr-main.d
index ca8b000c20e..df531509bd4 100644
--- a/gas/testsuite/gas/arm/archv8m-cmse-msr-main.d
+++ b/gas/testsuite/gas/arm/archv8m-cmse-msr-main.d
@@ -2,6 +2,7 @@
 #source: archv8m-cmse-msr.s
 #as: -march=armv8-m.main
 #objdump: -dr --prefix-addresses --show-raw-insn
+#skip: *-*-*coff *-*-pe *-*-wince *-*-*aout* *-*-netbsd *-*-riscix*
 
 .*: +file format .*arm.*
 
diff --git a/gas/testsuite/gas/arm/archv8m-main-dsp-1.d b/gas/testsuite/gas/arm/archv8m-main-dsp-1.d
index ffd25610f3b..17714b8ac3c 100644
--- a/gas/testsuite/gas/arm/archv8m-main-dsp-1.d
+++ b/gas/testsuite/gas/arm/archv8m-main-dsp-1.d
@@ -2,6 +2,7 @@
 #source: archv8m.s
 #as: -march=armv8-m.main+dsp
 #objdump: -dr --prefix-addresses --show-raw-insn
+#skip: *-*-*coff *-*-pe *-*-wince *-*-*aout* *-*-netbsd *-*-riscix*
 
 .*: +file format .*arm.*
 
diff --git a/gas/testsuite/gas/arm/archv8m-main-dsp-2.d b/gas/testsuite/gas/arm/archv8m-main-dsp-2.d
index 8532551029a..7730a032bcc 100644
--- a/gas/testsuite/gas/arm/archv8m-main-dsp-2.d
+++ b/gas/testsuite/gas/arm/archv8m-main-dsp-2.d
@@ -2,6 +2,7 @@
 #source: archv8m-cmse.s
 #as: -march=armv8-m.main+dsp
 #objdump: -dr --prefix-addresses --show-raw-insn
+#skip: *-*-*coff *-*-pe *-*-wince *-*-*aout* *-*-netbsd *-*-riscix*
 
 .*: +file format .*arm.*
 
diff --git a/gas/testsuite/gas/arm/archv8m-main-dsp-3.d b/gas/testsuite/gas/arm/archv8m-main-dsp-3.d
index 7d0c74852b7..fdd9c780252 100644
--- a/gas/testsuite/gas/arm/archv8m-main-dsp-3.d
+++ b/gas/testsuite/gas/arm/archv8m-main-dsp-3.d
@@ -2,6 +2,7 @@
 #source: archv8m-cmse-main.s
 #as: -march=armv8-m.main+dsp
 #objdump: -dr --prefix-addresses --show-raw-insn
+#skip: *-*-*coff *-*-pe *-*-wince *-*-*aout* *-*-netbsd *-*-riscix*
 
 .*: +file format .*arm.*
 
diff --git a/gas/testsuite/gas/arm/archv8m-main-dsp-4.d b/gas/testsuite/gas/arm/archv8m-main-dsp-4.d
index 5e07e9ea783..1bb19ea8f35 100644
--- a/gas/testsuite/gas/arm/archv8m-main-dsp-4.d
+++ b/gas/testsuite/gas/arm/archv8m-main-dsp-4.d
@@ -2,6 +2,7 @@
 #source: archv8m-cmse-msr.s
 #as: -march=armv8-m.main+dsp
 #objdump: -dr --prefix-addresses --show-raw-insn
+#skip: *-*-*coff *-*-pe *-*-wince *-*-*aout* *-*-netbsd *-*-riscix*
 
 .*: +file format .*arm.*