diff --git a/testsuite/expect/test15.14 b/testsuite/expect/test15.14
index 9ce1a024dbcd398dcf82f22010a0c471d3944c16..fb1e04bf526fa0f14dbe92558fdabf4edfa87406 100755
--- a/testsuite/expect/test15.14
+++ b/testsuite/expect/test15.14
@@ -80,7 +80,8 @@ expect {
 		set job_id2 $expect_out(1,string)
 		exp_continue
 	}
-	-re "JobState=COMPLETED" {
+#	COMPLETED or COMPLETING
+	-re "JobState=COMPLET" {
 		set match_state 1
 		exp_continue
 	}
diff --git a/testsuite/expect/test3.4 b/testsuite/expect/test3.4
index c679262404106698c6672675625ef47cc5f0e762..125fd0e89fbae1876c4b60826b12e5ec3f576566 100755
--- a/testsuite/expect/test3.4
+++ b/testsuite/expect/test3.4
@@ -129,7 +129,9 @@ if {$new_prio != $read_priority} {
 	set exit_code 1
 }
 
-cancel_job $job_id
+if {[cancel_job $job_id] != 0} {
+	set exit_code 1
+}
 if {$exit_code == 0} {
 	send_user "\nSUCCESS\n"
 }
diff --git a/testsuite/expect/test9.8 b/testsuite/expect/test9.8
index 12a14484d343abb2f9b1d588633acccece03fcce..aeb0d8d23ce12229555932bf5f0a6248cda5287d 100755
--- a/testsuite/expect/test9.8
+++ b/testsuite/expect/test9.8
@@ -226,7 +226,7 @@ if {$completing_jobs != 0} {
 	set completing_jobs 0
 	spawn $squeue --noheader --user $user_name
 	expect {
-		-re "$user_name *CG" {
+		-re "$job_name *$user_name *CG" {
 			incr completing_jobs
 			exp_continue
 		}
@@ -246,7 +246,7 @@ if {$completing_jobs != 0} {
 		exec $bin_sleep $max_wait
 		spawn $squeue --noheader --user $user_name
 		expect {
-			-re "$user_name *CG" {
+			-re "$job_name *$user_name *CG" {
 				incr completing_jobs
 				exp_continue
 			}