diff --git a/tests/spec/oracle/annot_decl_bts1009.res.oracle b/tests/spec/oracle/annot_decl_bts1009.res.oracle
index bbf8d6510c0653389b24cc7b7f0bce04b8553707..c947f45a80f50697345e6041c94b0cac198363d7 100644
--- a/tests/spec/oracle/annot_decl_bts1009.res.oracle
+++ b/tests/spec/oracle/annot_decl_bts1009.res.oracle
@@ -1,5 +1,5 @@
 [kernel] Parsing tests/spec/annot_decl_bts1009.i (no preprocessing)
-[kernel:annot-error] Warning: 
+[kernel:annot-error] tests/spec/annot_decl_bts1009.i:5: Warning: 
   Statement contract and ACSL pragmas over a local definition are not implemented. Ignoring annotation
 /* Generated by Frama-C */
 void f(void)
diff --git a/tests/syntax/oracle/cert_msc_38.0.res.oracle b/tests/syntax/oracle/cert_msc_38.0.res.oracle
index f6f03be6c14ed3c35391fa7938fb7d3ddebec501..436be5934df83f34a38c349268bc1cc44c678eca 100644
--- a/tests/syntax/oracle/cert_msc_38.0.res.oracle
+++ b/tests/syntax/oracle/cert_msc_38.0.res.oracle
@@ -1,5 +1,5 @@
 [kernel] Parsing tests/syntax/cert_msc_38.c (with preprocessing)
-[kernel:CERT:MSC:38] Warning: 
+[kernel:CERT:MSC:38] tests/syntax/cert_msc_38.c:25: Warning: 
   assert is a standard macro. Its definition cannot be suppressed, see CERT C coding rules MSC38-C
 [kernel] tests/syntax/cert_msc_38.c:25: User Error: 
   Cannot resolve variable assert
diff --git a/tests/syntax/oracle/cert_msc_38.1.res.oracle b/tests/syntax/oracle/cert_msc_38.1.res.oracle
index 2a38adfac84eabefb4c879a88f69deb49588968f..912e7c39eda85a2aca5b384ba7c66a19a7cc5ae3 100644
--- a/tests/syntax/oracle/cert_msc_38.1.res.oracle
+++ b/tests/syntax/oracle/cert_msc_38.1.res.oracle
@@ -1,5 +1,5 @@
 [kernel] Parsing tests/syntax/cert_msc_38.c (with preprocessing)
-[kernel:CERT:MSC:38] Warning: 
+[kernel:CERT:MSC:38] tests/syntax/cert_msc_38.c:32: Warning: 
   Attempt to declare errno as external identifier outside of the stdlib. It is supposed to be a macro name and cannot be declared. See CERT C coding rule MSC38-C
 [kernel] Warning: warning CERT:MSC:38 treated as deferred error. See above messages for more information.
 [kernel] Frama-C aborted: invalid user input.
diff --git a/tests/syntax/oracle/cert_msc_38.2.res.oracle b/tests/syntax/oracle/cert_msc_38.2.res.oracle
index 93f72be060a2c5c49ff0169355032ba46638140c..9f32d3600137b87eec1c8173f9c25065724ced79 100644
--- a/tests/syntax/oracle/cert_msc_38.2.res.oracle
+++ b/tests/syntax/oracle/cert_msc_38.2.res.oracle
@@ -1,5 +1,5 @@
 [kernel] Parsing tests/syntax/cert_msc_38.c (with preprocessing)
-[kernel:CERT:MSC:38] Warning: 
+[kernel:CERT:MSC:38] tests/syntax/cert_msc_38.c:37: Warning: 
   Attempt to declare math_errhandling as external identifier outside of the stdlib. It is supposed to be a macro name and cannot be declared. See CERT C coding rule MSC38-C
 [kernel] Warning: warning CERT:MSC:38 treated as deferred error. See above messages for more information.
 [kernel] Frama-C aborted: invalid user input.
diff --git a/tests/syntax/oracle/cert_msc_38.3.res.oracle b/tests/syntax/oracle/cert_msc_38.3.res.oracle
index f85b07111ff8c9a4ee739e586920a7ccaf5427f4..1d21e57a88d24c9b96be04b54e6a2cc7ae571c1d 100644
--- a/tests/syntax/oracle/cert_msc_38.3.res.oracle
+++ b/tests/syntax/oracle/cert_msc_38.3.res.oracle
@@ -1,5 +1,5 @@
 [kernel] Parsing tests/syntax/cert_msc_38.c (with preprocessing)
-[kernel:CERT:MSC:38] Warning: 
+[kernel:CERT:MSC:38] tests/syntax/cert_msc_38.c:42: Warning: 
   va_start is a standard macro. Its definition cannot be suppressed, see CERT C coding rules MSC38-C
 [kernel] tests/syntax/cert_msc_38.c:42: User Error: 
   Cannot resolve variable va_start
diff --git a/tests/syntax/oracle/cert_msc_38.4.res.oracle b/tests/syntax/oracle/cert_msc_38.4.res.oracle
index e8c0de5ba19c8a5268c8afd7424d7798582d8ece..a65e4b430e8d16990b62fde88248bc2595dab725 100644
--- a/tests/syntax/oracle/cert_msc_38.4.res.oracle
+++ b/tests/syntax/oracle/cert_msc_38.4.res.oracle
@@ -1,5 +1,5 @@
 [kernel] Parsing tests/syntax/cert_msc_38.c (with preprocessing)
