diff --git a/src/bin_client/dune b/src/bin_client/dune
index ed3a09d1139bdeae74a26611f422a366e9dffa04..ec9b8c5a5db9efea5b5d5f80aa4b4c3f9206fb44 100644
--- a/src/bin_client/dune
+++ b/src/bin_client/dune
@@ -6,8 +6,7 @@
  (static
   (flags (:standard -ccopt -static -cclib "-lusb-1.0 -lhidapi-libusb -ludev"))
   (ocamlopt_flags (:standard -O3)))
- (release
-  (ocamlopt_flags (:standard -O3))))
+ (release (ocamlopt_flags (:standard -O3))))
 
 (executables
  (names main_client main_admin)
diff --git a/src/bin_codec/dune b/src/bin_codec/dune
index e3b38d3d45cf9af81e2b52723b1a616dee305fe8..202b3cdfd95cbb23f1e580f06192c0f8e2b85577 100644
--- a/src/bin_codec/dune
+++ b/src/bin_codec/dune
@@ -2,8 +2,7 @@
  (static
   (flags (:standard -ccopt -static -cclib "-lusb-1.0 -lhidapi-libusb -ludev"))
   (ocamlopt_flags (:standard -O3)))
- (release
-  (ocamlopt_flags (:standard -O3))))
+ (release (ocamlopt_flags (:standard -O3))))
 
 (executable
  (name codec)
diff --git a/src/bin_node/dune b/src/bin_node/dune
index ddfad5635067a83566a309a90553cd5e72eba030..92ec6d879d47a14eb8ec4c83e333c59d87c862d0 100644
--- a/src/bin_node/dune
+++ b/src/bin_node/dune
@@ -8,9 +8,7 @@
 ; "void_for_linking".
 
 (env
- (static
-  (flags (:standard -ccopt -static))
-  (ocamlopt_flags (:standard -O3)))
+ (static (flags (:standard -ccopt -static)) (ocamlopt_flags (:standard -O3)))
  (release (ocamlopt_flags (:standard -O3))))
 
 (executable
diff --git a/src/bin_openapi/dune b/src/bin_openapi/dune
index be174c53f87a05e482fd9f9d7eb4b0538318c32a..291dab91fbde3753744e8681a6268501f70de914 100644
--- a/src/bin_openapi/dune
+++ b/src/bin_openapi/dune
@@ -1,6 +1,3 @@
-(env
- (release (ocamlopt_flags (:standard -O3))))
-
 (executable
  (name rpc_openapi)
  (instrumentation (backend bisect_ppx))
diff --git a/src/bin_proxy_server/dune b/src/bin_proxy_server/dune
index ff30b43ab7fa6b150df68ddcb8586a8bd248b9fa..f23a17bb14ed00da159d7ccf8081497e6eb034ac 100644
--- a/src/bin_proxy_server/dune
+++ b/src/bin_proxy_server/dune
@@ -3,11 +3,8 @@
 ; dependencies.
 
 (env
- (static
-  (flags (:standard -ccopt -static))
-  (ocamlopt_flags (:standard -O3)))
- (release
-  (ocamlopt_flags (:standard -O3))))
+ (static (flags (:standard -ccopt -static)) (ocamlopt_flags (:standard -O3)))
+ (release (ocamlopt_flags (:standard -O3))))
 
 (executable
  (name main_proxy_server)
diff --git a/src/bin_sandbox/dune b/src/bin_sandbox/dune
index 7524ab788e0eec3dcf6f9ee836adc9b61980a423..90d65b78acf1b0493b39606f85495442c3f906d3 100644
--- a/src/bin_sandbox/dune
+++ b/src/bin_sandbox/dune
@@ -1,6 +1,3 @@
-(env
- (release (ocamlopt_flags (:standard -O3))))
-
 (executable
  (name main)
  (libraries
diff --git a/src/bin_snoop/dune b/src/bin_snoop/dune
index ccb6f2453794c2517730c2da129a33459230e710..50f07cf6de3590ac8a03b61cb54de903dd145515 100644
--- a/src/bin_snoop/dune
+++ b/src/bin_snoop/dune
@@ -1,7 +1,5 @@
 (env
- (static
-  (flags (:standard -ccopt -static))
-  (ocamlopt_flags (:standard -O3)))
+ (static (flags (:standard -ccopt -static)) (ocamlopt_flags (:standard -O3)))
  (release (ocamlopt_flags (:standard -O3))))
 
 (executable
diff --git a/src/bin_validation/dune b/src/bin_validation/dune
index e7dd39d322722f04f91c245868ab62229cf5009a..2325afda57bcc2f718c7708a35cd1a50e7ae6ec1 100644
--- a/src/bin_validation/dune
+++ b/src/bin_validation/dune
@@ -1,5 +1,4 @@
-(env
- (release (ocamlopt_flags (:standard -O3))))
+(env (release (ocamlopt_flags (:standard -O3))))
 
 (library
  (name tezos_validator)
diff --git a/src/lib_error_monad/test/dune b/src/lib_error_monad/test/dune
index 447c15536b08e5c203cc916218ca98e713539048..f7e1ac8c51a672aa64a497bc47b56bcf643590a2 100644
--- a/src/lib_error_monad/test/dune
+++ b/src/lib_error_monad/test/dune
@@ -1,15 +1,14 @@
 (test
  (name test_registration)
  (package tezos-error-monad)
+ (modes native js)
  (libraries
   tezos-error-monad
   data-encoding
   alcotest)
- (modes native js)
  (flags (:standard -open Tezos_error_monad)))
 
-
 (rule
-  (alias runtest_js)
-  (package tezos-error-monad)
-  (action (run node %{dep:./test_registration.bc.js})))
+ (alias runtest_js)
+ (package tezos-error-monad)
+ (action (run node %{dep:./test_registration.bc.js})))
diff --git a/src/lib_error_monad/tezos-error-monad.opam b/src/lib_error_monad/tezos-error-monad.opam
index f48ccbd98592fbdc3e5324ec655596cce40d8b59..ec61428be751966832e33e4e852d1abd1838484d 100644
--- a/src/lib_error_monad/tezos-error-monad.opam
+++ b/src/lib_error_monad/tezos-error-monad.opam
@@ -13,7 +13,7 @@ depends: [
   "lwt-canceler" { >= "0.3" & < "0.4" }
   "lwt" { >= "5.4.0" }
   "tezos-lwt-result-stdlib"
-  "alcotest-lwt" { with-test & >= "1.5.0" }
+  "alcotest" { with-test & >= "1.5.0" }
 ]
 build: [
   ["dune" "build" "-p" name "-j" jobs]
diff --git a/src/lib_lwt_result_stdlib/bare/functor_outputs/dune b/src/lib_lwt_result_stdlib/bare/functor_outputs/dune
index 357ae36d7013009c6bec8e4bdcc94db7fadcdac7..27aaae2c2040ec556d6a16e6734f26df68439ccc 100644
--- a/src/lib_lwt_result_stdlib/bare/functor_outputs/dune
+++ b/src/lib_lwt_result_stdlib/bare/functor_outputs/dune
@@ -2,6 +2,6 @@
  (name bare_functor_outputs)
  (public_name tezos-lwt-result-stdlib.bare.functor-outputs)
  (instrumentation (backend bisect_ppx))
- (js_of_ocaml)
  (libraries
-  lwt))
+  lwt)
+ (js_of_ocaml))
diff --git a/src/lib_lwt_result_stdlib/bare/sigs/dune b/src/lib_lwt_result_stdlib/bare/sigs/dune
index e3830be3c1d3603055da413079def274f03c4ee3..ca9c18edc37108ddeb1e380bfd90f0d70b937378 100644
--- a/src/lib_lwt_result_stdlib/bare/sigs/dune
+++ b/src/lib_lwt_result_stdlib/bare/sigs/dune
@@ -2,7 +2,7 @@
  (name bare_sigs)
  (public_name tezos-lwt-result-stdlib.bare.sigs)
  (instrumentation (backend bisect_ppx))
- (js_of_ocaml)
  (libraries
   lwt
-  tezos-lwt-result-stdlib.bare.functor-outputs))
+  tezos-lwt-result-stdlib.bare.functor-outputs)
+ (js_of_ocaml))
diff --git a/src/lib_lwt_result_stdlib/bare/structs/dune b/src/lib_lwt_result_stdlib/bare/structs/dune
index 0912602bedea8a0b851fc482370db1ebc607a23e..f5807a4ecdd4330c07852d1dcb039fb27110097a 100644
--- a/src/lib_lwt_result_stdlib/bare/structs/dune
+++ b/src/lib_lwt_result_stdlib/bare/structs/dune
@@ -2,7 +2,7 @@
  (name bare_structs)
  (public_name tezos-lwt-result-stdlib.bare.structs)
  (instrumentation (backend bisect_ppx))
- (js_of_ocaml)
  (libraries
   lwt
-  tezos-lwt-result-stdlib.bare.sigs))
+  tezos-lwt-result-stdlib.bare.sigs)
+ (js_of_ocaml))
diff --git a/src/lib_lwt_result_stdlib/dune b/src/lib_lwt_result_stdlib/dune
index 52148d607180078b05c5872b089e9395f8295206..cfecba19107fe8b2ded798c44205c9039ce7beb4 100644
--- a/src/lib_lwt_result_stdlib/dune
+++ b/src/lib_lwt_result_stdlib/dune
@@ -2,10 +2,10 @@
  (name tezos_lwt_result_stdlib)
  (public_name tezos-lwt-result-stdlib)
  (instrumentation (backend bisect_ppx))
