diff --git a/tests/psa_crypto_helpers.h b/tests/psa_crypto_helpers.h
index 26d5623..3780d16 100644
--- a/tests/psa_crypto_helpers.h
+++ b/tests/psa_crypto_helpers.h
@@ -45,7 +45,7 @@
     /* If the test has already failed, don't overwrite the failure
      * information. Do keep the stats lookup above, because it can be
      * convenient to break on it when debugging a failure. */
-    if( msg != NULL && test_info.failed == 0 )
+    if( msg != NULL && test_info.result == TEST_RESULT_SUCCESS )
         test_fail( msg, line, file );
 
     return( msg == NULL );
diff --git a/tests/suites/target_test.function b/tests/suites/target_test.function
index d430d9d..91f7198 100644
--- a/tests/suites/target_test.function
+++ b/tests/suites/target_test.function
@@ -374,7 +374,7 @@
     while ( 1 )
     {
         ret = 0;
-        test_info.failed = 0;
+        test_info.result = TEST_RESULT_SUCCESS;
         data_len = 0;
 
         data = receive_data( &data_len );
@@ -432,7 +432,7 @@
         if ( ret )
             send_failure( ret );
         else
-            send_status( test_info.failed );
+            send_status( test_info.result );
     }
     return( 0 );
 }