diff --git a/src/lib_lwt_result_stdlib/bare/functor_outputs/dune b/src/lib_lwt_result_stdlib/bare/functor_outputs/dune
index db6a4a757d8ad57ee2835d024c3c4124581e3bb2..0e12401519a080f6237562b54e2c1a943f54ac1b 100644
--- a/src/lib_lwt_result_stdlib/bare/functor_outputs/dune
+++ b/src/lib_lwt_result_stdlib/bare/functor_outputs/dune
@@ -1,5 +1,5 @@
 (library
  (name bare_functor_outputs)
- (instrumentation (backend bisect_ppx))
  (public_name tezos-lwt-result-stdlib.bare.functor-outputs)
+ (instrumentation (backend bisect_ppx))
  (libraries lwt))
diff --git a/src/lib_lwt_result_stdlib/bare/sigs/dune b/src/lib_lwt_result_stdlib/bare/sigs/dune
index 99df3bc34fff31c3715648f1597502b37c505097..139807a3990b4ccba23d94185640ace7af2037f0 100644
--- a/src/lib_lwt_result_stdlib/bare/sigs/dune
+++ b/src/lib_lwt_result_stdlib/bare/sigs/dune
@@ -1,5 +1,5 @@
 (library
  (name bare_sigs)
- (instrumentation (backend bisect_ppx))
  (public_name tezos-lwt-result-stdlib.bare.sigs)
+ (instrumentation (backend bisect_ppx))
  (libraries lwt tezos-lwt-result-stdlib.bare.functor-outputs))
diff --git a/src/lib_lwt_result_stdlib/bare/structs/dune b/src/lib_lwt_result_stdlib/bare/structs/dune
index d578145a0bd6cd521f6aac568c706661153323c2..2d35c87f8a001ca82a26847ecc5b4202e563bf39 100644
--- a/src/lib_lwt_result_stdlib/bare/structs/dune
+++ b/src/lib_lwt_result_stdlib/bare/structs/dune
@@ -1,5 +1,5 @@
 (library
  (name bare_structs)
- (instrumentation (backend bisect_ppx))
  (public_name tezos-lwt-result-stdlib.bare.structs)
+ (instrumentation (backend bisect_ppx))
  (libraries lwt tezos-lwt-result-stdlib.bare.sigs))
diff --git a/src/lib_lwt_result_stdlib/dune b/src/lib_lwt_result_stdlib/dune
index 796e1e342256308572257cda05b1128a80a5ea79..23a44ba2120776750bd11e77292ea86b1df21aab 100644
--- a/src/lib_lwt_result_stdlib/dune
+++ b/src/lib_lwt_result_stdlib/dune
@@ -1,10 +1,10 @@
 (library
  (name tezos_lwt_result_stdlib)
- (instrumentation (backend bisect_ppx))
  (public_name tezos-lwt-result-stdlib)
- (libraries lwt
-            tezos-lwt-result-stdlib.bare.sigs
-            tezos-lwt-result-stdlib.bare.structs
-            tezos-lwt-result-stdlib.traced.sigs
-            tezos-lwt-result-stdlib.traced.structs
-            ))
+ (instrumentation (backend bisect_ppx))
+ (libraries
+  lwt
+  tezos-lwt-result-stdlib.bare.sigs
+  tezos-lwt-result-stdlib.bare.structs
+  tezos-lwt-result-stdlib.traced.sigs
+  tezos-lwt-result-stdlib.traced.structs))
diff --git a/src/lib_lwt_result_stdlib/examples/traces/dune b/src/lib_lwt_result_stdlib/examples/traces/dune
index 272ea2ae694da5e6a265705b1b263ea8e750d04f..fbe3af13a600571647e45a91b5cc19af43f72602 100644
--- a/src/lib_lwt_result_stdlib/examples/traces/dune
+++ b/src/lib_lwt_result_stdlib/examples/traces/dune
@@ -1,5 +1,8 @@
 (library
  (name traces)
- (instrumentation (backend bisect_ppx))
  (public_name tezos-lwt-result-stdlib.examples.traces)
- (libraries lwt tezos-lwt-result-stdlib.bare.structs tezos-lwt-result-stdlib.traced.sigs))
+ (instrumentation (backend bisect_ppx))
+ (libraries
+  lwt
+  tezos-lwt-result-stdlib.bare.structs
+  tezos-lwt-result-stdlib.traced.sigs))
diff --git a/src/lib_lwt_result_stdlib/test/dune b/src/lib_lwt_result_stdlib/test/dune
index 3e6cd5719dc229078022bab5d1aff922aa48be4d..f7f62179b3ff23e20c924af9806ec2b334f55a63 100644
--- a/src/lib_lwt_result_stdlib/test/dune
+++ b/src/lib_lwt_result_stdlib/test/dune
@@ -8,15 +8,13 @@
   test_fuzzing_list
   test_fuzzing_set
   test_fuzzing_seq_tiered
