diff --git a/testsuite/expect/test1.80 b/testsuite/expect/test1.80
index e64391ac896e40a2196c5df68a6ad6876bf70980..65f1ff0f240d7b979d144eea432c72ece1ec295f 100755
--- a/testsuite/expect/test1.80
+++ b/testsuite/expect/test1.80
@@ -54,6 +54,14 @@ if {[test_launch_poe]} {
 	set use_envvar SLURM_NODEID
 }
 
+# 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 < 2 } {
+	send_user "WARNING: Insufficient nodes in default partition ($node_count < 2)\n"
+	exit $exit_code
+}
+
 #
 # Submit a two node job with block distribution
 #
diff --git a/testsuite/expect/test1.81 b/testsuite/expect/test1.81
index 83c90b8722d62fe439265f5d40b96bf70ae61142..571dd670e799feb0aa5b663d6adf63ccfa47bd30 100755
--- a/testsuite/expect/test1.81
+++ b/testsuite/expect/test1.81
@@ -57,6 +57,14 @@ if {[test_launch_poe]} {
 	set use_envvar SLURM_NODEID
 }
 
+# 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 < 2 } {
+	send_user "WARNING: Insufficient nodes in default partition ($node_count < 2)\n"
+	exit $exit_code
+}
+
 #
 # Submit a 1 node job and validate that we don't get more than one
 #
diff --git a/testsuite/expect/test1.86 b/testsuite/expect/test1.86
index c89e26aba7e70078cfa023e4188671958aacb4f3..094f56540a833b3bb8294673f97b372da3ebcc99 100755
--- a/testsuite/expect/test1.86
+++ b/testsuite/expect/test1.86
@@ -59,6 +59,14 @@ if {[test_launch_poe]} {
 	set node_name_env SLURMD_NODENAME
 }
 
+# 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 < 2 } {
+	send_user "WARNING: Insufficient nodes in default partition ($node_count < 2)\n"
+	exit $exit_code
+}
+
 #
 # Build input script file
 #
diff --git a/testsuite/expect/test1.87 b/testsuite/expect/test1.87
index 446289c261b6b854a9ab5e7b0078ee16542a31b5..4b90b853f32b1450dbed125f65050e6c16c62d64 100755
--- a/testsuite/expect/test1.87
+++ b/testsuite/expect/test1.87
@@ -56,6 +56,14 @@ if {[test_launch_poe]} {
 	set node_name_env SLURMD_NODENAME
 }
 
+# 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 < 4 } {
+	send_user "WARNING: Insufficient nodes in default partition ($node_count < 4)\n"
+	exit $exit_code
+}
+
 #
 # Build input script file
 #
diff --git a/testsuite/expect/test1.92 b/testsuite/expect/test1.92
index 2a420400c5f8d14f6763353c8fe56e745425faaf..b0f249832ed73c50921a59f048668dac32480c2a 100755
--- a/testsuite/expect/test1.92
+++ b/testsuite/expect/test1.92
@@ -50,6 +50,14 @@ if {[test_front_end]} {
         exit $exit_code
 }
 
+# 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 < 2 } {
+	send_user "WARNING: Insufficient nodes in default partition ($node_count < 2)\n"
+	exit $exit_code
+}
+
 make_bash_script $file_bash {
 echo nodeid:$SLURM_NODEID taskid:$SLURM_PROCID localid:$SLURM_LOCALID
 exit 0
diff --git a/testsuite/expect/test15.19 b/testsuite/expect/test15.19
index d43a20dba7648637d6146345e87f1b1d711615a6..efa20fa7120742207894a33ab9812043e5fa107b 100755
--- a/testsuite/expect/test15.19
+++ b/testsuite/expect/test15.19
@@ -261,7 +261,18 @@ if {[string compare $host_0 $host_3] == 0} {
 }
 if {$dup_host == 1} {
 	send_user "\nFAILURE: Re-used a node in the allocation\n"
-	set exit_code   1
+	set exit_code 1
+}
+
+# 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 < 2 } {
+	send_user "WARNING: Insufficient nodes in default partition to continue ($node_count < 2)\n"
+	if {$exit_code == 0} {
+		send_user "\nSUCCESS\n"
+	}
+	exit $exit_code
 }
 
 #