diff --git a/tests/fc_script/build-callgraph.i b/tests/fc_script/build-callgraph.i
index 7ec5a976aeb0b98d696992b666850cb7c6e497fa..e31daa24c25e6661750ec306f9f6d5a52368801f 100644
--- a/tests/fc_script/build-callgraph.i
+++ b/tests/fc_script/build-callgraph.i
@@ -1,6 +1,6 @@
 /* run.config
    NOFRAMAC: testing frama-c-script, not frama-c itself
-   EXECNOW: LOG build-callgraph.res LOG build-callgraph.err %{bin:frama-c-script} heuristic-print-callgraph @PTEST_DIR@/@PTEST_NAME@.i > @PTEST_RESULT@/build-callgraph.res 2> @PTEST_RESULT@/build-callgraph.err
+   EXECNOW: LOG build-callgraph.res LOG build-callgraph.err %{bin:frama-c-script} heuristic-print-callgraph %{dep:@PTEST_DIR@/@PTEST_NAME@.i} > @PTEST_RESULT@/build-callgraph.res 2> @PTEST_RESULT@/build-callgraph.err
  */
 
 #include <stdio.h>
diff --git a/tests/metrics/used-files.i b/tests/metrics/used-files.i
index dee7f1945c2e8bf0642c26f0123b55da13483f14..bebb54173e8dd24888eded2ad23503e63cef3241 100644
--- a/tests/metrics/used-files.i
+++ b/tests/metrics/used-files.i
@@ -1,6 +1,6 @@
 /* run.config
-   OPT: -metrics-used-files @PTEST_DIR@/@PTEST_NAME@1.i @PTEST_DIR@/@PTEST_NAME@2.i @PTEST_DIR@/@PTEST_NAME@3.i @PTEST_DIR@/@PTEST_NAME@4.i @PTEST_DIR@/@PTEST_NAME@5.i @PTEST_DIR@/@PTEST_NAME@6.i @PTEST_DIR@/@PTEST_NAME@7.i @PTEST_DIR@/@PTEST_NAME@8.i @PTEST_DIR@/@PTEST_NAME@9.c @PTEST_DIR@/@PTEST_NAME@1.h @PTEST_DIR@/@PTEST_NAME@2.h
-   OPT: -metrics-used-files -main g @PTEST_DIR@/@PTEST_NAME@1.i @PTEST_DIR@/@PTEST_NAME@2.i @PTEST_DIR@/@PTEST_NAME@3.i @PTEST_DIR@/@PTEST_NAME@4.i @PTEST_DIR@/@PTEST_NAME@5.i @PTEST_DIR@/@PTEST_NAME@6.i @PTEST_DIR@/@PTEST_NAME@7.i @PTEST_DIR@/@PTEST_NAME@8.i @PTEST_DIR@/@PTEST_NAME@9.c @PTEST_DIR@/@PTEST_NAME@1.h @PTEST_DIR@/@PTEST_NAME@2.h
+   OPT: -metrics-used-files %{dep:@PTEST_DIR@/@PTEST_NAME@1.i} %{dep:@PTEST_DIR@/@PTEST_NAME@2.i} %{dep:@PTEST_DIR@/@PTEST_NAME@3.i} %{dep:@PTEST_DIR@/@PTEST_NAME@4.i} %{dep:@PTEST_DIR@/@PTEST_NAME@5.i} %{dep:@PTEST_DIR@/@PTEST_NAME@6.i} %{dep:@PTEST_DIR@/@PTEST_NAME@7.i} %{dep:@PTEST_DIR@/@PTEST_NAME@8.i} %{dep:@PTEST_DIR@/@PTEST_NAME@9.c} @PTEST_DIR@/@PTEST_NAME@1.h @PTEST_DIR@/@PTEST_NAME@2.h
+   OPT: -metrics-used-files -main g %{dep:@PTEST_DIR@/@PTEST_NAME@1.i} %{dep:@PTEST_DIR@/@PTEST_NAME@2.i} %{dep:@PTEST_DIR@/@PTEST_NAME@3.i} %{dep:@PTEST_DIR@/@PTEST_NAME@4.i} %{dep:@PTEST_DIR@/@PTEST_NAME@5.i} %{dep:@PTEST_DIR@/@PTEST_NAME@6.i} %{dep:@PTEST_DIR@/@PTEST_NAME@7.i} %{dep:@PTEST_DIR@/@PTEST_NAME@8.i} %{dep:@PTEST_DIR@/@PTEST_NAME@9.c} @PTEST_DIR@/@PTEST_NAME@1.h @PTEST_DIR@/@PTEST_NAME@2.h
 */
 
 int h(void);
