diff --git a/src/plugins/instantiate/Makefile.in b/src/plugins/instantiate/Makefile.in
index 5658325fc33460de75c7ad25981c3f778e63818d..1243f1bb6bedf316c9d36d046e21dee5c5c7a2df 100644
--- a/src/plugins/instantiate/Makefile.in
+++ b/src/plugins/instantiate/Makefile.in
@@ -66,6 +66,14 @@ PLUGIN_DISTRIBUTED := $(PLUGIN_ENABLE)
 PLUGIN_DISTRIB_EXTERNAL:= Makefile.in configure.ac configure
 #PLUGIN_NO_DEFAULT_TEST := no
 PLUGIN_TESTS_DIRS := string stdlib options api plugin
+PLUGIN_DISTRIB_TESTS := \
+  $(foreach dir, $(addprefix tests/,$(PLUGIN_TESTS_DIRS)), \
+    $(dir)/oracle/* \
+    $(filter-out result oracle,$(dir)/*)) \
+  ) \
+  $(filter-out result oracle,tests/*)) \
+  $(foreach dir, tests $(addprefix tests/,$(PLUGIN_TESTS_DIRS)), \
+    $(dir)/test_config)
 
 ################
 # Generic part #
diff --git a/src/plugins/instantiate/tests/options/test_config b/src/plugins/instantiate/tests/options/test_config
index 01d3ae76752389c86266658217efba589a7e71e0..b5a180b54364b476c60b7ec846eb330e5b84d2ff 100644
--- a/src/plugins/instantiate/tests/options/test_config
+++ b/src/plugins/instantiate/tests/options/test_config
@@ -1 +1 @@
-OPT: @PTEST_FILE@ -instantiate -print
\ No newline at end of file
+OPT: @PTEST_FILE@ -instantiate -print
diff --git a/src/plugins/instantiate/tests/plugin/ast_clear.c b/src/plugins/instantiate/tests/plugin/ast_clear.c
index d3dfbb6ad2a2fb83924f23cba30589f680d415e9..7efc3990bd099a9f2d634f975e82efe66e589c10 100644
--- a/src/plugins/instantiate/tests/plugin/ast_clear.c
+++ b/src/plugins/instantiate/tests/plugin/ast_clear.c
@@ -6,4 +6,4 @@
 
 int foo(char* s1, char* s2, size_t len){
   return memcmp(s1, s2, len) ;
-}
\ No newline at end of file
+}
diff --git a/src/plugins/instantiate/tests/plugin/function_pointers.i b/src/plugins/instantiate/tests/plugin/function_pointers.i
index 8f27dd1ab187cf20f3fd5572383a80d7e5be4dd9..b40b49be87beb6cc3670325f2f3047cfda6e986a 100644
--- a/src/plugins/instantiate/tests/plugin/function_pointers.i
+++ b/src/plugins/instantiate/tests/plugin/function_pointers.i
@@ -3,4 +3,4 @@
 */
 void foo(void (* bar)()){
   (*bar)();
-}
\ No newline at end of file
+}
diff --git a/src/plugins/instantiate/tests/stdlib/calloc.c b/src/plugins/instantiate/tests/stdlib/calloc.c
index d87508ad415bcf21b677949b5429c8b8b376fc97..6b100ff812eddc17145ebc067f7fa31b5c3faf80 100644
--- a/src/plugins/instantiate/tests/stdlib/calloc.c
+++ b/src/plugins/instantiate/tests/stdlib/calloc.c
@@ -23,4 +23,4 @@ int main(void){
   struct Flex* f = calloc(1, sizeof(struct Flex) + 3 * sizeof(int)) ;
   void *v = calloc(10, sizeof(char));
   struct incomplete* inc = calloc(10, 10);
-}
\ No newline at end of file
+}
diff --git a/src/plugins/instantiate/tests/stdlib/free.c b/src/plugins/instantiate/tests/stdlib/free.c
index e61ed8864c1d2657e6dc1f65a0d047735b3a2d6b..f2786b05cb0fdfcdfa1dc295a4f5085080b3b4f8 100644
--- a/src/plugins/instantiate/tests/stdlib/free.c
+++ b/src/plugins/instantiate/tests/stdlib/free.c
@@ -14,4 +14,4 @@ void with_void(void * x){
 }
 void with_incomplete(struct incomplete* t){
   free(t);
-}
\ No newline at end of file
+}
diff --git a/src/plugins/instantiate/tests/stdlib/malloc.c b/src/plugins/instantiate/tests/stdlib/malloc.c
index 00a07820a9ac4377c39826e16538d62e6f8c2322..70fab21bc4751ff7ac5920cfc4b044693f990f29 100644
--- a/src/plugins/instantiate/tests/stdlib/malloc.c
+++ b/src/plugins/instantiate/tests/stdlib/malloc.c
@@ -22,4 +22,4 @@ int main(void){
   struct Flex* f = malloc(sizeof(struct Flex) + 3 * sizeof(int)) ;
   void *v = malloc(sizeof(char) * 10);
   struct incomplete* inc = malloc(10);
-}
\ No newline at end of file
+}
diff --git a/src/plugins/markdown-report/Makefile.in b/src/plugins/markdown-report/Makefile.in
index d757a1afca069dc4dbe1cf245d5abaf76ff5651e..1319104e18fc93bb3628eb66df1c26e52f7754ac 100644
--- a/src/plugins/markdown-report/Makefile.in
+++ b/src/plugins/markdown-report/Makefile.in
@@ -43,6 +43,14 @@ PLUGIN_DISTRIB_EXTERNAL:=\
  eva_info.ml eva_info.mli
 PLUGIN_DEPFLAGS:= $(PLUGIN_DIR)/eva_info.mli $(PLUGIN_DIR)/eva_info.ml
 PLUGIN_TESTS_DIRS:= md sarif
