diff --git a/tests/misc/add_assigns.i b/tests/misc/add_assigns.i
index 8165be2e42b963354c94f2f9f0d97c498b66c30f..d35203787a0e1bd723881c08ac8f1ce4cd9d35a5 100644
--- a/tests/misc/add_assigns.i
+++ b/tests/misc/add_assigns.i
@@ -1,6 +1,7 @@
 /* run.config
+PLUGIN: report
 CMXS: @PTEST_NAME@
-OPT: -no-autoload-plugins -load-module report,@PTEST_DIR@/@PTEST_NAME@.cmxs -then -report -then -print
+OPT: -load-module %{dep:@PTEST_NAME@.cmxs} -then -report -then -print
 */
 
 /*@ assigns *x; */
diff --git a/tests/misc/bts0990_link.i b/tests/misc/bts0990_link.i
index 188afa885fdcb93d992906b9503fa47baefbbe49..8558ed15a6199c5396001c75d31d790d0587dc76 100644
--- a/tests/misc/bts0990_link.i
+++ b/tests/misc/bts0990_link.i
@@ -1,5 +1,5 @@
 /* run.config
-   OPT: bts0990_link_1.i
+   OPT: %{dep:bts0990_link_1.i}
 */
 
 // NB: This test is meant to return an error, as s is declared as an array in
diff --git a/tests/misc/bts1347.i b/tests/misc/bts1347.i
index 235b3db280db98f752a2d788ce4cf66b8b2a7b9a..9aa5ec357bbd00bd5c9708ccf3a403ddc90621ab 100644
--- a/tests/misc/bts1347.i
+++ b/tests/misc/bts1347.i
@@ -1,4 +1,5 @@
 /* run.config
+   PLUGIN: report
    CMXS: @PTEST_NAME@
    OPT:  @EVA_OPTIONS@ -load-module %{dep:@PTEST_NAME@.cmxs} -then -report
 */
diff --git a/tests/misc/cpp-extra-args-per-file1.c b/tests/misc/cpp-extra-args-per-file1.c
index a1f58ee5494a15795fded38853d461909d7fcf4d..1bc31a4d14c20923e2ecc90bb8943a56c2b63683 100644
--- a/tests/misc/cpp-extra-args-per-file1.c
+++ b/tests/misc/cpp-extra-args-per-file1.c
@@ -1,5 +1,5 @@
 /* run.config
-   OPT: -no-autoload-plugins -cpp-extra-args="-DGLOBAL" -cpp-extra-args-per-file @PTEST_DIR@/cpp-extra-args-per-file1.c:'-DFILE1 -DMACRO_WITH_QUOTES="\"hello world"\"',@PTEST_DIR@/cpp-extra-args-per-file2.c:"-DFILE2" -print -then @PTEST_DIR@/cpp-extra-args-per-file2.c -no-print
+   OPT: -cpp-extra-args="-DGLOBAL" -cpp-extra-args-per-file @PTEST_DIR@/cpp-extra-args-per-file1.c:'-DFILE1 -DMACRO_WITH_QUOTES="\"hello world"\"',@PTEST_DIR@/cpp-extra-args-per-file2.c:"-DFILE2" -print -then %{dep:cpp-extra-args-per-file2.c} -no-print
  */
 
 #ifndef GLOBAL
diff --git a/tests/misc/global_decl_loc.i b/tests/misc/global_decl_loc.i
index 779289768ebacd131f21be566fc2d8f5dfd34823..704292f3104c1d1b8957d30164e74f6dbed714de 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: @PTEST_DIR@/global_decl_loc2.i -no-autoload-plugins -load-module %{dep:@PTEST_NAME@.cmxs}
+   OPT: %{dep:global_decl_loc2.i} -load-module %{dep:@PTEST_NAME@.cmxs}
  */
 int g;
