diff --git a/testsuite/expect/test9.1 b/testsuite/expect/test9.1
index 035f39b7e0b6b999ac22dd931ea76866d3d0337b..d3b7ae0ceb3e5904f973cfa6cdf3636ec9417fae 100755
--- a/testsuite/expect/test9.1
+++ b/testsuite/expect/test9.1
@@ -106,14 +106,15 @@ for {set inx 0} {$inx < $cycle_count} {incr inx} {
 	}
 	if {$stdout_lines != $stdout_target} {
 		send_user "\nFAILURE: stdout is incomplete\n"
+		set cycle_count $inx
 		set exit_code 1
 	} else {
 		incr success_cnt
 	}
 }
-exec $bin_rm -f $file_in $file_out
 
 if {$exit_code == 0} {
+	exec $bin_rm -f $file_in $file_out
 	send_user "\nSUCCESS\n"
 } else {
 	send_user "\nFAILURE: Only $success_cnt of $cycle_count"
diff --git a/testsuite/expect/test9.2 b/testsuite/expect/test9.2
index a2fcb12a264c3bf2a75c9de34d24b37dbd78e233..aadcf852ad495f418db93ee693311534eda11d1a 100755
--- a/testsuite/expect/test9.2
+++ b/testsuite/expect/test9.2
@@ -96,14 +96,15 @@ for {set inx 0} {$inx < $cycle_count} {incr inx} {
 	}
 	if {$stdout_lines != $task_cnt} {
 		send_user "\nFAILURE:stdout is incomplete\n"
+		set cycle_count $inx
 		set exit_code 1
 	} else {
 		incr success_cnt
 	}
 }
-exec $bin_rm -f $file_out
 
 if {$exit_code == 0} {
+	exec $bin_rm -f $file_out
 	send_user "\nSUCCESS\n"
 } else {
 	send_user "\nFAILURE: Only $success_cnt of $cycle_count"
diff --git a/testsuite/expect/test9.3 b/testsuite/expect/test9.3
index 021b82d6f7a4d0843e5538e9e1a2202f6fe5f33e..5b8ab4e8eed0d049b3381af785dd336775c07164 100755
--- a/testsuite/expect/test9.3
+++ b/testsuite/expect/test9.3
@@ -106,17 +106,18 @@ for {set inx 0} {$inx < $cycle_count} {incr inx} {
 	}
 	if {$stdout_lines != $stdout_target} {
 		send_user "\nFAILURE:stdout is incomplete\n"
+		set cycle_count $inx
 		set exit_code 1
 	} else {
 		incr success_cnt
 	}
 }
-exec $bin_rm -f $file_in $file_out
 
 if {$exit_code == 0} {
+	exec $bin_rm -f $file_in $file_out
 	send_user "\nSUCCESS\n"
 } else {
-	send_user "\nFAILURE: Only $success_cnt of $cycle_count hostname"
-	send_user " output tests passed\n"
+	send_user "\nFAILURE: Only $success_cnt of $cycle_count I/O"
+	send_user " tests passed\n"
 }
 exit $exit_code
diff --git a/testsuite/expect/test9.6 b/testsuite/expect/test9.6
index 1f88f07e0864b0ba4a7a300dd49d6237ed578b95..177fe333b9cc6e429b9087b5cc8fc26e2fccbb79 100755
--- a/testsuite/expect/test9.6
+++ b/testsuite/expect/test9.6
@@ -107,14 +107,15 @@ for {set inx 0} {$inx < $cycle_count} {incr inx} {
 	}
 	if {$stdout_lines != $stdout_target} {
 		send_user "\nFAILURE:stdout is missing output\n"
+		set cycle_count $inx
 		set exit_code 1
 	} else {
 		incr success_cnt
 	}
 }
-exec $bin_rm -f $file_in $file_out
 
 if {$exit_code == 0} {
+	exec $bin_rm -f $file_in $file_out
 	send_user "\nSUCCESS\n"
 } else {
 	send_user "\nFAILURE: Only $success_cnt of $cycle_count hostname"