diff --git a/irmin-cli.opam b/irmin-cli.opam
index 2dcf04ef8fe..46776f98dfd 100644
--- a/irmin-cli.opam
+++ b/irmin-cli.opam
@@ -36,7 +36,7 @@ depends: [
   "cohttp-lwt-unix"
   "conduit"
   "conduit-lwt"
-  "conduit-lwt-unix"
+  "conduit-lwt-unix" {>= "6.0.0"}
   "websocket-lwt-unix"
   "ppx_blob"      {>= "0.7.2"}
   "logs"
diff --git a/irmin-client.opam b/irmin-client.opam
index e0ba7310858..cec7ba40dab 100644
--- a/irmin-client.opam
+++ b/irmin-client.opam
@@ -10,15 +10,17 @@ depends: [
   "ocaml" {>= "4.08.0"}
   "dune" {>= "2.0.0"}
   "irmin-server" {= version}
+  "irmin-cli" {= version}
   "ipaddr"
   "websocket-lwt-unix"
-  "conduit-lwt-unix"
+  "conduit-lwt-unix" {>= "6.0.0"}
   "lwt-dllist"
   "js_of_ocaml-lwt"
   "brr" {>= "0.0.4"}
   "fmt" {>= "0.9.0"}
   "logs" {>= "0.7.0"}
   "lwt" {>= "5.7.0"}
+  "irmin-test" {= version & with-test}
 ]
 build: [
   ["dune" "subst"] {pinned}
diff --git a/irmin-server.opam b/irmin-server.opam
index e7ce68c538a..c5976863378 100644
--- a/irmin-server.opam
+++ b/irmin-server.opam
@@ -12,18 +12,20 @@ depends: [
   "optint" {>= "0.1.0"}
   "irmin" {= version}
   "ppx_irmin" {= version}
+  "irmin-pack" {= version}
   "uri"
   "fmt"
   "cmdliner" {>= "1.0.4"}
   "logs" {>= "0.7.0"}
   "lwt" {>= "5.4.0"}
-  "conduit-lwt-unix"
+  "conduit-lwt-unix" {>= "6.0.0"}
   "websocket-lwt-unix"
   "cohttp-lwt-unix"
   "ppx_blob" {>= "0.7.2"}
   "digestif" {>= "1.1.4"}
   "alcotest-lwt" {>= "1.7.0" & with-test}
   "irmin-watcher" {>= "0.5.0" & with-test}
+  "irmin-test" {= version & with-test}
 ]
 
 build: [
diff --git a/test/irmin-server/dune b/test/irmin-client/dune
similarity index 87%
rename from test/irmin-server/dune
rename to test/irmin-client/dune
index 97da9a92bf3..0a2920ca17b 100644
--- a/test/irmin-server/dune
+++ b/test/irmin-client/dune
@@ -1,6 +1,6 @@
 (test
  (name test)
- (package irmin-server)
+ (package irmin-client)
  (libraries
   irmin.mem
   irmin-server.unix
diff --git a/test/irmin-server/test.ml b/test/irmin-client/test.ml
similarity index 100%
rename from test/irmin-server/test.ml
rename to test/irmin-client/test.ml
diff --git a/test/irmin-server/util.ml b/test/irmin-client/util.ml
similarity index 100%
rename from test/irmin-server/util.ml
rename to test/irmin-client/util.ml