-  test_fuzzing_option
- )
- (libraries
-            tezos-lwt-result-stdlib
-            tezos-lwt-result-stdlib.examples.traces
-            lwt.unix
-            alcotest-lwt
-            qcheck-alcotest
-            tezos-test-helpers)
- (flags (:standard -open Tezos_lwt_result_stdlib))
+  test_fuzzing_option)
  (package tezos-lwt-result-stdlib)
-)
+ (libraries
+  tezos-lwt-result-stdlib
+  tezos-lwt-result-stdlib.examples.traces
+  lwt.unix
+  alcotest-lwt
+  qcheck-alcotest
+  tezos-test-helpers)
+ (flags (:standard -open Tezos_lwt_result_stdlib)))
diff --git a/src/lib_lwt_result_stdlib/tezos-lwt-result-stdlib.opam b/src/lib_lwt_result_stdlib/tezos-lwt-result-stdlib.opam
index 68b6649b7b10fa50dc5c29a91cfa381489ce1ec1..0a47b6cd95887fa7e59a6bbb30031a38a4d4c8e3 100644
--- a/src/lib_lwt_result_stdlib/tezos-lwt-result-stdlib.opam
+++ b/src/lib_lwt_result_stdlib/tezos-lwt-result-stdlib.opam
@@ -1,6 +1,6 @@
 opam-version: "2.0"
 maintainer: "contact@tezos.com"
-authors: [ "Tezos devteam" ]
+authors: ["Tezos devteam"]
 homepage: "https://www.tezos.com/"
 bug-reports: "https://gitlab.com/tezos/tezos/issues"
 dev-repo: "git+https://gitlab.com/tezos/tezos.git"
