diff --git a/gas/testsuite/ChangeLog b/gas/testsuite/ChangeLog
index 341f5d2330e..3bc3582c972 100644
--- a/gas/testsuite/ChangeLog
+++ b/gas/testsuite/ChangeLog
@@ -1,3 +1,10 @@
+2011-05-16  Hans-Peter Nilsson  <hp@axis.com>
+
+	* gas/cris/rd-brokw-pic-1.d, gas/cris/rd-brokw-pic-2.d,
+	gas/cris/rd-fragtest-pic.d: Gate on targets cris-*-*elf* and
+	cris-*-linux-gnu.
+	* gas/cris/pic-err-2.s, gas/cris/pic-err-3.s: New tests.
+
 2011-05-14  Alan Modra  <amodra@gmail.com>
 
 	* gas/all/gas.exp: Fix typo last change.
diff --git a/gas/testsuite/gas/cris/pic-err-2.s b/gas/testsuite/gas/cris/pic-err-2.s
new file mode 100644
index 00000000000..1720054b56a
--- /dev/null
+++ b/gas/testsuite/gas/cris/pic-err-2.s
@@ -0,0 +1,6 @@
+; Check that --pic isn't recognized for a.out files, specified by emulation.
+
+; { dg-do assemble { target cris-*-* } }
+; { dg-options "--pic --em=crisaout" }
+; { dg-error ".* --pic is invalid" "" { target cris-*-* } 0 }
+ nop
diff --git a/gas/testsuite/gas/cris/pic-err-3.s b/gas/testsuite/gas/cris/pic-err-3.s
new file mode 100644
index 00000000000..eca76e88a95
--- /dev/null
+++ b/gas/testsuite/gas/cris/pic-err-3.s
@@ -0,0 +1,6 @@
+; Check that --pic isn't recognized for a.out files, with a.out the default.
+
+; { dg-do assemble { target cris-*-*aout* } }
+; { dg-options "--pic" }
+; { dg-error ".* --pic is invalid" "" { target cris-*-* } 0 }
+ nop
diff --git a/gas/testsuite/gas/cris/rd-brokw-pic-1.d b/gas/testsuite/gas/cris/rd-brokw-pic-1.d
index 502796817bf..b0574c37225 100644
--- a/gas/testsuite/gas/cris/rd-brokw-pic-1.d
+++ b/gas/testsuite/gas/cris/rd-brokw-pic-1.d
@@ -1,5 +1,6 @@
 #objdump: -dr
 #as: --pic
+#target: cris-*-*elf* cris-*-linux-gnu
 #source: brokw-1.s
 
 .*:     file format .*-cris
diff --git a/gas/testsuite/gas/cris/rd-brokw-pic-2.d b/gas/testsuite/gas/cris/rd-brokw-pic-2.d
index 30ca1f5b83d..3ce0af6b499 100644
--- a/gas/testsuite/gas/cris/rd-brokw-pic-2.d
+++ b/gas/testsuite/gas/cris/rd-brokw-pic-2.d
@@ -1,5 +1,6 @@
 #objdump: -dr
 #as: --pic
+#target: cris-*-*elf* cris-*-linux-gnu
 #source: brokw-2.s
 
 .*:     file format .*-cris
diff --git a/gas/testsuite/gas/cris/rd-fragtest-pic.d b/gas/testsuite/gas/cris/rd-fragtest-pic.d
index 0e4c2f16a39..7a134099040 100644
--- a/gas/testsuite/gas/cris/rd-fragtest-pic.d
+++ b/gas/testsuite/gas/cris/rd-fragtest-pic.d
@@ -1,5 +1,6 @@
 #objdump: -dr
 #as: --pic
+#target: cris-*-*elf* cris-*-linux-gnu
 #source: fragtest.s
 
 .*:     file format .*-cris