diff --git a/test/blackbox-tests/test-cases/github2206.t/run.t b/test/blackbox-tests/test-cases/github2206.t/run.t
index c0bb4ff7b43..579a3103291 100644
--- a/test/blackbox-tests/test-cases/github2206.t/run.t
+++ b/test/blackbox-tests/test-cases/github2206.t/run.t
@@ -1,15 +1,17 @@
 copy_files would break the generation of the preprocessing flags
   $ dune build copy_files/.merlin-conf/exe-foo
   $ dune ocaml merlin dump-config $PWD/copy_files |
-  > grep -B 1 -A 0 "pp"
+  > grep -B 2 -A 0 "pp"
   Foo: _build/default/copy_files/foo
   ((INDEX $TESTCASE_ROOT/_build/default/.pp.eobjs/cctx.ocaml-index)
   --
    (S $TESTCASE_ROOT/copy_files/sources)
+   (FLG (-w @1..3@5..28@30..39@43@46..47@49..57@61..62-40 -strict-sequence -strict-formats -short-paths -keep-locs -g))
    (FLG (-pp $TESTCASE_ROOT/_build/default/pp.exe))
-  --
+   (UNIT_NAME foo))
   Foo: _build/default/copy_files/foo.ml
   ((INDEX $TESTCASE_ROOT/_build/default/.pp.eobjs/cctx.ocaml-index)
   --
    (S $TESTCASE_ROOT/copy_files/sources)
+   (FLG (-w @1..3@5..28@30..39@43@46..47@49..57@61..62-40 -strict-sequence -strict-formats -short-paths -keep-locs -g))
    (FLG (-pp $TESTCASE_ROOT/_build/default/pp.exe))
diff --git a/test/blackbox-tests/test-cases/melange/merlin.t b/test/blackbox-tests/test-cases/melange/merlin.t
index da15ba35870..38f66dcc6c8 100644
--- a/test/blackbox-tests/test-cases/melange/merlin.t
+++ b/test/blackbox-tests/test-cases/melange/merlin.t
@@ -133,9 +133,9 @@ User ppx flags should appear in merlin config
    (STDLIB /MELC_STDLIB/melange)
    (SOURCE_ROOT $TESTCASE_ROOT)
    (EXCLUDE_QUERY_DIR)
-   (FLG (-open Foo))
-   (FLG (-ppx "$TESTCASE_ROOT/_build/default/.ppx/4128e43a9cfb141a37f547484cc9bf46/ppx.exe --as-ppx --cookie 'library-name="foo"'"))
    (FLG (-w @1..3@5..28@30..39@43@46..47@49..57@61..62@67@69-40 -strict-sequence -strict-formats -short-paths -keep-locs -g))
+   (FLG (-ppx "$TESTCASE_ROOT/_build/default/.ppx/4128e43a9cfb141a37f547484cc9bf46/ppx.exe --as-ppx --cookie 'library-name="foo"'"))
+   (FLG (-open Foo))
    (UNIT_NAME foo__Bar))
   Bar: _build/default/bar.ml
   ((INDEX $TESTCASE_ROOT/_build/default/.fooppx.objs/cctx.ocaml-index)
@@ -143,9 +143,9 @@ User ppx flags should appear in merlin config
    (STDLIB /MELC_STDLIB/melange)
    (SOURCE_ROOT $TESTCASE_ROOT)
    (EXCLUDE_QUERY_DIR)
-   (FLG (-open Foo))
-   (FLG (-ppx "$TESTCASE_ROOT/_build/default/.ppx/4128e43a9cfb141a37f547484cc9bf46/ppx.exe --as-ppx --cookie 'library-name="foo"'"))
    (FLG (-w @1..3@5..28@30..39@43@46..47@49..57@61..62@67@69-40 -strict-sequence -strict-formats -short-paths -keep-locs -g))
+   (FLG (-ppx "$TESTCASE_ROOT/_build/default/.ppx/4128e43a9cfb141a37f547484cc9bf46/ppx.exe --as-ppx --cookie 'library-name="foo"'"))
+   (FLG (-open Foo))
    (UNIT_NAME foo__Bar))
   Foo: _build/default/foo
   ((INDEX $TESTCASE_ROOT/_build/default/.fooppx.objs/cctx.ocaml-index)
@@ -153,8 +153,8 @@ User ppx flags should appear in merlin config
    (STDLIB /MELC_STDLIB/melange)
    (SOURCE_ROOT $TESTCASE_ROOT)
    (EXCLUDE_QUERY_DIR)
-   (FLG (-ppx "$TESTCASE_ROOT/_build/default/.ppx/4128e43a9cfb141a37f547484cc9bf46/ppx.exe --as-ppx --cookie 'library-name="foo"'"))
    (FLG (-w @1..3@5..28@30..39@43@46..47@49..57@61..62@67@69-40 -strict-sequence -strict-formats -short-paths -keep-locs -g))
+   (FLG (-ppx "$TESTCASE_ROOT/_build/default/.ppx/4128e43a9cfb141a37f547484cc9bf46/ppx.exe --as-ppx --cookie 'library-name="foo"'"))
    (UNIT_NAME foo))
   Foo: _build/default/foo.ml-gen
   ((INDEX $TESTCASE_ROOT/_build/default/.fooppx.objs/cctx.ocaml-index)
@@ -162,8 +162,8 @@ User ppx flags should appear in merlin config
    (STDLIB /MELC_STDLIB/melange)
    (SOURCE_ROOT $TESTCASE_ROOT)
    (EXCLUDE_QUERY_DIR)
-   (FLG (-ppx "$TESTCASE_ROOT/_build/default/.ppx/4128e43a9cfb141a37f547484cc9bf46/ppx.exe --as-ppx --cookie 'library-name="foo"'"))
    (FLG (-w @1..3@5..28@30..39@43@46..47@49..57@61..62@67@69-40 -strict-sequence -strict-formats -short-paths -keep-locs -g))
+   (FLG (-ppx "$TESTCASE_ROOT/_build/default/.ppx/4128e43a9cfb141a37f547484cc9bf46/ppx.exe --as-ppx --cookie 'library-name="foo"'"))
    (UNIT_NAME foo))
   Fooppx: _build/default/fooppx
   ((INDEX $TESTCASE_ROOT/_build/default/.fooppx.objs/cctx.ocaml-index)
diff --git a/test/blackbox-tests/test-cases/merlin/github1946.t/run.t b/test/blackbox-tests/test-cases/merlin/github1946.t/run.t
index 46367c381e8..32349b60a15 100644
--- a/test/blackbox-tests/test-cases/merlin/github1946.t/run.t
+++ b/test/blackbox-tests/test-cases/merlin/github1946.t/run.t
@@ -16,8 +16,8 @@ in the same dune file, but require different ppx specifications
    (EXCLUDE_QUERY_DIR)
    (B $TESTCASE_ROOT/_build/default/.usesppx1.objs/byte)
    (S $TESTCASE_ROOT)
-   (FLG (-ppx "$TESTCASE_ROOT/_build/default/.ppx/c152d6ca3c7e1d83471ffdf48bf729ae/ppx.exe --as-ppx --cookie 'library-name="usesppx1"'"))
    (FLG (-w -40 -g))
+   (FLG (-ppx "$TESTCASE_ROOT/_build/default/.ppx/c152d6ca3c7e1d83471ffdf48bf729ae/ppx.exe --as-ppx --cookie 'library-name="usesppx1"'"))
    (UNIT_NAME usesppx1))
   Usesppx1: _build/default/usesppx1.ml-gen
   ((INDEX $TESTCASE_ROOT/_build/default/.usesppx2.objs/cctx.ocaml-index)
@@ -29,8 +29,8 @@ in the same dune file, but require different ppx specifications
    (EXCLUDE_QUERY_DIR)
    (B $TESTCASE_ROOT/_build/default/.usesppx1.objs/byte)
    (S $TESTCASE_ROOT)
-   (FLG (-ppx "$TESTCASE_ROOT/_build/default/.ppx/c152d6ca3c7e1d83471ffdf48bf729ae/ppx.exe --as-ppx --cookie 'library-name="usesppx1"'"))
    (FLG (-w -40 -g))
+   (FLG (-ppx "$TESTCASE_ROOT/_build/default/.ppx/c152d6ca3c7e1d83471ffdf48bf729ae/ppx.exe --as-ppx --cookie 'library-name="usesppx1"'"))
    (UNIT_NAME usesppx1))
   Usesppx2: _build/default/usesppx2
   ((INDEX $TESTCASE_ROOT/_build/default/.usesppx2.objs/cctx.ocaml-index)
@@ -42,8 +42,8 @@ in the same dune file, but require different ppx specifications
    (EXCLUDE_QUERY_DIR)
    (B $TESTCASE_ROOT/_build/default/.usesppx2.objs/byte)
    (S $TESTCASE_ROOT)
-   (FLG (-ppx "$TESTCASE_ROOT/_build/default/.ppx/d7394c27c5e0f7ad7ab1110d6b092c05/ppx.exe --as-ppx --cookie 'library-name="usesppx2"'"))
    (FLG (-w -40 -g))
+   (FLG (-ppx "$TESTCASE_ROOT/_build/default/.ppx/d7394c27c5e0f7ad7ab1110d6b092c05/ppx.exe --as-ppx --cookie 'library-name="usesppx2"'"))
    (UNIT_NAME usesppx2))
   Usesppx2: _build/default/usesppx2.ml-gen
   ((INDEX $TESTCASE_ROOT/_build/default/.usesppx2.objs/cctx.ocaml-index)
@@ -55,6 +55,6 @@ in the same dune file, but require different ppx specifications
    (EXCLUDE_QUERY_DIR)
    (B $TESTCASE_ROOT/_build/default/.usesppx2.objs/byte)
    (S $TESTCASE_ROOT)
-   (FLG (-ppx "$TESTCASE_ROOT/_build/default/.ppx/d7394c27c5e0f7ad7ab1110d6b092c05/ppx.exe --as-ppx --cookie 'library-name="usesppx2"'"))
    (FLG (-w -40 -g))
+   (FLG (-ppx "$TESTCASE_ROOT/_build/default/.ppx/d7394c27c5e0f7ad7ab1110d6b092c05/ppx.exe --as-ppx --cookie 'library-name="usesppx2"'"))
    (UNIT_NAME usesppx2))
