diff --git a/dune-project b/dune-project
index c7d242e6..3938038b 100644
--- a/dune-project
+++ b/dune-project
@@ -30,14 +30,6 @@
   ambient-context
   (odoc :with-doc)
   (alcotest :with-test)
-  (opentelemetry-client-cohttp-lwt
-   (and
-    :with-test
-    (= :version)))
-  (opentelemetry-client-ocurl
-   (and
-    :with-test
-    (= :version)))
   (pbrt
    (>= 2.3))
   (ocaml-lsp-server :with-dev-setup)
@@ -70,15 +62,7 @@
    (>= "5.3"))
   (lwt_ppx
    (>= "2.0"))
-  (alcotest :with-test)
-  (opentelemetry-client-cohttp-lwt
-   (and
-    :with-test
-    (= :version)))
-  (opentelemetry-client-ocurl
-   (and
-    :with-test
-    (= :version))))
+  (alcotest :with-test))
  (tags
   (instrumentation tracing opentelemetry datadog lwt)))
 
@@ -99,11 +83,7 @@
   (ezcurl
    (>= 0.2.3))
   ocurl
-  (alcotest :with-test)
-  (opentelemetry-client-cohttp-lwt
-   (and
-    :with-test
-    (= :version))))
+  (alcotest :with-test))
  (synopsis "Collector client for opentelemetry, using http + ezcurl"))
 
 (package
@@ -120,15 +100,7 @@
    (>= "5.3"))
   (cohttp-lwt
    (>= "4.0.0"))
-  (alcotest :with-test)
-  (opentelemetry-client-cohttp-lwt
-   (and
-    :with-test
-    (= :version)))
-  (opentelemetry-client-ocurl
-   (and
-    :with-test
-    (= :version))))
+  (alcotest :with-test))
  (synopsis "Opentelemetry tracing for Cohttp HTTP servers"))
 
 (package
@@ -150,9 +122,5 @@
    (>= "2.0"))
   cohttp-lwt
   cohttp-lwt-unix
-  (alcotest :with-test)
-  (opentelemetry-client-ocurl
-   (and
-    :with-test
-    (= :version))))
+  (alcotest :with-test))
  (synopsis "Collector client for opentelemetry, using cohttp + lwt"))
