diff --git a/test/blackbox-tests/test-cases/c-stubs/run.t b/test/blackbox-tests/test-cases/c-stubs/run.t
index aede0a01..78d5c311 100644
--- a/test/blackbox-tests/test-cases/c-stubs/run.t
+++ b/test/blackbox-tests/test-cases/c-stubs/run.t
@@ -5,10 +5,10 @@
       ocamldep q/q.ml.d
       ocamldep q/q.mli.d
         ocamlc q/.q.objs/q.{cmi,cmti}
-        ocamlc qnativerun/.run.eobjs/run.{cmi,cmo,cmt}
       ocamlopt q/.q.objs/q.{cmx,o}
-      ocamlopt qnativerun/.run.eobjs/run.{cmx,o}
       ocamlopt q/q.{a,cmxa}
+        ocamlc qnativerun/.run.eobjs/run.{cmi,cmo,cmt}
+      ocamlopt qnativerun/.run.eobjs/run.{cmx,o}
       ocamlopt qnativerun/run.exe
   42
 #  $ $JBUILDER exec -j1 ./qbyterun/run.bc --display short --root .
diff --git a/test/blackbox-tests/test-cases/cross-compilation/run.t b/test/blackbox-tests/test-cases/cross-compilation/run.t
index b7a88116..a4d2c6b1 100644
--- a/test/blackbox-tests/test-cases/cross-compilation/run.t
+++ b/test/blackbox-tests/test-cases/cross-compilation/run.t
@@ -9,10 +9,10 @@
       ocamldep lib/p.ml.d
         ocamlc lib/.p.objs/p.{cmi,cmo,cmt}
         ocamlc bin/.blah.eobjs/blah.{cmi,cmo,cmt}
+        ocamlc lib/p.cma [default.foo]
         ocamlc bin/.blah.eobjs/blah.{cmi,cmo,cmt} [default.foo]
       ocamlopt bin/.blah.eobjs/blah.{cmx,o} [default.foo]
       ocamlopt bin/blah.exe [default.foo]
-        ocamlc lib/p.cma [default.foo]
       ocamlopt lib/.p.objs/p.{cmx,o}
       ocamlopt bin/.blah.eobjs/blah.{cmx,o}
       ocamlopt lib/p.{a,cmxa}
diff --git a/test/blackbox-tests/test-cases/gen-opam-install-file/run.t b/test/blackbox-tests/test-cases/gen-opam-install-file/run.t
index 9030708d..c32ceab7 100644
--- a/test/blackbox-tests/test-cases/gen-opam-install-file/run.t
+++ b/test/blackbox-tests/test-cases/gen-opam-install-file/run.t
@@ -6,11 +6,11 @@
       ocamldep foo.ml.d
       ocamldep foo.mli.d
         ocamlc .foo.objs/foo.{cmi,cmti}
-        ocamlc .foo.objs/foo.{cmo,cmt}
-        ocamlc foo.cma
       ocamlopt .foo.objs/foo.{cmx,o}
       ocamlopt foo.{a,cmxa}
       ocamlopt foo.cmxs
+        ocamlc .foo.objs/foo.{cmo,cmt}
+        ocamlc foo.cma
         ocamlc .bar.eobjs/bar.{cmi,cmo,cmt}
       ocamlopt .bar.eobjs/bar.{cmx,o}
       ocamlopt bar.exe
diff --git a/test/blackbox-tests/test-cases/intf-only/run.t b/test/blackbox-tests/test-cases/intf-only/run.t
index e24bee6a..0673a5f8 100644
--- a/test/blackbox-tests/test-cases/intf-only/run.t
+++ b/test/blackbox-tests/test-cases/intf-only/run.t
@@ -11,11 +11,11 @@ Successes:
       ocamlopt .foo.objs/foo.{cmx,o}
       ocamlopt foo.{a,cmxa}
       ocamlopt foo.cmxs
+        ocamlc foo.cma
         ocamlc test/.bar.objs/bar.{cmi,cmo,cmt}
       ocamlopt test/.bar.objs/bar.{cmx,o}
       ocamlopt test/bar.{a,cmxa}
       ocamlopt test/bar.cmxs
-        ocamlc foo.cma
         ocamlc test/bar.cma
 
 Errors:
diff --git a/test/blackbox-tests/test-cases/scope-bug/run.t b/test/blackbox-tests/test-cases/scope-bug/run.t
index f1291ff3..7ee752c5 100644
--- a/test/blackbox-tests/test-cases/scope-bug/run.t
+++ b/test/blackbox-tests/test-cases/scope-bug/run.t
@@ -9,16 +9,16 @@
       ocamlopt blib/sub/.sub.objs/sub.{cmx,o}
       ocamlopt blib/sub/sub.{a,cmxa}
       ocamlopt blib/sub/sub.cmxs
+        ocamlc blib/sub/sub.cma
         ocamlc blib/.blib.objs/blib.{cmi,cmo,cmt}
       ocamlopt blib/.blib.objs/blib.{cmx,o}
       ocamlopt blib/blib.{a,cmxa}
       ocamlopt blib/blib.cmxs
-        ocamlc blib/sub/sub.cma
+        ocamlc blib/blib.cma
         ocamlc alib/.alib.objs/alib.{cmi,cmo,cmt}
       ocamlopt alib/.alib.objs/alib.{cmx,o}
         ocamlc alib/.alib.objs/alib__Main.{cmi,cmo,cmt}
       ocamlopt alib/.alib.objs/alib__Main.{cmx,o}
       ocamlopt alib/alib.{a,cmxa}
       ocamlopt alib/alib.cmxs
-        ocamlc blib/blib.cma
         ocamlc alib/alib.cma