diff --git a/testsuite/expect/test12.2 b/testsuite/expect/test12.2
index c024d185364ae2902b76b9920fcb956893adccf0..91c1e7a16d5bdf76d6130bf4d37695febce3ceb7 100755
--- a/testsuite/expect/test12.2
+++ b/testsuite/expect/test12.2
@@ -55,12 +55,11 @@ set step_id	0
 print_header $test_id
 
 if {[test_front_end]} {
-        send_user "\nWARNING: This test is incompatible with front-end systems\n"
+        log_warn "This test is incompatible with front-end systems"
         exit $exit_code
 }
 if {![test_accting_steps]} {
-	send_user "\nWARNING: This test can not be run with nosteps or nojobs "
-	send_user "(AccountingStorageEnforce)\n"
+	log_warn "This test can not be run with nosteps or nojobs (AccountingStorageEnforce)"
 	exit 0
 }
 
@@ -85,7 +84,7 @@ proc _get_mem {prog} {
 			exp_continue
 		}
 		timeout {
-			send_user "\nFAILURE: $prog not responding\n"
+			log_error "$prog not responding"
 			set exit_code 1
 		}
 		eof {
@@ -98,24 +97,23 @@ proc _get_mem {prog} {
 	}
 
 	if { $mem_used == -1 } {
-		send_user "\nFAILURE: $prog stat memory not found\n"
+		log_error "$prog stat memory not found"
 		return 1
 	} elseif { $mem_task != 0 } {
-		send_user "\nFAILURE: $prog stat memory task not zero\n"
+		log_error "$prog stat memory task not zero"
 		return 1
 	} elseif { ($ave_used * $num_tasks) < $mem_used } {
-		send_user "\nFAILURE: $prog stat ave memory not believable against max memory\n"
+		log_error "$prog stat ave memory not believable against max memory"
 		return 1
 	}
 	# Compute error in KB
 	set diff_mem [expr $mem_used - $mem_size]
 	set error_mem [expr abs($diff_mem)]
 	if {($mem_used < $mem_size) || ($error_mem > $max_mem_error)} {
-		send_user "\nFAILURE: $prog memory use discrepancy of $diff_mem KB\n"
-		send_user "  Wanted $mem_size KB, got $mem_used KB\n"
+		log_error "$prog memory use discrepancy of $diff_mem KB (wanted $mem_size KB, got $mem_used KB)"
 		return 1
 	} else {
-		send_user "\nSUCCESS: $prog memory use discrepancy of $error_mem KB\n"
+		log_info "SUCCESS: $prog memory use discrepancy of $error_mem KB"
 	}
 	return 0
 }