- (js_of_ocaml)
  (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))
+  tezos-lwt-result-stdlib.traced.structs)
+ (js_of_ocaml))
diff --git a/src/lib_lwt_result_stdlib/traced/functor_outputs/dune b/src/lib_lwt_result_stdlib/traced/functor_outputs/dune
index 8d130bb70f171d650bf6225f3871e14135c29da8..ce98aaecab8ea27a7556109b0d19d19da250510b 100644
--- a/src/lib_lwt_result_stdlib/traced/functor_outputs/dune
+++ b/src/lib_lwt_result_stdlib/traced/functor_outputs/dune
@@ -2,7 +2,7 @@
  (name traced_functor_outputs)
  (public_name tezos-lwt-result-stdlib.traced.functor-outputs)
  (instrumentation (backend bisect_ppx))
- (js_of_ocaml)
  (libraries
   lwt
-  tezos-lwt-result-stdlib.bare.sigs))
+  tezos-lwt-result-stdlib.bare.sigs)
+ (js_of_ocaml))
diff --git a/src/lib_lwt_result_stdlib/traced/sigs/dune b/src/lib_lwt_result_stdlib/traced/sigs/dune
index 54fcaaaf2935722bf769702bb924ca3cc35752ae..5e8d81ef350453787e344eaff1ffea76feec25f8 100644
--- a/src/lib_lwt_result_stdlib/traced/sigs/dune
+++ b/src/lib_lwt_result_stdlib/traced/sigs/dune
@@ -2,9 +2,9 @@
  (name traced_sigs)
  (public_name tezos-lwt-result-stdlib.traced.sigs)
  (instrumentation (backend bisect_ppx))
