diff --git a/manifest/main.ml b/manifest/main.ml
index cb8877795195473d50f052b34d8fe58581268b6f..e0fa9fe1b1401d1b15b5efa1181cc8a4f4db4655 100644
--- a/manifest/main.ml
+++ b/manifest/main.ml
@@ -1921,8 +1921,8 @@ let octez_context_disk =
       ]
 
 let _tree_encoding_tests =
-  test
-    "test_tree_encoding"
+  tezt
+    ["test_tree_encoding"; "test_proofs"; "test_encoding"]
     ~path:"src/lib_tree_encoding/test"
     ~opam:"tezos-tree-encoding-test"
     ~synopsis:"Tests for the tree encoding library"
@@ -1936,7 +1936,7 @@ let _tree_encoding_tests =
         octez_test_helpers |> open_;
         octez_webassembly_interpreter;
         qcheck_alcotest;
-        alcotest_lwt;
+        alcotezt;
       ]
 
 let octez_context =
diff --git a/opam/tezos-tree-encoding-test.opam b/opam/tezos-tree-encoding-test.opam
index 172a0f114278f3155b3391a4dda0fb0f88139ac7..a9a48952d188582abdea94982e9a807e806e9b6a 100644
--- a/opam/tezos-tree-encoding-test.opam
+++ b/opam/tezos-tree-encoding-test.opam
@@ -10,6 +10,7 @@ license: "MIT"
 depends: [
   "dune" { >= "3.0" }
   "ocaml" { >= "4.14" }
+  "tezt" { with-test & >= "3.0.0" }
   "tezos-base" {with-test}
   "tezos-tree-encoding" {with-test}
   "tezos-context" {with-test}
@@ -17,11 +18,12 @@ depends: [
   "tezos-test-helpers" {with-test}
   "tezos-webassembly-interpreter" {with-test}
   "qcheck-alcotest" { with-test & >= "0.20" }
-  "alcotest-lwt" { with-test & >= "1.5.0" }
+  "octez-alcotezt" {with-test}
 ]
 build: [
   ["rm" "-r" "vendors"]
   ["dune" "build" "-p" name "-j" jobs]
   ["dune" "runtest" "-p" name "-j" jobs] {with-test}
+  ["dune" "build" "@runtezt" "-p" name "-j" jobs] {with-test}
 ]
 synopsis: "Tests for the tree encoding library"
diff --git a/src/lib_tree_encoding/test/dune b/src/lib_tree_encoding/test/dune
index 61506b71b087602a4c38888bef4d6cd769465ce8..33e6d45fe54489329f00f746f96320880ab170ab 100644
--- a/src/lib_tree_encoding/test/dune
+++ b/src/lib_tree_encoding/test/dune
@@ -1,9 +1,11 @@
 ; This file was automatically generated, do not edit.
 ; Edit file manifest/main.ml instead.
 
-(executable
- (name test_tree_encoding)
+(library
+ (name src_lib_tree_encoding_test_tezt_lib)
+ (instrumentation (backend bisect_ppx))
  (libraries
+  tezt.core
   tezos-base
   tezos-tree-encoding
   tezos-base.unix
@@ -12,14 +14,31 @@
   tezos-test-helpers
   tezos-webassembly-interpreter
   qcheck-alcotest
-  alcotest-lwt)
+  octez-alcotezt)
+ (library_flags (:standard -linkall))
  (flags
   (:standard)
+  -open Tezt_core
+  -open Tezt_core.Base
   -open Tezos_base.TzPervasives
   -open Tezos_base_test_helpers
-  -open Tezos_test_helpers))
+  -open Tezos_test_helpers
+  -open Octez_alcotezt)
+ (modules test_tree_encoding test_proofs test_encoding))
+
+(executable
+ (name main)
+ (instrumentation (backend bisect_ppx --bisect-sigterm))
+ (libraries
+  src_lib_tree_encoding_test_tezt_lib
+  tezt)
+ (modules main))
 
 (rule
- (alias runtest)
+ (alias runtezt)
  (package tezos-tree-encoding-test)
- (action (run %{dep:./test_tree_encoding.exe})))
+ (action (run %{dep:./main.exe})))
+
+(rule
+ (targets main.ml)
+ (action (with-stdout-to %{targets} (echo "let () = Tezt.Test.run ()"))))
diff --git a/src/lib_tree_encoding/test/test_encoding.ml b/src/lib_tree_encoding/test/test_encoding.ml
index fd6af7c490c02d8696f08c9840009e9f6ec2f958..e6b743632a8eecef2da53e3a0065605bec790430 100644
--- a/src/lib_tree_encoding/test/test_encoding.ml
+++ b/src/lib_tree_encoding/test/test_encoding.ml
@@ -26,8 +26,7 @@
 (** Testing
     -------
     Component:    Tree_encoding
-    Invocation:   dune exec src/lib_tree_encoding/test/test_tree_encoding.exe \
-                  -- test "^Encodings$"
+    Invocation:   dune exec src/lib_tree_encoding/test/main.exe
     Subject:      Encoding tests for the tree-encoding library
 *)
 
diff --git a/src/lib_tree_encoding/test/test_proofs.ml b/src/lib_tree_encoding/test/test_proofs.ml
index 880cfc9ed97cc5c215ff5592bf60b936cb4a40bc..2951f452bd0d37f17bb2f1319f9f52f4eee3895d 100644
--- a/src/lib_tree_encoding/test/test_proofs.ml
+++ b/src/lib_tree_encoding/test/test_proofs.ml
@@ -26,8 +26,7 @@
 (** Testing
     -------
     Component:    Tree_encoding
-    Invocation:   dune exec src/lib_tree_encoding/test/test_tree_encoding.exe \
-                  -- test "^Proofs$"
+    Invocation:   dune exec src/lib_tree_encoding/test/main.exe
     Subject:      Proof-related tests for the tree-encoding library
 *)
 
diff --git a/src/lib_tree_encoding/test/test_tree_encoding.ml b/src/lib_tree_encoding/test/test_tree_encoding.ml
index 46050bda4fd9436d477877192f248b6ce8a3bee3..d4bba85c9b0a7973a319ea384468e9e21692f9cb 100644
--- a/src/lib_tree_encoding/test/test_tree_encoding.ml
+++ b/src/lib_tree_encoding/test/test_tree_encoding.ml
@@ -26,7 +26,7 @@
 (** Testing
     -------
     Component:    Lib_tree_encoding
-    Invocation:   dune runtest src/lib_tree_encoding/
+    Invocation:   dune exec src/lib_tree_encoding/main.exe
     Subject:      Tests for the tree-encoding library
 *)
 
diff --git a/tezt/tests/dune b/tezt/tests/dune
index a9312e3f511d7dad38af8d8a74e6326ab4098b7d..8712a0ecc48d18183907ca1ef1926d6a1925281b 100644
--- a/tezt/tests/dune
+++ b/tezt/tests/dune
@@ -57,6 +57,7 @@
   src_proto_015_PtLimaPt_lib_client_test_tezt_lib
   src_lib_workers_test_tezt_lib
   src_lib_webassembly_tests_tezt_lib
+  src_lib_tree_encoding_test_tezt_lib
   src_lib_stdlib_unix_test__tezt_lib
   src_lib_stdlib_test_unix_tezt_lib
   src_lib_stdlib_test_tezt_lib