diff --git a/src/plugins/nonterm/tests/nonterm/oracle/output_to_file.txt b/src/plugins/nonterm/tests/nonterm/oracle/output_to_file.txt
index 6dd97cd6bff2dbb61792a7ce65fd78fc724e8751..4d8b2ffd404d89c7686480e76f267fcc882a4428 100644
--- a/src/plugins/nonterm/tests/nonterm/oracle/output_to_file.txt
+++ b/src/plugins/nonterm/tests/nonterm/oracle/output_to_file.txt
@@ -1,3 +1,3 @@
-tests/nonterm/output_to_file.i:7:[nonterm] warning: non-terminating loop
-stack: loop :: tests/nonterm/output_to_file.i:11 <- main
-tests/nonterm/output_to_file.i:12:[nonterm] warning: unreachable return
+output_to_file.i:7:[nonterm] warning: non-terminating loop
+stack: loop :: output_to_file.i:11 <- main
+output_to_file.i:12:[nonterm] warning: unreachable return
diff --git a/src/plugins/server/tests/batch/ast_services.i b/src/plugins/server/tests/batch/ast_services.i
index 2e5cdd094183b905ced97aa421b397e3adbfc59f..4c1e7b1b838700580f438bdcd4ca35bc4db693d9 100644
--- a/src/plugins/server/tests/batch/ast_services.i
+++ b/src/plugins/server/tests/batch/ast_services.i
@@ -1,5 +1,5 @@
-/* run.config
-   EXIT: 1
+/* run.config*
+ EXIT: 1
    STDOPT:
 */
 
diff --git a/src/plugins/server/tests/batch/wrong.i b/src/plugins/server/tests/batch/wrong.i
index 9997285b955e3cc0e50cd691b2f4d35063deae24..1a0a6550cd22661cdae17a41fdd59cc8e2709201 100644
--- a/src/plugins/server/tests/batch/wrong.i
+++ b/src/plugins/server/tests/batch/wrong.i
@@ -1,4 +1,4 @@
-/* run.config
+/* run.config*
  EXIT: 1
    STDOPT:
 */
diff --git a/src/plugins/variadic/tests/erroneous/no-param.i b/src/plugins/variadic/tests/erroneous/no-param.i
index 36a51880c6295e134e944ebb0d4bb244d5ed7ae4..d91685eee5b954a2e5b5f49d2e9005bc13041805 100644
--- a/src/plugins/variadic/tests/erroneous/no-param.i
+++ b/src/plugins/variadic/tests/erroneous/no-param.i
@@ -1,5 +1,5 @@
 /* run.config*
-   EXIT: 1
+ EXIT: 1
    STDOPT:
 */
 void f(...) // f must have at least one argument
@@ -11,4 +11,3 @@ int main()
 {
   f(0);
 }
-
diff --git a/src/plugins/variadic/tests/erroneous/not-enough-par.i b/src/plugins/variadic/tests/erroneous/not-enough-par.i
index ca9b1509cd0c328b61acc887b725cacb4c332b27..324731fc34133cbf5870e6560c82ad6540973f8f 100644
--- a/src/plugins/variadic/tests/erroneous/not-enough-par.i
+++ b/src/plugins/variadic/tests/erroneous/not-enough-par.i
@@ -1,5 +1,5 @@
 /* run.config*
-   EXIT: 1
+ EXIT: 1
    STDOPT:
 */
 int f(int a, int, int c,...);
diff --git a/src/plugins/variadic/tests/erroneous/variadic-builtin.i b/src/plugins/variadic/tests/erroneous/variadic-builtin.i
index 5f47371b838bfc2ad86da3911d72c5cec60e928f..160fba1f823fe062c4a7c82eac125cb52f8ca4ab 100644
--- a/src/plugins/variadic/tests/erroneous/variadic-builtin.i
+++ b/src/plugins/variadic/tests/erroneous/variadic-builtin.i
@@ -1,5 +1,5 @@
-/* run.config
-   EXIT: 3
+/* run.config*
+ EXIT: 3
    STDOPT:
 */
 extern void Frama_C_show_each_warning(char const * , ...);