- (js_of_ocaml)
  (libraries
   lwt
   tezos-lwt-result-stdlib.bare.sigs
   tezos-lwt-result-stdlib.bare.structs
-  tezos-lwt-result-stdlib.traced.functor-outputs))
+  tezos-lwt-result-stdlib.traced.functor-outputs)
+ (js_of_ocaml))
diff --git a/src/lib_lwt_result_stdlib/traced/structs/dune b/src/lib_lwt_result_stdlib/traced/structs/dune
index 155ec5d236e3c79cd6cafabc7f678c57cdaf9a23..bd14281ef1e3ebd19b4506652cdcc53b40c71308 100644
--- a/src/lib_lwt_result_stdlib/traced/structs/dune
+++ b/src/lib_lwt_result_stdlib/traced/structs/dune
@@ -2,8 +2,8 @@
  (name traced_structs)
  (public_name tezos-lwt-result-stdlib.traced.structs)
  (instrumentation (backend bisect_ppx))
- (js_of_ocaml)
  (libraries
   lwt
   tezos-lwt-result-stdlib.traced.sigs
-  tezos-lwt-result-stdlib.bare.structs))
+  tezos-lwt-result-stdlib.bare.structs)
+ (js_of_ocaml))
diff --git a/src/lib_micheline/dune b/src/lib_micheline/dune
index d82d6d12aabae1fe86a5041ef00aeb32850a2d02..e14ce2900185a431bd40aea4399a5c93ef083c45 100644
--- a/src/lib_micheline/dune
+++ b/src/lib_micheline/dune
@@ -9,8 +9,8 @@
   tezos-stdlib
   tezos-error-monad
   data-encoding)
