diff --git a/manifest/main.ml b/manifest/main.ml
index 64e580e7cb33e56ca03a3d6d4b093c493fcead41..dc30ea6f15b2c9a9228472435bd3a2fa84fece62 100644
--- a/manifest/main.ml
+++ b/manifest/main.ml
@@ -475,17 +475,6 @@ let octez_test_helpers =
              complains that the alias is empty. *)
           alias_rule "runtest_js" ~action:(S "progn");
         ]
-    ~modules:
-      [
-        "assert";
-        "lwt_assert";
-        "qcheck2_helpers";
-        "qcheck_extra";
-        "qcheck_helpers";
-        "random_pure";
-        "roundtrip";
-        "testable";
-      ]
 
 let octez_expect_helper =
   public_lib
@@ -7584,6 +7573,7 @@ let () =
   let make_tezt_exe test_libs =
     let deps =
       [
+        octez_test_helpers |> open_;
         tezt_lib |> open_ |> open_ ~m:"Base";
         str;
         bls12_381;
diff --git a/src/lib_p2p/tezt/test_p2p_socket.ml b/src/lib_p2p/tezt/test_p2p_socket.ml
index 5cc9d12de625e60789af2b2a49e25244ee9d3cb8..fb311fc6410bd3fefd64726d668bf67a41c0bbff 100644
--- a/src/lib_p2p/tezt/test_p2p_socket.ml
+++ b/src/lib_p2p/tezt/test_p2p_socket.ml
@@ -69,7 +69,7 @@ let nack_test () =
         (* FIXME: https://gitlab.com/tezos/tezos/-/issues/5903
            The tests using forked processes are flaky, EBADF error is raised.
         *)
-        "flaky";
+        Tag.flaky;
         "p2p";
         "socket";
         "nack";
@@ -123,7 +123,7 @@ module Self_identification = struct
           (* FIXME: https://gitlab.com/tezos/tezos/-/issues/5903
              The tests using forked processes are flaky, EBADF error is raised.
           *)
-          "flaky";
+          Tag.flaky;
           "p2p";
           "socket";
           "self_identification";
@@ -180,7 +180,7 @@ module Self_identification = struct
           (* FIXME: https://gitlab.com/tezos/tezos/-/issues/5903
              The tests using forked processes are flaky, EBADF error is raised.
           *)
-          "flaky";
+          Tag.flaky;
           "p2p";
           "socket";
           "self_identification";
diff --git a/src/lib_test/dune b/src/lib_test/dune
index cea3a2ce08edd8beddaa959396450eb5dd73ab9b..ba18f2b8fa47f6f87a4f066eaad6dc80fd5eec5e 100644
--- a/src/lib_test/dune
+++ b/src/lib_test/dune
@@ -13,15 +13,6 @@
   pure-splitmix
   data-encoding)
  (js_of_ocaml)
- (library_flags (:standard -linkall))
- (modules
-  assert
-  lwt_assert
-  qcheck2_helpers
-  qcheck_extra
-  qcheck_helpers
-  random_pure
-  roundtrip
-  testable))
+ (library_flags (:standard -linkall)))
 
 (rule (alias runtest_js) (action progn))
diff --git a/tezt/lib_tezos/tag.ml b/src/lib_test/tag.ml
similarity index 100%
rename from tezt/lib_tezos/tag.ml
rename to src/lib_test/tag.ml
diff --git a/tezt/lib_tezos/tag.mli b/src/lib_test/tag.mli
similarity index 100%
rename from tezt/lib_tezos/tag.mli
rename to src/lib_test/tag.mli
diff --git a/tezt/long_tests/dune b/tezt/long_tests/dune
index 167f82f5acea7abbd56fb786cbb34388ef889d1f..d5ae8ea591ade54dff5cdba233882abefef0feb9 100644
--- a/tezt/long_tests/dune
+++ b/tezt/long_tests/dune
@@ -12,6 +12,7 @@
             tezos-time-measurement
             data-encoding
             tezos-event-logging
+            tezos-test-helpers
             )
  (flags (:standard
           -open Tezt
@@ -21,5 +22,6 @@
           -open Tezt_performance_regression
           -open Tezos_lwt_result_stdlib
           -open Tezos_event_logging
+          -open Tezos_test_helpers
           (:include %{workspace_root}/macos-link-flags.sexp)
          )))
diff --git a/tezt/tests/dune b/tezt/tests/dune
index 573a863f575c4f61a9f3051c830f2fb3017339be..e11a62fff58c05fcd6408b34a2eeb057b09d9db8 100644
--- a/tezt/tests/dune
+++ b/tezt/tests/dune
@@ -5,6 +5,7 @@
  (name main)
  (instrumentation (backend bisect_ppx --bisect-sigterm))
  (libraries
+  tezos-test-helpers
   tezt
   str
   bls12-381
@@ -131,6 +132,7 @@
   (:include %{workspace_root}/macos-link-flags.sexp))
  (flags
   (:standard)
+  -open Tezos_test_helpers
   -open Tezt
   -open Tezt.Base
   -open Tezt_tezos