diff --git a/test/blackbox-tests/test-cases/merlin/granularity.t b/test/blackbox-tests/test-cases/merlin/granularity.t
index fd339cafffe..1c1e1bf6173 100644
--- a/test/blackbox-tests/test-cases/merlin/granularity.t
+++ b/test/blackbox-tests/test-cases/merlin/granularity.t
@@ -123,9 +123,9 @@ Is it expected that the suffix for implementation and interface is the same ?
   (?:EXCLUDE_QUERY_DIR
   (?:B?:$TESTCASE_ROOT/_build/default/.test.eobjs/byte
   (?:S?:$TESTCASE_ROOT
-  (?:FLG(?:-open?:Dune__exe)
-  (?:FLG(?:-pp?:$TESTCASE_ROOT/_build/default/pp.sh)
   (?:FLG(?:-w?:@1..3@5..28@31..39@43@46..47@49..57@61..62@67@69-?:-strict-sequence?:-strict-formats?:-short-paths?:-keep-locs?:-no-strict-formats?:-g)
+  (?:FLG(?:-pp?:$TESTCASE_ROOT/_build/default/pp.sh)
+  (?:FLG(?:-open?:Dune__exe)
   (?:UNIT_NAME?:dune__exe__Pped
   (?:SUFFIX?:.mlx .mlx))
 
@@ -141,8 +141,8 @@ As expected, the reader is not communicated for the standard mli
   (?:EXCLUDE_QUERY_DIR
   (?:B?:$TESTCASE_ROOT/_build/default/.test.eobjs/byte
   (?:S?:$TESTCASE_ROOT
-  (?:FLG(?:-open?:Dune__exe)
   (?:FLG(?:-w?:@1..3@5..28@31..39@43@46..47@49..57@61..62@67@69-?:-strict-sequence?:-strict-formats?:-short-paths?:-keep-locs?:-no-strict-formats?:-g)
+  (?:FLG(?:-open?:Dune__exe)
   (?:UNIT_NAME?:dune__exe__Mel
   (?:SUFFIX?:.mlx .mlx))
 
@@ -173,8 +173,8 @@ found, then it'll make a guess that the file was preprocessed into a file with
   (?:EXCLUDE_QUERY_DIR
   (?:B?:$TESTCASE_ROOT/_build/default/.test.eobjs/byte
   (?:S?:$TESTCASE_ROOT
-  (?:FLG(?:-open?:Dune__exe)
   (?:FLG(?:-w?:@1..3@5..28@31..39@43@46..47@49..57@61..62@67@69-?:-strict-sequence?:-strict-formats?:-short-paths?:-keep-locs?:-no-strict-formats?:-g)
+  (?:FLG(?:-open?:Dune__exe)
   (?:UNIT_NAME?:dune__exe__Cppomod
   (?:SUFFIX?:.mlx .mlx))
 
@@ -195,8 +195,8 @@ We could expect dune to get the wrongext module configuration
   (?:EXCLUDE_QUERY_DIR
   (?:B?:$TESTCASE_ROOT/_build/default/.test.eobjs/byte
   (?:S?:$TESTCASE_ROOT
-  (?:FLG(?:-open?:Dune__exe)
   (?:FLG(?:-w?:@1..3@5..28@31..39@43@46..47@49..57@61..62@67@69-?:-strict-sequence?:-strict-formats?:-short-paths?:-keep-locs?:-no-strict-formats?:-g)
+  (?:FLG(?:-open?:Dune__exe)
   (?:UNIT_NAME?:dune__exe__Wrongext
   (?:SUFFIX?:.mlx .mlx))
 
@@ -213,8 +213,8 @@ It should be possible to get its merlin configuration as well:
   (?:EXCLUDE_QUERY_DIR
   (?:B?:$TESTCASE_ROOT/_build/default/.test.eobjs/byte
   (?:S?:$TESTCASE_ROOT
-  (?:FLG(?:-open?:Dune__exe)
   (?:FLG(?:-w?:@1..3@5..28@31..39@43@46..47@49..57@61..62@67@69-?:-strict-sequence?:-strict-formats?:-short-paths?:-keep-locs?:-no-strict-formats?:-g)
+  (?:FLG(?:-open?:Dune__exe)
   (?:UNIT_NAME?:dune__exe__Generated
   (?:SUFFIX?:.mlx .mlx))
   $ ./merlin_conf.sh generatedx.mlx
@@ -224,8 +224,8 @@ It should be possible to get its merlin configuration as well:
   (?:EXCLUDE_QUERY_DIR
   (?:B?:$TESTCASE_ROOT/_build/default/.test.eobjs/byte
   (?:S?:$TESTCASE_ROOT
-  (?:FLG(?:-open?:Dune__exe)
   (?:FLG(?:-w?:@1..3@5..28@31..39@43@46..47@49..57@61..62@67@69-?:-strict-sequence?:-strict-formats?:-short-paths?:-keep-locs?:-no-strict-formats?:-g)
+  (?:FLG(?:-open?:Dune__exe)
   (?:UNIT_NAME?:dune__exe__Generatedx
   (?:SUFFIX?:.mlx .mlx
   (?:READER(?:mlx)))
diff --git a/test/blackbox-tests/test-cases/merlin/include-subdirs-qualified.t b/test/blackbox-tests/test-cases/merlin/include-subdirs-qualified.t
index c7648434747..afcd670dd02 100644
--- a/test/blackbox-tests/test-cases/merlin/include-subdirs-qualified.t
+++ b/test/blackbox-tests/test-cases/merlin/include-subdirs-qualified.t
@@ -96,8 +96,8 @@
    (S $TESTCASE_ROOT)
    (S $TESTCASE_ROOT/groupintf)
    (S $TESTCASE_ROOT/utils)
-   (FLG (-open Foo__Groupintf__ -open Foo))
    (FLG (-w @1..3@5..28@30..39@43@46..47@49..57@61..62@67@69-40 -strict-sequence -strict-formats -short-paths -keep-locs -g))
+   (FLG (-open Foo__Groupintf__ -open Foo))
    (UNIT_NAME foo__Groupintf__Calc))
   Calc: _build/default/groupintf/calc.ml
   ((INDEX $TESTCASE_ROOT/_build/default/.foo.objs/cctx.ocaml-index)
@@ -108,8 +108,8 @@
    (S $TESTCASE_ROOT)
    (S $TESTCASE_ROOT/groupintf)
    (S $TESTCASE_ROOT/utils)
-   (FLG (-open Foo__Groupintf__ -open Foo))
    (FLG (-w @1..3@5..28@30..39@43@46..47@49..57@61..62@67@69-40 -strict-sequence -strict-formats -short-paths -keep-locs -g))
+   (FLG (-open Foo__Groupintf__ -open Foo))
    (UNIT_NAME foo__Groupintf__Calc))
   Groupintf: _build/default/groupintf/groupintf
   ((INDEX $TESTCASE_ROOT/_build/default/.foo.objs/cctx.ocaml-index)
@@ -120,8 +120,8 @@
    (S $TESTCASE_ROOT)
    (S $TESTCASE_ROOT/groupintf)
    (S $TESTCASE_ROOT/utils)
-   (FLG (-open Foo__Groupintf__ -open Foo))
    (FLG (-w @1..3@5..28@30..39@43@46..47@49..57@61..62@67@69-40 -strict-sequence -strict-formats -short-paths -keep-locs -g))
+   (FLG (-open Foo__Groupintf__ -open Foo))
    (UNIT_NAME foo__Groupintf))
   Groupintf: _build/default/groupintf/groupintf.ml
   ((INDEX $TESTCASE_ROOT/_build/default/.foo.objs/cctx.ocaml-index)
@@ -132,8 +132,8 @@
    (S $TESTCASE_ROOT)
    (S $TESTCASE_ROOT/groupintf)
    (S $TESTCASE_ROOT/utils)
-   (FLG (-open Foo__Groupintf__ -open Foo))
    (FLG (-w @1..3@5..28@30..39@43@46..47@49..57@61..62@67@69-40 -strict-sequence -strict-formats -short-paths -keep-locs -g))
+   (FLG (-open Foo__Groupintf__ -open Foo))
    (UNIT_NAME foo__Groupintf))
   Main: _build/default/main
   ((INDEX $TESTCASE_ROOT/_build/default/.foo.objs/cctx.ocaml-index)
@@ -144,8 +144,8 @@
    (S $TESTCASE_ROOT)
    (S $TESTCASE_ROOT/groupintf)
    (S $TESTCASE_ROOT/utils)
-   (FLG (-open Foo))
    (FLG (-w @1..3@5..28@30..39@43@46..47@49..57@61..62@67@69-40 -strict-sequence -strict-formats -short-paths -keep-locs -g))
+   (FLG (-open Foo))
    (UNIT_NAME foo__Main))
   Main: _build/default/main.ml
   ((INDEX $TESTCASE_ROOT/_build/default/.foo.objs/cctx.ocaml-index)
@@ -156,8 +156,8 @@
    (S $TESTCASE_ROOT)
    (S $TESTCASE_ROOT/groupintf)
    (S $TESTCASE_ROOT/utils)
-   (FLG (-open Foo))
    (FLG (-w @1..3@5..28@30..39@43@46..47@49..57@61..62@67@69-40 -strict-sequence -strict-formats -short-paths -keep-locs -g))
+   (FLG (-open Foo))
    (UNIT_NAME foo__Main))
   Calc: _build/default/utils/calc
   ((INDEX $TESTCASE_ROOT/_build/default/.foo.objs/cctx.ocaml-index)
@@ -168,8 +168,8 @@
    (S $TESTCASE_ROOT)
    (S $TESTCASE_ROOT/groupintf)
    (S $TESTCASE_ROOT/utils)
-   (FLG (-open Foo__Utils -open Foo))
    (FLG (-w @1..3@5..28@30..39@43@46..47@49..57@61..62@67@69-40 -strict-sequence -strict-formats -short-paths -keep-locs -g))
+   (FLG (-open Foo__Utils -open Foo))
    (UNIT_NAME foo__Utils__Calc))
   Calc: _build/default/utils/calc.ml
   ((INDEX $TESTCASE_ROOT/_build/default/.foo.objs/cctx.ocaml-index)
@@ -180,7 +180,7 @@
    (S $TESTCASE_ROOT)
    (S $TESTCASE_ROOT/groupintf)
    (S $TESTCASE_ROOT/utils)
-   (FLG (-open Foo__Utils -open Foo))
    (FLG (-w @1..3@5..28@30..39@43@46..47@49..57@61..62@67@69-40 -strict-sequence -strict-formats -short-paths -keep-locs -g))
+   (FLG (-open Foo__Utils -open Foo))
    (UNIT_NAME foo__Utils__Calc))
   $ dune ocaml merlin dump-config utils
diff --git a/test/blackbox-tests/test-cases/merlin/instrumentation.t/run.t b/test/blackbox-tests/test-cases/merlin/instrumentation.t/run.t
index 5d68efc2912..e678d10dabb 100644
--- a/test/blackbox-tests/test-cases/merlin/instrumentation.t/run.t
+++ b/test/blackbox-tests/test-cases/merlin/instrumentation.t/run.t
@@ -54,8 +54,8 @@ up a project with instrumentation and testing checking the merlin config.
    (S $TESTCASE_ROOT/lib)
    (S $TESTCASE_ROOT/lib/subdir)
    (S $TESTCASE_ROOT/ppx)
-   (FLG (-open Bar))
    (FLG (-w -40 -g))
+   (FLG (-open Bar))
    (UNIT_NAME bar__File))
   File: _build/default/lib/subdir/file.ml
   ((INDEX $TESTCASE_ROOT/_build/default/exe/.x.eobjs/cctx.ocaml-index)
@@ -71,8 +71,8 @@ up a project with instrumentation and testing checking the merlin config.
    (S $TESTCASE_ROOT/lib)
    (S $TESTCASE_ROOT/lib/subdir)
    (S $TESTCASE_ROOT/ppx)
-   (FLG (-open Bar))
    (FLG (-w -40 -g))
+   (FLG (-open Bar))
    (UNIT_NAME bar__File))
   Foo: _build/default/lib/foo
   ((INDEX $TESTCASE_ROOT/_build/default/exe/.x.eobjs/cctx.ocaml-index)
@@ -120,8 +120,8 @@ up a project with instrumentation and testing checking the merlin config.
    (S $TESTCASE_ROOT/lib)
    (S $TESTCASE_ROOT/lib/subdir)
    (S $TESTCASE_ROOT/ppx)
-   (FLG (-open Foo))
    (FLG (-w -40 -g))
+   (FLG (-open Foo))
    (UNIT_NAME foo__Privmod))
   Privmod: _build/default/lib/privmod.ml
   ((INDEX $TESTCASE_ROOT/_build/default/exe/.x.eobjs/cctx.ocaml-index)
@@ -137,6 +137,6 @@ up a project with instrumentation and testing checking the merlin config.
    (S $TESTCASE_ROOT/lib)
    (S $TESTCASE_ROOT/lib/subdir)
    (S $TESTCASE_ROOT/ppx)
-   (FLG (-open Foo))
    (FLG (-w -40 -g))
+   (FLG (-open Foo))
    (UNIT_NAME foo__Privmod))
diff --git a/test/blackbox-tests/test-cases/merlin/merlin-tests.t/run.t b/test/blackbox-tests/test-cases/merlin/merlin-tests.t/run.t
index 80fd3faa441..a6de607b797 100644
--- a/test/blackbox-tests/test-cases/merlin/merlin-tests.t/run.t
+++ b/test/blackbox-tests/test-cases/merlin/merlin-tests.t/run.t
@@ -30,8 +30,8 @@ CRAM sanitization
    (S $TESTCASE_ROOT/_findlib/publicfoo)
    (S $TESTCASE_ROOT/exe)
    (S $TESTCASE_ROOT/lib)
-   (FLG (-pp $TESTCASE_ROOT/_build/default/pp/pp.exe))
    (FLG (-w -40 -g))
+   (FLG (-pp $TESTCASE_ROOT/_build/default/pp/pp.exe))
    (UNIT_NAME x))
   X: _build/default/exe/x.ml
   ((INDEX $TESTCASE_ROOT/_build/default/exe/.x.eobjs/cctx.ocaml-index)
@@ -50,8 +50,8 @@ CRAM sanitization
    (S $TESTCASE_ROOT/_findlib/publicfoo)
    (S $TESTCASE_ROOT/exe)
    (S $TESTCASE_ROOT/lib)
-   (FLG (-pp $TESTCASE_ROOT/_build/default/pp/pp.exe))
    (FLG (-w -40 -g))
+   (FLG (-pp $TESTCASE_ROOT/_build/default/pp/pp.exe))
    (UNIT_NAME x))
 
   $ dune build ./lib/.merlin-conf/lib-foo ./lib/.merlin-conf/lib-bar --profile release
@@ -70,8 +70,8 @@ CRAM sanitization
    (B $TESTCASE_ROOT/_build/default/lib/.bar.objs/byte)
    (S $TESTCASE_ROOT/lib)
    (S $TESTCASE_ROOT/lib/subdir)
-   (FLG (-ppx "$TESTCASE_ROOT/_build/default/.ppx/4128e43a9cfb141a37f547484cc9bf46/ppx.exe --as-ppx --cookie 'library-name="bar"'"))
    (FLG (-w -40 -g))
+   (FLG (-ppx "$TESTCASE_ROOT/_build/default/.ppx/4128e43a9cfb141a37f547484cc9bf46/ppx.exe --as-ppx --cookie 'library-name="bar"'"))
    (UNIT_NAME bar))
   Bar: _build/default/lib/bar.ml-gen
   ((INDEX $TESTCASE_ROOT/_build/default/exe/.x.eobjs/cctx.ocaml-index)
@@ -87,8 +87,8 @@ CRAM sanitization
    (B $TESTCASE_ROOT/_build/default/lib/.bar.objs/byte)
    (S $TESTCASE_ROOT/lib)
    (S $TESTCASE_ROOT/lib/subdir)
-   (FLG (-ppx "$TESTCASE_ROOT/_build/default/.ppx/4128e43a9cfb141a37f547484cc9bf46/ppx.exe --as-ppx --cookie 'library-name="bar"'"))
    (FLG (-w -40 -g))
+   (FLG (-ppx "$TESTCASE_ROOT/_build/default/.ppx/4128e43a9cfb141a37f547484cc9bf46/ppx.exe --as-ppx --cookie 'library-name="bar"'"))
    (UNIT_NAME bar))
   File: _build/default/lib/subdir/file
   ((INDEX $TESTCASE_ROOT/_build/default/exe/.x.eobjs/cctx.ocaml-index)
@@ -104,9 +104,9 @@ CRAM sanitization
    (B $TESTCASE_ROOT/_build/default/lib/.bar.objs/byte)
    (S $TESTCASE_ROOT/lib)
    (S $TESTCASE_ROOT/lib/subdir)
-   (FLG (-open Bar))
-   (FLG (-ppx "$TESTCASE_ROOT/_build/default/.ppx/4128e43a9cfb141a37f547484cc9bf46/ppx.exe --as-ppx --cookie 'library-name="bar"'"))
    (FLG (-w -40 -g))
+   (FLG (-ppx "$TESTCASE_ROOT/_build/default/.ppx/4128e43a9cfb141a37f547484cc9bf46/ppx.exe --as-ppx --cookie 'library-name="bar"'"))
+   (FLG (-open Bar))
    (UNIT_NAME bar__File))
   File: _build/default/lib/subdir/file.ml
   ((INDEX $TESTCASE_ROOT/_build/default/exe/.x.eobjs/cctx.ocaml-index)
@@ -122,9 +122,9 @@ CRAM sanitization
    (B $TESTCASE_ROOT/_build/default/lib/.bar.objs/byte)
    (S $TESTCASE_ROOT/lib)
    (S $TESTCASE_ROOT/lib/subdir)
-   (FLG (-open Bar))
-   (FLG (-ppx "$TESTCASE_ROOT/_build/default/.ppx/4128e43a9cfb141a37f547484cc9bf46/ppx.exe --as-ppx --cookie 'library-name="bar"'"))
    (FLG (-w -40 -g))
+   (FLG (-ppx "$TESTCASE_ROOT/_build/default/.ppx/4128e43a9cfb141a37f547484cc9bf46/ppx.exe --as-ppx --cookie 'library-name="bar"'"))
+   (FLG (-open Bar))
    (UNIT_NAME bar__File))
   Foo: _build/default/lib/foo
   ((INDEX $TESTCASE_ROOT/_build/default/exe/.x.eobjs/cctx.ocaml-index)
@@ -142,8 +142,8 @@ CRAM sanitization
    (S $TESTCASE_ROOT/_findlib/publicfoo)
    (S $TESTCASE_ROOT/lib)
    (S $TESTCASE_ROOT/lib/subdir)
-   (FLG (-ppx "$TESTCASE_ROOT/_build/default/.ppx/4128e43a9cfb141a37f547484cc9bf46/ppx.exe --as-ppx --cookie 'library-name="foo"'"))
    (FLG (-w -40 -g))
+   (FLG (-ppx "$TESTCASE_ROOT/_build/default/.ppx/4128e43a9cfb141a37f547484cc9bf46/ppx.exe --as-ppx --cookie 'library-name="foo"'"))
    (UNIT_NAME foo))
   Foo: _build/default/lib/foo.ml-gen
   ((INDEX $TESTCASE_ROOT/_build/default/exe/.x.eobjs/cctx.ocaml-index)
@@ -161,8 +161,8 @@ CRAM sanitization
    (S $TESTCASE_ROOT/_findlib/publicfoo)
    (S $TESTCASE_ROOT/lib)
    (S $TESTCASE_ROOT/lib/subdir)
-   (FLG (-ppx "$TESTCASE_ROOT/_build/default/.ppx/4128e43a9cfb141a37f547484cc9bf46/ppx.exe --as-ppx --cookie 'library-name="foo"'"))
    (FLG (-w -40 -g))
+   (FLG (-ppx "$TESTCASE_ROOT/_build/default/.ppx/4128e43a9cfb141a37f547484cc9bf46/ppx.exe --as-ppx --cookie 'library-name="foo"'"))
    (UNIT_NAME foo))
   Privmod: _build/default/lib/privmod
   ((INDEX $TESTCASE_ROOT/_build/default/exe/.x.eobjs/cctx.ocaml-index)
@@ -180,9 +180,9 @@ CRAM sanitization
    (S $TESTCASE_ROOT/_findlib/publicfoo)
    (S $TESTCASE_ROOT/lib)
    (S $TESTCASE_ROOT/lib/subdir)
-   (FLG (-open Foo))
-   (FLG (-ppx "$TESTCASE_ROOT/_build/default/.ppx/4128e43a9cfb141a37f547484cc9bf46/ppx.exe --as-ppx --cookie 'library-name="foo"'"))
    (FLG (-w -40 -g))
+   (FLG (-ppx "$TESTCASE_ROOT/_build/default/.ppx/4128e43a9cfb141a37f547484cc9bf46/ppx.exe --as-ppx --cookie 'library-name="foo"'"))
+   (FLG (-open Foo))
    (UNIT_NAME foo__Privmod))
   Privmod: _build/default/lib/privmod.ml
   ((INDEX $TESTCASE_ROOT/_build/default/exe/.x.eobjs/cctx.ocaml-index)
@@ -200,9 +200,9 @@ CRAM sanitization
    (S $TESTCASE_ROOT/_findlib/publicfoo)
    (S $TESTCASE_ROOT/lib)
    (S $TESTCASE_ROOT/lib/subdir)
-   (FLG (-open Foo))
-   (FLG (-ppx "$TESTCASE_ROOT/_build/default/.ppx/4128e43a9cfb141a37f547484cc9bf46/ppx.exe --as-ppx --cookie 'library-name="foo"'"))
    (FLG (-w -40 -g))
+   (FLG (-ppx "$TESTCASE_ROOT/_build/default/.ppx/4128e43a9cfb141a37f547484cc9bf46/ppx.exe --as-ppx --cookie 'library-name="foo"'"))
+   (FLG (-open Foo))
    (UNIT_NAME foo__Privmod))
 
 Make sure a ppx directive is generated (if not, the [grep ppx] step fails)
@@ -225,8 +225,8 @@ Make sure pp flag is correct and variables are expanded
    (EXCLUDE_QUERY_DIR)
    (B $TESTCASE_ROOT/_build/default/pp-with-expand/.foobar.eobjs/byte)
    (S $TESTCASE_ROOT/pp-with-expand)
-   (FLG (-pp "$TESTCASE_ROOT/_build/default/pp/pp.exe -nothing"))
    (FLG (-w -40 -g))
+   (FLG (-pp "$TESTCASE_ROOT/_build/default/pp/pp.exe -nothing"))
    (UNIT_NAME foobar))
   Foobar: _build/default/pp-with-expand/foobar.ml
   ((INDEX $TESTCASE_ROOT/_build/default/exe/.x.eobjs/cctx.ocaml-index)
@@ -241,8 +241,8 @@ Make sure pp flag is correct and variables are expanded
    (EXCLUDE_QUERY_DIR)
    (B $TESTCASE_ROOT/_build/default/pp-with-expand/.foobar.eobjs/byte)
    (S $TESTCASE_ROOT/pp-with-expand)
-   (FLG (-pp "$TESTCASE_ROOT/_build/default/pp/pp.exe -nothing"))
    (FLG (-w -40 -g))
+   (FLG (-pp "$TESTCASE_ROOT/_build/default/pp/pp.exe -nothing"))
    (UNIT_NAME foobar))
 
 Check hash of executables names if more than one
diff --git a/test/blackbox-tests/test-cases/merlin/per-module-pp.t/run.t b/test/blackbox-tests/test-cases/merlin/per-module-pp.t/run.t
index 5066220a9df..b3c09b831c0 100644
--- a/test/blackbox-tests/test-cases/merlin/per-module-pp.t/run.t
+++ b/test/blackbox-tests/test-cases/merlin/per-module-pp.t/run.t
@@ -35,8 +35,8 @@ should appear only once since only Foo is using it.
    (EXCLUDE_QUERY_DIR)
    (B $TESTCASE_ROOT/_build/default/.foo.objs/byte)
    (S $TESTCASE_ROOT)
-   (FLG (-pp $TESTCASE_ROOT/_build/default/pp/pp.exe))
    (FLG (-w @1..3@5..28@30..39@43@46..47@49..57@61..62-40 -strict-sequence -strict-formats -short-paths -keep-locs -g))
+   (FLG (-pp $TESTCASE_ROOT/_build/default/pp/pp.exe))
    (UNIT_NAME foo))
   Foo: _build/default/foo.ml
   ((INDEX $TESTCASE_ROOT/_build/default/.foo.objs/cctx.ocaml-index)
@@ -46,6 +46,6 @@ should appear only once since only Foo is using it.
    (EXCLUDE_QUERY_DIR)
    (B $TESTCASE_ROOT/_build/default/.foo.objs/byte)
    (S $TESTCASE_ROOT)
-   (FLG (-pp $TESTCASE_ROOT/_build/default/pp/pp.exe))
    (FLG (-w @1..3@5..28@30..39@43@46..47@49..57@61..62-40 -strict-sequence -strict-formats -short-paths -keep-locs -g))
+   (FLG (-pp $TESTCASE_ROOT/_build/default/pp/pp.exe))
    (UNIT_NAME foo))
diff --git a/test/blackbox-tests/test-cases/merlin/server.t/run.t b/test/blackbox-tests/test-cases/merlin/server.t/run.t
index 505271236e6..f0e1eb394bf 100644
--- a/test/blackbox-tests/test-cases/merlin/server.t/run.t
+++ b/test/blackbox-tests/test-cases/merlin/server.t/run.t
@@ -8,11 +8,11 @@
   $ dune build @check
 
   $ printf "(4:File%d:%s)" ${#FILE} $FILE | dune ocaml-merlin | sed -E "s/[[:digit:]]+:/\?:/g"
-  ((?:INDEX?:$TESTCASE_ROOT/_build/default/.not-a-module-name.eobjs/cctx.ocaml-index)(?:INDEX?:$TESTCASE_ROOT/_build/default/.main.eobjs/cctx.ocaml-index)(?:INDEX?:$TESTCASE_ROOT/_build/default/.mylib3.objs/cctx.ocaml-index)(?:INDEX?:$TESTCASE_ROOT/_build/default/.mylib.objs/cctx.ocaml-index)(?:STDLIB?:/OCAMLC_WHERE)(?:SOURCE_ROOT?:$TESTCASE_ROOT)(?:EXCLUDE_QUERY_DIR)(?:B?:$TESTCASE_ROOT/_build/default/.main.eobjs/byte)(?:B?:$TESTCASE_ROOT/_build/default/.mylib.objs/byte)(?:B?:$TESTCASE_ROOT/_build/default/.mylib3.objs/byte)(?:S?:$TESTCASE_ROOT)(?:FLG(?:-open?:Dune__exe))(?:FLG(?:-w?:@1..3@5..28@30..39@43@46..47@49..57@61..62-?:-strict-sequence?:-strict-formats?:-short-paths?:-keep-locs?:-g))(?:UNIT_NAME?:dune__exe__Main))
+  ((?:INDEX?:$TESTCASE_ROOT/_build/default/.not-a-module-name.eobjs/cctx.ocaml-index)(?:INDEX?:$TESTCASE_ROOT/_build/default/.main.eobjs/cctx.ocaml-index)(?:INDEX?:$TESTCASE_ROOT/_build/default/.mylib3.objs/cctx.ocaml-index)(?:INDEX?:$TESTCASE_ROOT/_build/default/.mylib.objs/cctx.ocaml-index)(?:STDLIB?:/OCAMLC_WHERE)(?:SOURCE_ROOT?:$TESTCASE_ROOT)(?:EXCLUDE_QUERY_DIR)(?:B?:$TESTCASE_ROOT/_build/default/.main.eobjs/byte)(?:B?:$TESTCASE_ROOT/_build/default/.mylib.objs/byte)(?:B?:$TESTCASE_ROOT/_build/default/.mylib3.objs/byte)(?:S?:$TESTCASE_ROOT)(?:FLG(?:-w?:@1..3@5..28@30..39@43@46..47@49..57@61..62-?:-strict-sequence?:-strict-formats?:-short-paths?:-keep-locs?:-g))(?:FLG(?:-open?:Dune__exe))(?:UNIT_NAME?:dune__exe__Main))
 
   $ FILE=$PWD/lib3.ml
   $ printf "(4:File%d:%s)" ${#FILE} $FILE | dune ocaml-merlin | sed -E "s/[[:digit:]]+:/\?:/g"
-  ((?:INDEX?:$TESTCASE_ROOT/_build/default/.not-a-module-name.eobjs/cctx.ocaml-index)(?:INDEX?:$TESTCASE_ROOT/_build/default/.main.eobjs/cctx.ocaml-index)(?:INDEX?:$TESTCASE_ROOT/_build/default/.mylib3.objs/cctx.ocaml-index)(?:INDEX?:$TESTCASE_ROOT/_build/default/.mylib.objs/cctx.ocaml-index)(?:STDLIB?:/OCAMLC_WHERE)(?:SOURCE_ROOT?:$TESTCASE_ROOT)(?:EXCLUDE_QUERY_DIR)(?:B?:$TESTCASE_ROOT/_build/default/.mylib.objs/byte)(?:B?:$TESTCASE_ROOT/_build/default/.mylib3.objs/byte)(?:S?:$TESTCASE_ROOT)(?:FLG(?:-open?:Mylib3))(?:FLG(?:-w?:@1..3@5..28@30..39@43@46..47@49..57@61..62-?:-strict-sequence?:-strict-formats?:-short-paths?:-keep-locs?:-g))(?:UNIT_NAME?:mylib3__Lib3))
+  ((?:INDEX?:$TESTCASE_ROOT/_build/default/.not-a-module-name.eobjs/cctx.ocaml-index)(?:INDEX?:$TESTCASE_ROOT/_build/default/.main.eobjs/cctx.ocaml-index)(?:INDEX?:$TESTCASE_ROOT/_build/default/.mylib3.objs/cctx.ocaml-index)(?:INDEX?:$TESTCASE_ROOT/_build/default/.mylib.objs/cctx.ocaml-index)(?:STDLIB?:/OCAMLC_WHERE)(?:SOURCE_ROOT?:$TESTCASE_ROOT)(?:EXCLUDE_QUERY_DIR)(?:B?:$TESTCASE_ROOT/_build/default/.mylib.objs/byte)(?:B?:$TESTCASE_ROOT/_build/default/.mylib3.objs/byte)(?:S?:$TESTCASE_ROOT)(?:FLG(?:-w?:@1..3@5..28@30..39@43@46..47@49..57@61..62-?:-strict-sequence?:-strict-formats?:-short-paths?:-keep-locs?:-g))(?:FLG(?:-open?:Mylib3))(?:UNIT_NAME?:mylib3__Lib3))
 
 If a file has a name of the kind `module_name.xx.xxx.ml/i`
 we consider it as ``module_name.ml/i`
@@ -20,13 +20,13 @@ This can be useful when some build scripts perform custom
 preprocessing and copy files around.
   $ FILE=lib3.foobar.ml
   $ printf "(4:File%d:%s)" ${#FILE} $FILE | dune ocaml-merlin | sed -E "s/[[:digit:]]+:/\?:/g"
-  ((?:INDEX?:$TESTCASE_ROOT/_build/default/.not-a-module-name.eobjs/cctx.ocaml-index)(?:INDEX?:$TESTCASE_ROOT/_build/default/.main.eobjs/cctx.ocaml-index)(?:INDEX?:$TESTCASE_ROOT/_build/default/.mylib3.objs/cctx.ocaml-index)(?:INDEX?:$TESTCASE_ROOT/_build/default/.mylib.objs/cctx.ocaml-index)(?:STDLIB?:/OCAMLC_WHERE)(?:SOURCE_ROOT?:$TESTCASE_ROOT)(?:EXCLUDE_QUERY_DIR)(?:B?:$TESTCASE_ROOT/_build/default/.mylib.objs/byte)(?:B?:$TESTCASE_ROOT/_build/default/.mylib3.objs/byte)(?:S?:$TESTCASE_ROOT)(?:FLG(?:-open?:Mylib3))(?:FLG(?:-w?:@1..3@5..28@30..39@43@46..47@49..57@61..62-?:-strict-sequence?:-strict-formats?:-short-paths?:-keep-locs?:-g))(?:UNIT_NAME?:mylib3__Lib3))
+  ((?:INDEX?:$TESTCASE_ROOT/_build/default/.not-a-module-name.eobjs/cctx.ocaml-index)(?:INDEX?:$TESTCASE_ROOT/_build/default/.main.eobjs/cctx.ocaml-index)(?:INDEX?:$TESTCASE_ROOT/_build/default/.mylib3.objs/cctx.ocaml-index)(?:INDEX?:$TESTCASE_ROOT/_build/default/.mylib.objs/cctx.ocaml-index)(?:STDLIB?:/OCAMLC_WHERE)(?:SOURCE_ROOT?:$TESTCASE_ROOT)(?:EXCLUDE_QUERY_DIR)(?:B?:$TESTCASE_ROOT/_build/default/.mylib.objs/byte)(?:B?:$TESTCASE_ROOT/_build/default/.mylib3.objs/byte)(?:S?:$TESTCASE_ROOT)(?:FLG(?:-w?:@1..3@5..28@30..39@43@46..47@49..57@61..62-?:-strict-sequence?:-strict-formats?:-short-paths?:-keep-locs?:-g))(?:FLG(?:-open?:Mylib3))(?:UNIT_NAME?:mylib3__Lib3))
 
 If a directory has no configuration the configuration of its parent is used
 This can be useful when some build scripts copy files from subdirectories.
   $ FILE=foobar/lib3.foobar.ml
   $ printf "(4:File%d:%s)" ${#FILE} $FILE | dune ocaml-merlin | sed -E "s/[[:digit:]]+:/\?:/g"
-  ((?:INDEX?:$TESTCASE_ROOT/_build/default/.not-a-module-name.eobjs/cctx.ocaml-index)(?:INDEX?:$TESTCASE_ROOT/_build/default/.main.eobjs/cctx.ocaml-index)(?:INDEX?:$TESTCASE_ROOT/_build/default/.mylib3.objs/cctx.ocaml-index)(?:INDEX?:$TESTCASE_ROOT/_build/default/.mylib.objs/cctx.ocaml-index)(?:STDLIB?:/OCAMLC_WHERE)(?:SOURCE_ROOT?:$TESTCASE_ROOT)(?:EXCLUDE_QUERY_DIR)(?:B?:$TESTCASE_ROOT/_build/default/.mylib.objs/byte)(?:B?:$TESTCASE_ROOT/_build/default/.mylib3.objs/byte)(?:S?:$TESTCASE_ROOT)(?:FLG(?:-open?:Mylib3))(?:FLG(?:-w?:@1..3@5..28@30..39@43@46..47@49..57@61..62-?:-strict-sequence?:-strict-formats?:-short-paths?:-keep-locs?:-g))(?:UNIT_NAME?:mylib3__Lib3))
+  ((?:INDEX?:$TESTCASE_ROOT/_build/default/.not-a-module-name.eobjs/cctx.ocaml-index)(?:INDEX?:$TESTCASE_ROOT/_build/default/.main.eobjs/cctx.ocaml-index)(?:INDEX?:$TESTCASE_ROOT/_build/default/.mylib3.objs/cctx.ocaml-index)(?:INDEX?:$TESTCASE_ROOT/_build/default/.mylib.objs/cctx.ocaml-index)(?:STDLIB?:/OCAMLC_WHERE)(?:SOURCE_ROOT?:$TESTCASE_ROOT)(?:EXCLUDE_QUERY_DIR)(?:B?:$TESTCASE_ROOT/_build/default/.mylib.objs/byte)(?:B?:$TESTCASE_ROOT/_build/default/.mylib3.objs/byte)(?:S?:$TESTCASE_ROOT)(?:FLG(?:-w?:@1..3@5..28@30..39@43@46..47@49..57@61..62-?:-strict-sequence?:-strict-formats?:-short-paths?:-keep-locs?:-g))(?:FLG(?:-open?:Mylib3))(?:UNIT_NAME?:mylib3__Lib3))
 
 Test of an valid invalid module name
   $ FILE=not-a-module-name.ml
@@ -36,8 +36,8 @@ Test of an valid invalid module name
 Dune should also provide configuration when the file is in the build folder
   $ FILE=$PWD/_build/default/lib3.ml
   $ printf "(4:File%d:%s)" ${#FILE} $FILE | dune ocaml-merlin | sed -E "s/[[:digit:]]+:/\?:/g"
-  ((?:INDEX?:$TESTCASE_ROOT/_build/default/.not-a-module-name.eobjs/cctx.ocaml-index)(?:INDEX?:$TESTCASE_ROOT/_build/default/.main.eobjs/cctx.ocaml-index)(?:INDEX?:$TESTCASE_ROOT/_build/default/.mylib3.objs/cctx.ocaml-index)(?:INDEX?:$TESTCASE_ROOT/_build/default/.mylib.objs/cctx.ocaml-index)(?:STDLIB?:/OCAMLC_WHERE)(?:SOURCE_ROOT?:$TESTCASE_ROOT)(?:EXCLUDE_QUERY_DIR)(?:B?:$TESTCASE_ROOT/_build/default/.mylib.objs/byte)(?:B?:$TESTCASE_ROOT/_build/default/.mylib3.objs/byte)(?:S?:$TESTCASE_ROOT)(?:FLG(?:-open?:Mylib3))(?:FLG(?:-w?:@1..3@5..28@30..39@43@46..47@49..57@61..62-?:-strict-sequence?:-strict-formats?:-short-paths?:-keep-locs?:-g))(?:UNIT_NAME?:mylib3__Lib3))
+  ((?:INDEX?:$TESTCASE_ROOT/_build/default/.not-a-module-name.eobjs/cctx.ocaml-index)(?:INDEX?:$TESTCASE_ROOT/_build/default/.main.eobjs/cctx.ocaml-index)(?:INDEX?:$TESTCASE_ROOT/_build/default/.mylib3.objs/cctx.ocaml-index)(?:INDEX?:$TESTCASE_ROOT/_build/default/.mylib.objs/cctx.ocaml-index)(?:STDLIB?:/OCAMLC_WHERE)(?:SOURCE_ROOT?:$TESTCASE_ROOT)(?:EXCLUDE_QUERY_DIR)(?:B?:$TESTCASE_ROOT/_build/default/.mylib.objs/byte)(?:B?:$TESTCASE_ROOT/_build/default/.mylib3.objs/byte)(?:S?:$TESTCASE_ROOT)(?:FLG(?:-w?:@1..3@5..28@30..39@43@46..47@49..57@61..62-?:-strict-sequence?:-strict-formats?:-short-paths?:-keep-locs?:-g))(?:FLG(?:-open?:Mylib3))(?:UNIT_NAME?:mylib3__Lib3))
 
   $ FILE=_build/default/lib3.ml
   $ printf "(4:File%d:%s)" ${#FILE} $FILE | dune ocaml-merlin | sed -E "s/[[:digit:]]+:/\?:/g"
-  ((?:INDEX?:$TESTCASE_ROOT/_build/default/.not-a-module-name.eobjs/cctx.ocaml-index)(?:INDEX?:$TESTCASE_ROOT/_build/default/.main.eobjs/cctx.ocaml-index)(?:INDEX?:$TESTCASE_ROOT/_build/default/.mylib3.objs/cctx.ocaml-index)(?:INDEX?:$TESTCASE_ROOT/_build/default/.mylib.objs/cctx.ocaml-index)(?:STDLIB?:/OCAMLC_WHERE)(?:SOURCE_ROOT?:$TESTCASE_ROOT)(?:EXCLUDE_QUERY_DIR)(?:B?:$TESTCASE_ROOT/_build/default/.mylib.objs/byte)(?:B?:$TESTCASE_ROOT/_build/default/.mylib3.objs/byte)(?:S?:$TESTCASE_ROOT)(?:FLG(?:-open?:Mylib3))(?:FLG(?:-w?:@1..3@5..28@30..39@43@46..47@49..57@61..62-?:-strict-sequence?:-strict-formats?:-short-paths?:-keep-locs?:-g))(?:UNIT_NAME?:mylib3__Lib3))
+  ((?:INDEX?:$TESTCASE_ROOT/_build/default/.not-a-module-name.eobjs/cctx.ocaml-index)(?:INDEX?:$TESTCASE_ROOT/_build/default/.main.eobjs/cctx.ocaml-index)(?:INDEX?:$TESTCASE_ROOT/_build/default/.mylib3.objs/cctx.ocaml-index)(?:INDEX?:$TESTCASE_ROOT/_build/default/.mylib.objs/cctx.ocaml-index)(?:STDLIB?:/OCAMLC_WHERE)(?:SOURCE_ROOT?:$TESTCASE_ROOT)(?:EXCLUDE_QUERY_DIR)(?:B?:$TESTCASE_ROOT/_build/default/.mylib.objs/byte)(?:B?:$TESTCASE_ROOT/_build/default/.mylib3.objs/byte)(?:S?:$TESTCASE_ROOT)(?:FLG(?:-w?:@1..3@5..28@30..39@43@46..47@49..57@61..62-?:-strict-sequence?:-strict-formats?:-short-paths?:-keep-locs?:-g))(?:FLG(?:-open?:Mylib3))(?:UNIT_NAME?:mylib3__Lib3))
diff --git a/test/blackbox-tests/test-cases/merlin/unit-names-merlin-gh1233.t/run.t b/test/blackbox-tests/test-cases/merlin/unit-names-merlin-gh1233.t/run.t
index 9ddcc8b2b3a..84b34888de3 100644
--- a/test/blackbox-tests/test-cases/merlin/unit-names-merlin-gh1233.t/run.t
+++ b/test/blackbox-tests/test-cases/merlin/unit-names-merlin-gh1233.t/run.t
@@ -39,8 +39,8 @@
    (EXCLUDE_QUERY_DIR)
    (B $TESTCASE_ROOT/_build/default/foo/.foo.objs/byte)
    (S $TESTCASE_ROOT/foo)
-   (FLG (-open Foo))
    (FLG (-w @1..3@5..28@30..39@43@46..47@49..57@61..62-40 -strict-sequence -strict-formats -short-paths -keep-locs -g))
+   (FLG (-open Foo))
    (UNIT_NAME foo__Bar))
   Bar: _build/default/foo/bar.ml
   ((INDEX $TESTCASE_ROOT/_build/default/.foo.eobjs/cctx.ocaml-index)
@@ -50,8 +50,8 @@
    (EXCLUDE_QUERY_DIR)
    (B $TESTCASE_ROOT/_build/default/foo/.foo.objs/byte)
    (S $TESTCASE_ROOT/foo)
-   (FLG (-open Foo))
    (FLG (-w @1..3@5..28@30..39@43@46..47@49..57@61..62-40 -strict-sequence -strict-formats -short-paths -keep-locs -g))
+   (FLG (-open Foo))
    (UNIT_NAME foo__Bar))
   Foo: _build/default/foo/foo
   ((INDEX $TESTCASE_ROOT/_build/default/.foo.eobjs/cctx.ocaml-index)