diff --git a/tests/saveload/basic.i b/tests/saveload/basic.i
index 96e934171473758e5b70f373733d4c78325ab754..338816e01c2355f5716f7ed4b3144d56da296b78 100644
--- a/tests/saveload/basic.i
+++ b/tests/saveload/basic.i
@@ -1,18 +1,18 @@
 /* run.config
  MODULE: @PTEST_NAME@
-   EXECNOW: LOG basic_sav.res LOG basic_sav.err BIN basic.sav @frama-c@ -eva @EVA_OPTIONS@ -out -input -deps @PTEST_FILE@ -save @PTEST_RESULT@/basic.sav > @PTEST_RESULT@/basic_sav.res 2> @PTEST_RESULT@/basic_sav.err
+   EXECNOW: BIN @PTEST_NAME@.sav LOG @PTEST_NAME@_sav.res LOG @PTEST_NAME@_sav.err @frama-c@ -eva @EVA_OPTIONS@ -out -input -deps @PTEST_FILE@ -save @PTEST_NAME@.sav > @PTEST_NAME@_sav.res 2> @PTEST_NAME@_sav.err
  MODULE:
-   EXECNOW: LOG basic_sav.1.res LOG basic_sav.1.err BIN basic.1.sav @frama-c@ -save @PTEST_RESULT@/basic.1.sav @PTEST_FILE@ -eva @EVA_OPTIONS@ -out -input -deps > @PTEST_RESULT@/basic_sav.1.res 2> @PTEST_RESULT@/basic_sav.1.err
-   STDOPT: +"-load %{dep:@PTEST_RESULT@/basic.sav} -eva @EVA_OPTIONS@ -out -input -deps"
+   EXECNOW: BIN @PTEST_NAME@.1.sav LOG @PTEST_NAME@_sav.1.res LOG @PTEST_NAME@_sav.1.err @frama-c@ -save @PTEST_NAME@.1.sav @PTEST_FILE@ -eva @EVA_OPTIONS@ -out -input -deps > @PTEST_NAME@_sav.1.res 2> @PTEST_NAME@_sav.1.err
+   STDOPT: +"-load %{dep:@PTEST_NAME@.sav} -eva @EVA_OPTIONS@ -out -input -deps"
  MODULE: @PTEST_NAME@
-   STDOPT: +"-load %{dep:@PTEST_RESULT@/basic.1}.sav -eva @EVA_OPTIONS@ -out -input -deps -print"
+   STDOPT: +"-load %{dep:@PTEST_NAME@.1}.sav -eva @EVA_OPTIONS@ -out -input -deps -print"
  MODULE:
-   STDOPT: +"-load %{dep:@PTEST_RESULT@/basic.1}.sav -eva @EVA_OPTIONS@ -out -input -deps"
+   STDOPT: +"-load %{dep:@PTEST_NAME@.1}.sav -eva @EVA_OPTIONS@ -out -input -deps"
  MODULE: status
-   EXECNOW: LOG status_sav.res LOG status_sav.err BIN status.sav @frama-c@ -save @PTEST_RESULT@/status.sav @PTEST_FILE@ > @PTEST_RESULT@/status_sav.res 2> @PTEST_RESULT@/status_sav.err
-   STDOPT: +"-load %{dep:@PTEST_RESULT@/status.sav}"
+   EXECNOW: LOG status_sav.res LOG status_sav.err BIN status.sav @frama-c@ -save status.sav @PTEST_FILE@ > status_sav.res 2> status_sav.err
+   STDOPT: +"-load %{dep:status.sav}"
  MODULE:
-   STDOPT: +"-load %{dep:@PTEST_RESULT@/status.sav}"
+   STDOPT: +"-load %{dep:status.sav}"
 */
 int main() {
   int i,j; i=10; /*@ assert (i == 10); */
diff --git a/tests/saveload/bool.c b/tests/saveload/bool.c
index ee02ead4e9d496c0b0df6b584b6454ca770acc57..b6b40e894029de1144330278dc6275e90de09ef8 100644
--- a/tests/saveload/bool.c
+++ b/tests/saveload/bool.c
@@ -1,7 +1,7 @@
 /* run.config
-   EXECNOW: BIN bool.sav LOG bool_sav.res LOG bool_sav.err @frama-c@ -save @PTEST_RESULT@/bool.sav -machdep x86_32 -eva @EVA_OPTIONS@ %{dep:@PTEST_DIR@/bool.c} > @PTEST_RESULT@/bool_sav.res 2> @PTEST_RESULT@/bool_sav.err
-   STDOPT: +"-load %{dep:@PTEST_RESULT@/bool.sav} -out -input -deps"
-   STDOPT: +"-load %{dep:@PTEST_RESULT@/bool.sav} -eva @EVA_OPTIONS@"
+   EXECNOW: BIN @PTEST_NAME@.sav LOG @PTEST_NAME@_sav.res LOG @PTEST_NAME@_sav.err @frama-c@ -save @PTEST_NAME@.sav -machdep x86_32 -eva @EVA_OPTIONS@ @PTEST_FILE@ > @PTEST_NAME@_sav.res 2> @PTEST_NAME@_sav.err
+   STDOPT: +"-load %{dep:@PTEST_NAME@.sav} -out -input -deps"
+   STDOPT: +"-load %{dep:@PTEST_NAME@.sav} -eva @EVA_OPTIONS@"
  */
 
 #include "stdbool.h"
diff --git a/tests/saveload/callbacks.i b/tests/saveload/callbacks.i
index 5d0b112d238d1c3f9fb76ecef4492e95d051f47f..31a79ab6d68372e612132f48bfbb8286b85ea3f5 100644
--- a/tests/saveload/callbacks.i
+++ b/tests/saveload/callbacks.i
@@ -1,6 +1,6 @@
 /* run.config
-   EXECNOW: LOG callbacks_initial.res LOG callbacks_initial.err BIN callbacks.sav @frama-c@ %{dep:@PTEST_DIR@/callbacks.i} -out -calldeps -eva-show-progress -main main1 -save @PTEST_RESULT@/callbacks.sav > @PTEST_RESULT@/callbacks_initial.res 2> @PTEST_RESULT@/callbacks_initial.err
-   STDOPT: +"-load %{dep:@PTEST_RESULT@/callbacks.sav} -main main2 -then -main main3"
+   EXECNOW: BIN @PTEST_NAME@.sav LOG @PTEST_NAME@_sav.res LOG @PTEST_NAME@_sav.err @frama-c@ @PTEST_FILE@ -out -calldeps -eva-show-progress -main main1 -save @PTEST_NAME@.sav > @PTEST_NAME@_sav.res 2> @PTEST_NAME@_sav.err
+   STDOPT: +"-load %{dep:@PTEST_NAME@.sav} -main main2 -then -main main3"
 */
 
 /* This tests whether the callbacks for callwise inout and from survive after
diff --git a/tests/saveload/deps.i b/tests/saveload/deps.i
index 633c19718ec97a731deb96a7354f64763379b5ba..f52f160618655e9f5b6a1fde609b2fbeee9e9940 100644
--- a/tests/saveload/deps.i
+++ b/tests/saveload/deps.i
@@ -1,15 +1,15 @@
 /* run.config
  MODULE: deps_A
-   EXECNOW: LOG deps_sav.res LOG deps_sav.err BIN deps.sav @frama-c@ -eva @EVA_OPTIONS@ -out -input -deps @PTEST_FILE@ -save @PTEST_RESULT@/deps.sav > @PTEST_RESULT@/deps_sav.res 2> @PTEST_RESULT@/deps_sav.err
-   STDOPT: +"-load %{dep:@PTEST_RESULT@/deps.sav} -eva @EVA_OPTIONS@ -out -input -deps "
+   EXECNOW: BIN @PTEST_NAME@.sav LOG @PTEST_NAME@_sav.res LOG @PTEST_NAME@_sav.err @frama-c@ -eva @EVA_OPTIONS@ -out -input -deps @PTEST_FILE@ -save @PTEST_NAME@.sav > @PTEST_NAME@_sav.res 2> @PTEST_NAME@_sav.err
+   STDOPT: +"-load %{dep:@PTEST_NAME@.sav} -eva @EVA_OPTIONS@ -out -input -deps "
  MODULE: deps_B
-   STDOPT: +"-load %{dep:@PTEST_RESULT@/deps.sav}  -out -input -deps "
+   STDOPT: +"-load %{dep:@PTEST_NAME@.sav}  -out -input -deps "
  MODULE: deps_C
-   STDOPT: +"-load %{dep:@PTEST_RESULT@/deps.sav}  -out -input -deps "
+   STDOPT: +"-load %{dep:@PTEST_NAME@.sav}  -out -input -deps "
  MODULE: deps_D
-   STDOPT: +"-load %{dep:@PTEST_RESULT@/deps.sav}  -out -input -deps "
+   STDOPT: +"-load %{dep:@PTEST_NAME@.sav}  -out -input -deps "
  MODULE: deps_E
-   STDOPT: +"-load %{dep:@PTEST_RESULT@/deps.sav}  -out -input -deps "
+   STDOPT: +"-load %{dep:@PTEST_NAME@.sav}  -out -input -deps "
 */
 
 int main() {
diff --git a/tests/saveload/isset.c b/tests/saveload/isset.c
index ebbce985577b02a719fafbf360c4f5bb05a3ce7c..9e8eb7af8624a4f22ff7a1b48287f5bf3575dd04 100644
--- a/tests/saveload/isset.c
+++ b/tests/saveload/isset.c
@@ -1,9 +1,9 @@
 /* run.config
-   EXECNOW: LOG isset_sav.res LOG isset_sav.err BIN isset.sav @frama-c@ -quiet -eva @EVA_OPTIONS@ -save @PTEST_RESULT@/isset.sav %{dep:@PTEST_DIR@/isset.c} > @PTEST_RESULT@/isset_sav.res 2> @PTEST_RESULT@/isset_sav.err
-   STDOPT: +"-quiet -load %{dep:@PTEST_RESULT@/isset.sav}"
-   STDOPT: +"-load %{dep:@PTEST_RESULT@/isset.sav}"
-   STDOPT: +"-eva @EVA_OPTIONS@ -load %{dep:@PTEST_RESULT@/isset.sav}"
-   STDOPT: +"-quiet -eva @EVA_OPTIONS@ -load %{dep:@PTEST_RESULT@/isset.sav}"
+   EXECNOW: BIN @PTEST_NAME@.sav LOG @PTEST_NAME@_sav.res LOG @PTEST_NAME@_sav.err @frama-c@ -quiet -eva @EVA_OPTIONS@ -save @PTEST_NAME@.sav @PTEST_FILE@ > @PTEST_NAME@_sav.res 2> @PTEST_NAME@_sav.err
+   STDOPT: +"-quiet -load %{dep:@PTEST_NAME@.sav}"
+   STDOPT: +"-load %{dep:@PTEST_NAME@.sav}"
+   STDOPT: +"-eva @EVA_OPTIONS@ -load %{dep:@PTEST_NAME@.sav}"
+   STDOPT: +"-quiet -eva @EVA_OPTIONS@ -load %{dep:@PTEST_NAME@.sav}"
 */
 
 int main() {
diff --git a/tests/saveload/multi_project.i b/tests/saveload/multi_project.i
index ec08de1fdb456c2aa77a3902568c09ff6513a32e..3c679630551fca3e0eb5c992804d9149439ffcee 100644
--- a/tests/saveload/multi_project.i
+++ b/tests/saveload/multi_project.i
@@ -1,7 +1,7 @@
 /* run.config
  PLUGIN: @EVA_PLUGINS@ constant_propagation
-   EXECNOW: BIN multi_project.sav LOG multi_project_sav.res LOG multi_project_sav.err @frama-c@ -save @PTEST_RESULT@/multi_project.sav @EVA_OPTIONS@ -semantic-const-folding @PTEST_DIR@/@PTEST_NAME@.i > @PTEST_RESULT@/multi_project_sav.res 2> @PTEST_RESULT@/multi_project_sav.err
-   STDOPT: +"-load %{dep:@PTEST_RESULT@/multi_project.sav}"
+   EXECNOW: BIN @PTEST_NAME@.sav LOG @PTEST_NAME@_sav.res LOG @PTEST_NAME@_sav.err @frama-c@ -save @PTEST_NAME@.sav @EVA_OPTIONS@ -semantic-const-folding @PTEST_FILE@ > @PTEST_NAME@_sav.res 2> @PTEST_NAME@_sav.err
+   STDOPT: +"-load %{dep:@PTEST_NAME@.sav}"
  MODULE: @PTEST_NAME@
    OPT: -eva @EVA_OPTIONS@
 */
diff --git a/tests/saveload/oracle/callbacks_initial.err b/tests/saveload/oracle/callbacks_sav.err
similarity index 100%
rename from tests/saveload/oracle/callbacks_initial.err
rename to tests/saveload/oracle/callbacks_sav.err
diff --git a/tests/saveload/oracle/callbacks_initial.res b/tests/saveload/oracle/callbacks_sav.res
similarity index 100%
rename from tests/saveload/oracle/callbacks_initial.res
rename to tests/saveload/oracle/callbacks_sav.res
diff --git a/tests/saveload/segfault_datatypes.i b/tests/saveload/segfault_datatypes.i
index 128453345c41c009c35b09b4ac912e801942a281..7cba664a76f74269d272e7d24bbcaa2aa6a8e42c 100644
--- a/tests/saveload/segfault_datatypes.i
+++ b/tests/saveload/segfault_datatypes.i
@@ -1,8 +1,8 @@
 /* run.config*
  MODULE: segfault_datatypes_A
-   EXECNOW: LOG segfault_datatypes_sav.res LOG segfault_datatypes_sav.err BIN segfault_datatypes.sav @frama-c@ -eva @EVA_OPTIONS@ -out -input -deps @PTEST_FILE@ -save @PTEST_RESULT@/segfault_datatypes.sav > @PTEST_RESULT@/segfault_datatypes_sav.res 2> @PTEST_RESULT@/segfault_datatypes_sav.err
+   EXECNOW: BIN @PTEST_NAME@.sav LOG @PTEST_NAME@_sav.res LOG @PTEST_NAME@_sav.err @frama-c@ -eva @EVA_OPTIONS@ -out -input -deps @PTEST_FILE@ -save @PTEST_NAME@.sav > @PTEST_NAME@_sav.res 2> @PTEST_NAME@_sav.err
  MODULE: segfault_datatypes_B
-   STDOPT: +"-load %{dep:@PTEST_RESULT@/segfault_datatypes.sav} -eva -out -input -deps"
+   STDOPT: +"-load %{dep:@PTEST_NAME@.sav} -eva -out -input -deps"
 */
 
 int main() {
diff --git a/tests/saveload/sparecode.i b/tests/saveload/sparecode.i
index 933cb8cb8de234563c6dea164eb9193a7df0ab87..b1e13d655e34e8f47b96597e5c40b2fe6fc7a241 100644
--- a/tests/saveload/sparecode.i
+++ b/tests/saveload/sparecode.i
@@ -1,7 +1,7 @@
 /* run.config
  PLUGIN: @EVA_PLUGINS@ slicing
-   EXECNOW: BIN sparecode.sav LOG sparecode_sav.res LOG sparecode_sav.err @frama-c@ -slicing-level 2 -slice-return main -eva-show-progress -save @PTEST_RESULT@/sparecode.sav %{dep:@PTEST_DIR@/sparecode.i} -then-on 'Slicing export' -print > @PTEST_RESULT@/sparecode_sav.res 2> @PTEST_RESULT@/sparecode_sav.err
-   STDOPT: +"-load %{dep:@PTEST_RESULT@/sparecode.sav}"
+   EXECNOW: BIN @PTEST_NAME@.sav LOG @PTEST_NAME@_sav.res LOG @PTEST_NAME@_sav.err @frama-c@ -slicing-level 2 -slice-return main -eva-show-progress -save @PTEST_NAME@.sav @PTEST_FILE@ -then-on 'Slicing export' -print > @PTEST_NAME@_sav.res 2> @PTEST_NAME@_sav.err
+   STDOPT: +"-load %{dep:@PTEST_NAME@.sav}"
 */
 int G;
 int f (int x, int y) {