diff --git a/testsuite/expect/inc21.21_tests b/testsuite/expect/inc21.21_tests
index b3b906ae28e0a74ada14f4494a2c5dbbee97b8fc..438067b4a5c89d011061a31edc4ca2faf5ef7dcb 100644
--- a/testsuite/expect/inc21.21_tests
+++ b/testsuite/expect/inc21.21_tests
@@ -234,7 +234,7 @@ sleep 10"
 
 	if { $pending != 1 || $running != $val } {
 		send_user "\nFAILURE found $pending jobs pending "
-		send_user "and $running jobs running"
+		send_user "and $running jobs running (want 1 and $val) "
 		print_err $test_type "inc21_21_grp_test"
 		set exit_code 1
 	}
diff --git a/testsuite/expect/test21.35 b/testsuite/expect/test21.35
index eaafd2ff9878e55c110c8f9254724a369e3702fd..d2be45a48467f4a2bb401c87b0877492a7a2548e 100755
--- a/testsuite/expect/test21.35
+++ b/testsuite/expect/test21.35
@@ -122,6 +122,11 @@ proc check_limit { type name } {
 			set match 1
 			exp_continue
 		}
+		-re "Node count specification invalid" {
+			send_user "\nWARNING: Test exceeds available node count\n"
+			set match 1
+			exp_continue
+		}
 		-re "Submitted batch job ($number)" {
 			set job_id $expect_out(1,string)
 			set exit_code 1
@@ -142,9 +147,6 @@ proc check_limit { type name } {
 		exit 1
 	}
 
-	# Cancel the submitted job
-	cancel_job $job_id
-
 	# Reset limits
 	mod_qos $test_qos [array get reset_qos_val]
 	mod_acct $test_acct "" "" [array get reset_assoc_val]