diff --git a/tests/saveload/basic.i b/tests/saveload/basic.i
index e0d5d8f8b74aa58031d88339800120da3fb0c659..e08f72217afc5872f078df8e68ece4bf9bd9d130 100644
--- a/tests/saveload/basic.i
+++ b/tests/saveload/basic.i
@@ -2,14 +2,14 @@
    EXECNOW: make -s @PTEST_DIR@/@PTEST_NAME@.cmxs
    EXECNOW: LOG basic_sav.res LOG basic_sav.err BIN basic.sav @frama-c@ -load-module @PTEST_DIR@/@PTEST_NAME@.cmxs -eva -out -input -deps -eva-show-progress ./@PTEST_DIR@/@PTEST_NAME@.i -save ./tests/saveload/result/basic.sav > ./tests/saveload/result/basic_sav.res 2> ./tests/saveload/result/basic_sav.err
    EXECNOW: LOG basic_sav.1.res LOG basic_sav.1.err BIN basic.1.sav ./bin/toplevel.opt -save ./tests/saveload/result/basic.1.sav @PTEST_DIR@/@PTEST_NAME@.i -eva -out -input -deps -eva-show-progress > ./tests/saveload/result/basic_sav.1.res 2> ./tests/saveload/result/basic_sav.1.err
-   OPT: -load ./tests/saveload/result/basic.sav -eva -out -input -deps -journal-disable
+   STDOPT: +"-load ./tests/saveload/result/basic.sav -eva -out -input -deps -journal-disable"
    CMD: @frama-c@ -load-module @PTEST_DIR@/@PTEST_NAME@.cmxs
-   OPT: -load ./tests/saveload/result/basic.1.sav -eva -out -input -deps -journal-disable -print
-   OPT: -load ./tests/saveload/result/basic.1.sav -eva -out -input -deps -journal-disable
+   STDOPT: +"-load ./tests/saveload/result/basic.1.sav -eva -out -input -deps -journal-disable -print"
+   STDOPT: +"-load ./tests/saveload/result/basic.1.sav -eva -out -input -deps -journal-disable"
    EXECNOW: make -s @PTEST_DIR@/status.cmxs
    EXECNOW: LOG status_sav.res LOG status_sav.err BIN status.sav @frama-c@ -load-module @PTEST_DIR@/status -save ./tests/saveload/result/status.sav @PTEST_DIR@/@PTEST_NAME@.i > ./tests/saveload/result/status_sav.res 2> ./tests/saveload/result/status_sav.err
