diff --git a/gas/testsuite/ChangeLog b/gas/testsuite/ChangeLog
index d43767cc82..165e42152e 100644
--- a/gas/testsuite/ChangeLog
+++ b/gas/testsuite/ChangeLog
@@ -1,3 +1,9 @@
+2000-07-20  Hans-Peter Nilsson  <hp@axis.com>
+
+	* gas/all/gas.exp: Don't run floating-point tests on CRIS.
+	* gas/ieee-fp/x930509a.exp: Ditto.
+	* gas/macros/macros.exp: Mark strings test xfail for CRIS.
+
 2000-07-19  Alan Modra  <alan@linuxcare.com.au>
 
 	* gas/macros/macros.exp (test1): Run it for hppa*-*-linux*.
diff --git a/gas/testsuite/gas/all/gas.exp b/gas/testsuite/gas/all/gas.exp
index 8098448ce9..84118fa099 100644
--- a/gas/testsuite/gas/all/gas.exp
+++ b/gas/testsuite/gas/all/gas.exp
@@ -23,7 +23,10 @@ if { [istarget hppa*-*-*] || [istarget *c54x*-*-*] } then {
     gas_test "p1480.s" "" "-a>" "simplifiable double subtraction"
 }
 
-gas_test "float.s" ""   "" "simple FP constants"
+# No floating point support in assembly code for CRIS.
+if ![istarget cris-*-*] then {
+    gas_test "float.s" ""   "" "simple FP constants"
+}
 
 # This test is meaningless for the PA; the difference of two undefined
 # symbols is something that is (and must be) supported on the PA.
diff --git a/gas/testsuite/gas/ieee-fp/x930509a.exp b/gas/testsuite/gas/ieee-fp/x930509a.exp
index 3f5f708b7b..88a2e13068 100644
--- a/gas/testsuite/gas/ieee-fp/x930509a.exp
+++ b/gas/testsuite/gas/ieee-fp/x930509a.exp
@@ -20,7 +20,9 @@ proc dotest {} {
 }
 
 # C54x alignment/addressing is different, so the listing looks different
-# float encoding is tested in c54x-specific tests
-if { ![istarget vax*-*-*] && ![istarget *c54x*-*-*] } then {
+# float encoding is tested in c54x-specific tests.
+# No floating point support in assembly code for CRIS.
+if { ![istarget vax*-*-*] && ![istarget *c54x*-*-*]
+     && ![istarget cris-*-*] } then {
     dotest
 }
diff --git a/gas/testsuite/gas/macros/macros.exp b/gas/testsuite/gas/macros/macros.exp
index c1d06a102a..6e647461bb 100644
--- a/gas/testsuite/gas/macros/macros.exp
+++ b/gas/testsuite/gas/macros/macros.exp
@@ -27,5 +27,7 @@ case $target_triplet in {
 }
 
 if { ![istarget hppa*-*-*] || [istarget *-*-linux*] } {
+    # FIXME: Due to macro mishandling of ONLY_STANDARD_ESCAPES.
+    setup_xfail cris-*-*
     run_dump_test strings
 }