diff --git a/tests/pdg/dyn_dpds.c b/tests/pdg/dyn_dpds.c
index ac0cc5c1557930cd5b24a3a03028b83fcdf47fcc..4d0909596c43be9d4737d2e1771be1ff8363ac79 100644
--- a/tests/pdg/dyn_dpds.c
+++ b/tests/pdg/dyn_dpds.c
@@ -6,7 +6,7 @@
 
 /*
    To have a look at the dot PDG :
-   bin/toplevel.byte -deps -pdg-dot pdg -fct-pdg main @PTEST_DIR@/@PTEST_NAME@.c ;
+   bin/toplevel.byte -deps -pdg-dot pdg -fct-pdg main %{dep:@PTEST_DIR@/@PTEST_NAME@.c} ;
    zgrviewer pdg.main.dot
 
    or use @PTEST_DIR@/@PTEST_NAME@.ml to test the dynamic dependencies.
diff --git a/tests/pdg/loops.c b/tests/pdg/loops.c
index 225fefc8c54dc405a2751e02ebdf3451022c66e6..e6991c95603709ab5a1d71ec4e7aadd8a2dd8340 100644
--- a/tests/pdg/loops.c
+++ b/tests/pdg/loops.c
@@ -24,11 +24,11 @@ bin/toplevel.opt -lib-entry -main $F -deps -verbose @PTEST_DIR@/loops.c
 zgrviewer ./$F_cfg.dot
 
 Pour voir les postdominateurs :
-bin/toplevel.opt -lib-entry -main $F -fct-pdg $F -dot-postdom p @PTEST_DIR@/loops.c ;
+bin/toplevel.opt -lib-entry -main $F -fct-pdg $F -dot-postdom p %{dep:@PTEST_DIR@/loops.c} ;
 zgrviewer ./p.$F.dot
 
 Pour voir le PDG :
-bin/toplevel.opt -lib-entry -main $F -fct-pdg $F -pdg-dot pdg @PTEST_DIR@/loops.c ;
+bin/toplevel.opt -lib-entry -main $F -fct-pdg $F -pdg-dot pdg %{dep:@PTEST_DIR@/loops.c} ;
 zgrviewer ./pdg.$F.dot
 
 */
diff --git a/tests/scope/scope.c b/tests/scope/scope.c
index 713fa01b7e39f2ced262ae48784728ed30d8eb74..341b5a51f4614bc27f2f5fcef5ff50f844bfca64 100644
--- a/tests/scope/scope.c
+++ b/tests/scope/scope.c
@@ -4,9 +4,9 @@
    OPT: -eva @EVA_CONFIG@ -main loop
 */
 /*
- * bin/viewer.byte -main f @PTEST_DIR@/scope.c -eva
- * bin/viewer.byte -main f2 @PTEST_DIR@/scope.c -eva
- * bin/viewer.byte -main loop @PTEST_DIR@/scope.c -eva
+ * bin/viewer.byte -main f %{dep:@PTEST_DIR@/scope.c} -eva
+ * bin/viewer.byte -main f2 %{dep:@PTEST_DIR@/scope.c} -eva
+ * bin/viewer.byte -main loop %{dep:@PTEST_DIR@/scope.c} -eva
  */
 
 #include "__fc_builtin.h"
