diff --git a/testsuite/expect/test1.19 b/testsuite/expect/test1.19
index e62e359f5a48abb96d278004cb945e597485cff5..e34b769c438246057735fefa9b6db59a9f1bdc6b 100755
--- a/testsuite/expect/test1.19
+++ b/testsuite/expect/test1.19
@@ -261,7 +261,8 @@ if {$job_id == 0} {
 	exit 1
 } else {
 	if {[wait_for_job $job_id DONE] != 0} {
-		send_user "\nFAILURE: error on job\n"
+		send_user "\nFAILURE: error completing job $job_id\n"
+		cancel_job $job_id
 		set exit_code 1
 	}
 }
diff --git a/testsuite/expect/test18.11 b/testsuite/expect/test18.11
index 0ef0b91e46a6baba26a79f136d0be641329165f4..7bb9961774819dfbc0aaee8ef6a1466df3517cf1 100755
--- a/testsuite/expect/test18.11
+++ b/testsuite/expect/test18.11
@@ -267,7 +267,8 @@ if {$job_id == 0} {
 	exit 1
 } else {
 	if {[wait_for_job $job_id DONE] != 0} {
-		send_user "\nFAILURE: error on job\n"
+		send_user "\nFAILURE: error completing job $job_id\n"
+		cancel_job $job_id
 		set exit_code 1
 	}
 }
diff --git a/testsuite/expect/test19.5 b/testsuite/expect/test19.5
index c289e38a73912714f6c4690469068cf0f240ba7d..d0c45dceaa3fc721530fcb29cea4f8369300ba0b 100755
--- a/testsuite/expect/test19.5
+++ b/testsuite/expect/test19.5
@@ -172,7 +172,11 @@ if {$matches < 2} {
 	set exit_code 1
 }
 
-
+if {[wait_for_job $job_id DONE] != 0} {
+	send_user "\nFAILURE: error completing job $job_id\n"
+	cancel_job $job_id
+	exit 1
+}
 if {[wait_for_file $file_out_time] != 0} {
 	send_user "\nFAILURE: file $file_out_time is missing\n"
 	set exit_code 1
@@ -218,7 +222,8 @@ if {[wait_for_file $file_out_fini] != 0} {
 
 cancel_job $job_id
 if {$exit_code == 0} {
-	exec $bin_rm -f $file_in $file_in_fini $file_in_time $file_out_fini $file_out_time
+	exec $bin_rm -f $file_in $file_in_fini $file_in_time 
+	exec $bin_rm -f $file_out_fini $file_out_time
 	send_user "\nSUCCESS\n"
 }
 exit $exit_code
diff --git a/testsuite/expect/test6.13 b/testsuite/expect/test6.13
index 5bdb28a0e48fa324ea09ca736e7b69bfe59cc964..b939416850e66bc46ba818a80db1cc451482c32a 100755
--- a/testsuite/expect/test6.13
+++ b/testsuite/expect/test6.13
@@ -73,7 +73,7 @@ expect {
 }
 
 if {[wait_for_job $job_id RUNNING] != 0} {
-	send_user "\nFAILURE: error on job\n"
+	send_user "\nFAILURE: error starting job $job_id\n"
 	cancel_job $job_id
 	exit 1
 }
@@ -112,7 +112,7 @@ if {$matches != 1} {
 }
 
 if {[wait_for_job $job_id DONE] != 0} {
-	send_user "\nFAILURE: error on job\n"
+	send_user "\nFAILURE: error completing job $job_id\n"
 	cancel_job $job_id
 	exit 1
 }
@@ -179,7 +179,7 @@ expect {
 }
 
 if {[wait_for_job $job_id RUNNING] != 0} {
-	send_user "\nFAILURE: error on job\n"
+	send_user "\nFAILURE: error starting job $job_id\n"
 	cancel_job $job_id
 	exit 1
 }
@@ -218,7 +218,7 @@ if {$matches != 1} {
 }
 
 if {[wait_for_job $job_id DONE] != 0} {
-	send_user "\nFAILURE: error on job\n"
+	send_user "\nFAILURE: error completing job $job_id\n"
 	cancel_job $job_id
 	exit 1
 }
diff --git a/testsuite/expect/test6.7 b/testsuite/expect/test6.7
index 3b11b3d8f38296070377137038a6de8429dfb480..2e89e959c22c5e0a0f80dbeb6a82ec4d7dd345c1 100755
--- a/testsuite/expect/test6.7
+++ b/testsuite/expect/test6.7
@@ -71,7 +71,7 @@ expect {
 }
 
 if {[wait_for_job $job_id RUNNING] != 0} {
-	send_user "\nFAILURE: error on job\n"
+	send_user "\nFAILURE: error starting job $job_id\n"
 	cancel_job $job_id
 	exit 1
 }
@@ -110,7 +110,7 @@ if {$matches != 1} {
 }
 
 if {[wait_for_job $job_id DONE] != 0} {
-	send_user "\nFAILURE: error on job\n"
+	send_user "\nFAILURE: error completing job $job_id\n"
 	cancel_job $job_id
 	exit 1
 }
@@ -177,7 +177,7 @@ expect {
 }
 
 if {[wait_for_job $job_id RUNNING] != 0} {
-	send_user "\nFAILURE: error on job\n"
+	send_user "\nFAILURE: error starting job $job_id\n"
 	cancel_job $job_id
 	exit 1
 }
@@ -216,7 +216,7 @@ if {$matches != 1} {
 }
 
 if {[wait_for_job $job_id DONE] != 0} {
-	send_user "\nFAILURE: error on job\n"
+	send_user "\nFAILURE: error completing job $job_id\n"
 	cancel_job $job_id
 	exit 1
 }
diff --git a/testsuite/expect/test6.9 b/testsuite/expect/test6.9
index bf8586adb28d3063a0a1380a5f2444edd01dbbbc..b9c7c699af6b92304b321ec461b7984950e21072 100755
--- a/testsuite/expect/test6.9
+++ b/testsuite/expect/test6.9
@@ -75,7 +75,8 @@ if {$job_id == 0} {
 }
 
 if {[wait_for_job $job_id RUNNING] != 0} {
-	send_user "\nFAILURE: error on job\n"
+	send_user "\nFAILURE: error starting job $job_id\n"
+	cancel_job $job_id
 	exit 1
 }
 # Wait for job steps to begin
diff --git a/testsuite/expect/test8.3 b/testsuite/expect/test8.3
index 33332e1f0136785c347d217d67859921df5db30f..54d30905f6dbe7c69bf2f1e2a8cc596dd55e2c96 100755
--- a/testsuite/expect/test8.3
+++ b/testsuite/expect/test8.3
@@ -84,7 +84,8 @@ expect {
 #
 if {$job_id != 0} {
 	if {[wait_for_job $job_id DONE] != 0} {
-		send_user "\nFAILURE: error on job\n"
+		send_user "\nFAILURE: error completing job $job_id\n"
+		cancel_job $job_id
 		exit 1
 	}
 
@@ -138,7 +139,8 @@ expect {
 #
 if {$job_id != 0} {
 	if {[wait_for_job $job_id DONE] != 0} {
-		send_user "\nFAILURE: error on job\n"
+		send_user "\nFAILURE: error completing job $job_id\n"
+		cancel_job $job_id
 		exit 1
 	}
 
@@ -189,7 +191,8 @@ expect {
 #
 if {$job_id != 0} {
 	if {[wait_for_job $job_id DONE] != 0} {
-		send_user "\nFAILURE: error on job\n"
+		send_user "\nFAILURE: error completing job $job_id\n"
+		cancel_job $job_id
 		exit 1
 	}