diff --git a/testsuite/expect/test1.16 b/testsuite/expect/test1.16
index d43c3978a8298f2a4ed88a84f721cf01b325653c..48fbae1bb00c364eda3d3ae9f2166d08de06c0d4 100755
--- a/testsuite/expect/test1.16
+++ b/testsuite/expect/test1.16
@@ -41,7 +41,7 @@ set scratch_file       "scratch.$test_id"
 print_header $test_id
 
 if {[test_cray]} {
-        send_user "\nWARNING: This test is not compatible with Cray systems\n"
+        send_user "\nWARNING: This test is incompatible with Cray systems\n"
         exit $exit_code
 }
 
diff --git a/testsuite/expect/test1.6 b/testsuite/expect/test1.6
index 3cd581903ec16223bea1437592c905a5c8b4b1b8..c25c4141fc22f57f22c0210351675abe3d083dd1 100755
--- a/testsuite/expect/test1.6
+++ b/testsuite/expect/test1.6
@@ -45,6 +45,9 @@ print_header $test_id
 if {[test_launch_poe]} {
 	send_user "\nWARNING: This test is incompatible with POE systems\n"
 	exit $exit_code
+} elseif {[test_cray]} {
+        send_user "\nWARNING: This test is incompatible with Cray systems\n"
+        exit $exit_code
 }
 
 #
diff --git a/testsuite/expect/test23.1 b/testsuite/expect/test23.1
index 3c5f7e441a892782c6a9df9df8087b718a3d3230..d8f548ed13b7f8e8b19cf12eaa64d5666ae3b4ba 100755
--- a/testsuite/expect/test23.1
+++ b/testsuite/expect/test23.1
@@ -39,6 +39,11 @@ set not_support 0
 
 print_header $test_id
 
+if {[test_cray]} {
+        send_user "\nWARNING: This test is incompatible with Cray systems\n"
+        exit $exit_code
+}
+
 ################################################################
 #
 # Proc: sstat_job
diff --git a/testsuite/expect/test7.13 b/testsuite/expect/test7.13
index 188ebd6f7f033d404a2afa4018a2dd8bdc8ad0fa..9707714bd88c4c89e4a9b1eb4c89436bfd2eb182 100755
--- a/testsuite/expect/test7.13
+++ b/testsuite/expect/test7.13
@@ -42,6 +42,9 @@ print_header $test_id
 if {[test_launch_poe]} {
 	send_user "\nWARNING: This test is incompatible with launch/poe systems\n"
 	exit 0
+} elseif {[test_cray]} {
+        send_user "\nWARNING: This test is incompatible with Cray systems\n"
+        exit $exit_code
 }
 
 #