diff --git a/testsuite/expect/test1.61 b/testsuite/expect/test1.61
index 0583f9cf3d5bb219aae24841f79f2780ae94ea2d..f10b7d06e09ab85302f758d4d7c03e9cf6c05f95 100755
--- a/testsuite/expect/test1.61
+++ b/testsuite/expect/test1.61
@@ -40,9 +40,13 @@ set file_out    "test$test_id.output"
 set file_err    "test$test_id.error"
 set timeout 60
 
-
 print_header $test_id
 
+if {[test_cray]} {
+	send_user "\nWARNING: This test is incompatible with Cray systems\n"
+	exit $exit_code
+}
+
 exec $bin_rm -f $file_in file_out file_err
 make_bash_script $file_in "
   $bin_date
diff --git a/testsuite/expect/test1.81 b/testsuite/expect/test1.81
index a1e7982a1f4903f4e8ddfdbd716f037157cdffdb..d08f061938a8cb59fe7ef6324627c9de95ed8094 100755
--- a/testsuite/expect/test1.81
+++ b/testsuite/expect/test1.81
@@ -40,6 +40,11 @@ set exit_code   0
 
 print_header $test_id
 
+if {[test_cray]} {
+	send_user "\nWARNING: This test is incompatible with Cray systems\n"
+	exit $exit_code
+}
+
 #
 # Submit a 1 node job and validate that we don't get more than one
 #
diff --git a/testsuite/expect/test11.5 b/testsuite/expect/test11.5
index 14f80b2bc4ea8c80f8e70f221379f86cb7065db3..f20e61425c89d2fbb68def4e73b803576693d39a 100755
--- a/testsuite/expect/test11.5
+++ b/testsuite/expect/test11.5
@@ -39,6 +39,11 @@ set job_id      0
 
 print_header $test_id
 
+if {[test_cray]} {
+	send_user "\nWARNING: This test is incompatible with Cray systems\n"
+	exit $exit_code
+}
+
 #
 # Delete left-over input script
 # Build input script file
@@ -85,7 +90,7 @@ if {[wait_for_step $job_id.0] != 0} {
 }
 
 #
-# Enable/disable/test ability to heckpoint
+# Enable/disable/test abFAILility to heckpoint
 #
 spawn $scontrol check disable $job_id.0
 expect {
diff --git a/testsuite/expect/test15.17 b/testsuite/expect/test15.17
index e91d6632a02f042e69564a0d4ae4d1ec7405c0e2..50e166f2c51992b02e624ca358878104a70f0b26 100755
--- a/testsuite/expect/test15.17
+++ b/testsuite/expect/test15.17
@@ -41,6 +41,11 @@ set job_id_2     0
 
 print_header $test_id
 
+if {[test_cray]} {
+	send_user "\nWARNING: This test is incompatible with Cray systems\n"
+	exit $exit_code
+}
+
 #
 # Build input script file
 #
diff --git a/testsuite/expect/test2.11 b/testsuite/expect/test2.11
index 3d8eac25cdcee5aea5c3e350e4280cd00cb36277..1cdb1546b7ad03ec5de22844c083b4bb09f306ff 100755
--- a/testsuite/expect/test2.11
+++ b/testsuite/expect/test2.11
@@ -41,6 +41,11 @@ set scontrol_id 0
 
 print_header $test_id
 
+if {[test_cray]} {
+	send_user "\nWARNING: This test is incompatible with Cray systems\n"
+	exit $exit_code
+}
+
 # Delete left-over stdout file
 file delete $file_out
 
diff --git a/testsuite/expect/test2.13 b/testsuite/expect/test2.13
index d4f77fef3fa075351adee7c10690b6347e0d0032..b2f6ab065441c52ddb9fe8b07a697d8075cd0f80 100755
--- a/testsuite/expect/test2.13
+++ b/testsuite/expect/test2.13
@@ -41,11 +41,16 @@ set orig_time     0
 set new_time      0
 
 print_header $test_id
-exec $bin_rm -f $file_in $file_out
+
+if {[test_cray]} {
+	send_user "\nWARNING: This test is incompatible with Cray systems\n"
+	exit $exit_code
+}
 
 #
 # Build input script file
 #
+exec $bin_rm -f $file_in $file_out
 make_bash_script $file_in "
   $bin_echo TEST_BEGIN
   $srun -t5 $bin_sleep 120
diff --git a/testsuite/expect/test2.8 b/testsuite/expect/test2.8
index 91ba33aa63a7124fe5a090b4dfcbc9e4d3c58973..605f88d89f215a917a59020dddc9f61f91df0072 100755
--- a/testsuite/expect/test2.8
+++ b/testsuite/expect/test2.8
@@ -178,7 +178,7 @@ expect {
 		wait
 	}
 }
