diff --git a/tests/suites/helpers.function b/tests/suites/helpers.function
index cc9ab7c42..31b8f586f 100644
--- a/tests/suites/helpers.function
+++ b/tests/suites/helpers.function
@@ -57,7 +57,7 @@ typedef UINT32 uint32_t;
     do {                                            \
         if( ! (TEST) )                              \
         {                                           \
-            test_fail( #TEST );                     \
+            test_fail( #TEST, __LINE__, __FILE__ ); \
             goto exit;                              \
         }                                           \
     } while( 0 )
@@ -348,11 +348,11 @@ static int rnd_pseudo_rand( void *rng_state, unsigned char *output, size_t len )
     return( 0 );
 }
 
-static void test_fail( const char *test )
+static void test_fail( const char *test, int line_no, char* filename )
 {
     test_errors++;
     if( test_errors == 1 )
         mbedtls_printf( "FAILED\n" );
-    mbedtls_printf( "  %s\n", test );
+    mbedtls_printf( "  %s\n  at line %d, %s\n", test, line_no, filename );
 }