diff --git a/testsuite/expect/globals b/testsuite/expect/globals
index 841759e9c5d72b74435df8687fb3c9809e1d8f83..28f596526450a4f77a3f034dfd7cfcf9e772dc8c 100755
--- a/testsuite/expect/globals
+++ b/testsuite/expect/globals
@@ -2745,7 +2745,7 @@ proc get_node_cnt { } {
 proc get_node_cnt_in_part { partition } {
 	global scontrol number
 
-#	log_user 0
+	log_user 0
 	set node_cnt 0
 	set scon_pid [spawn -noecho $scontrol show partition $partition]
 	expect {
@@ -2762,7 +2762,7 @@ proc get_node_cnt_in_part { partition } {
 		eof {
 		}
 	}
-#	log_user 1
+	log_user 1
 
 	return $node_cnt
 }
diff --git a/testsuite/expect/test1.69 b/testsuite/expect/test1.69
index c4e1856c7c0edde7d2ee5f5807fa362d2104256e..2fb04c3feffa960e692f1a739393b54fddf3a6f2 100755
--- a/testsuite/expect/test1.69
+++ b/testsuite/expect/test1.69
@@ -40,12 +40,20 @@ set exit_code   0
 
 print_header $test_id
 
-if {[test_bluegene]} {
+set select_type [test_select_type]
+if {![string compare $select_type "bluegene"]} {
 	send_user "\nWARNING: This test is incompatible with Bluegene systems\n"
 	exit $exit_code
-} elseif {[test_alps]} {
-	send_user "\nWARNING: This test is incompatible with Cray systems\n"
+} elseif {![string compare $select_type "alps"]} {
+	send_user "\nWARNING: This test is incompatible with Cray/ALPS systems\n"
 	exit $exit_code
+} elseif {![string compare $select_type "linear"]} {
+	set def_part_name [default_partition]
+	set nb_nodes [get_node_cnt_in_part $def_part_name]
+	if {$nb_nodes < 2} {
+		send_user "\nWARNING: This test is incompatible with select/linear and only one node\n"
+		exit $exit_code
+	}
 } elseif {[test_launch_poe]} {
 	send_user "\nWARNING: This test is incompatible with POE systems\n"
 	exit $exit_code