diff --git a/testsuite/expect/globals b/testsuite/expect/globals
index 2cfa11e926ceb7b51e5abae1d084945c02d4dcd8..76bef929c08a639e2d1cd333fe948ce039d2135b 100755
--- a/testsuite/expect/globals
+++ b/testsuite/expect/globals
@@ -1171,10 +1171,6 @@ proc test_front_end { } {
 			set front_end 1
 			exp_continue
 		}
-		"select/cray" {
-			set front_end 1
-			exp_continue
-		}
 		eof {
 			wait
 		}
diff --git a/testsuite/expect/test14.1 b/testsuite/expect/test14.1
index 4149cfbe79ad7c76719f1d2b55b2a05620964b7a..821355e19ac837c59208941f996942aafa6643ca 100755
--- a/testsuite/expect/test14.1
+++ b/testsuite/expect/test14.1
@@ -38,12 +38,11 @@ set matches     0
 
 print_header $test_id
 
-if {[test_bluegene]} {
-	send_user "\nWARNING: This test is incompatible with a Bluegene system\n"
-	exit $exit_code
+if {[test_front_end] != 0} {
+	send_user "\nWARNING: This test is incompatible with front-end systems\n"
+	exit 0
 }
 
-
 #
 # Report the sbcast usage format
 #
diff --git a/testsuite/expect/test14.2 b/testsuite/expect/test14.2
index 5013e4e6ac1d14e1c05bab6bdf5b4c77aa880387..aa0bc59e6ae2169428e46b5a434552c7082ff26f 100755
--- a/testsuite/expect/test14.2
+++ b/testsuite/expect/test14.2
@@ -38,9 +38,9 @@ set matches     0
 
 print_header $test_id
 
-if {[test_bluegene]} {
-	send_user "\nWARNING: This test is incompatible with a Bluegene system\n"
-	exit $exit_code
+if {[test_front_end] != 0} {
+	send_user "\nWARNING: This test is incompatible with front-end systems\n"
+	exit 0
 }
 
 #
diff --git a/testsuite/expect/test14.3 b/testsuite/expect/test14.3
index eeef3b24edda7a9ed99e8401bebbab025de7d0a5..e3a9343d7aea73f9996d2b0decd868e308d525b4 100755
--- a/testsuite/expect/test14.3
+++ b/testsuite/expect/test14.3
@@ -39,9 +39,9 @@ set version     0
 
 print_header $test_id
 
-if {[test_bluegene]} {
-	send_user "\nWARNING: This test is incompatible with a Bluegene system\n"
-	exit $exit_code
+if {[test_front_end] != 0} {
+	send_user "\nWARNING: This test is incompatible with front-end systems\n"
+	exit 0
 }
 
 #