diff --git a/tests/cil/bts892.i b/tests/cil/bts892.i
index c4e23ac5bf3454abf64691e2adca073f809d3615..493733c896a6f8f29ed439bfb4f2ee7f286f150a 100644
--- a/tests/cil/bts892.i
+++ b/tests/cil/bts892.i
@@ -1,5 +1,5 @@
 /* run.config*
-   EXIT: 1
+ EXIT: 1
    STDOPT:
 */
 
diff --git a/tests/cil/ghost_cfg.c b/tests/cil/ghost_cfg.c
index 5796f2a28e6e48272afff1d137f79c180cfb1351..077ac9570d45894d4b0919a2ab2c5baee1173ebd 100644
--- a/tests/cil/ghost_cfg.c
+++ b/tests/cil/ghost_cfg.c
@@ -1,5 +1,5 @@
 /* run.config
-   EXIT: 1
+ EXIT: 1
    OPT: -cpp-extra-args="-DCAN_CHECK"
    OPT: -cpp-extra-args="-DCANT_CHECK"
 */
diff --git a/tests/metrics/locals_size.i b/tests/metrics/locals_size.i
index 83b32f9b6a6bf4fe3ac436d7a168db282a08d9c6..bd261320029fac9ba2668b8f966066eb7b783dd4 100644
--- a/tests/metrics/locals_size.i
+++ b/tests/metrics/locals_size.i
@@ -1,5 +1,5 @@
 /* run.config
-  EXIT: 1
+ EXIT: 1
   OPT: -metrics-locals-size f,g,level3,level2,level1,main
   OPT: -metrics-locals-size recurse2
  */
diff --git a/tests/metrics/used-files.i b/tests/metrics/used-files.i
index dd38e0abe9ecd8b405b27cac91eb5d48e68d6170..82998e232362691b7ebae197606a6e49b75d7d9f 100644
--- a/tests/metrics/used-files.i
+++ b/tests/metrics/used-files.i
@@ -1,5 +1,5 @@
 /* run.config
-   EXIT: 1
+ EXIT: 1
    OPT: -metrics-used-files @PTEST_NAME@1.i @PTEST_NAME@2.i @PTEST_NAME@3.i @PTEST_NAME@4.i @PTEST_NAME@5.i @PTEST_NAME@6.i @PTEST_NAME@7.i @PTEST_NAME@8.i @PTEST_NAME@9.c @PTEST_NAME@1.h @PTEST_NAME@2.h
    OPT: -metrics-used-files -main g @PTEST_NAME@1.i @PTEST_NAME@2.i @PTEST_NAME@3.i @PTEST_NAME@4.i @PTEST_NAME@5.i @PTEST_NAME@6.i @PTEST_NAME@7.i @PTEST_NAME@8.i @PTEST_NAME@9.c @PTEST_NAME@1.h @PTEST_NAME@2.h
 */
diff --git a/tests/misc/bts0990_link.i b/tests/misc/bts0990_link.i
index cc237daa195f437ff5d43217291fb108b2f60d69..275a6a38c7b389817ecc181e7518fc6ae12cac4c 100644
--- a/tests/misc/bts0990_link.i
+++ b/tests/misc/bts0990_link.i
@@ -1,4 +1,4 @@
-/* run.config
+/* run.config*
  EXIT: 1
    OPT: %{dep:bts0990_link_1.i}
 */
diff --git a/tests/misc/custom_machdep.c b/tests/misc/custom_machdep.c
index 85f4d6116ac0e09033257978cfcbddd28af87dcd..f8e3930de1167f074090acbab6084ef682a45dd6 100644
--- a/tests/misc/custom_machdep.c
+++ b/tests/misc/custom_machdep.c
@@ -1,9 +1,9 @@
 /* run.config*
-EXIT: 1
-DEPS: __fc_machdep_custom.h
-MODULE: @PTEST_NAME@
-OPT: -cpp-extra-args="-D__FC_MACHDEP_CUSTOM" -machdep custom -print -then -print
-COMMENT: we need a -then to test double registering of a machdep
+ EXIT: 1
+  DEPS: __fc_machdep_custom.h
+  MODULE: @PTEST_NAME@
+  OPT: -cpp-extra-args="-D__FC_MACHDEP_CUSTOM" -machdep custom -print -then -print
+  COMMENT: we need a -then to test double registering of a machdep
 */
 #include "__fc_machdep_custom.h"
 // most of the following includes are not directly used, but they test if
