diff --git a/tests/spec/clash_double_file_bts1598.c b/tests/spec/clash_double_file_bts1598.c
index f601dd3260381f1d346ef7e29bd9865f5391306e..f3340e93f6983a4750700cf32863b64c9862b583 100644
--- a/tests/spec/clash_double_file_bts1598.c
+++ b/tests/spec/clash_double_file_bts1598.c
@@ -1,7 +1,7 @@
 /* run.config
 COMMENT: checks that linking string.h and its FC-pretty-printed version
 COMMENT: does not get rejected by name clash in the logic. See bts 1598
-OPT: @PTEST_FILE@ -cpp-extra-args " -Ishare/libc -nostdinc" -print -then -ocode foo.c -print -then @PTEST_FILE@ foo.c -ocode="" -print
+OPT: @PTEST_FILE@ -cpp-extra-args " -Ishare/libc -nostdinc" -print -then -ocode ocode_@PTEST_NUMBER@_@PTEST_NAME@.c -print -then @PTEST_FILE@ ocode_@PTEST_NUMBER@_@PTEST_NAME@.c -ocode="" -print
 */
 
 #include "__fc_builtin.h"
diff --git a/tests/spec/rm_qualifiers.i b/tests/spec/rm_qualifiers.i
index 05a41ac5cbd20f203d5dc6525d9aa141b2a6a5ba..d6d739b95cc0027f358736a6e5f9ae367aca9159 100644
--- a/tests/spec/rm_qualifiers.i
+++ b/tests/spec/rm_qualifiers.i
@@ -1,5 +1,5 @@
 /* run.config
-OPT: @PTEST_FILE@ -ocode @PTEST_NAME@_res.i -print -then @PTEST_NAME@_res.i -ocode="" -print
+OPT: @PTEST_FILE@ -ocode ocode_@PTEST_NUMBER@_@PTEST_NAME@.i -print -then ocode_@PTEST_NUMBER@_@PTEST_NAME@.i -ocode="" -print
 */
 extern void G(const void* p);
 typedef volatile int ARR[42][3];
diff --git a/tests/syntax/anon_enum_libc.c b/tests/syntax/anon_enum_libc.c
index a3c5136b3db9548ae9ba2a4765277480d8b47412..8ab5eeec2c97fd9e3ac2c4ffa9e692049b516920 100644
--- a/tests/syntax/anon_enum_libc.c
+++ b/tests/syntax/anon_enum_libc.c
@@ -1,7 +1,7 @@
 /* run.config
 DEPS: anon_enum_libc.h
 FILTER: sed -e 's|#include *"\([^/]*[/]\)*\([^/]*\)"|#include "PTESTS_DIR/\2"|'
-OPT: -cpp-extra-args="-I ." -ocode @PTEST_NAME@.tmp.c -print -then -ocode="" @PTEST_NAME@.tmp.c -print
+OPT: -cpp-extra-args="-I ." -ocode ocode_@PTEST_NUMBER@_@PTEST_NAME@.c -print -then -ocode="" ocode_@PTEST_NUMBER@_@PTEST_NAME@.c -print
 */
 struct { int x; float y; } s1;
 
diff --git a/tests/syntax/oracle/anon_enum_libc.res.oracle b/tests/syntax/oracle/anon_enum_libc.res.oracle
index 32aba9aeb34ea72fb29ff986cb3df21a0d11379a..ebe1e0a361983404397ebb82a1a1a2569c7e06b9 100644
--- a/tests/syntax/oracle/anon_enum_libc.res.oracle
+++ b/tests/syntax/oracle/anon_enum_libc.res.oracle
@@ -1,5 +1,5 @@
 [kernel] Parsing anon_enum_libc.c (with preprocessing)
-[kernel] Parsing anon_enum_libc.tmp.c (with preprocessing)
+[kernel] Parsing ocode_0_anon_enum_libc.c (with preprocessing)
 /* Generated by Frama-C */
 #include "PTESTS_DIR/anon_enum_libc.h"
 struct __anonstruct_s1_1 {