-[kernel:CERT:MSC:38] Warning: 
+[kernel:CERT:MSC:38] tests/syntax/cert_msc_38.c:46: Warning: 
   va_copy is a standard macro. Its definition cannot be suppressed, see CERT C coding rules MSC38-C
 [kernel] tests/syntax/cert_msc_38.c:46: User Error: 
   Cannot resolve variable va_copy
diff --git a/tests/syntax/oracle/cert_msc_38.5.res.oracle b/tests/syntax/oracle/cert_msc_38.5.res.oracle
index 7d12efef5671c40bc453c63227ae6e853fa92584..38293bc7042745d1f53f4b7b07f04c991d7b871b 100644
--- a/tests/syntax/oracle/cert_msc_38.5.res.oracle
+++ b/tests/syntax/oracle/cert_msc_38.5.res.oracle
@@ -1,5 +1,5 @@
 [kernel] Parsing tests/syntax/cert_msc_38.c (with preprocessing)
-[kernel:CERT:MSC:38] Warning: 
+[kernel:CERT:MSC:38] tests/syntax/cert_msc_38.c:50: Warning: 
   va_arg is a standard macro. Its definition cannot be suppressed, see CERT C coding rules MSC38-C
 [kernel] tests/syntax/cert_msc_38.c:50: User Error: 
   Cannot resolve variable va_arg
diff --git a/tests/syntax/oracle/cert_msc_38.6.res.oracle b/tests/syntax/oracle/cert_msc_38.6.res.oracle
index cbd86b6a84b58691348f42db7f3a6910952c20de..5aad28f718a5497c62d4ea5465bb4abe26a7b0b8 100644
--- a/tests/syntax/oracle/cert_msc_38.6.res.oracle
+++ b/tests/syntax/oracle/cert_msc_38.6.res.oracle
@@ -1,5 +1,5 @@
 [kernel] Parsing tests/syntax/cert_msc_38.c (with preprocessing)
-[kernel:CERT:MSC:38] Warning: 
+[kernel:CERT:MSC:38] tests/syntax/cert_msc_38.c:54: Warning: 
   va_end is a standard macro. Its definition cannot be suppressed, see CERT C coding rules MSC38-C
 [kernel] tests/syntax/cert_msc_38.c:54: User Error: 
   Cannot resolve variable va_end
diff --git a/tests/syntax/oracle/cert_msc_38.7.res.oracle b/tests/syntax/oracle/cert_msc_38.7.res.oracle
index 6db601e9319697a8e5e37d04651f2c0ff873b6ba..a13d4f25031321d636b4bd57ad8ff9ca9c89e66f 100644
--- a/tests/syntax/oracle/cert_msc_38.7.res.oracle
+++ b/tests/syntax/oracle/cert_msc_38.7.res.oracle
@@ -1,5 +1,5 @@
 [kernel] Parsing tests/syntax/cert_msc_38.c (with preprocessing)
-[kernel:CERT:MSC:38] Warning: 
+[kernel:CERT:MSC:38] tests/syntax/cert_msc_38.c:59: Warning: 
   setjmp is a standard macro. Its definition cannot be suppressed, see CERT C coding rules MSC38-C
 [kernel] Warning: warning CERT:MSC:38 treated as deferred error. See above messages for more information.
 [kernel] Frama-C aborted: invalid user input.
diff --git a/tests/syntax/oracle/incomplete_struct_field.res.oracle b/tests/syntax/oracle/incomplete_struct_field.res.oracle
index d75500699ee38adf210f757aeacc28508a7f8130..1da6f42644dd16360b1ebdbd454d298ccbd0d4ab 100644
--- a/tests/syntax/oracle/incomplete_struct_field.res.oracle
+++ b/tests/syntax/oracle/incomplete_struct_field.res.oracle
@@ -3,6 +3,7 @@
   declaration of array of incomplete type 'struct _s`
 [kernel] tests/syntax/incomplete_struct_field.i:1: User Error: 
   field `v' is declared with incomplete type struct _s [12]
-[kernel] User Error: type struct _s is circular
+[kernel] tests/syntax/incomplete_struct_field.i:1: User Error: 
+  type struct _s is circular
 [kernel] User Error: stopping on file "tests/syntax/incomplete_struct_field.i" that has errors.
 [kernel] Frama-C aborted: invalid user input.
diff --git a/tests/syntax/oracle/mutually_recursive_struct.res.oracle b/tests/syntax/oracle/mutually_recursive_struct.res.oracle
index 56467d6859bf63e8c99eb694516974ff4bbaba20..74ebf746db91b9e965360d7c32544edc1075bf5e 100644
--- a/tests/syntax/oracle/mutually_recursive_struct.res.oracle
+++ b/tests/syntax/oracle/mutually_recursive_struct.res.oracle
@@ -7,6 +7,7 @@
   declaration of array of incomplete type 'struct S1`
 [kernel] tests/syntax/mutually_recursive_struct.i:6: User Error: 
   field `s1' is declared with incomplete type struct S1 [2]
-[kernel] User Error: type struct S2 is circular
+[kernel] tests/syntax/mutually_recursive_struct.i:6: User Error: 
+  type struct S2 is circular
 [kernel] User Error: stopping on file "tests/syntax/mutually_recursive_struct.i" that has errors.
 [kernel] Frama-C aborted: invalid user input.