diff --git a/src/db/car/forest.rs b/src/db/car/forest.rs
index 4fae9a398446..6bbab45d2649 100644
--- a/src/db/car/forest.rs
+++ b/src/db/car/forest.rs
@@ -495,9 +495,9 @@ pub fn new_forest_car_temp_path_in(
 #[cfg(test)]
 mod tests {
     use super::*;
-    use crate::block_on;
     use nunny::vec as nonempty;
     use quickcheck_macros::quickcheck;
+    use tokio_test::block_on;
 
     fn mk_encoded_car(
         zstd_frame_size_tripwire: usize,
diff --git a/src/db/car/forest/index/mod.rs b/src/db/car/forest/index/mod.rs
index a8642e685f9f..d0fe66b58b1c 100644
--- a/src/db/car/forest/index/mod.rs
+++ b/src/db/car/forest/index/mod.rs
@@ -796,8 +796,8 @@ mod tests {
     use super::*;
     use ahash::{HashMap, HashSet};
     use cid::Cid;
-    use futures::executor::block_on;
     use tap::Tap as _;
+    use tokio_test::block_on;
 
     /// [`Reader`] should behave like a [`HashMap`], with a caveat for collisions.
     fn do_hashmap_of_cids(reference: HashMap<Cid, HashSet<u64>>) {
diff --git a/src/db/car/plain.rs b/src/db/car/plain.rs
index 0f36b1eb90b4..e3c41a8b1114 100644
--- a/src/db/car/plain.rs
+++ b/src/db/car/plain.rs
@@ -468,11 +468,12 @@ mod tests {
         car_stream::{CarStream, CarV1Header},
         car_util::load_car,
     };
-    use futures::{TryStreamExt as _, executor::block_on};
+    use futures::TryStreamExt as _;
     use fvm_ipld_blockstore::{Blockstore, MemoryBlockstore};
     use std::io::Cursor;
     use std::sync::LazyLock;
     use tokio::io::{AsyncBufRead, AsyncSeek, BufReader};
+    use tokio_test::block_on;
 
     #[test]
     fn test_uncompressed_v1() {
diff --git a/src/lib.rs b/src/lib.rs
index 255554fe2d2a..e083dfd83f1b 100644
--- a/src/lib.rs
+++ b/src/lib.rs
@@ -132,12 +132,3 @@ pub use key_management::{
 };
 pub use tool::main::main as forest_tool_main;
 pub use wallet::main::main as forest_wallet_main;
-
-#[cfg(test)]
-fn block_on<T>(f: impl std::future::Future<Output = T>) -> T {
-    tokio::runtime::Builder::new_multi_thread()
-        .enable_all()
-        .build()
-        .unwrap()
-        .block_on(f)
-}
diff --git a/src/utils/db/car_util.rs b/src/utils/db/car_util.rs
index 188365511dac..014a933c9bc3 100644
--- a/src/utils/db/car_util.rs
+++ b/src/utils/db/car_util.rs
@@ -42,7 +42,6 @@ mod tests {
     use std::io::Cursor;
 
     use super::*;
-    use crate::block_on;
     use crate::utils::db::car_stream::CarWriter;
     use crate::utils::multihash::prelude::*;
     use ahash::HashSet;
@@ -56,6 +55,7 @@ mod tests {
     use pretty_assertions::assert_eq;
     use quickcheck::Arbitrary;
     use quickcheck_macros::quickcheck;
+    use tokio_test::block_on;
 
     #[derive(Debug, Clone)]
     struct Blocks(Vec<CarBlock>);