-   OPT: -load-module @PTEST_DIR@/status -load ./tests/saveload/result/status.sav
-   OPT: -load ./tests/saveload/result/status.sav
+   STDOPT: +"-load-module @PTEST_DIR@/status -load ./tests/saveload/result/status.sav"
+   STDOPT: +"-load ./tests/saveload/result/status.sav"
 */
 
 int main() {
diff --git a/tests/saveload/bool.c b/tests/saveload/bool.c
index f202c7f7fda49ce59e6127ef60e39f992ed8741c..5453ccfe23850403af7beb11fbc4ed95c3ce6534 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 ./bin/toplevel.opt -save ./tests/saveload/result/bool.sav -eva -eva-show-progress ./tests/saveload/bool.c > tests/saveload/result/bool_sav.res 2> tests/saveload/result/bool_sav.err
-   OPT: -load ./tests/saveload/result/bool.sav -out -input -deps
-   OPT: -load ./tests/saveload/result/bool.sav -eva
+   STDOPT: +"-load ./tests/saveload/result/bool.sav -out -input -deps"
+   STDOPT: +"-load ./tests/saveload/result/bool.sav -eva"
  */
 
 #include "stdbool.h"
diff --git a/tests/saveload/callbacks.i b/tests/saveload/callbacks.i
index eaac5742247a0274a6b92b9395534e72d3966cde..b1fe21aabd15e996e1b84a7ba90ab7025dcd4cdb 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 ./bin/toplevel.opt tests/saveload/callbacks.i -out -calldeps -eva-show-progress -main main1 -save ./tests/saveload/result/callbacks.sav > ./tests/saveload/result/callbacks_initial.res 2> ./tests/saveload/result/callbacks_initial.err
-   OPT: -load ./tests/saveload/result/callbacks.sav -main main2 -then -main main3
+   STDOPT: +"-load ./tests/saveload/result/callbacks.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 9999d8a8912bf249be9b7cac48fd1279a14b9fe3..1e7dddc3a3c06bda23bc341a1df1a8b95e3d7922 100644
--- a/tests/saveload/deps.i
+++ b/tests/saveload/deps.i
@@ -1,11 +1,11 @@
 /* run.config
    EXECNOW: make -s ./tests/saveload/deps_A.cmxs ./tests/saveload/deps_B.cmxs ./tests/saveload/deps_C.cmxs ./tests/saveload/deps_D.cmxs ./tests/saveload/deps_E.cmxs
    EXECNOW: LOG deps_sav.res LOG deps_sav.err BIN deps.sav @frama-c@ -load-module ./tests/saveload/deps_A.cmxs -eva -out -input -deps -eva-show-progress ./tests/saveload/deps.i -save ./tests/saveload/result/deps.sav > ./tests/saveload/result/deps_sav.res 2> ./tests/saveload/result/deps_sav.err
-   OPT: -load-module ./tests/saveload/deps_A -load ./tests/saveload/result/deps.sav -eva -out -input -deps -eva-show-progress 
-   OPT: -load-module ./tests/saveload/deps_B -load ./tests/saveload/result/deps.sav  -out -input -deps -eva-show-progress 
-   OPT: -load-module ./tests/saveload/deps_C -load ./tests/saveload/result/deps.sav  -out -input -deps -eva-show-progress 
-   OPT: -load-module ./tests/saveload/deps_D -load ./tests/saveload/result/deps.sav  -out -input -deps -eva-show-progress 
-   OPT: -load-module ./tests/saveload/deps_E -load ./tests/saveload/result/deps.sav  -out -input -deps -eva-show-progress 
+   STDOPT: +"-load-module ./tests/saveload/deps_A -load ./tests/saveload/result/deps.sav -eva -out -input -deps "
+   STDOPT: +"-load-module ./tests/saveload/deps_B -load ./tests/saveload/result/deps.sav  -out -input -deps "
+   STDOPT: +"-load-module ./tests/saveload/deps_C -load ./tests/saveload/result/deps.sav  -out -input -deps "
+   STDOPT: +"-load-module ./tests/saveload/deps_D -load ./tests/saveload/result/deps.sav  -out -input -deps "
+   STDOPT: +"-load-module ./tests/saveload/deps_E -load ./tests/saveload/result/deps.sav  -out -input -deps "
 */
 
 int main() {
diff --git a/tests/saveload/isset.c b/tests/saveload/isset.c
index cd916529828d2db8a31bae87ed38b6e8aa0bb4b8..e490c3405e835d7c65980bd84767a42dd5f47449 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 ./bin/toplevel.opt -quiet -eva -save tests/saveload/result/isset.sav tests/saveload/isset.c > ./tests/saveload/result/isset_sav.res 2> ./tests/saveload/result/isset_sav.err
-   OPT: -quiet -load ./tests/saveload/result/isset.sav
-   OPT: -load ./tests/saveload/result/isset.sav
-   OPT: -eva -load ./tests/saveload/result/isset.sav
-   OPT: -quiet -eva -load ./tests/saveload/result/isset.sav
+   STDOPT: +"-quiet -load ./tests/saveload/result/isset.sav"
+   STDOPT: +"-load ./tests/saveload/result/isset.sav"
+   STDOPT: +"-eva -load ./tests/saveload/result/isset.sav"
+   STDOPT: +"-quiet -eva -load ./tests/saveload/result/isset.sav"
 */
 
 int main() {
diff --git a/tests/saveload/load_one.i b/tests/saveload/load_one.i
index 8f58edd16793be9f8f058ad48543ab1df2132096..75dde3f72926e6957c0fdfb898dbd3c3ba37932d 100644
--- a/tests/saveload/load_one.i
+++ b/tests/saveload/load_one.i
@@ -1,6 +1,6 @@
 /* run.config
    EXECNOW: make -s @PTEST_DIR@/@PTEST_NAME@.cmxs
-   OPT: -load-module @PTEST_DIR@/@PTEST_NAME@.cmxs -eva-show-progress
+   STDOPT: +"-load-module @PTEST_DIR@/@PTEST_NAME@.cmxs"
 */
 int G;
 
diff --git a/tests/saveload/multi_project.i b/tests/saveload/multi_project.i
index e8c3589515cd3bdca84e5679e3a52330cfbbbb50..3a98905ee05a858635d65a496b77f0e75e664535 100644
--- a/tests/saveload/multi_project.i
+++ b/tests/saveload/multi_project.i
@@ -1,7 +1,7 @@
 /* run.config
    EXECNOW: BIN multi_project.sav LOG multi_project_sav.res LOG multi_project_sav.err ./bin/toplevel.opt -save ./tests/saveload/result/multi_project.sav -eva-show-progress -semantic-const-folding @PTEST_DIR@/@PTEST_NAME@.i > tests/saveload/result/multi_project_sav.res 2> tests/saveload/result/multi_project_sav.err
    EXECNOW: make -s @PTEST_DIR@/@PTEST_NAME@.cmxs
-   OPT: -load ./tests/saveload/result/multi_project.sav -journal-disable
+   STDOPT: +"-load ./tests/saveload/result/multi_project.sav -journal-disable"
    CMD: @frama-c@ -load-module @PTEST_DIR@/@PTEST_NAME@.cmxs
    OPT: -eva -eva-show-progress
 */
diff --git a/tests/saveload/segfault_datatypes.i b/tests/saveload/segfault_datatypes.i
index 6aba95f697da0b1a07b74017bbcf431e0e2dd685..0e64333dd66e888dfbe6f51bc17a9c3f820de664 100644
--- a/tests/saveload/segfault_datatypes.i
+++ b/tests/saveload/segfault_datatypes.i
@@ -1,8 +1,8 @@
 /* run.config
    EXECNOW: make -s ./tests/saveload/segfault_datatypes_A.cmxs ./tests/saveload/segfault_datatypes_B.cmxs
-   EXECNOW: LOG segfault_datatypes_sav.res LOG segfault_datatypes_sav.err BIN segfault_datatypes.sav @frama-c@ -load-module ./tests/saveload/segfault_datatypes_A -eva -out -input -deps -eva-show-progress ./tests/saveload/segfault_datatypes.i -save ./tests/saveload/result/segfault_datatypes.sav > ./tests/saveload/result/segfault_datatypes_sav.res 2> ./tests/saveload/result/segfault_datatypes_sav.err
+   EXECNOW: LOG segfault_datatypes_sav.res LOG segfault_datatypes_sav.err BIN segfault_datatypes.sav @frama-c@ -load-module ./tests/saveload/segfault_datatypes_A -eva -out -input -deps ./tests/saveload/segfault_datatypes.i -eva-show-progress -save ./tests/saveload/result/segfault_datatypes.sav > ./tests/saveload/result/segfault_datatypes_sav.res 2> ./tests/saveload/result/segfault_datatypes_sav.err
    CMD: @frama-c@ -load-module ./tests/saveload/segfault_datatypes_B
-   OPT: -load ./tests/saveload/result/segfault_datatypes.sav -eva -out -input -deps -journal-disable
+   STDOPT: +"-load ./tests/saveload/result/segfault_datatypes.sav -eva -out -input -deps -journal-disable"
 */
 
 
diff --git a/tests/saveload/sparecode.i b/tests/saveload/sparecode.i
index ba347428ae754a68501dada38f5d819f7dad794a..33d1776ddc1ace121e6c617062505c43b4219b3d 100644
--- a/tests/saveload/sparecode.i
+++ b/tests/saveload/sparecode.i
@@ -1,6 +1,6 @@
 /* run.config
    EXECNOW: BIN sparecode.sav LOG sparecode_sav.res LOG sparecode_sav.err ./bin/toplevel.opt -slicing-level 2 -slice-return main -eva-show-progress -save ./tests/saveload/result/sparecode.sav tests/saveload/sparecode.i -then-on 'Slicing export' -print > tests/saveload/result/sparecode_sav.res 2> tests/saveload/result/sparecode_sav.err
-   OPT: -load ./tests/saveload/result/sparecode.sav
+   STDOPT: +"-load ./tests/saveload/result/sparecode.sav"
 */
 int G;
 
diff --git a/tests/saveload/test_config b/tests/saveload/test_config
new file mode 100644
index 0000000000000000000000000000000000000000..16c72227f60606ee00121bf18bf95a4d0736fe19
--- /dev/null
+++ b/tests/saveload/test_config
@@ -0,0 +1 @@
+OPT: -eva-show-progress