-if {$matches != 1} {
+if {[test_cray] == 0 && $matches != 1} {
 	send_user "\nFAILURE: scontrol failed to find all job steps\n"
 	set exit_code 1
 }
@@ -206,7 +206,7 @@ expect {
 		wait
 	}
 }
-if {$matches != 1} {
+if {[test_cray] == 0 && $matches != 1} {
 	send_user "\nFAILURE: scontrol failed to specific job step\n"
 	set exit_code 1
 }
@@ -242,7 +242,7 @@ expect {
 		wait
 	}
 }
-if {$matches != 1} {
+if {[test_cray] == 0 && $matches != 1} {
 	send_user "\nFAILURE: scontrol found unexpected job step\n"
 	set exit_code 1
 }
diff --git a/testsuite/expect/test3.9 b/testsuite/expect/test3.9
index 76a161f204558db11d7519e8178d8a02df06baca..026abb31afc0a7f819ef4e68252c2642e05a77bd 100755
--- a/testsuite/expect/test3.9
+++ b/testsuite/expect/test3.9
@@ -37,6 +37,11 @@ set exit_code   0
 
 print_header $test_id
 
+if {[test_cray]} {
+	send_user "\nWARNING: This test is incompatible with Cray systems\n"
+	exit $exit_code
+}
+
 #
 # Issue scontrol reconfigure
 #
diff --git a/testsuite/expect/test5.4 b/testsuite/expect/test5.4
index c502c09e1167faae04e7de33832efe92519ee3ce..32fbe630a9c97c45180946a9e627d824bec82302 100755
--- a/testsuite/expect/test5.4
+++ b/testsuite/expect/test5.4
@@ -229,7 +229,7 @@ expect {
 	}
 }
 
-if {$step_found == 0} {
+if {[test_cray] == 0 && $step_found == 0} {
 	send_user "\nFAILURE: squeue step format error\n"
 	set exit_code 1
 }
diff --git a/testsuite/expect/test5.6 b/testsuite/expect/test5.6
index 4b1d1244ae8a5650d9df7480ca2e54cb9bcccba1..753bb4467f0a75b43ed1754f44f16fd1403d9d57 100755
--- a/testsuite/expect/test5.6
+++ b/testsuite/expect/test5.6
@@ -336,7 +336,7 @@ expect {
 		wait
 	}
 }