diff --git a/opentelemetry-client-cohttp-lwt.opam b/opentelemetry-client-cohttp-lwt.opam
index 93b11939..8ded95ec 100644
--- a/opentelemetry-client-cohttp-lwt.opam
+++ b/opentelemetry-client-cohttp-lwt.opam
@@ -23,7 +23,6 @@ depends: [
   "cohttp-lwt"
   "cohttp-lwt-unix"
   "alcotest" {with-test}
-  "opentelemetry-client-ocurl" {with-test & = version}
 ]
 build: [
   ["dune" "subst"] {dev}
diff --git a/opentelemetry-client-ocurl.opam b/opentelemetry-client-ocurl.opam
index 0a32fc67..21d01814 100644
--- a/opentelemetry-client-ocurl.opam
+++ b/opentelemetry-client-ocurl.opam
@@ -21,7 +21,6 @@ depends: [
   "ezcurl" {>= "0.2.3"}
   "ocurl"
   "alcotest" {with-test}
-  "opentelemetry-client-cohttp-lwt" {with-test & = version}
 ]
 build: [
   ["dune" "subst"] {dev}
diff --git a/opentelemetry-cohttp-lwt.opam b/opentelemetry-cohttp-lwt.opam
index 94ec245d..20c5321a 100644
--- a/opentelemetry-cohttp-lwt.opam
+++ b/opentelemetry-cohttp-lwt.opam
@@ -20,8 +20,6 @@ depends: [
   "lwt" {>= "5.3"}
   "cohttp-lwt" {>= "4.0.0"}
   "alcotest" {with-test}
-  "opentelemetry-client-cohttp-lwt" {with-test & = version}
-  "opentelemetry-client-ocurl" {with-test & = version}
 ]
 build: [
   ["dune" "subst"] {dev}
diff --git a/opentelemetry-lwt.opam b/opentelemetry-lwt.opam
index ff13e0d6..a03196a2 100644
--- a/opentelemetry-lwt.opam
+++ b/opentelemetry-lwt.opam
@@ -22,8 +22,6 @@ depends: [
   "lwt" {>= "5.3"}
   "lwt_ppx" {>= "2.0"}
   "alcotest" {with-test}
-  "opentelemetry-client-cohttp-lwt" {with-test & = version}
-  "opentelemetry-client-ocurl" {with-test & = version}
 ]
 build: [
   ["dune" "subst"] {dev}
diff --git a/opentelemetry.opam b/opentelemetry.opam
index cfc11eeb..cf4a98f3 100644
--- a/opentelemetry.opam
+++ b/opentelemetry.opam
@@ -19,8 +19,6 @@ depends: [
   "ambient-context"
   "odoc" {with-doc}
   "alcotest" {with-test}
-  "opentelemetry-client-cohttp-lwt" {with-test & = version}
-  "opentelemetry-client-ocurl" {with-test & = version}
   "pbrt" {>= "2.3"}
   "ocaml-lsp-server" {with-dev-setup}
   "ocamlformat" {with-dev-setup & >= "0.24" & < "0.25"}
diff --git a/tests/cohttp/dune b/tests/cohttp/dune
new file mode 100644
index 00000000..b467b27c
--- /dev/null
+++ b/tests/cohttp/dune
@@ -0,0 +1,4 @@
+(tests
+ (names test_get_url)
+ (package opentelemetry-client-cohttp-lwt)
+ (libraries opentelemetry opentelemetry-client-cohttp-lwt))
diff --git a/tests/test_get_url.expected b/tests/cohttp/test_get_url.expected
similarity index 50%
rename from tests/test_get_url.expected
rename to tests/cohttp/test_get_url.expected
index bafd6ea4..400f46eb 100644
--- a/tests/test_get_url.expected
+++ b/tests/cohttp/test_get_url.expected
@@ -1,2 +1 @@
-ocurl url = http://localhost:3000
 cohttp url = http://localhost:3000
diff --git a/tests/test_get_url.ml b/tests/cohttp/test_get_url.ml
similarity index 51%
rename from tests/test_get_url.ml
rename to tests/cohttp/test_get_url.ml
index 397996d3..3a271956 100644
--- a/tests/test_get_url.ml
+++ b/tests/cohttp/test_get_url.ml
@@ -1,17 +1,9 @@
 let url = "http://localhost:3000"
 
-let ocurl () =
-  let config = Opentelemetry_client_ocurl.Config.make ~url () in
-  Opentelemetry_client_ocurl.with_setup ~config () @@ fun () ->
-  let url = Opentelemetry_client_ocurl.get_url () in
-  print_endline @@ Printf.sprintf "ocurl url = %s" url
-
 let cohttp () =
   let config = Opentelemetry_client_cohttp_lwt.Config.make ~url () in
   Opentelemetry_client_cohttp_lwt.with_setup ~config () @@ fun () ->
   let url = Opentelemetry_client_cohttp_lwt.get_url () in
   print_endline @@ Printf.sprintf "cohttp url = %s" url
 
-let () =
-  ocurl ();
-  cohttp ()
+let () = cohttp ()
diff --git a/tests/core/dune b/tests/core/dune
new file mode 100644
index 00000000..da93554f
--- /dev/null
+++ b/tests/core/dune
@@ -0,0 +1,5 @@
+
+(tests
+ (names test_trace_context )
+ (package opentelemetry)
+ (libraries opentelemetry))
diff --git a/tests/test_trace_context.expected b/tests/core/test_trace_context.expected
similarity index 100%
rename from tests/test_trace_context.expected
rename to tests/core/test_trace_context.expected
diff --git a/tests/test_trace_context.ml b/tests/core/test_trace_context.ml
similarity index 100%
rename from tests/test_trace_context.ml
rename to tests/core/test_trace_context.ml
diff --git a/tests/dune b/tests/dune
deleted file mode 100644
index c005f866..00000000
--- a/tests/dune
+++ /dev/null
@@ -1,4 +0,0 @@
-(tests
- (names test_trace_context test_get_url)
- (libraries opentelemetry opentelemetry-client-ocurl
-   opentelemetry-client-cohttp-lwt))
diff --git a/tests/implicit_scope/sync/dune b/tests/implicit_scope/sync/dune
index 072eee77..8b5407f4 100644
--- a/tests/implicit_scope/sync/dune
+++ b/tests/implicit_scope/sync/dune
@@ -1,3 +1,4 @@
 (tests
  (names test_implicit_scope_sync)
+ (package opentelemetry-client-cohttp-lwt)
  (libraries alcotest opentelemetry opentelemetry-client-cohttp-lwt))
diff --git a/tests/ocurl/dune b/tests/ocurl/dune
new file mode 100644
index 00000000..18a15fca
--- /dev/null
+++ b/tests/ocurl/dune
@@ -0,0 +1,5 @@
+
+(tests
+ (names test_get_url)
+ (package opentelemetry-client-ocurl)
+ (libraries opentelemetry opentelemetry-client-ocurl))
diff --git a/tests/ocurl/test_get_url.expected b/tests/ocurl/test_get_url.expected
new file mode 100644
index 00000000..0b9a4214
--- /dev/null
+++ b/tests/ocurl/test_get_url.expected
@@ -0,0 +1 @@
+ocurl url = http://localhost:3000
diff --git a/tests/ocurl/test_get_url.ml b/tests/ocurl/test_get_url.ml
new file mode 100644
index 00000000..1e142015
--- /dev/null
+++ b/tests/ocurl/test_get_url.ml
@@ -0,0 +1,9 @@
+let url = "http://localhost:3000"
+
+let ocurl () =
+  let config = Opentelemetry_client_ocurl.Config.make ~url () in
+  Opentelemetry_client_ocurl.with_setup ~config () @@ fun () ->
+  let url = Opentelemetry_client_ocurl.get_url () in
+  print_endline @@ Printf.sprintf "ocurl url = %s" url
+
+let () = ocurl ()