@@ -8,10 +8,10 @@ license: "MIT"
 depends: [
   "dune" { >= "2.0" }
   "ocaml" { >= "4.07" }
-  "lwt"
+  "lwt" { >= "5.4.0" }
   "alcotest-lwt" { with-test & >= "1.1.0" }
-  "tezos-test-helpers" { with-test }
-  "qcheck-alcotest" { with-test }
+  "qcheck-alcotest" {with-test}
+  "tezos-test-helpers" {with-test}
 ]
 build: [
   ["dune" "build" "-p" name "-j" jobs]
diff --git a/src/lib_lwt_result_stdlib/traced/functor_outputs/dune b/src/lib_lwt_result_stdlib/traced/functor_outputs/dune
index 16f8936020a9623313384633002b8c4f898961ea..299595942cd2a46de410191ed647bb05df6af34f 100644
--- a/src/lib_lwt_result_stdlib/traced/functor_outputs/dune
+++ b/src/lib_lwt_result_stdlib/traced/functor_outputs/dune
@@ -1,5 +1,5 @@
 (library
  (name traced_functor_outputs)
- (instrumentation (backend bisect_ppx))
  (public_name tezos-lwt-result-stdlib.traced.functor-outputs)
+ (instrumentation (backend bisect_ppx))
  (libraries lwt tezos-lwt-result-stdlib.bare.sigs))
diff --git a/src/lib_lwt_result_stdlib/traced/sigs/dune b/src/lib_lwt_result_stdlib/traced/sigs/dune
index 9d4d97ea3ce628e84fd1c10abb7685977b8ff3a7..08906321317bdaf134aabcc01bdd6a574d994b16 100644
--- a/src/lib_lwt_result_stdlib/traced/sigs/dune
+++ b/src/lib_lwt_result_stdlib/traced/sigs/dune
@@ -1,11 +1,9 @@
 (library
  (name traced_sigs)
- (instrumentation (backend bisect_ppx))
  (public_name tezos-lwt-result-stdlib.traced.sigs)
+ (instrumentation (backend bisect_ppx))
  (libraries
-   lwt
-   tezos-lwt-result-stdlib.bare.sigs
-   tezos-lwt-result-stdlib.bare.structs
-   tezos-lwt-result-stdlib.traced.functor-outputs
- )
-)
+  lwt
+  tezos-lwt-result-stdlib.bare.sigs
+  tezos-lwt-result-stdlib.bare.structs
+  tezos-lwt-result-stdlib.traced.functor-outputs))
diff --git a/src/lib_lwt_result_stdlib/traced/structs/dune b/src/lib_lwt_result_stdlib/traced/structs/dune
index be37b5116c6ce8f463db673e02da605f473d6248..cdae7fcf38cc2cae2fe07ef6a286a0441aab7f96 100644
--- a/src/lib_lwt_result_stdlib/traced/structs/dune
+++ b/src/lib_lwt_result_stdlib/traced/structs/dune
@@ -1,9 +1,8 @@
 (library
  (name traced_structs)
- (instrumentation (backend bisect_ppx))
  (public_name tezos-lwt-result-stdlib.traced.structs)
+ (instrumentation (backend bisect_ppx))
  (libraries
-   lwt
-   tezos-lwt-result-stdlib.traced.sigs
-   tezos-lwt-result-stdlib.bare.structs
- ))
+  lwt
+  tezos-lwt-result-stdlib.traced.sigs
+  tezos-lwt-result-stdlib.bare.structs))
diff --git a/src/lib_stdlib/dune b/src/lib_stdlib/dune
index 861061fb236046b14335801da53359196731eed3..cdeeff0b81e41c5d9256bda0d5c033d8f48e10e5 100644
--- a/src/lib_stdlib/dune
+++ b/src/lib_stdlib/dune
@@ -1,9 +1,7 @@
 (library
  (name tezos_stdlib)
- (instrumentation (backend bisect_ppx))
  (public_name tezos-stdlib)
- (libraries hex
-            zarith
-            lwt)
+ (instrumentation (backend bisect_ppx))
+ (libraries hex zarith lwt)
  (inline_tests)
  (preprocess (pps ppx_inline_test)))
diff --git a/src/lib_stdlib/test/dune b/src/lib_stdlib/test/dune
index 0b88c6ba19ca8f47dd7324d654a0fc0da61eb754..4a5f1f1cd30d53c66ae7cf1723cad444a057a8f6 100644
--- a/src/lib_stdlib/test/dune
+++ b/src/lib_stdlib/test/dune
@@ -1,21 +1,23 @@
 (tests
- (names test_bits
-        test_tzList
-        test_bounded_heap
-        test_tzString
-        test_arrays
-        test_fallbackArray
-        test_functionalArray
-        test_lwt_pipe
-        test_circular_buffer
-        test_circular_buffer_fuzzy)
- (libraries tezos-stdlib
-            alcotest
-            alcotest-lwt
-            lwt_log
-            bigstring
-            lwt.unix
-            tezos-test-helpers
-            qcheck-alcotest)
+ (names
+  test_bits
+  test_tzList
+  test_bounded_heap
+  test_tzString
+  test_arrays
+  test_fallbackArray
+  test_functionalArray
+  test_lwt_pipe
+  test_circular_buffer
+  test_circular_buffer_fuzzy)
  (package tezos-stdlib)
+ (libraries
+  tezos-stdlib
+  alcotest
+  alcotest-lwt
+  lwt_log
+  bigstring
+  lwt.unix
+  tezos-test-helpers
+  qcheck-alcotest)
  (flags (:standard -open Tezos_stdlib)))
