diff --git a/testsuite/expect/test1.59 b/testsuite/expect/test1.59
index 69ac646ce5965881e279aab01f14b6566d842638..e2dc89ca2d0781c58e175abc03b86e5cd45183ee 100755
--- a/testsuite/expect/test1.59
+++ b/testsuite/expect/test1.59
@@ -62,12 +62,9 @@ if {[test_launch_poe]} {
 
 # find out if we have enough nodes to test functionality
 set partition [default_partition]
-
 set node_count [get_node_cnt_in_part $partition]
 if { $node_count < 3 } {
-	send_user "WARNING: system must have at least 3 \
-		   nodes to run this test on.  This system \
-		   only has $node_count.\n"
+	send_user "WARNING: Insufficient nodes in default partition ($node_count < 3)\n"
 	exit $exit_code
 }
 
diff --git a/testsuite/expect/test38.10 b/testsuite/expect/test38.10
index b2639c16a70bc723c2065014bbca5cfe60cddab3..aded5a13464773cfefb7c72baf200513507aaf72 100755
--- a/testsuite/expect/test38.10
+++ b/testsuite/expect/test38.10
@@ -31,6 +31,7 @@
 source ./globals
 
 set test_id     "38.10"
+set exit_code	0
 
 print_header $test_id
 set prompt           "PROMPT: "
diff --git a/testsuite/expect/test38.17 b/testsuite/expect/test38.17
index 0eac423e7169a6ea1fd4866bab396d343bde2477..4785c12ee4ccdf246af1f3ba8767889ee2ea0c5b 100755
--- a/testsuite/expect/test38.17
+++ b/testsuite/expect/test38.17
@@ -52,6 +52,14 @@ proc end_it { exit_code } {
 
 print_header $test_id
 
+# find out if we have enough nodes to test functionality
+set partition [default_partition]
+set node_count [get_node_cnt_in_part $partition]
+if { $node_count < 3 } {
+	send_user "WARNING: Insufficient nodes in default partition ($node_count < 3)\n"
+	exit $exit_code
+}
+
 if {[test_front_end]} {
         send_user "\nWARNING: This test is incompatible with front-end systems\n"
         exit $exit_code
diff --git a/testsuite/expect/test38.2 b/testsuite/expect/test38.2
index 037f136afdff4c892655a77ec02019e9dd545b1d..7bc3f935f01381cfa27e41e47421e04a86858f43 100755
--- a/testsuite/expect/test38.2
+++ b/testsuite/expect/test38.2
@@ -40,6 +40,14 @@ set file_out     "test$test_id.out"
 
 print_header $test_id
 
+# find out if we have enough nodes to test functionality
+set partition [default_partition]
+set node_count [get_node_cnt_in_part $partition]
+if { $node_count < 3 } {
+	send_user "WARNING: Insufficient nodes in default partition ($node_count < 3)\n"
+	exit $exit_code
+}
+
 proc sbatch {} {
 	global number sbatch file_in bin_sleep file_out job_id
 
diff --git a/testsuite/expect/test38.4 b/testsuite/expect/test38.4
index 2112244564e699717362bcb705df950af790cde0..c95569aead03a19b2b2b63d074b2bc9738b99bda 100755
--- a/testsuite/expect/test38.4
+++ b/testsuite/expect/test38.4
@@ -41,6 +41,14 @@ set file_out     "test$test_id.out"
 
 print_header $test_id
 
+# find out if we have enough nodes to test functionality
+set partition [default_partition]
+set node_count [get_node_cnt_in_part $partition]
+if { $node_count < 3 } {
+	send_user "WARNING: Insufficient nodes in default partition ($node_count < 3)\n"
+	exit $exit_code
+}
+
 proc salloc {} {
 	global number salloc bin_sleep file_out job_id