diff --git a/tests/misc/debug_category.i b/tests/misc/debug_category.i
index 63a575d20bd98f593b6c962c88de6574a9b7d35a..f4b77fa6c365afe2abb45fb1aa71d9299e60b189 100644
--- a/tests/misc/debug_category.i
+++ b/tests/misc/debug_category.i
@@ -1,28 +1,28 @@
-/* run.config
+/* run.config*
 MODULE: Debug_category
 EXIT: 0
-OPT: -test-msg-key help -test-warn-key="a=inactive"
-OPT: -test-msg-key a -test-warn-key="a=inactive"
-OPT: -test-msg-key a -test-msg-key="-a:b" -test-warn-key="a=inactive"
-OPT: -test-msg-key a -test-msg-key="-a:b" -test-msg-key a:b:c -test-warn-key="a=inactive"
-OPT: -test-msg-key "a:b:c,d" -test-warn-key="a=inactive"
-OPT: -test-msg-key "*" -test-warn-key="a=inactive"
-OPT:
+  OPT: -test-msg-key help -test-warn-key="a=inactive"
+  OPT: -test-msg-key a -test-warn-key="a=inactive"
+  OPT: -test-msg-key a -test-msg-key="-a:b" -test-warn-key="a=inactive"
+  OPT: -test-msg-key a -test-msg-key="-a:b" -test-msg-key a:b:c -test-warn-key="a=inactive"
+  OPT: -test-msg-key "a:b:c,d" -test-warn-key="a=inactive"
+  OPT: -test-msg-key "*" -test-warn-key="a=inactive"
+  OPT:
 EXIT: 1
-OPT: -test-warn-key a=error
-OPT: -test-warn-key a=abort
+  OPT: -test-warn-key a=error
+  OPT: -test-warn-key a=abort
 EXIT: 0
-OPT: -test-warn-key a=feedback
+  OPT: -test-warn-key a=feedback
 EXIT: 1
-OPT: -test-warn-key="*=abort"
+  OPT: -test-warn-key="*=abort"
 EXIT: 0
-OPT: -test-warn-key=a=once
-OPT: -test-warn-key a=feedback-once
+  OPT: -test-warn-key=a=once
+  OPT: -test-warn-key a=feedback-once
 EXIT: 1
-OPT: -test-warn-key a=err-once
-OPT: -test-warn-key test-vis-err
-OPT: -test-warn-key test-inv-err
+  OPT: -test-warn-key a=err-once
+  OPT: -test-warn-key test-vis-err
+  OPT: -test-warn-key test-inv-err
 EXIT: 4
-OPT: -test-warn-key test-failure
+  OPT: -test-warn-key test-failure
 FILTER: sed 's|Your Frama-C version is.*|Your Frama-C version is VERSION|'
 */
diff --git a/tests/misc/function_ptr_lvalue_1.i b/tests/misc/function_ptr_lvalue_1.i
index 08951484173257eda353d8ebd537da7bf55540ba..b48ddbd09f7be85d24a13b2f581addd5a8a8fbae 100644
--- a/tests/misc/function_ptr_lvalue_1.i
+++ b/tests/misc/function_ptr_lvalue_1.i
@@ -2,6 +2,8 @@
  EXIT: 1
    STDOPT:
 */
+
+
 void f(void) {}
 
 int main()
diff --git a/tests/misc/global_decl_loc2.i b/tests/misc/global_decl_loc2.i
index 6183bafeabb6281910c22f46e9eb56f1401d9796..725fed64ce77d87c431a2ac1946ccb427f737209 100644
--- a/tests/misc/global_decl_loc2.i
+++ b/tests/misc/global_decl_loc2.i
@@ -1,5 +1,5 @@
-/* run.config
-   EXIT: 1
+/* run.config*
+ EXIT: 1
    LIBS: global_decl_loc
    OPT: @PTEST_DIR@/global_decl_loc.i
 */