- (js_of_ocaml)
  (inline_tests)
  (preprocess (pps ppx_inline_test))
+ (js_of_ocaml)
  (flags
   (:standard -open Tezos_stdlib -open Tezos_error_monad -open Data_encoding)))
diff --git a/src/lib_micheline/test/dune b/src/lib_micheline/test/dune
index 924254e690494806d958a8fc000e5e0104d19261..b8a0212c00ff3b1bbbff2b516e8f81c0b785b20f 100644
--- a/src/lib_micheline/test/dune
+++ b/src/lib_micheline/test/dune
@@ -1,13 +1,13 @@
 (test
  (name test_parser)
  (package tezos-micheline)
+ (modes native js)
  (libraries
   tezos-micheline
   alcotest)
- (modes native js)
  (flags (:standard -open Tezos_micheline)))
 
 (rule
-  (alias runtest_js)
-  (package tezos-micheline)
-  (action (run node %{dep:./test_parser.bc.js})))
+ (alias runtest_js)
+ (package tezos-micheline)
+ (action (run node %{dep:./test_parser.bc.js})))
diff --git a/src/lib_micheline/tezos-micheline.opam b/src/lib_micheline/tezos-micheline.opam
index e986754f3058fb9602407833369f6a0335aa3ea9..1469c9d623c982c140e60fea6fced5862238f430 100644
--- a/src/lib_micheline/tezos-micheline.opam
+++ b/src/lib_micheline/tezos-micheline.opam
@@ -14,7 +14,7 @@ depends: [
   "tezos-stdlib"
   "tezos-error-monad"
   "data-encoding" { >= "0.4" & < "0.5" }
-  "alcotest-lwt" { with-test & >= "1.5.0" }
+  "alcotest" { with-test & >= "1.5.0" }
 ]
 build: [
   ["dune" "build" "-p" name "-j" jobs]
diff --git a/src/lib_protocol_compiler/dune b/src/lib_protocol_compiler/dune
index 127a73e537f16bc24056aa29a4f8660cca640792..5d87016100dba5d73018ac82e304a63a9510f85e 100644
--- a/src/lib_protocol_compiler/dune
+++ b/src/lib_protocol_compiler/dune
@@ -1,8 +1,6 @@
 ; build static executable with --profile static
 (env
- (static
-  (flags (:standard -ccopt -static))
-  (ocamlopt_flags (:standard -O3)))
+ (static (flags (:standard -ccopt -static)) (ocamlopt_flags (:standard -O3)))
  (release (ocamlopt_flags (:standard -O3))))
 
 (library
diff --git a/src/lib_signer_backends/tezos-signer-backends.opam b/src/lib_signer_backends/tezos-signer-backends.opam
index d63f3598f5dc414fb4fa641af5b789ee016ad7d6..c1d8e103ae985ad3c49c25e347b9bb04aab93b4e 100644
--- a/src/lib_signer_backends/tezos-signer-backends.opam
+++ b/src/lib_signer_backends/tezos-signer-backends.opam
@@ -7,7 +7,6 @@ dev-repo: "git+https://gitlab.com/tezos/tezos.git"
 license: "MIT"
 depends: [
   "dune" { >= "2.0" }
-  "fmt"
   "tezos-base"
   "tezos-stdlib"
   "tezos-client-base"
@@ -16,6 +15,7 @@ depends: [
   "tezos-shell-services"
   "alcotest-lwt" { with-test & >= "1.5.0" }
   "ocplib-endian"
+  "fmt"
   "tezos-stdlib-unix"
   "tezos-rpc-http-client-unix"
 ]
diff --git a/src/lib_stdlib/dune b/src/lib_stdlib/dune
index d18aada04c820da7128689f842b79d401e7f22c0..22eb92bb69ec78ca757abb35825815ebc6ceeb78 100644
--- a/src/lib_stdlib/dune
+++ b/src/lib_stdlib/dune
@@ -7,6 +7,6 @@
   zarith
   zarith_stubs_js
   lwt)
- (js_of_ocaml)
  (inline_tests)
- (preprocess (pps ppx_inline_test)))
+ (preprocess (pps ppx_inline_test))
+ (js_of_ocaml))
diff --git a/src/lib_stdlib/test-unix/dune b/src/lib_stdlib/test-unix/dune
index c8198c5f7cb742b925c8104065c5d17848ec3cc2..480f0caacffcc0af4d76c83a80ffd9c968b335ae 100644
--- a/src/lib_stdlib/test-unix/dune
+++ b/src/lib_stdlib/test-unix/dune
@@ -1,8 +1,5 @@
 (tests
- (names
-  test_lwt_pipe
-  test_circular_buffer
-  test_circular_buffer_fuzzy)
+ (names test_lwt_pipe test_circular_buffer test_circular_buffer_fuzzy)
  (package tezos-stdlib)
  (libraries
   tezos-stdlib
diff --git a/src/lib_stdlib/test/dune b/src/lib_stdlib/test/dune
index fc0f0ba7c0568e1ec185a9389255e365e2cae726..498db102508b7e9481a5821868a411e1a8a95fad 100644
--- a/src/lib_stdlib/test/dune
+++ b/src/lib_stdlib/test/dune
@@ -7,36 +7,41 @@
   test_fallbackArray
   test_functionalArray)
  (package tezos-stdlib)
+ (modes native js)
  (libraries
   tezos-stdlib
   alcotest
   bigstring
   tezos-test-helpers
   qcheck-alcotest)
- (modes native js)
  (flags (:standard -open Tezos_stdlib)))
 
 (rule
-  (alias runtest_js)
-  (package tezos-stdlib)
-  (action (run node %{dep:./test_bits.bc.js})))
+ (alias runtest_js)
+ (package tezos-stdlib)
+ (action (run node %{dep:./test_bits.bc.js})))
+
 (rule
-  (alias runtest_js)
-  (package tezos-stdlib)
-  (action (run node %{dep:./test_tzList.bc.js})))
+ (alias runtest_js)
+ (package tezos-stdlib)
+ (action (run node %{dep:./test_tzList.bc.js})))
+
 (rule
-  (alias runtest_js)
-  (package tezos-stdlib)
-  (action (run node %{dep:./test_bounded_heap.bc.js})))
+ (alias runtest_js)
+ (package tezos-stdlib)
+ (action (run node %{dep:./test_bounded_heap.bc.js})))
+
 (rule
-  (alias runtest_js)
-  (package tezos-stdlib)
-  (action (run node %{dep:./test_tzString.bc.js})))
+ (alias runtest_js)
+ (package tezos-stdlib)
+ (action (run node %{dep:./test_tzString.bc.js})))
+
 (rule
-  (alias runtest_js)
-  (package tezos-stdlib)
-  (action (run node %{dep:./test_fallbackArray.bc.js})))
+ (alias runtest_js)
+ (package tezos-stdlib)
+ (action (run node %{dep:./test_fallbackArray.bc.js})))
+
 (rule
-  (alias runtest_js)
-  (package tezos-stdlib)
-  (action (run node %{dep:./test_functionalArray.bc.js})))
+ (alias runtest_js)
+ (package tezos-stdlib)
+ (action (run node %{dep:./test_functionalArray.bc.js})))
diff --git a/src/lib_stdlib/tezos-stdlib.opam b/src/lib_stdlib/tezos-stdlib.opam
index b3d048f7355aea6c4637f826d3ad0d704411200c..ff3abd24f54676bff1ca54508b162df9073ef0db 100644
--- a/src/lib_stdlib/tezos-stdlib.opam
+++ b/src/lib_stdlib/tezos-stdlib.opam
@@ -13,11 +13,11 @@ depends: [
   "zarith_stubs_js"
   "lwt" { >= "5.4.0" }
   "alcotest" { with-test & >= "1.5.0" }
-  "alcotest-lwt" { with-test & >= "1.5.0" }
-  "lwt_log" {with-test}
   "bigstring" {with-test}
   "tezos-test-helpers" {with-test}
   "qcheck-alcotest" {with-test}
+  "alcotest-lwt" { with-test & >= "1.5.0" }
+  "lwt_log" {with-test}
 ]
 build: [
   ["dune" "build" "-p" name "-j" jobs]
diff --git a/src/lib_test/dune b/src/lib_test/dune
index 83846b1bd51cbe5221243c64e2232fd783a756ef..1475e281b3ebbe248cd7774a944cf7188530d08b 100644
--- a/src/lib_test/dune
+++ b/src/lib_test/dune
@@ -14,6 +14,4 @@
 
 ;; This rule is necessary for `make lint-tests-pkg`, without it dune
 ;; complains that the alias is empty
-(rule
-  (alias runtest_js)
-  (action progn))
\ No newline at end of file
+(rule (alias runtest_js) (action progn))
diff --git a/src/lib_test/tezos-test-helpers.opam b/src/lib_test/tezos-test-helpers.opam
index 3a548e338bbc25f6a0280f555ebc370e2a4f2f14..ffa24998775eff4131a3c6696918d55efc586ca0 100644
--- a/src/lib_test/tezos-test-helpers.opam
+++ b/src/lib_test/tezos-test-helpers.opam
@@ -11,7 +11,7 @@ depends: [
   "fmt"
   "qcheck-alcotest"
   "alcotest" { >= "1.5.0" }
-  "alcotest-lwt" { >= "1.5.0" }
+  "lwt" { >= "5.4.0" }
   "pure-splitmix" { = "0.2" }
 ]
 build: [
diff --git a/src/tooling/dune b/src/tooling/dune
index 809c7e6ea7b5feeed8c20b1597a140d684a9c79f..353a4c390c82b8497e0f4363a0cc6acc7cfec890 100644
--- a/src/tooling/dune
+++ b/src/tooling/dune
@@ -1,8 +1,8 @@
 (library
  (name tezos_tooling)
  (public_name tezos-tooling)
- (modules)
- (instrumentation (backend bisect_ppx)))
+ (instrumentation (backend bisect_ppx))
+ (modules))
 
 (install
  (package tezos-tooling)
@@ -10,6 +10,8 @@
  (files (lint.sh as lint.sh)))
 
 (executable
-  (name run_js_inline_tests)
-  (modules run_js_inline_tests)
-  (libraries parsexp unix))
+ (name run_js_inline_tests)
+ (libraries
+  parsexp
+  unix)
+ (modules run_js_inline_tests))
diff --git a/src/tooling/tezos-tooling.opam b/src/tooling/tezos-tooling.opam
index 6e12bd0e25485cf3b1ef88c128b32ac890e52704..de60c493df04b53f2eaac848490ce8a10a560c46 100644
--- a/src/tooling/tezos-tooling.opam
+++ b/src/tooling/tezos-tooling.opam
@@ -7,6 +7,8 @@ dev-repo: "git+https://gitlab.com/tezos/tezos.git"
 license: "MIT"
 depends: [
   "dune" { >= "2.0" }
+  "parsexp" {with-test}
+  "base-unix" {with-test}
   "coq-of-ocaml" { = "2.5.0" }
   "ocamlformat" { = "0.18.0" }
   "bisect_ppx" { >= "2.3" }