diff --git a/test/fiber/t_fib1.ml b/test/fiber/t_fib1.ml
index ac255d92..a71d309e 100644
--- a/test/fiber/t_fib1.ml
+++ b/test/fiber/t_fib1.ml
@@ -1,9 +1,6 @@
-open! Moonpool
-
 let ( let@ ) = ( @@ )
-let runner = Fifo_pool.create ~num_threads:1 ()
 
 let () =
+  let@ runner = Moonpool_fib.main in
   T_fibers.Fib.run1 ~runner ();
-  T_fibers.Fib.run2 ~runner ();
-
+  T_fibers.Fib.run2 ~runner ()
diff --git a/test/lwt/fibers/t_main.ml b/test/lwt/fibers/t_main.ml
index 988e8955..fd1e2127 100644
--- a/test/lwt/fibers/t_main.ml
+++ b/test/lwt/fibers/t_main.ml
@@ -19,15 +19,17 @@ let () =
   assert (r = 13)
 
 let () =
-  Printf.eprintf "PART 2\n%!";
-  try
-    let _r =
-      M_lwt.lwt_main @@ fun runner ->
-      let fib = F.spawn_top ~on:runner (fun () -> failwith "oops") in
-      F.await fib
-    in
+  (* run multiple times to make sure cleanup is correct *)
+  for _i = 1 to 10 do
+    try
+      let _r =
+        M_lwt.lwt_main @@ fun runner ->
+        let fib = F.spawn_top ~on:runner (fun () -> failwith "oops") in
+        F.await fib
+      in
 
-    assert false
-  with Failure msg ->
-    (* Printf.eprintf "got %S\n%!" msg; *)
-    assert (msg = "oops")
+      assert false
+    with Failure msg ->
+      (* Printf.eprintf "got %S\n%!" msg; *)
+      assert (msg = "oops")
+  done
diff --git a/test/lwt/hash_client.ml b/test/lwt/hash_client.ml
index 1ea3fcea..1e807184 100644
--- a/test/lwt/hash_client.ml
+++ b/test/lwt/hash_client.ml
@@ -1,4 +1,3 @@
-module M = Moonpool
 module M_lwt = Moonpool_lwt
 module Trace = Trace_core