+PLUGIN_DISTRIB_TESTS := \
+  $(foreach dir, $(addprefix tests/,$(PLUGIN_TESTS_DIRS)), \
+    $(dir)/oracle/* \
+    $(filter-out result oracle,$(dir)/*)) \
+  ) \
+  $(filter-out result oracle,tests/*)) \
+  $(foreach dir, tests $(addprefix tests/,$(PLUGIN_TESTS_DIRS)), \
+    $(dir)/test_config)
 
 include $(FRAMAC_SHARE)/Makefile.dynamic
 
diff --git a/src/plugins/markdown-report/md_gen.ml b/src/plugins/markdown-report/md_gen.ml
index 7d306b15ece681ac9dd5e8ef70c4b38e3f1525aa..3179c4a4835c38dc24a66aaa6775bf209e75631b 100644
--- a/src/plugins/markdown-report/md_gen.ml
+++ b/src/plugins/markdown-report/md_gen.ml
@@ -615,7 +615,9 @@ let gen_report ~draft:is_draft () =
   else
     try
       Command.print_file (file:>string)
-        (fun fmt -> Markdown.pp_pandoc fmt doc) ;
+        (fun fmt ->
+           Markdown.pp_pandoc fmt doc;
+           Format.pp_print_newline fmt ()) ;
       Mdr_params.result "Report %a generated" Filepath.Normalized.pretty file
     with Sys_error s ->
       Mdr_params.warning
diff --git a/src/plugins/markdown-report/sarif_gen.ml b/src/plugins/markdown-report/sarif_gen.ml
index c6cfaa1e235d59deed95dc34bb0df1044c35c6f6..f452170bbf5d2cc55fe973a25ec4f8ac6035e141 100644
--- a/src/plugins/markdown-report/sarif_gen.ml
+++ b/src/plugins/markdown-report/sarif_gen.ml
@@ -291,7 +291,9 @@ let generate () =
     let file = Mdr_params.Output.get () in
     try
       Command.write_file (file:>string)
-        (fun out -> Yojson.Safe.pretty_to_channel ~std:true out json) ;
+        (fun out ->
+           Yojson.Safe.pretty_to_channel ~std:true out json;
+           output_char out '\n') ;
       Mdr_params.result "Report %a generated" Filepath.Normalized.pretty file
     with Sys_error s ->
       Mdr_params.abort "Unable to generate %a (%s)"
diff --git a/src/plugins/markdown-report/tests/md/cwe126.remarks.md b/src/plugins/markdown-report/tests/md/cwe126.remarks.md
index 9e40167cfed25932494165b9044ea105c4081d67..de91a5414ce1d727209f59aa1aa7c6d9def02342 100644
--- a/src/plugins/markdown-report/tests/md/cwe126.remarks.md
+++ b/src/plugins/markdown-report/tests/md/cwe126.remarks.md
@@ -128,4 +128,4 @@ any spurious alarm anywhere else.
 
 <!-- BEGIN_REMARK -->
 
-<!-- END_REMARK -->
\ No newline at end of file
+<!-- END_REMARK -->
diff --git a/src/plugins/markdown-report/tests/md/oracle/cwe126.0.md b/src/plugins/markdown-report/tests/md/oracle/cwe126.0.md
index 7cf06c232a619ad0ae15cd66cea3a3f08c8f3763..0b7517ee5ebe307b81b66eecd564ec368fb67c21 100644
--- a/src/plugins/markdown-report/tests/md/oracle/cwe126.0.md
+++ b/src/plugins/markdown-report/tests/md/oracle/cwe126.0.md
@@ -102,4 +102,4 @@ assert mem_access: \valid_read(data + i);
 
 
 This alarm is real: Eva correctly identified the issue and did not report
-any spurious alarm anywhere else.
\ No newline at end of file
+any spurious alarm anywhere else.
diff --git a/src/plugins/markdown-report/tests/sarif/oracle/cwe125.sarif b/src/plugins/markdown-report/tests/sarif/oracle/cwe125.sarif
index 2948ddbd9c5105aac802a40e5b0b6e78f04bf2d9..3769a8fc34c9937c920179b4cc011f400febe713 100644
--- a/src/plugins/markdown-report/tests/sarif/oracle/cwe125.sarif
+++ b/src/plugins/markdown-report/tests/sarif/oracle/cwe125.sarif
@@ -235,4 +235,4 @@
       ]
     }
   ]
-}
\ No newline at end of file
+}
diff --git a/src/plugins/markdown-report/tests/sarif/oracle/std_string.sarif b/src/plugins/markdown-report/tests/sarif/oracle/std_string.sarif
index 874f9d2005cdcf6b681410f6951f269095abb9ad..289318d160e25da79dfcb8918643ebccb0bd5b0c 100644
--- a/src/plugins/markdown-report/tests/sarif/oracle/std_string.sarif
+++ b/src/plugins/markdown-report/tests/sarif/oracle/std_string.sarif
@@ -26422,4 +26422,4 @@
       ]
     }
   ]
-}
\ No newline at end of file
+}
diff --git a/src/plugins/markdown-report/tests/sarif/oracle/with-libc.sarif b/src/plugins/markdown-report/tests/sarif/oracle/with-libc.sarif
index 2751be961c329268582cec503890b5c327363f2c..959696dfba7c771680aa1d287e4cf7e9b4fd3d3f 100644
--- a/src/plugins/markdown-report/tests/sarif/oracle/with-libc.sarif
+++ b/src/plugins/markdown-report/tests/sarif/oracle/with-libc.sarif
@@ -9767,4 +9767,4 @@
       ]
     }
   ]
-}
\ No newline at end of file
+}
diff --git a/src/plugins/markdown-report/tests/sarif/oracle/without-libc.sarif b/src/plugins/markdown-report/tests/sarif/oracle/without-libc.sarif
index 5a6593d4a478a3c440dce32dee238c7d6a389162..23babca6ce70631edc4076a7a4ee4f1705e533c4 100644
--- a/src/plugins/markdown-report/tests/sarif/oracle/without-libc.sarif
+++ b/src/plugins/markdown-report/tests/sarif/oracle/without-libc.sarif
@@ -81,4 +81,4 @@
       ]
     }
   ]
-}
\ No newline at end of file
+}
diff --git a/src/plugins/nonterm/Makefile.in b/src/plugins/nonterm/Makefile.in
index 70c5b92517bc9256d7866f05dc369ec9da26feed..a45d5b990a5a9f948f6ebd1db46811a427c8c344 100644
--- a/src/plugins/nonterm/Makefile.in
+++ b/src/plugins/nonterm/Makefile.in
@@ -42,6 +42,14 @@ PLUGIN_DISTRIB_EXTERNAL:= Makefile.in configure.ac configure
 PLUGIN_DEPENDENCIES:=Eva
 #PLUGIN_NO_DEFAULT_TEST:=no
 PLUGIN_TESTS_DIRS:=nonterm
+PLUGIN_DISTRIB_TESTS := \
+  $(foreach dir, $(addprefix tests/,$(PLUGIN_TESTS_DIRS)), \
+    $(dir)/oracle/* \
+    $(filter-out result oracle,$(dir)/*)) \
+  ) \
+  $(filter-out result oracle,tests/*)) \
+  $(foreach dir, tests $(addprefix tests/,$(PLUGIN_TESTS_DIRS)), \
+    $(dir)/test_config)
 
 ################
 # Generic part #
diff --git a/src/plugins/variadic/Makefile.in b/src/plugins/variadic/Makefile.in
index e6d7e0ca24c30195cee5e5450789feaa092a27d2..d1eb8663af0792793af4ca6100f175156d607270 100644
--- a/src/plugins/variadic/Makefile.in
+++ b/src/plugins/variadic/Makefile.in
@@ -45,6 +45,14 @@ PLUGIN_DISTRIBUTED := $(PLUGIN_ENABLE)
 PLUGIN_DISTRIB_EXTERNAL:= Makefile.in configure.ac configure
 #PLUGIN_NO_DEFAULT_TEST := no
 PLUGIN_TESTS_DIRS := declared defined known erroneous
+PLUGIN_DISTRIB_TESTS := \
+  $(foreach dir, $(addprefix tests/,$(PLUGIN_TESTS_DIRS)), \
+    $(dir)/oracle/* \
+    $(filter-out result oracle,$(dir)/*)) \
+  ) \
+  $(filter-out result oracle,tests/*)) \
+  $(foreach dir, tests $(addprefix tests/,$(PLUGIN_TESTS_DIRS)), \
+    $(dir)/test_config)
 
 ################
 # Generic part #
diff --git a/src/plugins/variadic/tests/declared/function-ptr-with-ghost.i b/src/plugins/variadic/tests/declared/function-ptr-with-ghost.i
index 0ab1f1a1c0c7e5597794b56a0192ee6cb5cf9206..58f175bdf3a37f53121551512ab109b9d966baef 100644
--- a/src/plugins/variadic/tests/declared/function-ptr-with-ghost.i
+++ b/src/plugins/variadic/tests/declared/function-ptr-with-ghost.i
@@ -5,4 +5,4 @@ void va_f(int, ...) /*@ ghost(int x) */ ;
 
 int main(void){
   function(va_f, 3);
-}
\ No newline at end of file
+}