diff --git a/src/lib_stdlib/tezos-stdlib.opam b/src/lib_stdlib/tezos-stdlib.opam
index d53c7369b2b4419e8a604b6d15fde22371b5712f..5a6df2ab117352eb58c2a66d87ba33007e5a11fb 100644
--- a/src/lib_stdlib/tezos-stdlib.opam
+++ b/src/lib_stdlib/tezos-stdlib.opam
@@ -1,22 +1,22 @@
 opam-version: "2.0"
 maintainer: "contact@tezos.com"
-authors: [ "Tezos devteam" ]
+authors: ["Tezos devteam"]
 homepage: "https://www.tezos.com/"
 bug-reports: "https://gitlab.com/tezos/tezos/issues"
 dev-repo: "git+https://gitlab.com/tezos/tezos.git"
 license: "MIT"
 depends: [
   "dune" { >= "2.0" }
+  "ppx_inline_test" {with-test}
   "hex"
-  "lwt" { >= "4.0.0" }
-  "zarith"
-  "ppx_inline_test"
-  "bigstring" { with-test }
-  "lwt_log" { with-test }
+  "zarith" { < "1.12" }
+  "lwt" { >= "5.4.0" }
   "alcotest" { with-test & >= "1.1.0" }
   "alcotest-lwt" { with-test & >= "1.1.0" }
-  "tezos-test-helpers" { with-test }
-  "qcheck-alcotest" { with-test }
+  "lwt_log" {with-test}
+  "bigstring" {with-test}
+  "tezos-test-helpers" {with-test}
+  "qcheck-alcotest" {with-test}
 ]
 build: [
   ["dune" "build" "-p" name "-j" jobs]
diff --git a/src/lib_test/dune b/src/lib_test/dune
index ea50db92d6c6ac5cc297aef181ad2e58b6c10014..8bd3b1771e00f8df3e9c7607acffd42c515a2863 100644
--- a/src/lib_test/dune
+++ b/src/lib_test/dune
@@ -1,7 +1,6 @@
 (library
  (name lib_test)
- (instrumentation (backend bisect_ppx))
  (public_name tezos-test-helpers)
+ (instrumentation (backend bisect_ppx))
  (libraries uri qcheck-alcotest alcotest alcotest-lwt)
- (flags
-  (:standard -linkall)))
+ (flags (:standard -linkall)))
diff --git a/src/lib_test/tezos-test-helpers.opam b/src/lib_test/tezos-test-helpers.opam
index 1dd15f0fcbae9638948757e3e57682543396e0ce..b02e9dba1205b86667659d6c556b7646e6fa2627 100644
--- a/src/lib_test/tezos-test-helpers.opam
+++ b/src/lib_test/tezos-test-helpers.opam
@@ -1,19 +1,19 @@
 opam-version: "2.0"
 maintainer: "contact@tezos.com"
-authors: [ "Tezos devteam" ]
+authors: ["Tezos devteam"]
 homepage: "https://www.tezos.com/"
 bug-reports: "https://gitlab.com/tezos/tezos/issues"
 dev-repo: "git+https://gitlab.com/tezos/tezos.git"
 license: "MIT"
 depends: [
   "dune" { >= "2.0" }
-  "qcheck-alcotest"
   "uri"
-  "alcotest"
-  "alcotest-lwt"
+  "qcheck-alcotest"
+  "alcotest" { >= "1.1.0" }
+  "alcotest-lwt" { >= "1.1.0" }
 ]
 build: [
   ["dune" "build" "-p" name "-j" jobs]
-  ["dune" "runtest" "-p" name "-j" jobs] { with-test }
+  ["dune" "runtest" "-p" name "-j" jobs] {with-test}
 ]
 synopsis: "Tezos-agnostic test helpers"