diff --git a/src/plugins/aorai/tests/ya/oracle/saveload.res.0.log b/src/plugins/aorai/tests/ya/oracle/saveload.res.0.log.txt
similarity index 100%
rename from src/plugins/aorai/tests/ya/oracle/saveload.res.0.log
rename to src/plugins/aorai/tests/ya/oracle/saveload.res.0.log.txt
diff --git a/src/plugins/aorai/tests/ya/oracle/saveload.res.1.log b/src/plugins/aorai/tests/ya/oracle/saveload.res.1.log.txt
similarity index 100%
rename from src/plugins/aorai/tests/ya/oracle/saveload.res.1.log
rename to src/plugins/aorai/tests/ya/oracle/saveload.res.1.log.txt
diff --git a/src/plugins/aorai/tests/ya/saveload.i b/src/plugins/aorai/tests/ya/saveload.i
index 24fb0c24fecadc7208148311d896180e2eb04a72..2ac81c70606919b6ed14b3588faf41d0cb926659 100644
--- a/src/plugins/aorai/tests/ya/saveload.i
+++ b/src/plugins/aorai/tests/ya/saveload.i
@@ -1,7 +1,7 @@
 /* run.config
 NOFRAMAC:
-EXECNOW: LOG @PTEST_NAME@.res.0.log BIN @PTEST_NAME@.sav @frama-c@ -aorai-automata @PTEST_DIR@/@PTEST_NAME@.ya @PTEST_FILE@ -save @PTEST_DIR@/result/@PTEST_NAME@.sav > @PTEST_DIR@/result/@PTEST_NAME@.res.0.log
-EXECNOW: LOG @PTEST_NAME@.res.1.log @frama-c@ -load @PTEST_DIR@/result/@PTEST_NAME@.sav -then-on aorai -eva > @PTEST_DIR@/result/@PTEST_NAME@.res.1.log
+EXECNOW: LOG @PTEST_NAME@.res.0.log.txt BIN @PTEST_NAME@.sav @frama-c@ -aorai-automata @PTEST_DIR@/@PTEST_NAME@.ya @PTEST_FILE@ -save @PTEST_DIR@/result/@PTEST_NAME@.sav > @PTEST_DIR@/result/@PTEST_NAME@.res.0.log.txt
+EXECNOW: LOG @PTEST_NAME@.res.1.log.txt @frama-c@ -load @PTEST_DIR@/result/@PTEST_NAME@.sav -then-on aorai -eva > @PTEST_DIR@/result/@PTEST_NAME@.res.1.log.txt
 */
 /* run.config_prove
 DONTRUN:
diff --git a/tests/pdg/call.c b/tests/pdg/call.c
index 1a48d0b295e9159cff8413003882272a43b10f99..b71d403e4ba62559c40c7a8455ac0dac1ee673b0 100644
--- a/tests/pdg/call.c
+++ b/tests/pdg/call.c
@@ -1,6 +1,6 @@
 /* run.config
    
-   STDOPT: +"-lib-entry -main g -pdg -pdg-dot tests/pdg/call "
+   STDOPT: +"-lib-entry -main g -pdg -pdg-dot tests/pdg/result/call "
 */
 
 /* Ne pas modifier : exemple utilisé dans le rapport. */
diff --git a/tests/pdg/doc_dot.c b/tests/pdg/doc_dot.c
index 74710f1cb5f0f675e75c98e8867bb32af584d438..862b8bf811874da0e718125e75017b876791d969 100644
--- a/tests/pdg/doc_dot.c
+++ b/tests/pdg/doc_dot.c
@@ -1,8 +1,8 @@
 /* run.config
- STDOPT: +"-lib-entry -main g -fct-pdg g -pdg-dot tests/pdg/doc"
+ STDOPT: +"-lib-entry -main g -fct-pdg g -pdg-dot tests/pdg/result/doc"
 */
 /* To build the svg file:
- * dot -Tsvg tests/pdg/doc.g.dot > tests/pdg/doc.g.svg
+ * dot -Tsvg tests/pdg/result/doc.g.dot > tests/pdg/result/doc.g.svg
  */
 int G1, G2, T[10];
 
