diff --git a/build.sbt b/build.sbt
index 63f1aa9e..94dee571 100644
--- a/build.sbt
+++ b/build.sbt
@@ -24,7 +24,7 @@ lazy val root = tlCrossRootProject.aggregate(servlet, examples)
 val asyncHttpClientVersion = "2.12.3"
 val jettyVersion = "10.0.21"
 val http4sVersion = "0.23.27"
-val munitCatsEffectVersion = "1.0.7"
+val munitCatsEffectVersion = "2.0.0"
 val servletApiVersion = "4.0.1"
 
 lazy val servlet = project
@@ -39,7 +39,7 @@ lazy val servlet = project
       "org.eclipse.jetty" % "jetty-servlet" % jettyVersion % Test,
       "org.http4s" %% "http4s-dsl" % http4sVersion % Test,
       "org.http4s" %% "http4s-server" % http4sVersion,
-      "org.typelevel" %% "munit-cats-effect-3" % munitCatsEffectVersion % Test,
+      "org.typelevel" %% "munit-cats-effect" % munitCatsEffectVersion % Test,
     ),
   )
 
diff --git a/servlet/src/test/scala/org/http4s/servlet/AsyncHttp4sServletSuite.scala b/servlet/src/test/scala/org/http4s/servlet/AsyncHttp4sServletSuite.scala
index bb04b234..93034f0b 100644
--- a/servlet/src/test/scala/org/http4s/servlet/AsyncHttp4sServletSuite.scala
+++ b/servlet/src/test/scala/org/http4s/servlet/AsyncHttp4sServletSuite.scala
@@ -59,7 +59,7 @@ class AsyncHttp4sServletSuite extends CatsEffectSuite {
     .orNotFound
 
   private def servletServer(asyncTimeout: FiniteDuration = 10.seconds) =
-    ResourceFixture[Int](
+    ResourceFunFixture[Int](
       Dispatcher.parallel[IO].flatMap(d => TestEclipseServer(servlet(d, asyncTimeout)))
     )
 
diff --git a/servlet/src/test/scala/org/http4s/servlet/BlockingHttp4sServletSuite.scala b/servlet/src/test/scala/org/http4s/servlet/BlockingHttp4sServletSuite.scala
index e212d7fb..2a5ee548 100644
--- a/servlet/src/test/scala/org/http4s/servlet/BlockingHttp4sServletSuite.scala
+++ b/servlet/src/test/scala/org/http4s/servlet/BlockingHttp4sServletSuite.scala
@@ -45,7 +45,7 @@ class BlockingHttp4sServletSuite extends CatsEffectSuite {
     }
     .orNotFound
 
-  private val servletServer = ResourceFixture(
+  private val servletServer = ResourceFunFixture(
     Dispatcher.parallel[IO].flatMap(d => TestEclipseServer(servlet(d)))
   )
 
diff --git a/servlet/src/test/scala/org/http4s/servlet/RouterInServletSuite.scala b/servlet/src/test/scala/org/http4s/servlet/RouterInServletSuite.scala
index e1a9ed94..f8de9e15 100644
--- a/servlet/src/test/scala/org/http4s/servlet/RouterInServletSuite.scala
+++ b/servlet/src/test/scala/org/http4s/servlet/RouterInServletSuite.scala
@@ -45,23 +45,25 @@ class RouterInServletSuite extends CatsEffectSuite {
   )
 
   private val serverWithoutRouter =
-    ResourceFixture[Int](Dispatcher.parallel[IO].flatMap(d => mkServer(mainRoutes, dispatcher = d)))
+    ResourceFunFixture[Int](
+      Dispatcher.parallel[IO].flatMap(d => mkServer(mainRoutes, dispatcher = d))
+    )
   private val server =
-    ResourceFixture[Int](Dispatcher.parallel[IO].flatMap(d => mkServer(router, dispatcher = d)))
+    ResourceFunFixture[Int](Dispatcher.parallel[IO].flatMap(d => mkServer(router, dispatcher = d)))
   private val serverWithContextPath =
-    ResourceFixture[Int](
+    ResourceFunFixture[Int](
       Dispatcher
         .parallel[IO]
         .flatMap(d => mkServer(router, contextPath = "/context", dispatcher = d))
     )
   private val serverWithServletPath =
-    ResourceFixture[Int](
+    ResourceFunFixture[Int](
       Dispatcher
         .parallel[IO]
         .flatMap(d => mkServer(router, servletPath = "/servlet/*", dispatcher = d))
     )
   private val serverWithContextAndServletPath =
-    ResourceFixture[Int](
+    ResourceFunFixture[Int](
       Dispatcher
         .parallel[IO]
         .flatMap(d =>