7 files changed, 72 insertions, 59 deletions
diff --git a/testsuite/tests/regression/gpr1623/gpr1623.ml b/testsuite/tests/regression/gpr1623/gpr1623.ml
index 80f844524d..51f5720352 100644
--- a/testsuite/tests/regression/gpr1623/gpr1623.ml
+++ b/testsuite/tests/regression/gpr1623/gpr1623.ml
@@ -1,6 +1,6 @@
 (* TEST
-  arguments = "???"
-  *)
+ arguments = "???";
+*)
 
 (* On Windows the runtime expand windows wildcards (asterisks and
  * question marks).
diff --git a/testsuite/tests/regression/missing_set_of_closures/missing_set_of_closures.ml b/testsuite/tests/regression/missing_set_of_closures/missing_set_of_closures.ml
index c71250cdb2..6f4aa12589 100644
--- a/testsuite/tests/regression/missing_set_of_closures/missing_set_of_closures.ml
+++ b/testsuite/tests/regression/missing_set_of_closures/missing_set_of_closures.ml
@@ -1,20 +1,20 @@
 (* TEST
-readonly_files = "a.ml b.ml b2.ml"
-subdirectories = "dir"
-* setup-ocamlopt.byte-build-env
-** ocamlopt.byte
-module = "a.ml"
-*** ocamlopt.byte
-module = "b.ml"
-**** ocamlopt.byte
-module = "b2.ml"
-***** copy
-src = "b.cmx b.cmi b2.cmx b2.cmi"
-dst = "dir/"
-****** cd
-cwd = "dir"
-******* ocamlopt.byte
-module = "c.ml"
-flags = "-w -58"
-******** check-ocamlopt.byte-output
+ readonly_files = "a.ml b.ml b2.ml";
+ subdirectories = "dir";
+ setup-ocamlopt.byte-build-env;
+ module = "a.ml";
+ ocamlopt.byte;
+ module = "b.ml";
+ ocamlopt.byte;
+ module = "b2.ml";
+ ocamlopt.byte;
+ src = "b.cmx b.cmi b2.cmx b2.cmi";
+ dst = "dir/";
+ copy;
+ cwd = "dir";
+ cd;
+ module = "c.ml";
+ flags = "-w -58";
+ ocamlopt.byte;
+ check-ocamlopt.byte-output;
 *)
diff --git a/testsuite/tests/regression/pr11887/pr11887.ml b/testsuite/tests/regression/pr11887/pr11887.ml
index 9e7fc6da65..858ae3e2dc 100644
--- a/testsuite/tests/regression/pr11887/pr11887.ml
+++ b/testsuite/tests/regression/pr11887/pr11887.ml
@@ -1,6 +1,6 @@
 (* TEST
-   * native
-     ocamlopt_flags = "-dcmm-invariants"
+ ocamlopt_flags = "-dcmm-invariants";
+ native;
 *)
 
 module Constant = struct
diff --git a/testsuite/tests/regression/pr3612/pr3612.ml b/testsuite/tests/regression/pr3612/pr3612.ml
index c2ca8dbb7f..758011943a 100644
--- a/testsuite/tests/regression/pr3612/pr3612.ml
+++ b/testsuite/tests/regression/pr3612/pr3612.ml
@@ -1,5 +1,5 @@
 (* TEST
-   modules = "custom_finalize.c"
+ modules = "custom_finalize.c";
 *)
 
 type t
diff --git a/testsuite/tests/regression/pr7798/pr7798.ml b/testsuite/tests/regression/pr7798/pr7798.ml
index a91b4dc2fb..3f09de0768 100644
--- a/testsuite/tests/regression/pr7798/pr7798.ml
+++ b/testsuite/tests/regression/pr7798/pr7798.ml
@@ -1,8 +1,12 @@
 (* TEST
-   * bytecode
-   * native
-   * native
-     ocamlopt_flags = "-compact"
+ {
+   bytecode;
+ }{
+   native;
+ }{
+   ocamlopt_flags = "-compact";
+   native;
+ }
 *)
 
 type mut2 = { mutable p: int; mutable q:int }
diff --git a/testsuite/tests/regression/pr8769/pr8769.ml b/testsuite/tests/regression/pr8769/pr8769.ml
index fa0c73f7a4..e6e5c3b4dd 100644
--- a/testsuite/tests/regression/pr8769/pr8769.ml
+++ b/testsuite/tests/regression/pr8769/pr8769.ml
@@ -1,32 +1,42 @@
 (* TEST
-modules = "nocrypto.mli fortuna.ml rng.ml"
-
-* setup-ocamlc.byte-build-env
-** ocamlc.byte
-module = "nocrypto.mli"
-** ocamlc.byte
-flags = "-for-pack Nocrypto"
-module = "fortuna.ml"
-** ocamlc.byte
-flags = "-for-pack Nocrypto"
-module = "rng.ml"
-** ocamlc.byte
-program = "nocrypto.cmo"
-flags = "-pack"
-all_modules = "fortuna.cmo rng.cmo"
-
-* setup-ocamlopt.byte-build-env
-** ocamlopt.byte
-module = "nocrypto.mli"
-** ocamlopt.byte
-flags = "-for-pack Nocrypto"
-module = "fortuna.ml"
-** ocamlopt.byte
-flags = "-for-pack Nocrypto"
-module = "rng.ml"
-** ocamlopt.byte
-program = "nocrypto.cmx"
-flags = "-pack"
-all_modules = "fortuna.cmx rng.cmx"
-
+ modules = "nocrypto.mli fortuna.ml rng.ml";
+ {
+   setup-ocamlc.byte-build-env;
+   {
+     module = "nocrypto.mli";
+     ocamlc.byte;
+   }{
+     flags = "-for-pack Nocrypto";
+     module = "fortuna.ml";
+     ocamlc.byte;
+   }{
+     flags = "-for-pack Nocrypto";
+     module = "rng.ml";
+     ocamlc.byte;
+   }{
+     program = "nocrypto.cmo";
+     flags = "-pack";
+     all_modules = "fortuna.cmo rng.cmo";
+     ocamlc.byte;
+   }
+ }{
+   setup-ocamlopt.byte-build-env;
+   {
+     module = "nocrypto.mli";
+     ocamlopt.byte;
+   }{
+     flags = "-for-pack Nocrypto";
+     module = "fortuna.ml";
+     ocamlopt.byte;
+   }{
+     flags = "-for-pack Nocrypto";
+     module = "rng.ml";
+     ocamlopt.byte;
+   }{
+     program = "nocrypto.cmx";
+     flags = "-pack";
+     all_modules = "fortuna.cmx rng.cmx";
+     ocamlopt.byte;
+   }
+ }
 *)
diff --git a/testsuite/tests/regression/pr9326/gc_set.ml b/testsuite/tests/regression/pr9326/gc_set.ml
index 2570aec28e..e672e23c9d 100644
--- a/testsuite/tests/regression/pr9326/gc_set.ml
+++ b/testsuite/tests/regression/pr9326/gc_set.ml
@@ -1,5 +1,4 @@
-(* TEST
-*)
+(* TEST *)
 
 open Gc