diff --git a/manifest/main.ml b/manifest/main.ml
index 88d9e844098e0ff8e1ee3de205863dfc42b5de8d..9926e98f2a392e9d722df7b45999d99832950307 100644
--- a/manifest/main.ml
+++ b/manifest/main.ml
@@ -2242,10 +2242,11 @@ let octez_shell_context =
       ]
 
 let _octez_protocol_environment_tests =
-  tests
+  tezt
     [
       "test_mem_context";
       "test_mem_context_array_theory";
+      "test_mem_context_common";
       "test_cache";
       "test_data_encoding";
     ]
@@ -2256,7 +2257,7 @@ let _octez_protocol_environment_tests =
         octez_base |> open_ ~m:"TzPervasives";
         octez_base_unix;
         octez_protocol_environment |> open_;
-        alcotest_lwt;
+        alcotezt;
         octez_test_helpers |> open_;
         qcheck_alcotest;
         lwt_unix;
diff --git a/opam/tezos-protocol-environment.opam b/opam/tezos-protocol-environment.opam
index d391763d71f1a955121d731294d0dee98465635a..f1ba59104e1c2ff7a54f1bfa98dd150fafadd27e 100644
--- a/opam/tezos-protocol-environment.opam
+++ b/opam/tezos-protocol-environment.opam
@@ -28,7 +28,8 @@ depends: [
   "tezos-micheline"
   "tezos-context"
   "tezos-event-logging"
-  "alcotest-lwt" { with-test & >= "1.5.0" }
+  "tezt" { with-test & >= "3.0.0" }
+  "octez-alcotezt" {with-test}
   "tezos-test-helpers" {with-test}
   "qcheck-alcotest" { with-test & >= "0.20" }
   "lwt" { with-test & >= "5.6.0" }
@@ -37,6 +38,7 @@ 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: "Interface layer between the protocols and the shell"
 description: "The protocol-environment is a two-sided component sitting between the shell and
diff --git a/src/lib_protocol_environment/test/dune b/src/lib_protocol_environment/test/dune
index 4d87b397d6f18313cfa9d45d3c1c507298d60c1a..329182634cf5292f9ed5f90462d89d00ac63e1d2 100644
--- a/src/lib_protocol_environment/test/dune
+++ b/src/lib_protocol_environment/test/dune
@@ -1,42 +1,46 @@
 ; This file was automatically generated, do not edit.
 ; Edit file manifest/main.ml instead.
 
-(executables
- (names
-  test_mem_context
-  test_mem_context_array_theory
-  test_cache
-  test_data_encoding)
+(library
+ (name src_lib_protocol_environment_test_tezt_lib)
+ (instrumentation (backend bisect_ppx))
  (libraries
+  tezt.core
   tezos-base
   tezos-base.unix
   tezos-protocol-environment
-  alcotest-lwt
+  octez-alcotezt
   tezos-test-helpers
   qcheck-alcotest
   lwt.unix)
+ (library_flags (:standard -linkall))
  (flags
   (:standard)
+  -open Tezt_core
+  -open Tezt_core.Base
   -open Tezos_base.TzPervasives
   -open Tezos_protocol_environment
-  -open Tezos_test_helpers))
-
-(rule
- (alias runtest)
- (package tezos-protocol-environment)
- (action (run %{dep:./test_mem_context.exe})))
+  -open Octez_alcotezt
+  -open Tezos_test_helpers)
+ (modules
+  test_mem_context
+  test_mem_context_array_theory
+  test_mem_context_common
+  test_cache
+  test_data_encoding))
 
-(rule
- (alias runtest)
- (package tezos-protocol-environment)
- (action (run %{dep:./test_mem_context_array_theory.exe})))
+(executable
+ (name main)
+ (libraries
+  src_lib_protocol_environment_test_tezt_lib
+  tezt)
+ (modules main))
 
 (rule
- (alias runtest)
+ (alias runtezt)
  (package tezos-protocol-environment)
- (action (run %{dep:./test_cache.exe})))
+ (action (run %{dep:./main.exe})))
 
 (rule
- (alias runtest)
- (package tezos-protocol-environment)
- (action (run %{dep:./test_data_encoding.exe})))
+ (targets main.ml)
+ (action (with-stdout-to %{targets} (echo "let () = Tezt.Test.run ()"))))
diff --git a/tezt/tests/dune b/tezt/tests/dune
index 4716aba6c202b504cc18265874cbb4493977a09b..b9b233223ff5b4ac8af94ccc73fcd56d8a2e089e 100644
--- a/tezt/tests/dune
+++ b/tezt/tests/dune
@@ -54,6 +54,7 @@
   src_lib_requester_test_tezt_lib
   src_lib_proxy_server_config_test_tezt_lib
   src_lib_protocol_environment_test_shell_context_tezt_lib
+  src_lib_protocol_environment_test_tezt_lib
   src_lib_p2p_tezt_tezt_lib
   src_lib_mockup_test_tezt_lib
   src_lib_lwt_result_stdlib_test_tezt_lib