diff --git a/tests/misc/log_selfrec.i b/tests/misc/log_selfrec.i
index 7e90ffb0a839588e3915c6256e5442b693a45b68..0059f5e09db80bdf2bdbc4a22b8236210a97057d 100644
--- a/tests/misc/log_selfrec.i
+++ b/tests/misc/log_selfrec.i
@@ -1,4 +1,4 @@
-/* run.config
+/* run.config*
    PLUGIN: report @PLUGIN@
  EXIT: 1
    OPT: -foobar -report-unclassified-error jazz
diff --git a/tests/misc/oracle/function_ptr_lvalue_1.res.oracle b/tests/misc/oracle/function_ptr_lvalue_1.res.oracle
index 5cc114cdd1d9044547ed2c0b647e3b0466ba598f..d3d88774926a89d4af95ef421961e739ba2853e0 100644
--- a/tests/misc/oracle/function_ptr_lvalue_1.res.oracle
+++ b/tests/misc/oracle/function_ptr_lvalue_1.res.oracle
@@ -1,5 +1,5 @@
 [kernel] Parsing function_ptr_lvalue_1.i (no preprocessing)
-[kernel] function_ptr_lvalue_1.i:11: User Error: 
+[kernel] function_ptr_lvalue_1.i:13: User Error: 
   Cannot assign to non-modifiable lval *p
 [kernel] User Error: stopping on file "function_ptr_lvalue_1.i" that has errors.
 [kernel] Frama-C aborted: invalid user input.
diff --git a/tests/spec/multiple_include_2.c b/tests/spec/multiple_include_2.c
index f9cd751dcc43c7317bec54ab1833b3c986c76320..4a8f6316eab192d39abad8c4604171f7e1f08a33 100644
--- a/tests/spec/multiple_include_2.c
+++ b/tests/spec/multiple_include_2.c
@@ -1,5 +1,5 @@
 /* run.config
-   EXIT: 1
+ EXIT: 1
    DEPS: multiple_include.h
    OPT: -kernel-warn-key=annot-error=active -print %{dep:multiple_include_1.c}
 */
diff --git a/tests/syntax/arg_type.i b/tests/syntax/arg_type.i
index 1d78c959ba83b4427968b68b2097fd176b7c306d..7f17b62b70041b3ef24187b91e6bb1b421f8ee47 100644
--- a/tests/syntax/arg_type.i
+++ b/tests/syntax/arg_type.i
@@ -1,4 +1,4 @@
-/* run.config
+/* run.config*
  EXIT: 1
    STDOPT: +"-machdep gcc_x86_32"
 */
diff --git a/tests/syntax/bad_return_bts_599.i b/tests/syntax/bad_return_bts_599.i
index 27707059b85e88ada4752eac5661fb4679a4313c..0306283d85e7d51baf78513fb457add2faf010a4 100644
--- a/tests/syntax/bad_return_bts_599.i
+++ b/tests/syntax/bad_return_bts_599.i
@@ -1,4 +1,4 @@
-/* run.config
+/* run.config*
  EXIT: 1
    STDOPT:
 */
diff --git a/tests/syntax/bts0519.c b/tests/syntax/bts0519.c
index a969be5270ab47e345adcacd68b2c3c1c545a847..8b7f870c14b9d368467c1e5bd624d256a3025a46 100644
--- a/tests/syntax/bts0519.c
+++ b/tests/syntax/bts0519.c
@@ -1,9 +1,9 @@
 /* run.config
- EXIT: 0
    STDOPT: +"-cpp-command='gcc -C -E -I.'" +"-cpp-frama-c-compliant"
  EXIT: 1
    STDOPT: +"-cpp-command='gcc -C -E -I. -DERR'" +"-cpp-frama-c-compliant"
  */
+
 int t[4];
 #ifdef ERR
 int q[static 3];