-if {$job_found == 0} {
+if {[test_cray] == 0 && $job_found == 0} {
 	send_user "\nFAILURE: squeue failed to locate desired job step\n"
 	set exit_code 1
 }
diff --git a/testsuite/expect/test7.5 b/testsuite/expect/test7.5
index 7abd866337213312de6e98625f38bf852e3c2a2e..0c8f6b9ef85e11b556ec5b6535d969bd7a43acc9 100755
--- a/testsuite/expect/test7.5
+++ b/testsuite/expect/test7.5
@@ -49,7 +49,10 @@ if { [test_xcpu] } {
 	send_user "\nWARNING: This test is incompatible with XCPU systems\n"
 	exit $exit_code
 }
-
+if {[test_cray]} {
+	send_user "\nWARNING: This test is incompatible with Cray systems\n"
+	exit $exit_code
+}
 
 #
 # Delete left-over program and rebuild it
diff --git a/testsuite/expect/test9.1 b/testsuite/expect/test9.1
index a55ca422dfc2a3d04a91ce43bd8576d609fb666a..da24e690ea8c94efd237dc3054de9ad1cc1a498f 100755
--- a/testsuite/expect/test9.1
+++ b/testsuite/expect/test9.1
@@ -57,6 +57,11 @@ set other_opts   "-O"
 
 print_header $test_id
 
+if {[test_cray]} {
+	send_user "\nWARNING: This test is incompatible with Cray systems\n"
+	exit $exit_code
+}
+
 # Execute an srun job to cat input_file to output_file, wait for completion
 # Returns 0 on successful completion, returns 1 otherwise
 proc run_cat_job { input_file output_file } {
diff --git a/testsuite/expect/test9.2 b/testsuite/expect/test9.2
index 52fd0a75131644526c6722cd90b3c7996be13b59..70bf0f3b5af248495a4f7557c417e79c01666147 100755
--- a/testsuite/expect/test9.2
+++ b/testsuite/expect/test9.2
@@ -55,6 +55,11 @@ set task_cnt     $max_stress_tasks
 
 print_header $test_id
 
+if {[test_cray]} {
+	send_user "\nWARNING: This test is incompatible with Cray systems\n"
+	exit $exit_code
+}
+
 # Execute an srun job to print hostname to output_file with task_cnt tasks per node,
 # wait for completion
 # Returns 0 on successful completion, returns 1 otherwise
diff --git a/testsuite/expect/test9.4 b/testsuite/expect/test9.4
index 684040b54c7273355bdd7463265790fb4b6d7fd3..d51c267f0645d46b49af6729b0b7d37e6f0dc059 100755
--- a/testsuite/expect/test9.4
+++ b/testsuite/expect/test9.4
@@ -63,6 +63,11 @@ set task_cnt      $max_stress_tasks
 
 print_header $test_id
 
+if {[test_cray]} {
+	send_user "\nWARNING: This test is incompatible with Cray systems\n"
+	exit $exit_code
+}
+
 # Execute an srun job to print hostname to output_file with task_cnt tasks
 # per node, wait for completion
 # Returns 0 on successful completion, returns 1 otherwise
diff --git a/testsuite/expect/test9.5 b/testsuite/expect/test9.5
index df7a1ed99effb9b2e4af04f7c6ee74804e61a92e..70637170f3d71fcf7cd8ce23cda74b915fa364e5 100755
--- a/testsuite/expect/test9.5
+++ b/testsuite/expect/test9.5
@@ -54,6 +54,11 @@ set task_cnt      $max_stress_tasks
 
 print_header $test_id
 
+if {[test_cray]} {
+	send_user "\nWARNING: This test is incompatible with Cray systems\n"
+	exit $exit_code
+}
+
 # Execute an srun job to print hostname to output_file with task_cnt tasks
 # per node, wait for completion
 # Returns 0 on successful completion, returns 1 otherwise
diff --git a/testsuite/expect/test9.8 b/testsuite/expect/test9.8
index f2259e7360c20b2f94e34e07fc28b64cd3f15d22..288e821dc3f2dd237f00614cc48b43f19e8d44dc 100755
--- a/testsuite/expect/test9.8
+++ b/testsuite/expect/test9.8
@@ -46,6 +46,11 @@ set task_cnt     60
 
 print_header $test_id
 
+if {[test_cray]} {
+	send_user "\nWARNING: This test is incompatible with Cray systems\n"
+	exit $exit_code
+}
+
 #
 # A single slurmd can't handle a large task count without
 # running out of memory and pthreads