diff --git a/tests/cil/mkBinOp.i b/tests/cil/mkBinOp.i
index f6d3c59d93a9800e7182be9036ee7fc0ebaa7472..f1565da600ffa29b3e0e27d976e95c55363dc1ee 100644
--- a/tests/cil/mkBinOp.i
+++ b/tests/cil/mkBinOp.i
@@ -1,6 +1,6 @@
 /* run.config
-CMXS: @PTEST_NAME@
-OPT: -no-autoload-plugins -load-module %{dep:@PTEST_NAME@.cmxs} -print -constfold
+MODULE: @PTEST_NAME@.cmxs
+STDOPT: +"-constfold"
 */
 
 int main(void) {
diff --git a/tests/misc/add_assigns.i b/tests/misc/add_assigns.i
index d35203787a0e1bd723881c08ac8f1ce4cd9d35a5..e61ecc871b3991ba5500dab063c0ee50edc0a3d0 100644
--- a/tests/misc/add_assigns.i
+++ b/tests/misc/add_assigns.i
@@ -1,7 +1,7 @@
 /* run.config
 PLUGIN: report
-CMXS: @PTEST_NAME@
-OPT: -load-module %{dep:@PTEST_NAME@.cmxs} -then -report -then -print
+MODULE: @PTEST_NAME@.cmxs
+OPT: -then -report -then -print
 */
 
 /*@ assigns *x; */
diff --git a/tests/misc/bts0452.i b/tests/misc/bts0452.i
index a8eebfb6832b91a1ce206ef57876f0028f6fd345..2ff6745a2a88de3059d328c39d31919ebb64b525 100644
--- a/tests/misc/bts0452.i
+++ b/tests/misc/bts0452.i
@@ -1,6 +1,6 @@
 /* run.config
-   CMXS: @PTEST_NAME@
-   OPT: -typecheck -no-autoload-plugins -load-module %{dep:@PTEST_NAME@.cmxs}
+   MODULE: @PTEST_NAME@.cmxs
+   OPT: -typecheck
 */
 /* must emit falls-through warning. */
 int f (int foo, char** args) {
diff --git a/tests/misc/bts0489.i b/tests/misc/bts0489.i
index f920a1fc09388d61bab16eef5145c9f52dced563..04714822f55c51db8781b0484beb8f26488e3159 100644
--- a/tests/misc/bts0489.i
+++ b/tests/misc/bts0489.i
@@ -1,6 +1,6 @@
 /* run.config
-   CMXS: @PTEST_NAME@
-   OPT: -no-autoload-plugins -load-module %{dep:@PTEST_NAME@.cmxs}
+   MODULE: @PTEST_NAME@.cmxs
+   OPT: 
 */
 
 typedef unsigned char uint8_t;
diff --git a/tests/misc/bts1201.i b/tests/misc/bts1201.i
index fff261907b0ca153e35550984aa71a793bade5b8..630683fb3d4913c006be90b3b765a2ae77d75013 100644
--- a/tests/misc/bts1201.i
+++ b/tests/misc/bts1201.i
@@ -1,6 +1,6 @@
 /* run.config
-   CMXS: @PTEST_NAME@
-   OPT: -eva-verbose 2 -load-module %{dep:@PTEST_NAME@.cmxs} -print
+   MODULE: @PTEST_NAME@.cmxs
+   OPT: -eva-verbose 2 -print
 */
 void main() { //@ assert \true;
 }
diff --git a/tests/misc/bts1347.i b/tests/misc/bts1347.i
index 9aa5ec357bbd00bd5c9708ccf3a403ddc90621ab..b22939220f4f751861e51ea91631c1bd5a79a803 100644
--- a/tests/misc/bts1347.i
+++ b/tests/misc/bts1347.i
@@ -1,7 +1,7 @@
 /* run.config
    PLUGIN: report
-   CMXS: @PTEST_NAME@
-   OPT:  @EVA_OPTIONS@ -load-module %{dep:@PTEST_NAME@.cmxs} -then -report
+   MODULE: @PTEST_NAME@.cmxs
+   OPT:  @EVA_OPTIONS@ -then -report
 */
 int f(int *x) { return *x; }
 int g(int *x) { return *(x++); }
diff --git a/tests/misc/callsite.i b/tests/misc/callsite.i
index ab6149b8732a7922f050b5b94daa4d9d0aedef3b..57cec3316abd36b77a8c99b55a06bbe954e4b46f 100644
--- a/tests/misc/callsite.i
+++ b/tests/misc/callsite.i
@@ -1,6 +1,6 @@
 /* run.config
-   CMXS: @PTEST_NAME@
-   OPT: -no-autoload-plugins -load-module %{dep:@PTEST_NAME@.cmxs}
+   MODULE: @PTEST_NAME@.cmxs
+   OPT:
  */
 // Don't use -debug 1 option in the test command.
 
diff --git a/tests/misc/change_main.i b/tests/misc/change_main.i
index 627d22668d5fae9c6299ee49193d53faa35d5a11..c24f0615a05e897c2bcea759e615cc30f88c8773 100644
--- a/tests/misc/change_main.i
+++ b/tests/misc/change_main.i
@@ -1,6 +1,6 @@
 /* run.config*
-CMXS: @PTEST_NAME@
-OPT: -eva -main f -load-module %{dep:@PTEST_NAME@.cmxs} -then-on change_main -main g -eva
+MODULE: @PTEST_NAME@.cmxs
+OPT: -eva -main f -then-on change_main -main g -eva
 */
 
 int f(int x) { return x; }
diff --git a/tests/misc/cli_string_multiple_map.i b/tests/misc/cli_string_multiple_map.i
index 4c91d501d72cd510deb77d68f0d3d0b00508e976..9d67683258a06f7eb8be8cda490bb9096ad32f09 100644
--- a/tests/misc/cli_string_multiple_map.i
+++ b/tests/misc/cli_string_multiple_map.i
@@ -1,4 +1,4 @@
 /* run.config
-   CMXS: @PTEST_NAME@
-   OPT: -no-autoload-plugins -load-module %{dep:@PTEST_NAME@.cmxs} -multiple-map a:1,b:2,a:3
+   MODULE: @PTEST_NAME@.cmxs
+   OPT: -multiple-map a:1,b:2,a:3
 */
diff --git a/tests/misc/copy_kf.i b/tests/misc/copy_kf.i
index 245afeacb0bec543efe1fd891f2d35e339767f9c..14030a7a450abcef2d00b94843dd3333418a8ebb 100644
--- a/tests/misc/copy_kf.i
+++ b/tests/misc/copy_kf.i
@@ -1,6 +1,6 @@
 /* run.config
-CMXS: @PTEST_NAME@
-OPT: -no-autoload-plugins -load-module %{dep:@PTEST_NAME@.cmxs}
+MODULE: @PTEST_NAME@.cmxs
+OPT: 
 */
 
 /*@ requires \valid(p); assigns *p; ensures *p == x; */
diff --git a/tests/misc/copy_machdep.i b/tests/misc/copy_machdep.i
index 704c0406024b1c4429e7c2bfa0e0f4d2d9460b4e..b106aef20aef71fc0ebe16d0a8cafc483ba50cc3 100644
--- a/tests/misc/copy_machdep.i
+++ b/tests/misc/copy_machdep.i
@@ -1,6 +1,6 @@
 /* run.config
-CMXS: @PTEST_NAME@
-OPT: -no-autoload-plugins -load-module %{dep:@PTEST_NAME@.cmxs} -machdep x86_64 -enums int -no-unicode
+MODULE: @PTEST_NAME@.cmxs
+OPT: -machdep x86_64 -enums int -no-unicode
 */
 
 int main () { return 0; }
diff --git a/tests/misc/ensures.i b/tests/misc/ensures.i
index 41a96a18a21b26a8bfab804500ba694c8d12fbe9..66c76ecaae1e3536d597961e1a85929d33cf874e 100644
--- a/tests/misc/ensures.i
+++ b/tests/misc/ensures.i
@@ -1,6 +1,6 @@
 /* run.config
-   CMXS: @PTEST_NAME@
-   OPT: -load-module %{dep:@PTEST_NAME@.cmxs}
+   MODULE: @PTEST_NAME@.cmxs
+   OPT:
 */
 //@ ensures *p==1;
 void main(int * p){ *p = 0; }
diff --git a/tests/misc/exception.i b/tests/misc/exception.i
index 16e3d60c420593e2affb2bc4e837958bfe95a27b..7b5c3c93ceab410bf53d2708bf13eeab7626014c 100644
--- a/tests/misc/exception.i
+++ b/tests/misc/exception.i
@@ -1,7 +1,7 @@
 /* run.config
-   CMXS: @PTEST_NAME@
-   OPT: -no-autoload-plugins -load-module %{dep:@PTEST_NAME@.cmxs} -print
-   OPT: -no-autoload-plugins -load-module %{dep:@PTEST_NAME@.cmxs} -remove-exn -print
+   MODULE: @PTEST_NAME@.cmxs
+   OPT: -print
+   OPT: -remove-exn -print
  */
 struct my_exn { int e; };
 
diff --git a/tests/misc/global_decl_loc.i b/tests/misc/global_decl_loc.i
index 704292f3104c1d1b8957d30164e74f6dbed714de..6adb58636d258a8c5b936fb278b0ccdd0866a317 100644
--- a/tests/misc/global_decl_loc.i
+++ b/tests/misc/global_decl_loc.i
@@ -1,5 +1,5 @@
 /* run.config
-   CMXS: global_decl_loc
-   OPT: %{dep:global_decl_loc2.i} -load-module %{dep:@PTEST_NAME@.cmxs}
+   MODULE: @PTEST_NAME@.cmxs
+   OPT: %{dep:global_decl_loc2.i}
  */
 int g;
diff --git a/tests/misc/init_from_cil.i b/tests/misc/init_from_cil.i
index e38ff8d3e44bd3850ef5c6888d576724f191f83d..1ca1be906aef188d2f9f4dacaeaaa5c1d37de25a 100644
--- a/tests/misc/init_from_cil.i
+++ b/tests/misc/init_from_cil.i
@@ -1,6 +1,6 @@
 /* run.config
-   CMXS: @PTEST_NAME@
-   OPT: -no-autoload-plugins -load-module %{dep:@PTEST_NAME@.cmxs}
+   MODULE: @PTEST_NAME@.cmxs
+   OPT: 
 */
 
 int f(int x);
diff --git a/tests/misc/issue109.i b/tests/misc/issue109.i
index 5f1c470e65412f3cc9466b6fda731bdd5ca41b29..790aa603d9df3f695be6975ded0a8f78363be1dc 100644
--- a/tests/misc/issue109.i
+++ b/tests/misc/issue109.i
@@ -1,6 +1,6 @@
 /* run.config
-   CMXS: @PTEST_NAME@
-   OPT: -eva @EVA_CONFIG@ -eva-slevel-function main:10 -load-module %{dep:@PTEST_NAME@.cmxs}
+   MODULE: @PTEST_NAME@.cmxs
+   OPT: -eva @EVA_CONFIG@ -eva-slevel-function main:10
 */
 void main() {
   int i, j = 0;
diff --git a/tests/misc/justcopy.i b/tests/misc/justcopy.i
index 33ffb04bc44c39470855ff963ae9dfabb532b04e..cad0fea6b9593a57ebe64a2d2bf74c0650727769 100644
--- a/tests/misc/justcopy.i
+++ b/tests/misc/justcopy.i
@@ -1,4 +1,4 @@
 /* run.config
- CMXS: @PTEST_NAME@
- OPT: -no-autoload-plugins -load-module %{dep:@PTEST_NAME@.cmxs}
+ MODULE: @PTEST_NAME@.cmxs
+ OPT:
 */
diff --git a/tests/misc/keep_entry_point.i b/tests/misc/keep_entry_point.i
index b25fc87da1c50bd3cba85de62a0855e23a11156e..c99e1492bc4f77dbc854da8dacf6e3a27770f2b5 100644
--- a/tests/misc/keep_entry_point.i
+++ b/tests/misc/keep_entry_point.i
@@ -1,6 +1,6 @@
 /* run.config
-CMXS: @PTEST_NAME@
-OPT: -main f -no-autoload-plugins -load-module %{dep:@PTEST_NAME@.cmxs} -print
+MODULE: @PTEST_NAME@.cmxs
+OPT: -main f -print
 */
 
 static int f(void);
diff --git a/tests/misc/log-file.i b/tests/misc/log-file.i
index bff6e513cb3f1df8c066a40d63067540ec7ef76c..38133efcea9b7876d09a800aa107483f6e201605 100644
--- a/tests/misc/log-file.i
+++ b/tests/misc/log-file.i
@@ -1,5 +1,5 @@
 /* run.config
-   CMXS: plugin_log
+   MODULE: plugin_log.cmxs
    LOG: log-file-kernel-warnings.txt
    LOG: log-file-kernel-results.txt
    LOG: log-file-feedback.txt
@@ -8,7 +8,7 @@
    LOG: plugin-log-all.txt
    FILTER: sed 's|Your Frama-C version is.*|Your Frama-C version is VERSION|'
    STDOPT: #"-kernel-log w:@PTEST_RESULT@/log-file-kernel-warnings.txt,r:@PTEST_RESULT@/log-file-kernel-results.txt -eva-log f:@PTEST_RESULT@/log-file-feedback.txt,afewr:@PTEST_RESULT@/log-file-value-all.txt -eva-log :@PTEST_RESULT@/log-file-value-default.txt -then -kernel-log f:@PTEST_RESULT@/log-file-feedback.txt"
-   OPT: -load-module plugin_log -kernel-msg-key foo-category -kernel-log=a:@PTEST_RESULT@/plugin-log-all.txt
+   OPT: -kernel-msg-key foo-category -kernel-log=a:@PTEST_RESULT@/plugin-log-all.txt
    DONTRUN: test disabled due to non-deterministic errors in CI
  */
 int f(void); // generates kernel warning (missing spec)
diff --git a/tests/misc/log_twice.i b/tests/misc/log_twice.i
index b4095c43f19fa3f7e88cb13ff4c477f48936b837..dc2306c1c6e9a5e6121d9c53e6e5a670609f6af4 100644
--- a/tests/misc/log_twice.i
+++ b/tests/misc/log_twice.i
@@ -1,6 +1,6 @@
 /* run.config
-   CMXS: @PTEST_NAME@
-   OPT: @EVA_CONFIG@ -load-module %{dep:@PTEST_NAME@.cmxs}
+   MODULE: @PTEST_NAME@.cmxs
+   OPT: @EVA_CONFIG@
 */
 
 int* f() {
diff --git a/tests/misc/remove_status_hyps.i b/tests/misc/remove_status_hyps.i
index b62c85f1c6d396bede6422962fa95c3785dbba40..94c0702b8a52745035e17f6634835f2b73691e77 100644
--- a/tests/misc/remove_status_hyps.i
+++ b/tests/misc/remove_status_hyps.i
@@ -1,6 +1,6 @@
 /* run.config
-   CMXS: @PTEST_NAME@
-   OPT: -no-autoload-plugins -load-module %{dep:@PTEST_NAME@.cmxs}
+   MODULE: @PTEST_NAME@.cmxs
+   OPT: 
 */
 
 int main(void) {
diff --git a/tests/misc/static.i b/tests/misc/static.i
index bf9737025ee13ae2229622e316fbeea666ba8b80..26d56abf4559f78c38ab192943d8b3955ecd183b 100644
--- a/tests/misc/static.i
+++ b/tests/misc/static.i
@@ -1,6 +1,6 @@
 /* run.config
-CMXS: @PTEST_NAME@
-OPT: -no-autoload-plugins -load-module %{dep:@PTEST_NAME@.cmxs}
+MODULE: @PTEST_NAME@.cmxs
+OPT:
 */
 
 int x;
diff --git a/tests/misc/test_datatype.i b/tests/misc/test_datatype.i
index 2de60116213af5a0dd353f174e487b98fe406393..3b8208180d1549542b0862afc0405960dffd27d6 100644
--- a/tests/misc/test_datatype.i
+++ b/tests/misc/test_datatype.i
@@ -1,4 +1,4 @@
 /* run.config
-CMXS: @PTEST_NAME@
-OPT: -no-autoload-plugins -load-module %{dep:@PTEST_NAME@.cmxs}
+MODULE: @PTEST_NAME@.cmxs
+OPT:
 */
diff --git a/tests/misc/version.i b/tests/misc/version.i
index 55b838eefadabd84facd4ca185eb0398948f6111..c9cc3e3277b7a22b0c19f23408fd795728243f46 100644
--- a/tests/misc/version.i
+++ b/tests/misc/version.i
@@ -1,4 +1,4 @@
 /* run.config
-   CMXS: @PTEST_NAME@
-   OPT: -no-autoload-plugins -load-module %{dep:@PTEST_NAME@.cmxs}
+   MODULE: @PTEST_NAME@.cmxs
+   OPT:
 */
diff --git a/tests/misc/vis_queueInstr.i b/tests/misc/vis_queueInstr.i
index 1524969c741304d0bf5568738eb99ca292df6f4d..d1113a9c0958b0c7ca07a4dc1b3dbd2580c3f5ed 100644
--- a/tests/misc/vis_queueInstr.i
+++ b/tests/misc/vis_queueInstr.i
@@ -1,6 +1,6 @@
 /* run.config
-CMXS: @PTEST_NAME@
-OPT: -no-autoload-plugins -load-module %{dep:@PTEST_NAME@.cmxs} -print -then-on A -print
+MODULE: @PTEST_NAME@.cmxs
+OPT: -print -then-on A -print
 */
 
 int main(){
diff --git a/tests/misc/vis_spec.i b/tests/misc/vis_spec.i
index bd51666e94768e4cee525250f7fe6d9c029c2dc3..dfb0db12d24b7a4ded49fb7416c1bc43437eb2bf 100644
--- a/tests/misc/vis_spec.i
+++ b/tests/misc/vis_spec.i
@@ -1,6 +1,6 @@
 /* run.config
-   CMXS: @PTEST_NAME@
-   OPT: -no-autoload-plugins -load-module %{dep:@PTEST_NAME@.cmxs}
+   MODULE: @PTEST_NAME@.cmxs
+   OPT:
 */
 
 //@ assigns \nothing;
diff --git a/tests/misc/visitor_creates_func_bts_1349.i b/tests/misc/visitor_creates_func_bts_1349.i
index 21e906659f7f75322456d90b258919112082571e..d49711b42c5a240185ca5b989d75713214f60cae 100644
--- a/tests/misc/visitor_creates_func_bts_1349.i
+++ b/tests/misc/visitor_creates_func_bts_1349.i
@@ -1,6 +1,6 @@
 /* run.config
-   CMXS: @PTEST_NAME@
-   OPT: -load-script %{dep:@PTEST_NAME@.cmxs} -then-on test -print
+   MODULE: @PTEST_NAME@.cmxs
+   OPT: -then-on test -print
 */
 
 int a = 10;
diff --git a/tests/misc/well_typed_alarm.i b/tests/misc/well_typed_alarm.i
index 83a2141b638650c074b49f471873cffda7327918..47649ab778f0ea48b33bc759b13e30f0b45eeefe 100644
--- a/tests/misc/well_typed_alarm.i
+++ b/tests/misc/well_typed_alarm.i
@@ -1,6 +1,6 @@
 /* run.config*
-CMXS: @PTEST_NAME@
-OPT: -load-module %{dep:@PTEST_NAME@.cmxs}
+MODULE: @PTEST_NAME@.cmxs
+OPT:
 */
 int main(int c) {
   int x = 0;
diff --git a/tests/saveload/load_one.i b/tests/saveload/load_one.i
index 76c439e6ecb48dd96df0b2080d0708b32235087f..2ff222cf2e67560cacdc2d57133f44f57bfbc6b5 100644
--- a/tests/saveload/load_one.i
+++ b/tests/saveload/load_one.i
@@ -1,7 +1,7 @@
 /* run.config
    PLUGIN: sparecode
-   CMXS: @PTEST_NAME@
-   STDOPT: +"-load-module %{dep:@PTEST_NAME@.cmxs}"
+   MODULE: @PTEST_NAME@.cmxs
+   STDOPT:
 */
 int G;
 
diff --git a/tests/saveload/serialized_queue.i b/tests/saveload/serialized_queue.i
index b5673fd361bc96910c8c1d8a06d2d5cbbb57fe67..be2d8f6ca3e2ad47531e8a5aeddb3b6977697ef6 100644
--- a/tests/saveload/serialized_queue.i
+++ b/tests/saveload/serialized_queue.i
@@ -1,6 +1,6 @@
 /* run.config
-CMXS: @PTEST_NAME@
-OPT: -no-autoload-plugins -load-module %{dep:@PTEST_NAME@.cmxs}
+MODULE: @PTEST_NAME@.cmxs
+OPT: 
 */
 
 // empty C file, we're only interested in the script itself
diff --git a/tests/spec/Extend.i b/tests/spec/Extend.i
index 5fe1d0b3a9956eb3da2054e910e65605bbf2aea1..c6e161b7bd054d1d4b82430f642ce02140fff01e 100644
--- a/tests/spec/Extend.i
+++ b/tests/spec/Extend.i
@@ -1,6 +1,6 @@
 /* run.config
-CMXS: @PTEST_NAME@
-OPT: -no-autoload-plugins -load-module %{dep:@PTEST_NAME@.cmxs} -copy -kernel-warn-key=annot-error=active
+MODULE: @PTEST_NAME@.cmxs
+OPT: -copy -kernel-warn-key=annot-error=active
 */
 
 /*@ foo x == 0;
diff --git a/tests/spec/Extend_short_print.i b/tests/spec/Extend_short_print.i
index ace4e346de692cf86d1392bb3068e14155d5fe7b..7b3ae458f203cb34f627dae58201ec3443f7e095 100644
--- a/tests/spec/Extend_short_print.i
+++ b/tests/spec/Extend_short_print.i
@@ -1,9 +1,9 @@
 /* run.config
-CMXS: @PTEST_NAME@
-OPT: -no-autoload-plugins -load-module %{dep:@PTEST_NAME@.cmxs}
+MODULE: @PTEST_NAME@.cmxs
+OPT:
 */
 
 /*@
   without_short \true ;
   has_short \true ;
-*/
\ No newline at end of file
+*/
diff --git a/tests/spec/add_global.i b/tests/spec/add_global.i
index 060e91bc160525f15cdc36132100287282d87e17..755f2f64396c3f65cdb153de69ad8c5788575a2f 100644
--- a/tests/spec/add_global.i
+++ b/tests/spec/add_global.i
@@ -1,6 +1,6 @@
 /* run.config
-CMXS: @PTEST_NAME@
-OPT: -no-autoload-plugins -load-module %{dep:@PTEST_NAME@.cmxs} -print
+MODULE: @PTEST_NAME@.cmxs
+OPT: -print
 */
 
 int main () { return 0; }
diff --git a/tests/spec/bts0655.i b/tests/spec/bts0655.i
index 721f5b4037710aba83651a2cc9c45412cad02634..3482676d722807ca0eca3730822f8e19b3118686 100644
--- a/tests/spec/bts0655.i
+++ b/tests/spec/bts0655.i
@@ -1,6 +1,6 @@
 /* run.config
-   CMXS: @PTEST_NAME@
-   OPT: -no-autoload-plugins -load-module %{dep:@PTEST_NAME@.cmxs}
+   MODULE: @PTEST_NAME@.cmxs
+   OPT:
 */
 /*@
   @ ensures \result == \max( a, b );
diff --git a/tests/spec/comparison.i b/tests/spec/comparison.i
index 3efacf43f66562d0a951392b5b50aa82df1c2b1e..49629260c529b2ab9488026f312e4450b26553c2 100644
--- a/tests/spec/comparison.i
+++ b/tests/spec/comparison.i
@@ -1,6 +1,6 @@
 /* run.config
-   CMXS: @PTEST_NAME@
-   OPT: -no-autoload-plugins -load-module %{dep:@PTEST_NAME@.cmxs}
+   MODULE: @PTEST_NAME@.cmxs
+   OPT:
 */
 
 /*@ predicate foo(boolean a, boolean b) = a == b; */
diff --git a/tests/spec/model.i b/tests/spec/model.i
index 2d9b486e635c860bd9e71ec0e0850cdc3b543f22..b44f80ec34b1cb0b7d62f7f1c347df0138c3a0d5 100644
--- a/tests/spec/model.i
+++ b/tests/spec/model.i
@@ -1,6 +1,6 @@
 /* run.config
-CMXS: @PTEST_NAME@
-STDOPT: +"-no-autoload-plugins -load-module %{dep:@PTEST_NAME@.cmxs}"
+MODULE: @PTEST_NAME@.cmxs
+STDOPT:
 */
 struct S { int x; int y; };
 typedef struct S T;
diff --git a/tests/spec/pp_empty_spec.i b/tests/spec/pp_empty_spec.i
index 3f70a8fcfda7b236b0f5fbc9a5d2e52c5272289d..f53e09bad41bff116581fee8ff181a6f16874b87 100644
--- a/tests/spec/pp_empty_spec.i
+++ b/tests/spec/pp_empty_spec.i
@@ -1,6 +1,6 @@
 /* run.config
-   CMXS: @PTEST_NAME@
-   OPT: -no-autoload-plugins -load-module %{dep:@PTEST_NAME@.cmxs}
+   MODULE: @PTEST_NAME@.cmxs
+   OPT: 
  */
 int main(void) {
     int x = 0;
diff --git a/tests/spec/property_test.i b/tests/spec/property_test.i
index 328aeed58978849783980787f3bb66cd0e1ea062..648ccb1b1afbf089cba6c3e220116455627d3092 100644
--- a/tests/spec/property_test.i
+++ b/tests/spec/property_test.i
@@ -1,6 +1,6 @@
 /* run.config
-   CMXS: @PTEST_NAME@
-   OPT: -no-autoload-plugins -load-module %{dep:@PTEST_NAME@.cmxs}
+   MODULE: @PTEST_NAME@.cmxs
+   OPT:
 */
 
 int X;
diff --git a/tests/spec/type_constructors_in_env.i b/tests/spec/type_constructors_in_env.i
index 97b266e4814a70dc2c7fd42d046708021af2d7c3..8ec7ff268b11908244f666363df4ba29d9aa4a0a 100644
--- a/tests/spec/type_constructors_in_env.i
+++ b/tests/spec/type_constructors_in_env.i
@@ -1,6 +1,6 @@
 /* run.config
-CMXS: @PTEST_NAME@
-OPT: -no-autoload-plugins -load-module %{dep:@PTEST_NAME@.cmxs}
+MODULE: @PTEST_NAME@.cmxs
+OPT:
 */
 
 /*@ type foo = A | B; */
diff --git a/tests/spec/type_of_term.i b/tests/spec/type_of_term.i
index 38c08465470065d1195125bef16d7f627c38eda0..74f0b57316e8eb148f04a1ff550345bd98d06191 100644
--- a/tests/spec/type_of_term.i
+++ b/tests/spec/type_of_term.i
@@ -1,6 +1,6 @@
 /* run.config
-   CMXS: Type_of_term
-   OPT: -load-module %{dep:Type_of_term.cmxs} -print
+   MODULE: @TEST_NAME@.cmxs
+   OPT: -print
 */
 
 int t [42];