diff --git a/packages/conjury/conjury.2.0.1/opam b/packages/conjury/conjury.2.0.1/opam
index 56f99998210..310657d5857 100644
--- a/packages/conjury/conjury.2.0.1/opam
+++ b/packages/conjury/conjury.2.0.1/opam
@@ -12,7 +12,7 @@ depends: [
     "ocaml" { with-test & >= "4.04" }
     "ocamlfind" { with-test & >= "1.7.3" }
     "omake" { = "0.10.3" }
-    "ounit2" { with-test >= "2.2" }
+    "ounit2" { with-test & >= "2.2" }
 ]
 build: [
     [ "omake" "--configure" ]
diff --git a/packages/conjury/conjury.2.1.1/opam b/packages/conjury/conjury.2.1.1/opam
index a8de089f7dd..f7b7d7faf9f 100644
--- a/packages/conjury/conjury.2.1.1/opam
+++ b/packages/conjury/conjury.2.1.1/opam
@@ -11,7 +11,7 @@ depends: [
   "ocaml" { >= "4.08" & < "5.0"}
   "ocamlfind" { >= "1.7.3"}
   "omake" { >= "0.10.3"}
-  "ounit2" { with-test >= "2.2"}
+  "ounit2" { >= "2.2"}
 ]
 build: [
   ["omake" "--dotomake.omake" "--force-dotomake" "--configure" "build"]
diff --git a/packages/conjury/conjury.2.1/opam b/packages/conjury/conjury.2.1/opam
index 03b15c7555a..f95fe8ba91a 100644
--- a/packages/conjury/conjury.2.1/opam
+++ b/packages/conjury/conjury.2.1/opam
@@ -11,7 +11,7 @@ depends: [
   "ocaml" { >= "4.08" & < "5.0"}
   "ocamlfind" { >= "1.7.3"}
   "omake" { = "0.10.3"}
-  "ounit2" { with-test >= "2.2"}
+  "ounit2" { >= "2.2"}
 ]
 build: [
   ["omake" "--dotomake.omake" "--force-dotomake" "--configure" "build"]
diff --git a/packages/gobba/gobba.0.4.1/opam b/packages/gobba/gobba.0.4.1/opam
index 2316ce20e6a..5e8c879ffb4 100644
--- a/packages/gobba/gobba.0.4.1/opam
+++ b/packages/gobba/gobba.0.4.1/opam
@@ -15,15 +15,15 @@ build: [
 ]
 
 depends: [
-    "dune" {>= "2.0"}
+    "dune" {>= "3.0"}
     "ocaml" {>= "4.05.0"}
     "ANSITerminal"
     "ocamline" {>= "1.0" & < "1.2"}
-    "menhir"
+    "menhir" {>= "20180528"}
     "ppx_deriving"
-    "cmdliner"
+    "cmdliner" {>= "0.9.8"}
     "alcotest" {with-test & >= "0.8.5"}
-    "bisect_ppx" {with-test >= "1.4.1" & < "2.6.0"}
+    "bisect_ppx" {>= "1.4.1" & < "2.6.0"}
 ]
 url {
   src:
diff --git a/packages/lsp/lsp.1.11.3/opam b/packages/lsp/lsp.1.11.3/opam
index c7164bd8d42..c6ab448dea9 100644
--- a/packages/lsp/lsp.1.11.3/opam
+++ b/packages/lsp/lsp.1.11.3/opam
@@ -22,14 +22,14 @@ license: "ISC"
 homepage: "https://github.com/ocaml/ocaml-lsp"
 bug-reports: "https://github.com/ocaml/ocaml-lsp/issues"
 depends: [
-  "dune" {>= "2.9"}
+  "dune" {>= "3.0"}
   "jsonrpc" {= version}
   "dyn"
   "yojson"
   "ppx_yojson_conv_lib" {>= "v0.14"}
   "cinaps" {with-test}
-  "menhir" {"20211230" >= with-test}
-  "ppx_expect" {"v0.14.0" >= with-test}
+  "menhir" {>= "20211230" & with-test}
+  "ppx_expect" {>= "v0.14.0" & with-test}
   "uutf" {>= "1.0.2"}
   "odoc" {with-doc}
   "ocaml" {>= "4.12"}
diff --git a/packages/lsp/lsp.1.11.4/opam b/packages/lsp/lsp.1.11.4/opam
index ca7bb16d411..737556718fa 100644
--- a/packages/lsp/lsp.1.11.4/opam
+++ b/packages/lsp/lsp.1.11.4/opam
@@ -22,14 +22,14 @@ license: "ISC"
 homepage: "https://github.com/ocaml/ocaml-lsp"
 bug-reports: "https://github.com/ocaml/ocaml-lsp/issues"
 depends: [
-  "dune" {>= "2.9"}
+  "dune" {>= "3.0"}
   "jsonrpc" {= version}
   "dyn"
   "yojson"
   "ppx_yojson_conv_lib" {>= "v0.14"}
   "cinaps" {with-test}
-  "menhir" {"20211230" >= with-test}
-  "ppx_expect" {"v0.14.0" >= with-test}
+  "menhir" {>= "20211230" & with-test}
+  "ppx_expect" {>= "v0.14.0" & with-test}
   "uutf" {>= "1.0.2"}
   "odoc" {with-doc}
   "ocaml" {>= "4.12"}
diff --git a/packages/lsp/lsp.1.11.5/opam b/packages/lsp/lsp.1.11.5/opam
index 3898281af45..bdf878a9890 100644
--- a/packages/lsp/lsp.1.11.5/opam
+++ b/packages/lsp/lsp.1.11.5/opam
@@ -22,14 +22,14 @@ license: "ISC"
 homepage: "https://github.com/ocaml/ocaml-lsp"
 bug-reports: "https://github.com/ocaml/ocaml-lsp/issues"
 depends: [
-  "dune" {>= "2.9"}
+  "dune" {>= "3.0"}
   "jsonrpc" {= version}
   "dyn"
   "yojson"
   "ppx_yojson_conv_lib" {>= "v0.14"}
   "cinaps" {with-test}
-  "menhir" {"20211230" >= with-test}
-  "ppx_expect" {"v0.14.0" >= with-test}
+  "menhir" {>= "20211230" & with-test}
+  "ppx_expect" {>= "v0.14.0" & with-test}
   "uutf" {>= "1.0.2"}
   "odoc" {with-doc}
   "ocaml" {>= "4.12"}
diff --git a/packages/lsp/lsp.1.11.6/opam b/packages/lsp/lsp.1.11.6/opam
index f59232cc607..2b269e4c7a2 100644
--- a/packages/lsp/lsp.1.11.6/opam
+++ b/packages/lsp/lsp.1.11.6/opam
@@ -22,14 +22,14 @@ license: "ISC"
 homepage: "https://github.com/ocaml/ocaml-lsp"
 bug-reports: "https://github.com/ocaml/ocaml-lsp/issues"
 depends: [
-  "dune" {>= "2.9"}
+  "dune" {>= "3.0"}
   "jsonrpc" {= version}
   "dyn"
   "yojson"
   "ppx_yojson_conv_lib" {>= "v0.14"}
   "cinaps" {with-test}
-  "menhir" {"20211230" >= with-test}
-  "ppx_expect" {"v0.14.0" >= with-test}
+  "menhir" {>= "20211230" & with-test}
+  "ppx_expect" {>= "v0.14.0" & with-test}
   "uutf" {>= "1.0.2"}
   "odoc" {with-doc}
   "ocaml" {>= "4.12"}
diff --git a/packages/lsp/lsp.1.12.0/opam b/packages/lsp/lsp.1.12.0/opam
index 2fc445b30d0..cc0c2cf8961 100644
--- a/packages/lsp/lsp.1.12.0/opam
+++ b/packages/lsp/lsp.1.12.0/opam
@@ -22,14 +22,14 @@ license: "ISC"
 homepage: "https://github.com/ocaml/ocaml-lsp"
 bug-reports: "https://github.com/ocaml/ocaml-lsp/issues"
 depends: [
-  "dune" {>= "2.9"}
+  "dune" {>= "3.0"}
   "jsonrpc" {= version}
   "dyn"
   "yojson"
   "ppx_yojson_conv_lib" {>= "v0.14"}
   "cinaps" {with-test}
-  "menhir" {"20211230" >= with-test}
-  "ppx_expect" {"v0.15.0" >= with-test}
+  "menhir" {>= "20211230" & with-test}
+  "ppx_expect" {>= "v0.15.0" & with-test}
   "uutf" {>= "1.0.2"}
   "odoc" {with-doc}
   "ocaml" {>= "4.12"}
diff --git a/packages/lsp/lsp.1.12.1/opam b/packages/lsp/lsp.1.12.1/opam
index 6cecb12ae70..fb16e71353a 100644
--- a/packages/lsp/lsp.1.12.1/opam
+++ b/packages/lsp/lsp.1.12.1/opam
@@ -22,14 +22,14 @@ license: "ISC"
 homepage: "https://github.com/ocaml/ocaml-lsp"
 bug-reports: "https://github.com/ocaml/ocaml-lsp/issues"
 depends: [
-  "dune" {>= "2.9"}
+  "dune" {>= "3.0"}
   "jsonrpc" {= version}
   "dyn"
   "yojson"
   "ppx_yojson_conv_lib" {>= "v0.14"}
   "cinaps" {with-test}
   "menhir" {>= "20211230" & with-test}
-  "ppx_expect" {"v0.15.0" >= with-test}
+  "ppx_expect" {>= "v0.15.0" & with-test}
   "uutf" {>= "1.0.2"}
   "odoc" {with-doc}
   "ocaml" {>= "4.12"}
diff --git a/packages/minicaml/minicaml.0.3.3/opam b/packages/minicaml/minicaml.0.3.3/opam
index e77c793470e..fd710b03479 100644
--- a/packages/minicaml/minicaml.0.3.3/opam
+++ b/packages/minicaml/minicaml.0.3.3/opam
@@ -14,14 +14,15 @@ build: [
   [make "test" "-j" jobs] {with-test}
 ]
 depends: [
-    "dune" {>= "2.0"}
+    "dune" {>= "3.0"}
     "ocaml" {>= "4.05.0"}
     "ANSITerminal"
-    "menhir"
+    "menhir" {>= "20180528"}
     "ppx_deriving"
-    "cmdliner"
+    "cmdliner" {>= "0.9.8"}
+    "cmdliner" {with-test & < "1.1.0"}
     "alcotest" {with-test & >= "0.8.5" & < "1.0.0"}
-    "bisect_ppx" {with-test >= "1.4.1" & < "2.0.0"}
+    "bisect_ppx" {>= "1.4.1" & < "2.0.0"}
 ]
 url {
   src:
diff --git a/packages/minicaml/minicaml.0.4/opam b/packages/minicaml/minicaml.0.4/opam
index c61b54133f4..7c90641fbd1 100644
--- a/packages/minicaml/minicaml.0.4/opam
+++ b/packages/minicaml/minicaml.0.4/opam
@@ -14,13 +14,14 @@ build: [
   [make "test" "-j" jobs] {with-test}
 ]
 depends: [
-    "dune" {>= "2.0"}
+    "dune" {>= "3.0"}
     "ocaml" {>= "4.05.0"}
     "ANSITerminal"
     "ocamline" {>= "1.0" & < "1.2"}
-    "menhir"
+    "menhir" {>= "20180528"}
     "ppx_deriving"
-    "cmdliner"
+    "cmdliner" {>= "0.9.8"}
+    "cmdliner" {with-test & < "1.1.0"}
     "alcotest" {with-test & >= "0.8.5"}
     "bisect_ppx" {>= "1.4.1" & < "2.0.0"}
 ]
diff --git a/packages/pa_ppx/pa_ppx.0.09/opam b/packages/pa_ppx/pa_ppx.0.09/opam
index 42526b31cf6..afe2b147f98 100644
--- a/packages/pa_ppx/pa_ppx.0.09/opam
+++ b/packages/pa_ppx/pa_ppx.0.09/opam
@@ -47,7 +47,7 @@ depends: [
   "bos" { >= "0.2.0" }
   "uint" { >= "2.0.1" }
   "ounit"
-#  "sexplib" { with-test >= "v0.14.0" }
+#  "sexplib" { with-test & >= "v0.14.0" }
 #  "ppx_import" { with-test & >= "1.7.1" }
 #  "ppx_deriving { with-test }
 #  "ppx_deriving_yojson" { with-test & >= "3.5.2" }
diff --git a/packages/pratter/pratter.3.0.0/opam b/packages/pratter/pratter.3.0.0/opam
index ac0aae31f29..8aa14567989 100644
--- a/packages/pratter/pratter.3.0.0/opam
+++ b/packages/pratter/pratter.3.0.0/opam
@@ -15,11 +15,11 @@ homepage: "https://forge.tedomum.net/koizel/pratter"
 bug-reports: "https://github.com/gabrielhdt/pratter/issues"
 depends: [
   "ocaml" {>= "4.08"}
-  "dune" {>= "2.7"}
+  "dune" {>= "3.0"}
   "camlp-streams" {>= "5.0" & < "6"}
-  "alcotest" {with-test >= "1.5.0" & < "2"}
-  "qcheck" {with-test >= "0.12"}
-  "qcheck-alcotest" {with-test >= "0.12"}
+  "alcotest" {with-test & >= "1.5.0" & < "2"}
+  "qcheck" {with-test & >= "0.12"}
+  "qcheck-alcotest" {with-test & >= "0.12"}
   "odoc" {with-doc}
 ]
 build: [
diff --git a/packages/tls-eio/tls-eio.1.0.0/opam b/packages/tls-eio/tls-eio.1.0.0/opam
index d093b52b466..4201aba8278 100644
--- a/packages/tls-eio/tls-eio.1.0.0/opam
+++ b/packages/tls-eio/tls-eio.1.0.0/opam
@@ -20,10 +20,10 @@ depends: [
   "mirage-crypto-rng" {>= "1.0.0"}
   "mirage-crypto-rng-eio" {with-test & >= "1.0.0"}
   "eio" {>= "0.12"}
-  "eio_main" {>= "0.12" with-test}
+  "eio_main" {>= "0.12" & with-test}
   "mdx" {with-test}
-  "crowbar" {>= "0.2.1" with-test}
-  "logs" {>= "0.7.0" with-test}
+  "crowbar" {>= "0.2.1" & with-test}
+  "logs" {>= "0.7.0" & with-test}
   "ptime" {>= "1.0.0"}
 ]
 tags: [ "org:mirage"]
diff --git a/packages/tls-eio/tls-eio.1.0.2/opam b/packages/tls-eio/tls-eio.1.0.2/opam
index 55987da93e2..ffea5f3cab8 100644
--- a/packages/tls-eio/tls-eio.1.0.2/opam
+++ b/packages/tls-eio/tls-eio.1.0.2/opam
@@ -20,10 +20,10 @@ depends: [
   "mirage-crypto-rng" {>= "1.0.0"}
   "mirage-crypto-rng-eio" {with-test & >= "1.0.0"}
   "eio" {>= "0.12"}
-  "eio_main" {>= "0.12" with-test}
+  "eio_main" {>= "0.12" & with-test}
   "mdx" {with-test}
-  "crowbar" {>= "0.2.1" with-test}
-  "logs" {>= "0.7.0" with-test}
+  "crowbar" {>= "0.2.1" & with-test}
+  "logs" {>= "0.7.0" & with-test}
   "ptime" {>= "1.0.0"}
 ]
 tags: [ "org:mirage"]
diff --git a/packages/tls-eio/tls-eio.1.0.4/opam b/packages/tls-eio/tls-eio.1.0.4/opam
index 406c6056a9e..34e330d2ca2 100644
--- a/packages/tls-eio/tls-eio.1.0.4/opam
+++ b/packages/tls-eio/tls-eio.1.0.4/opam
@@ -20,10 +20,10 @@ depends: [
   "mirage-crypto-rng" {>= "1.0.0"}
   "mirage-crypto-rng-eio" {with-test & >= "1.0.0"}
   "eio" {>= "0.12"}
-  "eio_main" {>= "0.12" with-test}
+  "eio_main" {>= "0.12" & with-test}
   "mdx" {with-test}
-  "crowbar" {>= "0.2.1" with-test}
-  "logs" {>= "0.7.0" with-test}
+  "crowbar" {>= "0.2.1" & with-test}
+  "logs" {>= "0.7.0" & with-test}
   "ptime" {>= "1.0.0"}
 ]
 tags: [ "org:mirage"]