diff --git a/tests/scope/zones.c b/tests/scope/zones.c
index b60b239a0fcd7922d9cee94203c6c2f1594f6630..c13c5daea5d146f84d0b9898ca51cf4b473b8571 100644
--- a/tests/scope/zones.c
+++ b/tests/scope/zones.c
@@ -4,7 +4,7 @@
    OPT: -eva @EVA_OPTIONS@
 */
 
-/* bin/viewer.opt -eva @PTEST_DIR@/@PTEST_NAME@.c */
+/* bin/viewer.opt -eva %{dep:@PTEST_DIR@/@PTEST_NAME@.c} */
 
 int T [10];
 struct Tstr { int a; int b; } S;
diff --git a/tests/slicing/bts335.i b/tests/slicing/bts335.i
index 61e42e2ccc7ffe999288e4f668305412b9a35a3f..6a2d334787fc595f000fdee61b4822bd6dd85e4d 100644
--- a/tests/slicing/bts335.i
+++ b/tests/slicing/bts335.i
@@ -3,8 +3,8 @@
 */
 
 /*
-bin/toplevel.opt -slice-pragma g -calldeps -slicing-level 3 @PTEST_DIR@/bts335.c -debug 2
-bin/toplevel.opt -pdg-debug -pdg -pdg-debug "-pdg-pot bts335" @PTEST_DIR@/bts335.c 
+bin/toplevel.opt -slice-pragma g -calldeps -slicing-level 3 %{dep:@PTEST_DIR@/bts335.c} -debug 2
+bin/toplevel.opt -pdg-debug -pdg -pdg-debug "-pdg-pot bts335" %{dep:@PTEST_DIR@/bts335.c} 
  */
 int T[2]  = {0, 0};
 void f (int i) { T[i]++; }
diff --git a/tests/slicing/horwitz.i b/tests/slicing/horwitz.i
index 1d78afc6949995143065990be039f5c1d4cf614f..62b29557becfdc37d0f1e27346d55501b8a0935d 100644
--- a/tests/slicing/horwitz.i
+++ b/tests/slicing/horwitz.i
@@ -4,8 +4,8 @@
    OPT: @EVA_OPTIONS@ -deps -slicing-level 0
 */
 
