diff --git a/test/dune b/test/dune
index 2b153b0..c671c0d 100644
--- a/test/dune
+++ b/test/dune
@@ -1,23 +1,22 @@
-(executables
- (names t1 t2 t_debug t_core)
- (modules t1 t2 t_debug t_core)
- (libraries trace))
 
-(executables
- (names t_runtime_events)
+(tests
+ (names t1 t_core t_debug)
+ (modules t1 t_core t_debug)
+ (package trace-tef)
+ (libraries trace trace-tef))
+
+(test
+ (name t2)
+ (package ppx_trace)
+ (modules t2)
+ (preprocess
+  (pps ppx_trace))
+ (libraries trace-tef))
+
+(test
+ (name t_runtime_events)
+ (package trace-runtime-events)
  (modules t_runtime_events)
- (enabled_if
-  (>= %{ocaml_version} 5))
- (libraries trace trace.runtime-events))
-
-(rule
- (target t_core.output)
- (action
-  (with-stdout-to
-   t_core.output
-   (run %{exe:t_core.exe}))))
-
-(rule
- (alias runtest)
- (action
-  (diff t_core.expected t_core.output)))
+ (preprocess
+  (pps ppx_trace))
+ (libraries trace trace-runtime-events runtime_events))
diff --git a/test/t1.ml b/test/t1.ml
index 4f85ccc..16df2a1 100644
--- a/test/t1.ml
+++ b/test/t1.ml
@@ -1,3 +1,5 @@
+module Trace = Trace_core
+
 let run () =
   Trace.set_process_name "main";
   Trace.set_thread_name "t1";
diff --git a/test/t2.ml b/test/t2.ml
index e2868c9..c6e1ac5 100644
--- a/test/t2.ml
+++ b/test/t2.ml
@@ -1,3 +1,5 @@
+module Trace = Trace_core
+
 let ( let@ ) = ( @@ )
 
 let rec fib x =
diff --git a/test/t_debug.ml b/test/t_debug.ml
index 5257172..f2b712a 100644
--- a/test/t_debug.ml
+++ b/test/t_debug.ml
@@ -1,3 +1,5 @@
+module Trace = Trace_core
+
 let ( let@ ) = ( @@ )
 
 let main () =