diff --git a/tests/syntax/oracle/arg_type.res.oracle b/tests/syntax/oracle/arg_type.res.oracle
index 8fe99704dddfeb6373d5662d551a2cf3d4a27bd6..6115193a5c10236f87e3870997085ea9c3cd53a8 100644
--- a/tests/syntax/oracle/arg_type.res.oracle
+++ b/tests/syntax/oracle/arg_type.res.oracle
@@ -2,6 +2,6 @@
 [kernel] tests/syntax/arg_type.i:15: User Error: 
   Declaration of g does not match previous declaration from tests/syntax/arg_type.i:13 (different integer types:
   'int' and 'short').
-[kernel] tests/syntax/arg_type.i:15: Failure: Cannot resolve variable x
+[kernel] tests/syntax/arg_type.i:15: User Error: Cannot resolve variable x
 [kernel] User Error: stopping on file "tests/syntax/arg_type.i" that has errors.
 [kernel] Frama-C aborted: invalid user input.
diff --git a/tests/syntax/oracle/cert_msc_38.0.res.oracle b/tests/syntax/oracle/cert_msc_38.0.res.oracle
index 9824fc415ba8a6638ce69e45071d9feaaffb3cf8..f6f03be6c14ed3c35391fa7938fb7d3ddebec501 100644
--- a/tests/syntax/oracle/cert_msc_38.0.res.oracle
+++ b/tests/syntax/oracle/cert_msc_38.0.res.oracle
@@ -1,7 +1,8 @@
 [kernel] Parsing tests/syntax/cert_msc_38.c (with preprocessing)
 [kernel:CERT:MSC:38] 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: Failure: Cannot resolve variable assert
+[kernel] tests/syntax/cert_msc_38.c:25: User Error: 
+  Cannot resolve variable assert
 [kernel] User Error: stopping on file "tests/syntax/cert_msc_38.c" that has errors. Add
   '-kernel-msg-key pp' for preprocessing command.
 [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 e7e3e470dbc12dbddfdfa9b61a0552e0c6caa953..f85b07111ff8c9a4ee739e586920a7ccaf5427f4 100644
--- a/tests/syntax/oracle/cert_msc_38.3.res.oracle
+++ b/tests/syntax/oracle/cert_msc_38.3.res.oracle
@@ -1,7 +1,7 @@
 [kernel] Parsing tests/syntax/cert_msc_38.c (with preprocessing)
 [kernel:CERT:MSC:38] 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: Failure: 
+[kernel] tests/syntax/cert_msc_38.c:42: User Error: 
   Cannot resolve variable va_start
 [kernel] User Error: stopping on file "tests/syntax/cert_msc_38.c" that has errors. Add
   '-kernel-msg-key pp' for preprocessing command.
diff --git a/tests/syntax/oracle/cert_msc_38.4.res.oracle b/tests/syntax/oracle/cert_msc_38.4.res.oracle
index 47e5a66d0b30560faa89927c75d1b68a891c2297..e8c0de5ba19c8a5268c8afd7424d7798582d8ece 100644
--- a/tests/syntax/oracle/cert_msc_38.4.res.oracle
+++ b/tests/syntax/oracle/cert_msc_38.4.res.oracle
@@ -1,7 +1,8 @@
 [kernel] Parsing tests/syntax/cert_msc_38.c (with preprocessing)
 [kernel:CERT:MSC:38] 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: Failure: Cannot resolve variable va_copy
+[kernel] tests/syntax/cert_msc_38.c:46: User Error: 
+  Cannot resolve variable va_copy
 [kernel] User Error: stopping on file "tests/syntax/cert_msc_38.c" that has errors. Add
   '-kernel-msg-key pp' for preprocessing command.
 [kernel] Frama-C aborted: invalid user input.
diff --git a/tests/syntax/oracle/cert_msc_38.5.res.oracle b/tests/syntax/oracle/cert_msc_38.5.res.oracle
index 84140cf482f8f33089ab52ebbbedadda5cc7d1b3..7d12efef5671c40bc453c63227ae6e853fa92584 100644
--- a/tests/syntax/oracle/cert_msc_38.5.res.oracle
+++ b/tests/syntax/oracle/cert_msc_38.5.res.oracle
@@ -1,7 +1,8 @@
 [kernel] Parsing tests/syntax/cert_msc_38.c (with preprocessing)
 [kernel:CERT:MSC:38] 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: Failure: Cannot resolve variable va_arg
+[kernel] tests/syntax/cert_msc_38.c:50: User Error: 
+  Cannot resolve variable va_arg
 [kernel] User Error: stopping on file "tests/syntax/cert_msc_38.c" that has errors. Add
   '-kernel-msg-key pp' for preprocessing command.
 [kernel] Frama-C aborted: invalid user input.
diff --git a/tests/syntax/oracle/cert_msc_38.6.res.oracle b/tests/syntax/oracle/cert_msc_38.6.res.oracle
index c90f405e1df64605330a7cc7a9e68daaf5bbc7be..cbd86b6a84b58691348f42db7f3a6910952c20de 100644
--- a/tests/syntax/oracle/cert_msc_38.6.res.oracle
+++ b/tests/syntax/oracle/cert_msc_38.6.res.oracle
@@ -1,7 +1,8 @@
 [kernel] Parsing tests/syntax/cert_msc_38.c (with preprocessing)
 [kernel:CERT:MSC:38] 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: Failure: Cannot resolve variable va_end
+[kernel] tests/syntax/cert_msc_38.c:54: User Error: 
+  Cannot resolve variable va_end
 [kernel] User Error: stopping on file "tests/syntax/cert_msc_38.c" that has errors. Add
   '-kernel-msg-key pp' for preprocessing command.
 [kernel] Frama-C aborted: invalid user input.