diff --git a/tests/misc/log_twice.i b/tests/misc/log_twice.i
index 014cd7f075deb563801ccedfdd72e1dd527722fd..b4095c43f19fa3f7e88cb13ff4c477f48936b837 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 @PTEST_NAME@
+   OPT: @EVA_CONFIG@ -load-module %{dep:@PTEST_NAME@.cmxs}
 */
 
 int* f() {
diff --git a/tests/misc/long_ident.c b/tests/misc/long_ident.c
index e0ebb31439ac8df4662bbc3106d93d620ff94a9b..6e3ea10e4d9e83e7e390a20e6bcc6fb3c4bfcd89 100644
--- a/tests/misc/long_ident.c
+++ b/tests/misc/long_ident.c
@@ -1,7 +1,7 @@
 /* run.config
+   PLUGIN: obfuscator
    OPT: -obfuscate -journal-disable
 */
-
 /*@ ensures \valid(q);  // <-- obfuscation error [bts#404]
  */
 int f(int *q) ;
diff --git a/tests/misc/mergestruct2.i b/tests/misc/mergestruct2.i
index 2a80dd274dcc300ad68423ab30bafc97d0c75fca..10ab9882fda7a522cd533d74e2a09937db2cd143 100644
--- a/tests/misc/mergestruct2.i
+++ b/tests/misc/mergestruct2.i
@@ -1,5 +1,5 @@
 /* run.config
-   OPT: -print -journal-disable mergestruct3.i mergestruct1.i
+   OPT: -print -journal-disable %{dep:mergestruct3.i} %{dep:mergestruct1.i}
 */
 struct s *p;
 
diff --git a/tests/misc/obfuscate.c b/tests/misc/obfuscate.c
index f993479d0f78d337c57155e20dd3cddbf06a6228..2683da037cd0ec590c37fbcb9ae5ba86919eae84 100644
--- a/tests/misc/obfuscate.c
+++ b/tests/misc/obfuscate.c
@@ -1,7 +1,7 @@
 /* run.config
+   PLUGIN: obfuscator
    OPT: -obfuscate
 */
-
 int my_var = 0;
 
 /*@ global invariant I: my_var >= 0; */
diff --git a/tests/misc/pragma-pack.c b/tests/misc/pragma-pack.c
index 4d81f069887ec1d621c24bf091c486a1801455f0..4e930ec2580967f2cb58acd0405099948af054b7 100644
--- a/tests/misc/pragma-pack.c
+++ b/tests/misc/pragma-pack.c
@@ -1,9 +1,9 @@
 /*run.config
+  DEPS: pragma-pack-utils.h
   STDOPT: #"-machdep gcc_x86_64 -kernel-msg-key typing:pragma"
   STDOPT: #"-cpp-command=\"gcc -E -C -I. -m32\" -cpp-frama-c-compliant"
   STDOPT: #"-machdep msvc_x86_64"
  */
-
 #include "pragma-pack-utils.h"
 
 #include <stdint.h>
diff --git a/tests/misc/visitor_creates_func_bts_1349.i b/tests/misc/visitor_creates_func_bts_1349.i
index 1ff0a2ebac6d4ac428523cbbc0a34d54634b3d6d..21e906659f7f75322456d90b258919112082571e 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 @PTEST_DIR@/@PTEST_NAME@ -then-on test -print
+   OPT: -load-script %{dep:@PTEST_NAME@.cmxs} -then-on test -print
 */
 
 int a = 10;
diff --git a/tests/pdg/sets.c b/tests/pdg/sets.c
index 3bfb14466ce631d822604c84d0bbc3023a97762f..7db13b002ea507fb851e7e6bb5e254567450ef9a 100644
--- a/tests/pdg/sets.c
+++ b/tests/pdg/sets.c
@@ -1,6 +1,6 @@
 /* run.config
    CMXS: @PTEST_NAME@
-   STDOPT: +"-load-module @PTEST_NAME@ -lib-entry -main f -pdg -inout "
+   STDOPT: +"-load-module %{dep:@PTEST_NAME@.cmxs} -lib-entry -main f -pdg -inout "
 */