diff --git a/tests/builtins/big_local_array.i b/tests/builtins/big_local_array.i
index 84322912cb6c9b8a476d38e523f53629faab6d0a..83bb0fda45a32a5472b6aed4986d7fd80fa2cc0b 100644
--- a/tests/builtins/big_local_array.i
+++ b/tests/builtins/big_local_array.i
@@ -1,7 +1,8 @@
 /* run.config*
-   EXECNOW: make -s @PTEST_DIR@/big_local_array_script.cmxs
    OPT: @EVA_OPTIONS@ -print -journal-disable -eva -report
-   OPT: @EVA_OPTIONS@ -load-module @PTEST_DIR@/big_local_array_script -then-on prj -print -report
+ MODULE: big_local_array_script
+   OPT: @EVA_OPTIONS@ -then-on prj -print -report
+ MODULE:
    OPT: @EVA_OPTIONS@ -print -journal-disable -no-initialized-padding-locals -eva
 */
 
diff --git a/tests/cil/change_formals.c b/tests/cil/change_formals.c
index 5ac6f89b75edfa8287197e7faefe404870c75820..a8ab915199fa3e2ea0422a9eb314603930ddbf39 100644
--- a/tests/cil/change_formals.c
+++ b/tests/cil/change_formals.c
@@ -1,8 +1,8 @@
 /* run.config
-EXECNOW: make -s tests/cil/Change_formals.cmxs
-OPT: -load-module tests/cil/Change_formals.cmxs -cpp-extra-args="-DNO_PROTO" -then-on test -print
-OPT: -load-module tests/cil/Change_formals.cmxs -cpp-extra-args="-DNO_IMPLEM" -then-on test -print
-OPT: -load-module tests/cil/Change_formals.cmxs -then-on test -print
+ MODULE: Change_formals
+   OPT: -cpp-extra-args="-DNO_PROTO" -then-on test -print
+   OPT: -cpp-extra-args="-DNO_IMPLEM" -then-on test -print
+   OPT: -then-on test -print
 */
 
 #ifndef NO_PROTO
diff --git a/tests/jcdb/jcdb.c b/tests/jcdb/jcdb.c
index caf9e83a15294ec38baa1aec35760c73ecbcd5c9..13af9552975e857f6e062cd3068b82e98d9a33bd 100644
--- a/tests/jcdb/jcdb.c
+++ b/tests/jcdb/jcdb.c
@@ -1,11 +1,13 @@
 /* run.config
-EXECNOW: make -s @PTEST_DIR@/@PTEST_NAME@.cmxs
-OPT: -json-compilation-database @PTEST_DIR@ -print
-OPT: @PTEST_DIR@/jcdb2.c -json-compilation-database @PTEST_DIR@/with_arguments.json -print
-OPT: -json-compilation-database @PTEST_DIR@/with_arguments.json -no-autoload-plugins -load-module @PTEST_DIR@/@PTEST_NAME@.cmxs
-EXECNOW: LOG list_files.res LOG list_files.err share/analysis-scripts/list_files.py @PTEST_DIR@/compile_commands_working.json > @PTEST_DIR@/result/list_files.res 2> @PTEST_DIR@/result/list_files.err
-EXECNOW: LOG logic-pp-include.res LOG logic-pp-include.err @frama-c@ -json-compilation-database @PTEST_DIR@/logic-pp-include @PTEST_DIR@/logic-pp-include/no-stdio.c -print -no-autoload-plugins > @PTEST_DIR@/result/logic-pp-include.res 2> @PTEST_DIR@/result/logic-pp-include.err
+   OPT: -json-compilation-database @PTEST_DIR@ -print
+   OPT: @PTEST_DIR@/jcdb2.c -json-compilation-database @PTEST_DIR@/with_arguments.json -print
+ MODULE: @PTEST_NAME@
+   OPT: -json-compilation-database @PTEST_DIR@/with_arguments.json -no-autoload-plugins
+ MODULE:
+   EXECNOW: LOG list_files.res LOG list_files.err share/analysis-scripts/list_files.py @PTEST_DIR@/compile_commands_working.json > @PTEST_DIR@/result/list_files.res 2> @PTEST_DIR@/result/list_files.err
+   EXECNOW: LOG logic-pp-include.res LOG logic-pp-include.err @frama-c@ -json-compilation-database @PTEST_DIR@/logic-pp-include @PTEST_DIR@/logic-pp-include/no-stdio.c -print -no-autoload-plugins > @PTEST_DIR@/result/logic-pp-include.res 2> @PTEST_DIR@/result/logic-pp-include.err
 */
+
 #include <stdio.h>
 
 #ifdef TOUNDEF
diff --git a/tests/libc/fc_libc.c b/tests/libc/fc_libc.c
index 096e9927c8d52cb5f445c140e07155ffa3064a6b..a1a67ca9bf4926c860af9cdbc073eef600b28594 100644
--- a/tests/libc/fc_libc.c
+++ b/tests/libc/fc_libc.c
@@ -1,19 +1,19 @@
 /* run.config*
-   EXECNOW: make -s @PTEST_DIR@/check_libc_naming_conventions.cmxs
-   EXECNOW: make -s @PTEST_DIR@/check_const.cmxs
-   EXECNOW: make -s @PTEST_DIR@/check_parsing_individual_headers.cmxs
-   EXECNOW: make -s @PTEST_DIR@/check_libc_anonymous_tags.cmxs
-   EXECNOW: make -s @PTEST_DIR@/check_compliance.cmxs
-   OPT: -load-module @PTEST_DIR@/check_libc_naming_conventions -print -cpp-extra-args='-nostdinc -Ishare/libc' -metrics -metrics-libc -load-module @PTEST_DIR@/check_const -load-module metrics -eva @EVA_CONFIG@ -then -lib-entry -no-print -metrics-no-libc
+ MODULE: check_libc_naming_conventions, check_const
+   OPT: -print -cpp-extra-args='-nostdinc -Ishare/libc' -metrics -metrics-libc -load-module metrics -eva @EVA_CONFIG@ -then -lib-entry -no-print -metrics-no-libc
+ MODULE:
    OPT: -print -print-libc -machdep x86_32
-   OPT: -load-module @PTEST_DIR@/check_parsing_individual_headers
-   OPT: -load-module @PTEST_DIR@/check_libc_anonymous_tags
-   OPT: -load-module @PTEST_DIR@/check_compliance -kernel-msg-key printer:attrs
-   CMD: ./tests/libc/check_full_libc.sh
+ MODULE: check_parsing_individual_headers
+   OPT:
+ MODULE: check_libc_anonymous_tags
+   OPT:
+ MODULE: check_compliance
+   OPT: -kernel-msg-key printer:attrs
+ MODULE:
+ CMD: ./tests/libc/check_full_libc.sh
    OPT:
 **/
 #define __FC_REG_TEST
-
 // Some functions such as usleep() are only defined for older of POSIX headers,
 // while others may be defined only by newer ones, so it is not possible to
 // test all of them. We nevertheless define some headers to test additional