diff --git a/tests/syntax/ghost_cv_parsing_errors.c b/tests/syntax/ghost_cv_parsing_errors.c
index 1bcbcce7fab9abbd5902c72e1df2c844516e4709..7e1c57415c9b6f85fb309395c1fe835d1bffd2d9 100644
--- a/tests/syntax/ghost_cv_parsing_errors.c
+++ b/tests/syntax/ghost_cv_parsing_errors.c
@@ -1,5 +1,5 @@
 /* run.config
-   EXIT: 1
+ EXIT: 1
    OPT:-cpp-extra-args="-DIN_TYPE"
    OPT:-cpp-extra-args="-DIN_DECL"
    OPT:-cpp-extra-args="-DIN_GHOST_ATTR"
diff --git a/tests/syntax/ghost_else_bad_oneline.i b/tests/syntax/ghost_else_bad_oneline.i
index f1d5b8b82446ab65dfcc12db267d19ae45ec32af..ea8b5d76a13fbb5d29ea56429ff289bc5f5de274 100644
--- a/tests/syntax/ghost_else_bad_oneline.i
+++ b/tests/syntax/ghost_else_bad_oneline.i
@@ -1,5 +1,5 @@
 /* run.config
-   EXIT: 1
+ EXIT: 1
    OPT: -print
 */
 void if_ghost_else_one_line_bad(int x, int y) {
diff --git a/tests/syntax/inconsistent_decl.c b/tests/syntax/inconsistent_decl.c
index 6fea90cb9de75537909cb75154ca5b5b6fe1e26e..b3bdd2eee5ac8e29e25b4d3806e442a6a008de9f 100644
--- a/tests/syntax/inconsistent_decl.c
+++ b/tests/syntax/inconsistent_decl.c
@@ -1,7 +1,7 @@
 /* run.config
 EXIT: 1
-STDOPT: +"%{dep:inconsistent_decl_2.i}"
-STDOPT: +"%{dep:inconsistent_decl_2.i}"+"-cpp-extra-args='-DWITH_PROTO'"
+  STDOPT: +"%{dep:inconsistent_decl_2.i}"
+  STDOPT: +"%{dep:inconsistent_decl_2.i}"+"-cpp-extra-args='-DWITH_PROTO'"
 */
 #ifdef WITH_PROTO
 int f();
diff --git a/tests/syntax/inconsistent_global_ghost_spec.c b/tests/syntax/inconsistent_global_ghost_spec.c
index 02802a5fc23944cdb38d56788271bd0738d3aff5..231b0c1123f057a3607a57915af9f32a59427d46 100644
--- a/tests/syntax/inconsistent_global_ghost_spec.c
+++ b/tests/syntax/inconsistent_global_ghost_spec.c
@@ -1,9 +1,9 @@
 /* run.config
 EXIT: 1
-OPT: -cpp-extra-args="-DNON_GHOST_DECL_GHOST_DEF"
-OPT: -cpp-extra-args="-DGHOST_DECL_NON_GHOST_DEF"
-OPT: -cpp-extra-args="-DGHOST_DEF_NON_GHOST_DECL"
-OPT: -cpp-extra-args="-DNON_GHOST_DEF_GHOST_DECL"
+  OPT: -cpp-extra-args="-DNON_GHOST_DECL_GHOST_DEF"
+  OPT: -cpp-extra-args="-DGHOST_DECL_NON_GHOST_DEF"
+  OPT: -cpp-extra-args="-DGHOST_DEF_NON_GHOST_DECL"
+  OPT: -cpp-extra-args="-DNON_GHOST_DEF_GHOST_DECL"
 */
 #ifdef NON_GHOST_DECL_GHOST_DEF
 
diff --git a/tests/syntax/merge_unused.c b/tests/syntax/merge_unused.c
index 28dd7b221638a94c15ea705758387b00639a7160..5fa0b7c312052103a04e7c46f9991868d6b40826 100644
--- a/tests/syntax/merge_unused.c
+++ b/tests/syntax/merge_unused.c
@@ -1,7 +1,7 @@
-/* run.config
+/* run.config*
 EXIT: 1
-DEPS: merge_unused.h
-OPT: -cpp-extra-args="-I@PTEST_DIR@" %{dep:@PTEST_NAME@_2.c} -print
+  DEPS: merge_unused.h
+  OPT: -cpp-extra-args="-I@PTEST_DIR@" %{dep:@PTEST_NAME@_2.c} -print
 */
 #pragma pack(1)
 
diff --git a/tests/syntax/multiple_assigns.i b/tests/syntax/multiple_assigns.i
index d30757ea3ba8fcd8e595ac4cc6d8c610e7b2affe..e452e0fdc96d8b18d2fd631480a4ee7aff1c35fd 100644
--- a/tests/syntax/multiple_assigns.i
+++ b/tests/syntax/multiple_assigns.i
@@ -1,7 +1,7 @@
-/* run.config
-  EXIT: 1
+/* run.config*
+  EXIT: 0
+   STDOPT:
 */
-
 int z;
 
 /*@ assigns z, z;
diff --git a/tests/syntax/multiple_froms.i b/tests/syntax/multiple_froms.i
index ff8f1a77de17b331689da380c09b5fd3c2329345..fb2cf140850349af5468b540e848f847d4d1852c 100644
--- a/tests/syntax/multiple_froms.i
+++ b/tests/syntax/multiple_froms.i
@@ -1,5 +1,6 @@
-/* run.config
-  EXIT: 1
+/* run.config*
+ EXIT: 0
+   STDOPT:
 */
 
 
diff --git a/tests/syntax/oracle/multiple_froms.res.oracle b/tests/syntax/oracle/multiple_froms.res.oracle
index 782d8b3af9eb39d99f859564ce2a526bad18e94f..6cf99a12c336a5cfa75ebc4dd24bd2433c005718 100644
--- a/tests/syntax/oracle/multiple_froms.res.oracle
+++ b/tests/syntax/oracle/multiple_froms.res.oracle
@@ -1,8 +1,8 @@
 [kernel] Parsing multiple_froms.i (no preprocessing)
 [kernel:annot:multi-from] Warning: 
-  Drop 'b' \from at multiple_froms.i:14 for more precise one at multiple_froms.i:15
+  Drop 'b' \from at multiple_froms.i:15 for more precise one at multiple_froms.i:16
 [kernel:annot:multi-from] Warning: 
-  Drop 'a' \from at multiple_froms.i:12 for more precise one at multiple_froms.i:11
+  Drop 'a' \from at multiple_froms.i:13 for more precise one at multiple_froms.i:12
 /* Generated by Frama-C */
 int a;
 int b;
diff --git a/tests/syntax/reject_use_decl_mismatch_bts728.c b/tests/syntax/reject_use_decl_mismatch_bts728.c
index 0af65563bebda87a9210c762fcdca8413725f24d..1dde8a89eb9d16db31800408f4643807af985f35 100644
--- a/tests/syntax/reject_use_decl_mismatch_bts728.c
+++ b/tests/syntax/reject_use_decl_mismatch_bts728.c
@@ -1,7 +1,7 @@
 /* run.config
 EXIT: 1
-STDOPT: +"-cpp-extra-args='-DHAS_PROTO'"
-STDOPT: +"-cpp-extra-args='-DNO_PROTO'"
+  STDOPT: +"-cpp-extra-args='-DHAS_PROTO'"
+  STDOPT: +"-cpp-extra-args='-DNO_PROTO'"
 */
 #ifdef HAS_PROTO
 int f();
diff --git a/tests/syntax/type_redef.i b/tests/syntax/type_redef.i
index 1789ed03904244bf19485229ac09c0b1f5803a46..2c56c35150bac395c2cbd72c1479e474c39ce1d8 100644
--- a/tests/syntax/type_redef.i
+++ b/tests/syntax/type_redef.i
@@ -1,5 +1,5 @@
 /* run.config
-   EXIT: 1
+ EXIT: 1
    STDOPT:
    STDOPT: #"-c11"
 */ // Note: redefinition of local typedefs is currently unsupported
diff --git a/tests/syntax/typedef_namespace_bts1500.c b/tests/syntax/typedef_namespace_bts1500.c
index 9b979bf221d74ed7230832d2b93b8cc32eca93ee..0e4a066a648ca14e136020376812cdbcfe33908e 100644
--- a/tests/syntax/typedef_namespace_bts1500.c
+++ b/tests/syntax/typedef_namespace_bts1500.c
@@ -1,4 +1,4 @@
-/* run.config
+/* run.config*
    STDOPT:
  EXIT: 1
    STDOPT: +"-cpp-extra-args='-DHIDING_TYPEDEF'"
diff --git a/tests/value/empty_base.c b/tests/value/empty_base.c
index a1e08e2b7e0741f4c18b6cac0b635446cf67ed43..02c1b9f96ea1b3cf18b39fc236568e2d13b7d28c 100644
--- a/tests/value/empty_base.c
+++ b/tests/value/empty_base.c
@@ -1,5 +1,5 @@
 /* run.config*
-   EXIT: 1
+ EXIT: 1
    STDOPT: +"-machdep gcc_x86_32"
    STDOPT:
  */
diff --git a/tests/value/recursion.i b/tests/value/recursion.i
index a54b9703d4eb8d8a128def97b5d3e5a748225c16..18c8cb1d2d04fffe854a55a30de3bc228c988376 100644
--- a/tests/value/recursion.i
+++ b/tests/value/recursion.i
@@ -1,5 +1,5 @@
-/*run.config*
-  EXIT: 1
+/* run.config*
+ EXIT: 1
   OPT: -lib-entry -main main -eva @EVA_CONFIG@
   OPT: -lib-entry -main main -eva @EVA_CONFIG@ -eva-ignore-recursive-calls
  */
diff --git a/tests/value/split_return.i b/tests/value/split_return.i
index c5cf8b5cf3f85d604ccbdefb130bcf93d5976540..08885c5c4b2680b286067d2a89da991ad9bad1ce 100644
--- a/tests/value/split_return.i
+++ b/tests/value/split_return.i
@@ -2,8 +2,8 @@
    PLUGIN: @PLUGIN@ report
    STDOPT: +"-deterministic -eva-no-memexec -eva-slevel-function init:3,main1:3,f2:4,main2:4,f4:3,main5:3,uninit:2,main9:2 -eva-split-return-function f2:0,f3:-2:-4,f4:4,f5:-2,NON_EXISTING:4,uninit:0,escaping:0 -eva-warn-copy-indeterminate=-uninit,-escaping,-main9 -permissive -then -report"
    STDOPT: +"-deterministic -eva-no-memexec -eva -out -input -deps -eva-slevel 6 -eva-split-return auto -eva-split-return-function f7:0:3 -eva-warn-copy-indeterminate=-uninit,-escaping,-main9 -then -report"
-   COMMENT: below command must fail, as -permissive is not set
  EXIT:1
+   COMMENT: below command must fail, as -permissive is not set
    STDOPT: +"-deterministic -eva-no-memexec -eva -eva-slevel-function NON_EXISTING:4 -eva-warn-copy-indeterminate=-uninit,-escaping,-main9"
  EXIT:0
    STDOPT: +"-deterministic -eva-no-memexec -eva -out -input -deps -eva-slevel 6 -eva-split-return full -eva-warn-copy-indeterminate=-uninit,-escaping,-main9"
diff --git a/tests/value/traces/test5.i b/tests/value/traces/test5.i
index 2cadc99b60b12effe20889b46e0d46129e8ae474..8f21952cadf7e80687dc60f6a6e274cee2e14b8d 100644
--- a/tests/value/traces/test5.i
+++ b/tests/value/traces/test5.i
@@ -1,5 +1,5 @@
 /* run.config
-   EXIT: 1
+ EXIT: 1
    STDOPT: #"-eva-domains traces -eva-msg-key d-traces -eva-slevel 10" +"-then-last -eva -eva-slevel 10 -print -no-eva-traces-domain"
 */
 
diff --git a/tests/value/unknown_sizeof.i b/tests/value/unknown_sizeof.i
index 38f1f696870902effe3b53d61a959f9ea904049e..873f0e1e81ff6d6d3cf52e5bb6e25e8069f173db 100644
--- a/tests/value/unknown_sizeof.i
+++ b/tests/value/unknown_sizeof.i
@@ -1,5 +1,5 @@
 /* run.config*
-   EXIT: 1
+ EXIT: 1
    OPT: -eva @EVA_CONFIG@ -main main1
    OPT: -eva @EVA_CONFIG@ -main main2
 */
diff --git a/tests/value/use_spec.i b/tests/value/use_spec.i
index 31507fa899b69ec2f9c5ba408a3e27a9eea71adb..58fc74027e79ec01c859edc32bebbb5f818c1016 100644
--- a/tests/value/use_spec.i
+++ b/tests/value/use_spec.i
@@ -1,7 +1,7 @@
 /* run.config*
  EXIT: 1
- OPT: -eva-use-spec f,h -eva @EVA_CONFIG@ -inout -calldeps
- OPT: -eva-use-spec f,h -eva @EVA_CONFIG@ -inout -calldeps -show-indirect-deps
+   OPT: -eva-use-spec f,h -eva @EVA_CONFIG@ -inout -calldeps
+   OPT: -eva-use-spec f,h -eva @EVA_CONFIG@ -inout -calldeps -show-indirect-deps
 */
 
 void f(int *x) {