@@ -149,7 +147,7 @@ proc _get_file_size {prog} {
 			set ave_disk_read  [scale_to_megs $ave_disk_read  $scale4]
 		}
 		timeout {
-			send_user "\nFAILURE: $prog not responding\n"
+			log_error "$prog not responding"
 			set exit_code 1
 		}
 		eof {
@@ -159,27 +157,27 @@ proc _get_file_size {prog} {
 
 	set mb_file_size [ expr ($file_size/(1024 * 1024)) ]
 	if { $max_disk_write == -1 } {
-		send_user "\nFAILURE: MaxDiskWrite not reported\n"
+		log_error "MaxDiskWrite not reported"
 		return 1
 	}
 	if { $ave_disk_write == -1 } {
-		send_user "\nFAILURE: AveDiskWrite not reported\n"
+		log_error "AveDiskWrite not reported"
 		return 1
 	}
 	if { $max_disk_read == -1 } {
-		send_user "\nFAILURE: MaxDiskRead not reported\n"
+		log_error "MaxDiskRead not reported"
 		return 1
 	}
 	if { $ave_disk_read == -1 } {
-		send_user "\nFAILURE: AveDiskRead not reported\n"
+		log_error "AveDiskRead not reported"
 		return 1
 	}
 	if { $w_task != 1 } {
-		send_user "\nFAILURE: MaxDiskWriteTask not 1\n"
+		log_error "MaxDiskWriteTask not 1"
 		return 1
 	}
 	if { $r_task != 2 } {
-		send_user "\nFAILURE: MaxDiskReadTask not 2\n"
+		log_error "MaxDiskReadTask not 2"
 		return 1
 	}
 
@@ -187,27 +185,18 @@ proc _get_file_size {prog} {
 	set diff_io [expr $max_disk_write - $max_disk_read]
 	set error_io [expr abs($diff_io)]
 	if { $error_io > 0.3 } {
-		send_user "\nFAILURE: written file size does not match read size "
-		send_user "file_size:$mb_file_size MB "
-		send_user "max_disk_write:$max_disk_write MB "
-		send_user "max_disk_read:$max_disk_read MB\n"
+		log_error "written file size does not match read size file_size:$mb_file_size MB max_disk_write:$max_disk_write MB max_disk_read:$max_disk_read MB"
 		return 1
 	}
 
 	set diff_io [expr $ave_disk_write - $ave_disk_read]
 	set error_io [expr abs($diff_io)]
 	if { $error_io > 0.3 } {
-		send_user "\nFAILURE: average written file size "
-		send_user "does not match average read size "
-		send_user "file_size:$mb_file_size MB "
-		send_user "ave_disk_write:$ave_disk_write MB "
-		send_user "ave_disk_read:$ave_disk_read MB\n"
+		log_error "average written file size does not match average read size file_size:$mb_file_size MB ave_disk_write:$ave_disk_write MB ave_disk_read:$ave_disk_read MB"
 		return 1
 	}
 
-	send_user "\nSUCCESS: $prog reported correct written and read file size\n"
-	send_user "file_size:$mb_file_size MB max_disk_write:$max_disk_write MB "
-	send_user "max_disk_read:$max_disk_read MB\n"
+	log_info "SUCCESS: $prog reported correct written and read file size (file_size:$mb_file_size MB max_disk_write:$max_disk_write MB max_disk_read:$max_disk_read MB)"
 
 	return 0
 }
@@ -238,11 +227,11 @@ expect {
 }
 log_user 1
 if {$supported_gather == 0} {
-	send_user "\nWARNING: Job accounting information not gathered on this system\n"
+	log_warn "Job accounting information not gathered on this system"
 	exit 0
 }
 if {$supported_storage == 0} {
-	send_user "\nWARNING: Job accounting information not stored on this system\n"
+	log_warn "Job accounting information not stored on this system"
 	exit 0
 }
 
@@ -277,7 +266,7 @@ expect {
 		exp_continue
 	}
 	timeout {
-		send_user "\nFAILURE: srun not responding\n"
+		log_error "srun not responding"
 		slow_kill $sbatch_pid
 		exit 1
 	}
@@ -286,11 +275,11 @@ expect {
 	}
 }
 if {$config_prob != 0} {
-	send_user "\nWARNING: Unable to test with current node configuration\n"
+	log_warn "Unable to test with current node configuration"
 	exit 0
 }
 if {$job_id == 0} {
-	send_user "\nFAILURE: batch submit failure\n"
+	log_error "batch submit failure"
 	exit 1
 }
 
@@ -298,7 +287,7 @@ if {$job_id == 0} {
 # Wait for job to run
 #
 if {[wait_for_job $job_id "RUNNING"] != 0} {
-	send_user "\nFAILURE: waiting for job to run\n"
+	log_error "waiting for job to run"
 	set exit_code 1
 }
 
@@ -317,7 +306,7 @@ if {[_get_file_size $sstat] != 0} {
 # Wait for job to complete
 #
 if {[wait_for_job $job_id "DONE"] != 0} {
-	send_user "\nFAILURE: waiting for job to complete\n"
+	log_error "waiting for job to complete"
 	set exit_code 1
 }
 
@@ -349,7 +338,7 @@ expect {
 		exp_continue
 	}
 	-re "COMPLETING" {
-		send_user "\nWARNING: Step in completing state rather than $expected_state\n"
+		log_warn "Step in completing state rather than $expected_state"
 		incr matches
 		exp_continue
 	}
@@ -358,7 +347,7 @@ expect {
 		exp_continue
 	}
 	timeout {
-		send_user "\nFAILURE: sacct not responding\n"
+		log_error "sacct not responding"
 		set exit_code 1
 	}
 	eof {
@@ -367,7 +356,7 @@ expect {
 }
 
 if {$matches < 4} {
-	send_user "\nFAILURE: sacct reporting failed ($matches < 4)\n"
+	log_error "sacct reporting failed ($matches < 4)"
 	set exit_code 1
 }
 
@@ -389,7 +378,7 @@ expect {
 		exp_continue
 	}
 	timeout {
-		send_user "\nFAILURE: sacct not responding\n"
+		log_error "sacct not responding"
 		set exit_code 1
 	}
 	eof {
@@ -399,11 +388,10 @@ expect {
 set diff_time [expr $elapsed_time - $sleep_time]
 set error_time [expr abs($diff_time)]
 if {$error_time > $max_time_error} {
-	send_user "\nFAILURE: sacct elapsed time discrepancy of $error_time secs\n"
-	send_user "  Wanted $sleep_time secs, got $elapsed_time secs\n"
+	log_error "sacct elapsed time discrepancy of $error_time secs. Wanted $sleep_time secs, got $elapsed_time secs"
 	set exit_code 1
 } else {
-	send_user "\nSUCCESS: sacct elapsed time discrepancy of $error_time secs\n"
+	log_info "SUCCESS: sacct elapsed time discrepancy of $error_time secs"
 }
 
 set total_cpu 0
@@ -419,7 +407,7 @@ expect {
 		exp_continue
 	}
 	timeout {
-		send_user "\nFAILURE: sacct not responding\n"
+		log_error "sacct not responding"
 		set exit_code 1
 	}
 	eof {
@@ -427,11 +415,10 @@ expect {
 	}
 }
 if {$total_cpu > $sleep_time} {
-	send_user "\nFAILURE: sacct reported an impossible TotalCPU time of $total_cpu secs\n"
-	send_user "  Has to be less than $sleep_time secs!\n"
+	log_error "sacct reported an impossible TotalCPU time of $total_cpu secs Has to be less than $sleep_time secs!"
 	set exit_code 1
 } else {
-	send_user "\nSUCCESS: sacct TotalCPU time looks reasonable ($total_cpu seconds)\n"
+	log_info "SUCCESS: sacct TotalCPU time looks reasonable ($total_cpu seconds)"
 }
 
 set min_cpu 0
@@ -447,7 +434,7 @@ expect {
 		exp_continue
 	}
 	timeout {
-		send_user "\nFAILURE: sacct not responding\n"
+		log_error "sacct not responding"
 		set exit_code 1
 	}
 	eof {
@@ -455,11 +442,10 @@ expect {
 	}
 }
 if {$min_cpu > $sleep_time} {
-	send_user "\nFAILURE: sacct reported an impossible MinCPU time of $min_cpu secs\n"
-	send_user "  Has to be less than $sleep_time secs!\n"
+	log_error "sacct reported an impossible MinCPU time of $min_cpu secs. Has to be less than $sleep_time secs!"
 	set exit_code 1
 } else {
-	send_user "\nSUCCESS: sacct MinCPU time looks reasonable ($min_cpu seconds)\n"
+	log_info "SUCCESS: sacct MinCPU time looks reasonable ($min_cpu seconds)"
 }
 
 if {[_get_mem $sacct] != 0} {
@@ -472,6 +458,8 @@ if {[_get_file_size $sacct] != 0} {
 
 if {$exit_code == 0} {
 	exec rm -f $file_prog $file_in $file_out $file_err $file_name
-	send_user "\nSUCCESS\n"
+	print_success $test_id
+} else {
+	print_failure $test_id
 }
 exit $exit_code