diff --git a/tests/libc/inttypes_h.c b/tests/libc/inttypes_h.c
index 4fbe71cf8a26e8cc0a391cf0df53002aa4263ac9..646c8009c1f74e1168210e690797f58305b83c23 100644
--- a/tests/libc/inttypes_h.c
+++ b/tests/libc/inttypes_h.c
@@ -1,12 +1,12 @@
 /* run.config
-OPT: -kernel-msg-key pp -machdep x86_16 -print
-OPT: -kernel-msg-key pp -machdep x86_32 -print
-OPT: -kernel-msg-key pp -machdep x86_64 -print
-OPT: -kernel-msg-key pp -machdep gcc_x86_16 -print
-OPT: -kernel-msg-key pp -machdep gcc_x86_32 -print
-OPT: -kernel-msg-key pp -machdep gcc_x86_64 -print
-OPT: -kernel-msg-key pp -machdep ppc_32 -print
-OPT: -kernel-msg-key pp -machdep msvc_x86_64 -print
+OPT: -machdep x86_16 -print
+OPT: -machdep x86_32 -print
+OPT: -machdep x86_64 -print
+OPT: -machdep gcc_x86_16 -print
+OPT: -machdep gcc_x86_32 -print
+OPT: -machdep gcc_x86_64 -print
+OPT: -machdep ppc_32 -print
+OPT: -machdep msvc_x86_64 -print
 */
 
 #include <inttypes.h>
diff --git a/tests/libc/oracle/inttypes_h.0.res.oracle b/tests/libc/oracle/inttypes_h.0.res.oracle
index cd58d651b715eea4648a1c123000b557a9755c8d..eaaa132d690dde79c31b64fed1258454417d0d00 100644
--- a/tests/libc/oracle/inttypes_h.0.res.oracle
+++ b/tests/libc/oracle/inttypes_h.0.res.oracle
@@ -1,5 +1,3 @@
-[kernel:pp] 
-  preprocessing with "gcc -E -C -I.  -I./share/libc -D__FRAMAC__ -D__FC_MACHDEP_X86_16 -dD -nostdinc -m16 tests/libc/inttypes_h.c"
 [kernel] Parsing tests/libc/inttypes_h.c (with preprocessing)
 /* Generated by Frama-C */
 #include "errno.h"
diff --git a/tests/libc/oracle/inttypes_h.1.res.oracle b/tests/libc/oracle/inttypes_h.1.res.oracle
index 9b6a585e15d6f4fcb05e1b7674519b3fc6cd5a27..ee3b253caf33cceda5773e2ab7553f01ef3d5e2d 100644
--- a/tests/libc/oracle/inttypes_h.1.res.oracle
+++ b/tests/libc/oracle/inttypes_h.1.res.oracle
@@ -1,5 +1,3 @@
-[kernel:pp] 
-  preprocessing with "gcc -E -C -I.  -I./share/libc -D__FRAMAC__ -D__FC_MACHDEP_X86_32 -dD -nostdinc -m32 tests/libc/inttypes_h.c"
 [kernel] Parsing tests/libc/inttypes_h.c (with preprocessing)
 /* Generated by Frama-C */
 #include "errno.h"
diff --git a/tests/libc/oracle/inttypes_h.2.res.oracle b/tests/libc/oracle/inttypes_h.2.res.oracle
index 3ddc4b43a71bca335306337adf4d046cb40a2f26..a70f22663383c9b382e0ba42f879d9fb625fa700 100644
--- a/tests/libc/oracle/inttypes_h.2.res.oracle
+++ b/tests/libc/oracle/inttypes_h.2.res.oracle
@@ -1,5 +1,3 @@
-[kernel:pp] 
-  preprocessing with "gcc -E -C -I.  -I./share/libc -D__FRAMAC__ -D__FC_MACHDEP_X86_64 -dD -nostdinc -m64 tests/libc/inttypes_h.c"
 [kernel] Parsing tests/libc/inttypes_h.c (with preprocessing)
 /* Generated by Frama-C */
 #include "errno.h"
