diff --git a/Makefile b/Makefile
index 72ee2dfc2f0620c2e77838010085d4c7b6d89ec6..4290dd453852e363b88dd566e6c3818d727f290b 100644
--- a/Makefile
+++ b/Makefile
@@ -937,10 +937,10 @@ PLUGIN_DISTRIBUTED:=yes
 PLUGIN_INTERNAL_TEST:=yes
 PLUGIN_TESTS_DIRS:=rte rte_manual
 PLUGIN_TESTS_LIB:=\
-  tests/rte/my_annotation/my_annotation.ml \
-  tests/rte/rte_api/rte_get_annot.ml \
-  tests/rte/compute_annot/compute_annot.ml \
-  tests/rte/my_annot_proxy/my_annot_proxy.ml
+  tests/rte/my_annotation.ml \
+  tests/rte/rte_get_annot.ml \
+  tests/rte/compute_annot.ml \
+  tests/rte/my_annot_proxy.ml
 $(eval $(call include_generic_plugin_Makefile,$(PLUGIN_NAME)))
 
 #################
diff --git a/tests/rte/compute_annot/compute_annot.ml b/tests/rte/compute_annot.ml
similarity index 100%
rename from tests/rte/compute_annot/compute_annot.ml
rename to tests/rte/compute_annot.ml
diff --git a/tests/rte/my_annot_proxy/my_annot_proxy.ml b/tests/rte/my_annot_proxy.ml
similarity index 100%
rename from tests/rte/my_annot_proxy/my_annot_proxy.ml
rename to tests/rte/my_annot_proxy.ml
diff --git a/tests/rte/my_annotation/my_annotation.ml b/tests/rte/my_annotation.ml
similarity index 100%
rename from tests/rte/my_annotation/my_annotation.ml
rename to tests/rte/my_annotation.ml
diff --git a/tests/rte/precond2.c b/tests/rte/precond2.c
index 72d360e0d96667335f976b60727fdeb9843b965c..1998f41545b7cd9700fd8e864a0693c9c5c0861f 100644
--- a/tests/rte/precond2.c
+++ b/tests/rte/precond2.c
@@ -1,6 +1,6 @@
 /* run.config
-   EXECNOW: make -s @PTEST_DIR@/compute_annot/compute_annot.cmxs
-   OPT: -warn-special-float none -load-module @PTEST_DIR@/compute_annot/compute_annot -journal-disable
+ MODULE: compute_annot
+   OPT: -warn-special-float none -journal-disable
 */
 
 int global = 15;
diff --git a/tests/rte/rte_api/rte_get_annot.ml b/tests/rte/rte_get_annot.ml
similarity index 100%
rename from tests/rte/rte_api/rte_get_annot.ml
rename to tests/rte/rte_get_annot.ml
diff --git a/tests/rte/threefunc.c b/tests/rte/threefunc.c
index 03b2ad3b373fd5dcc26253574999f9bccfa59a30..5f784c64cd08177110479769cf890185e1ee1389 100644
--- a/tests/rte/threefunc.c
+++ b/tests/rte/threefunc.c
@@ -1,6 +1,6 @@
 /* run.config
-EXECNOW: make -s @PTEST_DIR@/my_annotation/my_annotation.cmxs
-OPT: -load-module @PTEST_DIR@/my_annotation/my_annotation
+ MODULE: my_annotation
+   OPT:
 */
 
 
diff --git a/tests/rte/twofunc.c b/tests/rte/twofunc.c
index 2732ad9f1f99b79c79b2f9450870d3904a69cd71..353f3f1aa779b1df8a6b91d9b3475ce8133e8341 100644
--- a/tests/rte/twofunc.c
+++ b/tests/rte/twofunc.c
@@ -1,6 +1,6 @@
 /* run.config
-EXECNOW: make -s @PTEST_DIR@/my_annot_proxy/my_annot_proxy.cmxs
-OPT: -load-module @PTEST_DIR@/my_annot_proxy/my_annot_proxy
+ MODULE: my_annot_proxy
+   OPT:
 */
 
 
diff --git a/tests/rte/twofunc3.c b/tests/rte/twofunc3.c
index fab3e66a5abf45ebcf5d3ea1c88983614b468ef6..883964687b8bd296c95f4bd3ee6046c2af5d4ed9 100644
--- a/tests/rte/twofunc3.c
+++ b/tests/rte/twofunc3.c
@@ -1,6 +1,6 @@
 /* run.config
-   EXECNOW: make -s @PTEST_DIR@/rte_api/rte_get_annot.cmxs
-   OPT: -rte-select @@all -load-module @PTEST_DIR@/rte_api/rte_get_annot -journal-disable
+ MODULE: rte_get_annot
+   OPT: -rte-select @@all -journal-disable
 */