9 files changed, 46 insertions, 23 deletions
diff --git a/testsuite/tests/tmc/ambiguities.ml b/testsuite/tests/tmc/ambiguities.ml
index 55d99fe236..0f846587cd 100644
--- a/testsuite/tests/tmc/ambiguities.ml
+++ b/testsuite/tests/tmc/ambiguities.ml
@@ -1,5 +1,6 @@
 (* TEST
-   * expect *)
+ expect;
+*)
 type 'a tree =
 | Leaf of 'a
 | Node of 'a tree * 'a tree
diff --git a/testsuite/tests/tmc/other_features.ml b/testsuite/tests/tmc/other_features.ml
index 0183b01858..d75e1dab0c 100644
--- a/testsuite/tests/tmc/other_features.ml
+++ b/testsuite/tests/tmc/other_features.ml
@@ -1,5 +1,6 @@
 (* TEST
-   * expect *)
+ expect;
+*)
 
 module Non_recursive_let_bad = struct
   type 'a t =
diff --git a/testsuite/tests/tmc/partial_application.ml b/testsuite/tests/tmc/partial_application.ml
index 7721416f82..35ddd35e8b 100644
--- a/testsuite/tests/tmc/partial_application.ml
+++ b/testsuite/tests/tmc/partial_application.ml
@@ -1,6 +1,6 @@
-(* TEST
-   * bytecode
-   * native
+(* TEST_BELOW
+(* Blank lines added here to preserve locations. *)
+
 *)
 type t = Ret of (unit -> unit) | Next of t
 
@@ -17,3 +17,11 @@ let () =
   match g ~first:true with
   | Next (Ret f) -> f ()
   | _ -> assert false
+
+(* TEST
+ {
+   bytecode;
+ }{
+   native;
+ }
+*)
diff --git a/testsuite/tests/tmc/readable_output.ml b/testsuite/tests/tmc/readable_output.ml
index 1e931d7720..0cf0140a02 100644
--- a/testsuite/tests/tmc/readable_output.ml
+++ b/testsuite/tests/tmc/readable_output.ml
@@ -1,6 +1,7 @@
 (* TEST
-   flags = "-dlambda -dno-unique-ids"
-   * expect *)
+ flags = "-dlambda -dno-unique-ids";
+ expect;
+*)
 
 (* Check that the code produced by TMC reads reasonably well. *)
 let[@tail_mod_cons] rec map f = function
diff --git a/testsuite/tests/tmc/semantic.ml b/testsuite/tests/tmc/semantic.ml
index 32ffed168a..3e99e5a947 100644
--- a/testsuite/tests/tmc/semantic.ml
+++ b/testsuite/tests/tmc/semantic.ml
@@ -1,5 +1,5 @@
 (* TEST
-   * bytecode
+ bytecode;
 *)
 
 (* Test that evaluation order of constructor arguments is preserved.
diff --git a/testsuite/tests/tmc/stack_space.ml b/testsuite/tests/tmc/stack_space.ml
index 664cc2e668..45499db65a 100644
--- a/testsuite/tests/tmc/stack_space.ml
+++ b/testsuite/tests/tmc/stack_space.ml
@@ -1,13 +1,13 @@
 (* TEST
-   * setup-ocamlc.byte-build-env
-   ** ocamlc.byte
-   module = "stack_space.ml"
-   *** ocamlc.byte
-   program = "./test.byte.exe"
-   all_modules = "stack_space.cmo"
-   module = ""
-   **** run
-   ocamlrunparam += ",l=300"
+ setup-ocamlc.byte-build-env;
+ module = "stack_space.ml";
+ ocamlc.byte;
+ program = "./test.byte.exe";
+ all_modules = "stack_space.cmo";
+ module = "";
+ ocamlc.byte;
+ ocamlrunparam += ",l=300";
+ run;
 *)
 
 (* large with respect to the stack-size=300 setting above *)
diff --git a/testsuite/tests/tmc/tupled_function.ml b/testsuite/tests/tmc/tupled_function.ml
index 605bab9886..5ed4172f9a 100644
--- a/testsuite/tests/tmc/tupled_function.ml
+++ b/testsuite/tests/tmc/tupled_function.ml
@@ -1,6 +1,9 @@
 (* TEST
-   * bytecode
-   * native
+ {
+   bytecode;
+ }{
+   native;
+ }
 *)
 type 'a t =
   | N of 'a
diff --git a/testsuite/tests/tmc/tupled_function_calls.ml b/testsuite/tests/tmc/tupled_function_calls.ml
index 1ce7fa5f6e..a99354def4 100644
--- a/testsuite/tests/tmc/tupled_function_calls.ml
+++ b/testsuite/tests/tmc/tupled_function_calls.ml
@@ -1,6 +1,6 @@
-(* TEST
-   * bytecode
-   * native
+(* TEST_BELOW
+(* Blank lines added here to preserve locations. *)
+
 *)
 
 (* this works as expected *)
@@ -19,3 +19,11 @@ let[@tail_mod_cons] rec tupled_map_not_direct (f, li) =
   | x :: xs ->
       let pair = (f, xs) in
       f x :: (tupled_map_not_direct[@tailcall true]) pair
+
+(* TEST
+ {
+   bytecode;
+ }{
+   native;
+ }
+*)
diff --git a/testsuite/tests/tmc/usage_warnings.ml b/testsuite/tests/tmc/usage_warnings.ml
index 966b65983f..009210a613 100644
--- a/testsuite/tests/tmc/usage_warnings.ml
+++ b/testsuite/tests/tmc/usage_warnings.ml
@@ -1,5 +1,6 @@
 (* TEST
-   * expect *)
+ expect;
+*)
 
 (* build-up *)
 let[@tail_mod_cons] rec append xs ys =