diff --git a/tests/libc/oracle/inttypes_h.3.res.oracle b/tests/libc/oracle/inttypes_h.3.res.oracle
index b6a1a81b1b5b24d2046eb339122260a995bc7cd6..eaaa132d690dde79c31b64fed1258454417d0d00 100644
--- a/tests/libc/oracle/inttypes_h.3.res.oracle
+++ b/tests/libc/oracle/inttypes_h.3.res.oracle
@@ -1,5 +1,3 @@
-[kernel:pp] 
-  preprocessing with "gcc -E -C -I.  -I./share/libc -D__FRAMAC__ -D__FC_MACHDEP_GCC_X86_16 -dD -nostdinc -m16 tests/libc/inttypes_h.c"
 [kernel] Parsing tests/libc/inttypes_h.c (with preprocessing)
 /* Generated by Frama-C */
 #include "errno.h"
diff --git a/tests/libc/oracle/inttypes_h.4.res.oracle b/tests/libc/oracle/inttypes_h.4.res.oracle
index 72f9ad7dc63be5a742802549bd6f85f376ae5a1c..ee3b253caf33cceda5773e2ab7553f01ef3d5e2d 100644
--- a/tests/libc/oracle/inttypes_h.4.res.oracle
+++ b/tests/libc/oracle/inttypes_h.4.res.oracle
@@ -1,5 +1,3 @@
-[kernel:pp] 
-  preprocessing with "gcc -E -C -I.  -I./share/libc -D__FRAMAC__ -D__FC_MACHDEP_GCC_X86_32 -dD -nostdinc -m32 tests/libc/inttypes_h.c"
 [kernel] Parsing tests/libc/inttypes_h.c (with preprocessing)
 /* Generated by Frama-C */
 #include "errno.h"
diff --git a/tests/libc/oracle/inttypes_h.5.res.oracle b/tests/libc/oracle/inttypes_h.5.res.oracle
index 59a3cd9a2e142d3e3d7e434f2495a82fcee0fb5a..a70f22663383c9b382e0ba42f879d9fb625fa700 100644
--- a/tests/libc/oracle/inttypes_h.5.res.oracle
+++ b/tests/libc/oracle/inttypes_h.5.res.oracle
@@ -1,5 +1,3 @@
-[kernel:pp] 
-  preprocessing with "gcc -E -C -I.  -I./share/libc -D__FRAMAC__ -D__FC_MACHDEP_GCC_X86_64 -dD -nostdinc -m64 tests/libc/inttypes_h.c"
 [kernel] Parsing tests/libc/inttypes_h.c (with preprocessing)
 /* Generated by Frama-C */
 #include "errno.h"
diff --git a/tests/libc/oracle/inttypes_h.6.res.oracle b/tests/libc/oracle/inttypes_h.6.res.oracle
index fb934c52cae00ba8699897d1a1acb997c4f3e0d9..ee3b253caf33cceda5773e2ab7553f01ef3d5e2d 100644
--- a/tests/libc/oracle/inttypes_h.6.res.oracle
+++ b/tests/libc/oracle/inttypes_h.6.res.oracle
@@ -1,5 +1,3 @@
-[kernel:pp] 
-  preprocessing with "gcc -E -C -I.  -I./share/libc -D__FRAMAC__ -D__FC_MACHDEP_PPC_32 -dD -nostdinc -m32 tests/libc/inttypes_h.c"
 [kernel] Parsing tests/libc/inttypes_h.c (with preprocessing)
 /* Generated by Frama-C */
 #include "errno.h"
diff --git a/tests/libc/oracle/inttypes_h.7.res.oracle b/tests/libc/oracle/inttypes_h.7.res.oracle
index 0b9b61e5b7897cdab9e5247543744749c329fd4c..6a5939c36733097f68a48520a54e40a8899a5d42 100644
--- a/tests/libc/oracle/inttypes_h.7.res.oracle
+++ b/tests/libc/oracle/inttypes_h.7.res.oracle
@@ -1,5 +1,3 @@
-[kernel:pp] 
-  preprocessing with "gcc -E -C -I.  -I./share/libc -D__FRAMAC__ -D__FC_MACHDEP_MSVC_X86_64 -dD -nostdinc -m64 tests/libc/inttypes_h.c"
 [kernel] Parsing tests/libc/inttypes_h.c (with preprocessing)
 /* Generated by Frama-C */
 #include "errno.h"