diff --git a/tests/callgraph/function_pointer.i b/tests/callgraph/function_pointer.i
index b28287119069e61b95d7115a89eeb8592e7e8412..4d2a1df1ad8a95527dc4a5bfded076b19114d0a0 100644
--- a/tests/callgraph/function_pointer.i
+++ b/tests/callgraph/function_pointer.i
@@ -1,10 +1,11 @@
 /* run.config
    COMMENT: Test option -cg-function-pointers
-   EXECNOW: make -s @PTEST_DIR@/@PTEST_NAME@.cmxs
-   OPT: -cg-function-pointers -no-autoload-plugins -load-module eva,@PTEST_DIR@/@PTEST_NAME@.cmxs
-   OPT: -cg-no-services -cg-function-pointers -no-autoload-plugins -load-module eva,@PTEST_DIR@/@PTEST_NAME@.cmxs
-   OPT: -cg-no-function-pointers -no-autoload-plugins -load-module eva,@PTEST_DIR@/@PTEST_NAME@.cmxs
-   OPT: -cg-no-services -cg-no-function-pointers -no-autoload-plugins -load-module eva,@PTEST_DIR@/@PTEST_NAME@.cmxs
+   MODULE: @PTEST_NAME@
+   PLUGIN: @PTEST_PLUGIN@,eva
+   OPT: -cg-function-pointers
+   OPT: -cg-no-services -cg-function-pointers
+   OPT: -cg-no-function-pointers
+   OPT: -cg-no-services -cg-no-function-pointers
 */
 
 int (*fptr)(int);
diff --git a/tests/dynamic/dynamic.i b/tests/dynamic/dynamic.i
index 2e7d88279ff52ccf97b5fc13b2d1e2d2fee4bc71..c9cccd8e7c2e0e292cb9dab261eba0bae715624f 100644
--- a/tests/dynamic/dynamic.i
+++ b/tests/dynamic/dynamic.i
@@ -1,6 +1,5 @@
 /*run.config
-  EXECNOW: make tests/dynamic/empty.cmo tests/dynamic/abstract.cmo tests/dynamic/abstract2.cmo
-  CMD: FRAMAC_PLUGIN=tests/dynamic bin/toplevel.byte
   OPT: -add-path tests/dynamic/file_path -add-path tests/dynamic/directory_path -add-path tests/dynamic/none
-  OPT: -load-module tests/dynamic/empty.cmo,tests/dynamic/abstract.cmo,tests/dynamic/abstract2.cmo
+ MODULE: empty abstract abstract2
+  OPT:
  */
diff --git a/tests/misc/my_visitor.c b/tests/misc/my_visitor.c
index 9ce70834706be3ccc9798f57e77d6e9e52258308..67f7b93d4e96b40a03ccf1b3824d21104de6992e 100644
--- a/tests/misc/my_visitor.c
+++ b/tests/misc/my_visitor.c
@@ -1,8 +1,10 @@
 /* run.config
-EXECNOW: make -s @PTEST_DIR@/@PTEST_NAME@.cmxs
-EXECNOW: LOG my_visitor_sav.res LOG my_visitor_sav.err BIN my_visitor.sav FRAMAC_PLUGIN=./lib/plugins @frama-c@ @PTEST_FILE@ -no-autoload-plugins -load-module @PTEST_DIR@/@PTEST_NAME@.cmxs -main f -save @PTEST_DIR@/@PTEST_NAME@.sav > @PTEST_DIR@/result/@PTEST_NAME@_sav.res 2> @PTEST_DIR@/result/@PTEST_NAME@_sav.err
-OPT: -load @PTEST_DIR@/@PTEST_NAME@.sav -no-autoload-plugins -load-module @PTEST_DIR@/@PTEST_NAME@.cmxs -no-my-visitor -print
-OPT: -load @PTEST_DIR@/@PTEST_NAME@.sav -no-autoload-plugins -print
+ PLUGIN:
+ MODULE: @PTEST_NAME@
+   EXECNOW: LOG my_visitor_sav.res LOG my_visitor_sav.err BIN my_visitor.sav @frama-c@ @PTEST_FILE@ -main f -save @PTEST_DIR@/@PTEST_NAME@.sav > @PTEST_DIR@/result/@PTEST_NAME@_sav.res 2> @PTEST_DIR@/result/@PTEST_NAME@_sav.err
+   OPT: -load @PTEST_DIR@/@PTEST_NAME@.sav -no-my-visitor -print
+ MODULE:
+   OPT: -load @PTEST_DIR@/@PTEST_NAME@.sav -print
 */
 int f() {
   int y = 0;
diff --git a/tests/slicing/horwitz.i b/tests/slicing/horwitz.i
index d12de9261ad6bc3aeafd7a22b559eb3ecb9ade0e..74125fa8ac32f3fcc4fb0a7d90bc25cda6d07e58 100644
--- a/tests/slicing/horwitz.i
+++ b/tests/slicing/horwitz.i
@@ -1,9 +1,9 @@
 /* run.config
-   EXECNOW: make -s @PTEST_DIR@/@PTEST_NAME@.cmxs
-   CMD: @frama-c@ -load-module tests/slicing/libSelect.cmxs -load-module @PTEST_DIR@/@PTEST_NAME@.cmxs
+   MODULE: libSelect @PTEST_NAME@
    OPT: @EVA_OPTIONS@ -deps -slicing-level 0 -journal-disable
 */
 
+
 /* bin/toplevel.opt -deps -eva @PTEST_DIR@/@PTEST_NAME@.c */
 /* bin/toplevel.opt -deps -pdg-debug -pdg @PTEST_DIR@/@PTEST_NAME@.c */
 /* cf aussi @PTEST_DIR@/@PTEST_NAME@.ml */