-/* bin/toplevel.opt -deps -eva @PTEST_DIR@/@PTEST_NAME@.c */
-/* bin/toplevel.opt -deps -pdg-debug -pdg @PTEST_DIR@/@PTEST_NAME@.c */
+/* bin/toplevel.opt -deps -eva %{dep:@PTEST_DIR@/@PTEST_NAME@.c} */
+/* bin/toplevel.opt -deps -pdg-debug -pdg %{dep:@PTEST_DIR@/@PTEST_NAME@.c} */
 /* cf aussi @PTEST_DIR@/@PTEST_NAME@.ml */
 
 int add (int a, int b) {
diff --git a/tests/spec/lib.c b/tests/spec/lib.c
index 67e220163062cea5c601ac3f2892bfa5e015fdff..eb145ec41674dcc8194b29dfd2d48cac7ff1ec8e 100644
--- a/tests/spec/lib.c
+++ b/tests/spec/lib.c
@@ -1,6 +1,6 @@
 /* run.config
+ DEPS: lib.h
    OPT: -cpp-extra-args="-Itests/spec" -cpp-extra-args="-include lib.h" -print
 */
-
 /*@ ensures f((int)0) == (int)0; */
 int main () { return 0; }
diff --git a/tests/spec/merge_1.i b/tests/spec/merge_1.i
index 5781ff60a9d687e7f0067c8ad05b458130553ef2..0e236f1cfaec8c87b87193f4061cf945d50e6ac9 100644
--- a/tests/spec/merge_1.i
+++ b/tests/spec/merge_1.i
@@ -1,5 +1,5 @@
 /* run.config
-   STDOPT: +"@PTEST_DIR@/merge_2.i"
+   STDOPT: +"%{dep:@PTEST_DIR@/merge_2.i}"
  */
 /*@ requires \valid(s);
   @ assigns \nothing;
diff --git a/tests/spec/merge_bts938.c b/tests/spec/merge_bts938.c
index 9616f9bca200e73b68a7321d784108f443364fad..81f2626d24bcc615feb9e455754f7af3212b423b 100644
--- a/tests/spec/merge_bts938.c
+++ b/tests/spec/merge_bts938.c
@@ -1,7 +1,7 @@
 /* run.config
-   STDOPT: +"@PTEST_DIR@/merge_bts938_1.c"
+ DEPS: merge_bts938.h
+   STDOPT: +"%{dep:@PTEST_DIR@/merge_bts938_1.c}"
 */
-
 #include "merge_bts938.h"
 
 //@ ensures test:\true;
diff --git a/tests/spec/merge_different_assigns.i b/tests/spec/merge_different_assigns.i
index ff278513e6bdd0346793466453e1b698f5a9f02d..90c66e6c0f8b2c00904390331951865c7b729a65 100644
--- a/tests/spec/merge_different_assigns.i
+++ b/tests/spec/merge_different_assigns.i
@@ -1,5 +1,5 @@
 /* run.config
-   STDOPT: +"@PTEST_DIR@/merge_different_assigns_bis.i"
+   STDOPT: +"%{dep:@PTEST_DIR@/merge_different_assigns_bis.i}"
 */
 
 int x, z, t, u, v, w;
diff --git a/tests/spec/model1.c b/tests/spec/model1.c
index 21245d1606668b2dee63c70f3621dfb84b26a090..69ab6b80250a4d2abd6de552eb25102bc2e046f6 100644
--- a/tests/spec/model1.c
+++ b/tests/spec/model1.c
@@ -1,6 +1,6 @@
 /* run.config
  DEPS: model1.h
-  STDOPT: +"@PTEST_DIR@/model2.c"
+  STDOPT: +"%{dep:@PTEST_DIR@/model2.c}"
 */
 
 #include "model1.h"
diff --git a/tests/spec/use.c b/tests/spec/use.c
index 31add8c1753526097d60c7959ea716859a42db9d..8a84f1802f399f481034310d3032724c09c22f7d 100644
--- a/tests/spec/use.c
+++ b/tests/spec/use.c
@@ -1,6 +1,6 @@
 /* run.config
  DEPS: dec.h
-   STDOPT: +"@PTEST_DIR@/use2.c"
+   STDOPT: +"%{dep:@PTEST_DIR@/use2.c}"
 */
 
 // BTS 0887
diff --git a/tests/syntax/bts0442-2.i b/tests/syntax/bts0442-2.i
index c590a24098eec704369194c0ae312dcdc41d318d..579a877ad22e25f818adc8530c421e51da93ba6c 100644
--- a/tests/syntax/bts0442-2.i
+++ b/tests/syntax/bts0442-2.i
@@ -1,5 +1,5 @@
 /* run.config
-STDOPT: +"@PTEST_DIR@/bts0442.i"
+STDOPT: +"%{dep:@PTEST_DIR@/bts0442.i}"
 */
 enum E { E0=0, E1=1} ve1=E1;
 void f (void) {
diff --git a/tests/syntax/bts0442.i b/tests/syntax/bts0442.i
index 6a0681975ea63f797833df107ca4810471a274a2..2c44d84fdb461cbc2c7a27ef221f4c181d2cae69 100644
--- a/tests/syntax/bts0442.i
+++ b/tests/syntax/bts0442.i
@@ -1,4 +1,4 @@
 /* run.config
-STDOPT: +"@PTEST_DIR@/bts0442-2.i"
+STDOPT: +"%{dep:@PTEST_DIR@/bts0442-2.i}"
 */
 enum E { E1=1, E2=2} ve2=E2;
diff --git a/tests/syntax/bts0672_link.c b/tests/syntax/bts0672_link.c
index 6fee817be92f8abffc57e6e981ebcc22dc39f0c9..b75887c3b413d8e5f8c08db5adbdf322d7fb3ee6 100644
--- a/tests/syntax/bts0672_link.c
+++ b/tests/syntax/bts0672_link.c
@@ -1,6 +1,6 @@
 /* run.config
-   STDOPT: +"@PTEST_DIR@/bts0672_link_2.c"
-   STDOPT: +"@PTEST_DIR@/bts0672_link_2.c" +"-cpp-extra-args='-DPROTO'"
+   STDOPT: +"%{dep:@PTEST_DIR@/bts0672_link_2.c}"
+   STDOPT: +"%{dep:@PTEST_DIR@/bts0672_link_2.c}" +"-cpp-extra-args='-DPROTO'"
 */
 
 int Frama_C_entropy_source;
diff --git a/tests/syntax/extern_init.i b/tests/syntax/extern_init.i
index 37a97faef54b721dcfc5c135e34f9c294e4c7235..2a7d0516f9bc639eb3797d330672997f25b28c9a 100644
--- a/tests/syntax/extern_init.i
+++ b/tests/syntax/extern_init.i
@@ -1,7 +1,7 @@
 /* run.config
 PLUGIN: eva,scope
-OPT: @PTEST_DIR@/@PTEST_NAME@_1.i @PTEST_DIR@/@PTEST_NAME@_2.i -eva @EVA_CONFIG@
-OPT: @PTEST_DIR@/@PTEST_NAME@_2.i @PTEST_DIR@/@PTEST_NAME@_1.i -eva @EVA_CONFIG@
+OPT: %{dep:@PTEST_DIR@/@PTEST_NAME@_1.i} %{dep:@PTEST_DIR@/@PTEST_NAME@_2.i} -eva @EVA_CONFIG@
+OPT: %{dep:@PTEST_DIR@/@PTEST_NAME@_2.i} %{dep:@PTEST_DIR@/@PTEST_NAME@_1.i} -eva @EVA_CONFIG@
 */
 
 extern int a[] ;
diff --git a/tests/syntax/inconsistent_decl.c b/tests/syntax/inconsistent_decl.c
index 43fe38e5c0edbbdd94b658b77acac715fe4809a2..d27679ec4f16b344de6cae41590397cff58a7a48 100644
--- a/tests/syntax/inconsistent_decl.c
+++ b/tests/syntax/inconsistent_decl.c
@@ -1,7 +1,7 @@
 /* run.config
 EXIT: 1
-  STDOPT: +"@PTEST_DIR@/inconsistent_decl_2.i"
-  STDOPT: +"@PTEST_DIR@/inconsistent_decl_2.i"+"-cpp-extra-args='-DWITH_PROTO'"
+  STDOPT: +"%{dep:@PTEST_DIR@/inconsistent_decl_2.i}"
+  STDOPT: +"%{dep:@PTEST_DIR@/inconsistent_decl_2.i}"+"-cpp-extra-args='-DWITH_PROTO'"
 */
 
 #ifdef WITH_PROTO
diff --git a/tests/syntax/inline_def_1.i b/tests/syntax/inline_def_1.i
index d9f3bf03143273afe0a6337fb774e07af82cbbae..2b6cf856a6a1c122240f3380de8cbbce0a026a23 100644
--- a/tests/syntax/inline_def_1.i
+++ b/tests/syntax/inline_def_1.i
@@ -1,5 +1,5 @@
 /* run.config
-STDOPT: +"@PTEST_DIR@/inline_def_2.i"
+STDOPT: +"%{dep:@PTEST_DIR@/inline_def_2.i}"
 */
 
 // inline definition can be used in this translation unit, but does not
diff --git a/tests/syntax/inline_def_bad_1.i b/tests/syntax/inline_def_bad_1.i
index 03ee6e12cddb2a8e9cbd14ff5ee1021567f27176..37c0f891ee032bcee5d77fac54b9680115fbbcef 100644
--- a/tests/syntax/inline_def_bad_1.i
+++ b/tests/syntax/inline_def_bad_1.i
@@ -1,5 +1,5 @@
 /* run.config
-STDOPT: +"@PTEST_DIR@/inline_def_bad_2.i"
+STDOPT: +"%{dep:@PTEST_DIR@/inline_def_bad_2.i}"
 */
 
 extern inline f() { return 1; }
diff --git a/tests/syntax/merge_attrs_align.c b/tests/syntax/merge_attrs_align.c
index c0d94d12f36b9278000f0511a096b7c125cc6946..41cbe951b502fd8c22f4902e7d2083e45692b54a 100644
--- a/tests/syntax/merge_attrs_align.c
+++ b/tests/syntax/merge_attrs_align.c
@@ -1,13 +1,13 @@
 /*run.config
  EXIT: 1
-  STDOPT: +"-machdep x86_64" +"@PTEST_DIR@/merge_attrs_align1.c" +"@PTEST_DIR@/merge_attrs_align2.c"
-  STDOPT: +"-machdep x86_64" +"@PTEST_DIR@/merge_attrs_align1.c" +"@PTEST_DIR@/merge_attrs_align3.c"
+  STDOPT: +"-machdep x86_64" +"%{dep:@PTEST_DIR@/merge_attrs_align1.c}" +"%{dep:@PTEST_DIR@/merge_attrs_align2.c}"
+  STDOPT: +"-machdep x86_64" +"%{dep:@PTEST_DIR@/merge_attrs_align1.c}" +"%{dep:@PTEST_DIR@/merge_attrs_align3.c}"
  EXIT: 0
-  STDOPT: +"-machdep x86_64" +"@PTEST_DIR@/merge_attrs_align1.c" +"@PTEST_DIR@/merge_attrs_align4.c"
-  STDOPT: +"-machdep x86_64" +"@PTEST_DIR@/merge_attrs_align2.c" +"@PTEST_DIR@/merge_attrs_align3.c"
+  STDOPT: +"-machdep x86_64" +"%{dep:@PTEST_DIR@/merge_attrs_align1.c}" +"%{dep:@PTEST_DIR@/merge_attrs_align4.c}"
+  STDOPT: +"-machdep x86_64" +"%{dep:@PTEST_DIR@/merge_attrs_align2.c}" +"%{dep:@PTEST_DIR@/merge_attrs_align3.c}"
  EXIT: 1
-  STDOPT: +"-machdep x86_64" +"@PTEST_DIR@/merge_attrs_align2.c" +"@PTEST_DIR@/merge_attrs_align4.c"
-  STDOPT: +"-machdep x86_64" +"@PTEST_DIR@/merge_attrs_align3.c" +"@PTEST_DIR@/merge_attrs_align4.c"
+  STDOPT: +"-machdep x86_64" +"%{dep:@PTEST_DIR@/merge_attrs_align2.c}" +"%{dep:@PTEST_DIR@/merge_attrs_align4.c}"
+  STDOPT: +"-machdep x86_64" +"%{dep:@PTEST_DIR@/merge_attrs_align3.c}" +"%{dep:@PTEST_DIR@/merge_attrs_align4.c}"
  */
 
 // for testing with GCC/Clang
diff --git a/tests/syntax/merge_bts0948.i b/tests/syntax/merge_bts0948.i
index 38a8ae897bbf6d9ebd3f27f2a9b891413591b448..9cec05f94ed233e5b6acc40721c84d6d66164cb0 100644
--- a/tests/syntax/merge_bts0948.i
+++ b/tests/syntax/merge_bts0948.i
@@ -1,5 +1,5 @@
 /* run.config
-   STDOPT: +"@PTEST_DIR@/merge_bts0948_1.i" +"@PTEST_DIR@/merge_bts0948_2.i"
+   STDOPT: +"%{dep:@PTEST_DIR@/merge_bts0948_1.i}" +"%{dep:@PTEST_DIR@/merge_bts0948_2.i}"
 */
 
 /*@ requires \valid((char*)dest);
diff --git a/tests/syntax/merge_variadic.i b/tests/syntax/merge_variadic.i
index b296224e959149e92dd12a8136ea5ed89d60076d..71598363f14e9ae1412478c99ab6272ef06b5b4f 100644
--- a/tests/syntax/merge_variadic.i
+++ b/tests/syntax/merge_variadic.i
@@ -1,6 +1,6 @@
 /* run.config
 PLUGIN: variadic
-  OPT: @PTEST_DIR@/@PTEST_NAME@_aux.i -print
+  OPT: %{dep:@PTEST_DIR@/@PTEST_NAME@_aux.i} -print
 */
 int open (const char* file, int flags, int mode) {
   return -1;
diff --git a/tests/syntax/tentative_definition.c b/tests/syntax/tentative_definition.c
index 2d8e8726590485e19e0ec48173453ad31bb4f22d..4e8253e21ff088c8c6c2de7f68ec587ad25c8e5d 100644
--- a/tests/syntax/tentative_definition.c
+++ b/tests/syntax/tentative_definition.c
@@ -1,15 +1,15 @@
 /* run.config*
-OPT: -cpp-extra-args="-DEEDN" @PTEST_DIR@/@PTEST_NAME@_aux.c -print
-OPT: -cpp-extra-args="-DEENN" @PTEST_DIR@/@PTEST_NAME@_aux.c -print
-OPT: -cpp-extra-args="-DENND" @PTEST_DIR@/@PTEST_NAME@_aux.c -print
-OPT: -cpp-extra-args="-DENNN" @PTEST_DIR@/@PTEST_NAME@_aux.c -print
-OPT: -cpp-extra-args="-DNNNN" @PTEST_DIR@/@PTEST_NAME@_aux.c -print
+OPT: -cpp-extra-args="-DEEDN" %{dep:@PTEST_DIR@/@PTEST_NAME@_aux.c} -print
+OPT: -cpp-extra-args="-DEENN" %{dep:@PTEST_DIR@/@PTEST_NAME@_aux.c} -print
+OPT: -cpp-extra-args="-DENND" %{dep:@PTEST_DIR@/@PTEST_NAME@_aux.c} -print
+OPT: -cpp-extra-args="-DENNN" %{dep:@PTEST_DIR@/@PTEST_NAME@_aux.c} -print
+OPT: -cpp-extra-args="-DNNNN" %{dep:@PTEST_DIR@/@PTEST_NAME@_aux.c} -print
 EXIT: 1
-OPT: -cpp-extra-args="-DEEDD" @PTEST_DIR@/@PTEST_NAME@_aux.c -print
-OPT: -cpp-extra-args="-DENDD" @PTEST_DIR@/@PTEST_NAME@_aux.c -print
-OPT: -cpp-extra-args="-DENDN" @PTEST_DIR@/@PTEST_NAME@_aux.c -print
-OPT: -cpp-extra-args="-DNNDD" @PTEST_DIR@/@PTEST_NAME@_aux.c -print
-OPT: -cpp-extra-args="-DNNDN" @PTEST_DIR@/@PTEST_NAME@_aux.c -print
+OPT: -cpp-extra-args="-DEEDD" %{dep:@PTEST_DIR@/@PTEST_NAME@_aux.c} -print
+OPT: -cpp-extra-args="-DENDD" %{dep:@PTEST_DIR@/@PTEST_NAME@_aux.c} -print
+OPT: -cpp-extra-args="-DENDN" %{dep:@PTEST_DIR@/@PTEST_NAME@_aux.c} -print
+OPT: -cpp-extra-args="-DNNDD" %{dep:@PTEST_DIR@/@PTEST_NAME@_aux.c} -print
+OPT: -cpp-extra-args="-DNNDN" %{dep:@PTEST_DIR@/@PTEST_NAME@_aux.c} -print
 */
 
 // OK (one global defined to 1)
diff --git a/tests/syntax/vdefined_bts1241.i b/tests/syntax/vdefined_bts1241.i
index fb57d75836e844c708592e005026036ec42fc08f..77854d6e4805837b8149926e56e52b093a591e5b 100644
--- a/tests/syntax/vdefined_bts1241.i
+++ b/tests/syntax/vdefined_bts1241.i
@@ -1,5 +1,5 @@
 /* run.config
-STDOPT: +"@PTEST_DIR@/vdefined_bts1241_1.i"
+STDOPT: +"%{dep:@PTEST_DIR@/vdefined_bts1241_1.i}"
  */
 
 int f();