diff --git a/tests/pdg/dyn_dpds.ml b/tests/pdg/dyn_dpds.ml
index 834d304c304ff50002977a9a94348d1279377178..caa5d09a5d892e1b58bb6259b31f83630610aa53 100644
--- a/tests/pdg/dyn_dpds.ml
+++ b/tests/pdg/dyn_dpds.ml
@@ -23,7 +23,7 @@ let main _ =
   let kf =  Globals.Functions.find_def_by_name "main" in
   let pdg = !Db.Pdg.get kf in
   Format.printf "%a@." (!Db.Pdg.pretty ~bw:false) pdg;
-  !Db.Pdg.extract pdg "tests/pdg/dyn_dpds_0.dot";
+  !Db.Pdg.extract pdg "tests/pdg/result/dyn_dpds_0.dot";
   let assert_sid = 5 in (* assert ( *p>G) *)
   let assert_stmt, kf = Kernel_function.find_from_sid assert_sid in
   let _assert_node =
@@ -44,6 +44,6 @@ let main _ =
   Format.printf "Warning : cannot select %a in this function...@\n"
     Locations.Zone.pretty undef;
   Format.printf "%a@." (!Db.Pdg.pretty ~bw:false) pdg;
-  !Db.Pdg.extract pdg "tests/pdg/dyn_dpds_1.dot"
+  !Db.Pdg.extract pdg "tests/pdg/result/dyn_dpds_1.dot"
 
 let () = Db.Main.extend main
diff --git a/tests/pdg/oracle/call.res.oracle b/tests/pdg/oracle/call.res.oracle
index 80cf9777950bf7e17b36cfe1fc9b9ccee7dcbd51..f78649a62d3b4db24db184ff73b4050aa603d218 100644
--- a/tests/pdg/oracle/call.res.oracle
+++ b/tests/pdg/oracle/call.res.oracle
@@ -22,12 +22,12 @@
 [eva] done for function g
 [pdg] computing for function f
 [pdg] done for function f
-[pdg] dot file generated in tests/pdg/call.f.dot
+[pdg] dot file generated in tests/pdg/result/call.f.dot
 [pdg] computing for function g
 [from] Computing for function f
 [from] Done for function f
 [pdg] done for function g
-[pdg] dot file generated in tests/pdg/call.g.dot
+[pdg] dot file generated in tests/pdg/result/call.g.dot
 [pdg] ====== PDG GRAPH COMPUTED ======
 [pdg] PDG for f
  {n1}: InCtrl
diff --git a/tests/pdg/oracle/doc_dot.res.oracle b/tests/pdg/oracle/doc_dot.res.oracle
index 84c3993bf5149470ec46e7447825000d6ad90f00..4542afc34288005b3598e26732ee3c96b4d72836 100644
--- a/tests/pdg/oracle/doc_dot.res.oracle
+++ b/tests/pdg/oracle/doc_dot.res.oracle
@@ -16,7 +16,7 @@
 [from] Computing for function f
 [from] Done for function f
 [pdg] done for function g
-[pdg] dot file generated in tests/pdg/doc.g.dot
+[pdg] dot file generated in tests/pdg/result/doc.g.dot
 [pdg] PDG for g
  {n1}: InCtrl
  {n2}: VarDecl : x
diff --git a/tests/pdg/oracle/dyn_dpds.res.oracle b/tests/pdg/oracle/dyn_dpds.res.oracle
index 232e2df8be3cdb07b42cd08942dac7d60167e1e0..658d717167d486e40fee9e8561a91e94832cd3ed 100644
--- a/tests/pdg/oracle/dyn_dpds.res.oracle
+++ b/tests/pdg/oracle/dyn_dpds.res.oracle
@@ -94,7 +94,7 @@ RESULT for main:
    -[--d]-> 13
  {n16}: OutRet
    -[--d]-> 15
-[pdg] dot file generated in tests/pdg/dyn_dpds_0.dot
+[pdg] dot file generated in tests/pdg/result/dyn_dpds_0.dot
 Warning : cannot select G in this function...
 RESULT for main:
  {n1}: InCtrl
@@ -142,4 +142,4 @@ RESULT for main:
    -[--d]-> 13
  {n16}: OutRet
    -[--d]-> 15
-[pdg] dot file generated in tests/pdg/dyn_dpds_1.dot
+[pdg] dot file generated in tests/pdg/result/dyn_dpds_1.dot