diff --git a/test/blackbox-tests/test-cases/stdlib/stdlib-compilation-unwrapped.t b/test/blackbox-tests/test-cases/stdlib/stdlib-compilation-unwrapped.t
deleted file mode 100644
index 310b628039b..00000000000
--- a/test/blackbox-tests/test-cases/stdlib/stdlib-compilation-unwrapped.t
+++ /dev/null
@@ -1,50 +0,0 @@
-Compile a library with `(stdlib ..)` and `(wrapped false)`
-
-  $ cat > dune-project <<EOF
-  > (lang dune 3.7)
-  > (using experimental_building_ocaml_compiler_with_dune 0.1)
-  > EOF
-
-  $ mkdir stdlib
-  $ cat > stdlib/dune <<EOF
-  > (library
-  >  (name mystdlib)
-  >  (wrapped false)
-  >  (stdlib
-  >   (internal_modules Camlinternal*)))
-  > EOF
-  $ cat > stdlib/other.ml <<EOF
-  > let other () = Mystdlib.defined_in_stdlib
-  > EOF
-  $ cat > stdlib/one_module.ml <<EOF
-  > let foo = "foo"
-  > EOF
-  $ cat > stdlib/mystdlib.ml <<EOF
-  > let defined_in_stdlib = "defined"
-  > module One_module = One_module
-  > module Other = Other
-  > EOF
-
-  $ dune build --display=short
-      ocamldep stdlib/.mystdlib.objs/mystdlib.impl.d
-      ocamldep stdlib/.mystdlib.objs/one_module.impl.d
-      ocamldep stdlib/.mystdlib.objs/other.impl.d
-        ocamlc stdlib/.mystdlib.objs/byte/mystdlib.{cmi,cmo,cmt}
-      ocamlopt stdlib/.mystdlib.objs/native/mystdlib.{cmx,o}
-        ocamlc stdlib/.mystdlib.objs/byte/one_module.{cmi,cmo,cmt}
-        ocamlc stdlib/.mystdlib.objs/byte/other.{cmi,cmo,cmt}
-      ocamlopt stdlib/.mystdlib.objs/native/one_module.{cmx,o}
-      ocamlopt stdlib/.mystdlib.objs/native/other.{cmx,o}
-        ocamlc stdlib/mystdlib.cma
-      ocamlopt stdlib/mystdlib.{a,cmxa}
-      ocamlopt stdlib/mystdlib.cmxs
-
-modules are unwrapped
-
-  $ ls _build/default/stdlib/.mystdlib.objs/native
-  mystdlib.cmx
-  mystdlib.o
-  one_module.cmx
-  one_module.o
-  other.cmx
-  other.o
diff --git a/test/blackbox-tests/test-cases/stdlib/stdlib-compilation-wrapped.t b/test/blackbox-tests/test-cases/stdlib/stdlib-compilation-wrapped.t
deleted file mode 100644
index 3fdf0a59b8b..00000000000
--- a/test/blackbox-tests/test-cases/stdlib/stdlib-compilation-wrapped.t
+++ /dev/null
@@ -1,39 +0,0 @@
-Compile a library with `(stdlib ..)` and `(wrapped true)`
-
-  $ cat > dune-project <<EOF
-  > (lang dune 3.7)
-  > (using experimental_building_ocaml_compiler_with_dune 0.1)
-  > EOF
-
-  $ mkdir stdlib
-  $ cat > stdlib/dune <<EOF
-  > (library
-  >  (name mystdlib)
-  >  (stdlib
-  >   (internal_modules Camlinternal*)))
-  > EOF
-  $ cat > stdlib/other.ml <<EOF
-  > let other () = Mystdlib.defined_in_stdlib
-  > EOF
-  $ cat > stdlib/one_module.ml <<EOF
-  > let foo = "foo"
-  > EOF
-  $ cat > stdlib/mystdlib.ml <<EOF
-  > let defined_in_stdlib = "defined"
-  > module One_module = One_module
-  > module Other = Other
-  > EOF
-
-  $ dune build --display=short
-      ocamldep stdlib/.mystdlib.objs/mystdlib.impl.d
-      ocamldep stdlib/.mystdlib.objs/mystdlib__One_module.impl.d
-      ocamldep stdlib/.mystdlib.objs/mystdlib__Other.impl.d
-        ocamlc stdlib/.mystdlib.objs/byte/mystdlib.{cmi,cmo,cmt}
-      ocamlopt stdlib/.mystdlib.objs/native/mystdlib.{cmx,o}
-        ocamlc stdlib/.mystdlib.objs/byte/mystdlib__One_module.{cmi,cmo,cmt}
-        ocamlc stdlib/.mystdlib.objs/byte/mystdlib__Other.{cmi,cmo,cmt}
-      ocamlopt stdlib/.mystdlib.objs/native/mystdlib__One_module.{cmx,o}
-      ocamlopt stdlib/.mystdlib.objs/native/mystdlib__Other.{cmx,o}
-        ocamlc stdlib/mystdlib.cma
-      ocamlopt stdlib/mystdlib.{a,cmxa}
-      ocamlopt stdlib/mystdlib.cmxs
diff --git a/test/blackbox-tests/test-cases/stdlib/stdlib-compilation-wrapping.t b/test/blackbox-tests/test-cases/stdlib/stdlib-compilation-wrapping.t
new file mode 100644
index 00000000000..aa255832112
--- /dev/null
+++ b/test/blackbox-tests/test-cases/stdlib/stdlib-compilation-wrapping.t
@@ -0,0 +1,45 @@
+Compile a library with `(stdlib ..)` and wrapped settings
+
+  $ cat > dune-project <<EOF
+  > (lang dune 3.7)
+  > (using experimental_building_ocaml_compiler_with_dune 0.1)
+  > EOF
+
+  $ mkdir stdlib
+  $ runtest() {
+  > cat >stdlib/dune <<EOF
+  > (library
+  >  (name mystdlib)
+  >  (wrapped $1)
+  >  (stdlib
+  >   (internal_modules Camlinternal*)))
+  > EOF
+  > dune build
+  > find _build/default/stdlib -iname '*.cmi' | sort;
+  > }
+
+  $ cat > stdlib/other.ml <<EOF
+  > let other () = Mystdlib.defined_in_stdlib
+  > EOF
+  $ cat > stdlib/one_module.ml <<EOF
+  > let foo = "foo"
+  > EOF
+  $ cat > stdlib/mystdlib.ml <<EOF
+  > let defined_in_stdlib = "defined"
+  > module One_module = One_module
+  > module Other = Other
+  > EOF
+
+First we test wrapped:
+
+  $ runtest "true"
+  _build/default/stdlib/.mystdlib.objs/byte/mystdlib.cmi
+  _build/default/stdlib/.mystdlib.objs/byte/mystdlib__One_module.cmi
+  _build/default/stdlib/.mystdlib.objs/byte/mystdlib__Other.cmi
+
+And now unwrapped:
+
+  $ runtest "false"
+  _build/default/stdlib/.mystdlib.objs/byte/mystdlib.cmi
+  _build/default/stdlib/.mystdlib.objs/byte/one_module.cmi
+  _build/default/stdlib/.mystdlib.objs/byte/other.cmi