diff --git a/dune-project b/dune-project
index fc74adc8a6e..ddcceb428f4 100644
--- a/dune-project
+++ b/dune-project
@@ -304,6 +304,7 @@
     ; 'xapi-tools' will have version ~dev, not 'master' like all the others
     ; because it is not in xs-opam yet
     rrd-transport
+    xapi-tracing-export
     (alcotest :with-test)
     (ppx_deriving_rpc :with-test)
     (qcheck-core :with-test)
@@ -391,6 +392,7 @@
     (xapi-stdext-zerocheck (= :version))
     (xapi-test-utils :with-test)
     (xapi-tracing (= :version))
+    (xapi-tracing-export (= :version))
     (xapi-types (= :version))
     xenctrl ; for quicktest
     xenstore_transport
diff --git a/ocaml/quicktest/dune b/ocaml/quicktest/dune
index 0ac6a171acd..ac0bc21c193 100644
--- a/ocaml/quicktest/dune
+++ b/ocaml/quicktest/dune
@@ -45,6 +45,6 @@
 
 (rule
  (alias runtest)
- (package xapi)
+ (package xapi-debug)
  (action (run ./quicktest.exe -skip-xapi -- list))
 )
diff --git a/ocaml/xs-trace/test/dune b/ocaml/xs-trace/test/dune
index d794381a742..06e45a36165 100644
--- a/ocaml/xs-trace/test/dune
+++ b/ocaml/xs-trace/test/dune
@@ -5,6 +5,6 @@
 
 (rule
   (alias runtest)
-  (package xapi)
+  (package xapi-tools)
   (deps test-xs-trace.sh ../xs_trace.exe test-source.json test-source.ndjson test_xs_trace.exe)
   (action (run bash test-xs-trace.sh)))
diff --git a/xapi-tools.opam b/xapi-tools.opam
index ba0f73b479f..c897251fa55 100644
--- a/xapi-tools.opam
+++ b/xapi-tools.opam
@@ -28,6 +28,7 @@ depends: [
   "xmlm"
   "yojson"
   "rrd-transport"
+  "xapi-tracing-export"
   "alcotest" {with-test}
   "ppx_deriving_rpc" {with-test}
   "qcheck-core" {with-test}
diff --git a/xapi.opam b/xapi.opam
index 3a850a4e359..098d8463442 100644
--- a/xapi.opam
+++ b/xapi.opam
@@ -84,6 +84,7 @@ depends: [
   "xapi-stdext-zerocheck" {= version}
   "xapi-test-utils" {with-test}
   "xapi-tracing" {= version}
+  "xapi-tracing-export" {= version}
   "xapi-types" {= version}
   "xenctrl"
   "xenstore_transport"