diff --git a/build.sbt b/build.sbt
index 79a8559e0..fcb90d4ea 100644
--- a/build.sbt
+++ b/build.sbt
@@ -59,7 +59,7 @@ ThisBuild / mimaBinaryIssueFilters ++= List(
 )
 
 // This is used in a couple places
-lazy val fs2Version = "3.11.0"
+lazy val fs2Version = "3.12.0-RC2"
 lazy val natchezVersion = "0.3.7"
 
 // Global Settings
@@ -109,7 +109,7 @@ lazy val core = crossProject(JVMPlatform, JSPlatform, NativePlatform)
     description := "Tagless, non-blocking data access library for Postgres.",
     libraryDependencies ++= Seq(
       "org.typelevel"          %%% "cats-core"               % "2.11.0",
-      "org.typelevel"          %%% "cats-effect"             % "3.5.7",
+      "org.typelevel"          %%% "cats-effect"             % "3.6.0-RC2",
       "co.fs2"                 %%% "fs2-core"                % fs2Version,
       "co.fs2"                 %%% "fs2-io"                  % fs2Version,
       "org.scodec"             %%% "scodec-bits"             % "1.1.38",
@@ -208,7 +208,6 @@ lazy val tests = crossProject(JVMPlatform, JSPlatform, NativePlatform)
   )
   .nativeEnablePlugins(ScalaNativeBrewedConfigPlugin)
   .nativeSettings(
-    libraryDependencies += "com.armanbilge" %%% "epollcat" % "0.1.6",
     Test / nativeBrewFormulas ++= Set("s2n", "utf8proc"),
     Test / envVars ++= Map("S2N_DONT_MLOCK" -> "1")
   )
diff --git a/modules/tests/js/src/main/scala/ffstest/FFrameworkPlatform.scala b/modules/tests/js/src/main/scala/ffstest/FFrameworkPlatform.scala
deleted file mode 100644
index fc0470dc3..000000000
--- a/modules/tests/js/src/main/scala/ffstest/FFrameworkPlatform.scala
+++ /dev/null
@@ -1,9 +0,0 @@
-// Copyright (c) 2018-2021 by Rob Norris
-// This software is licensed under the MIT License (MIT).
-// For more information see LICENSE or https://opensource.org/licenses/MIT
-
-package ffstest
-
-import munit.CatsEffectSuite
-
-trait FTestPlatform extends CatsEffectSuite
\ No newline at end of file
diff --git a/modules/tests/jvm/src/main/scala/ffstest/FFrameworkPlatform.scala b/modules/tests/jvm/src/main/scala/ffstest/FFrameworkPlatform.scala
deleted file mode 100644
index 16acda019..000000000
--- a/modules/tests/jvm/src/main/scala/ffstest/FFrameworkPlatform.scala
+++ /dev/null
@@ -1,9 +0,0 @@
-// Copyright (c) 2018-2021 by Rob Norris
-// This software is licensed under the MIT License (MIT).
-// For more information see LICENSE or https://opensource.org/licenses/MIT
-
-package ffstest
-
-import munit.CatsEffectSuite
-
-trait FTestPlatform extends CatsEffectSuite
diff --git a/modules/tests/native/src/main/scala/ffstest/FFrameworkPlatform.scala b/modules/tests/native/src/main/scala/ffstest/FFrameworkPlatform.scala
deleted file mode 100644
index d1db03526..000000000
--- a/modules/tests/native/src/main/scala/ffstest/FFrameworkPlatform.scala
+++ /dev/null
@@ -1,12 +0,0 @@
-// Copyright (c) 2018-2021 by Rob Norris
-// This software is licensed under the MIT License (MIT).
-// For more information see LICENSE or https://opensource.org/licenses/MIT
-
-package ffstest
-
-import epollcat.unsafe.EpollRuntime
-import munit.CatsEffectSuite
-
-trait FTestPlatform extends CatsEffectSuite {
-  override def munitIORuntime = EpollRuntime.global
-}
\ No newline at end of file
diff --git a/modules/tests/shared/src/main/scala/ffstest/FFramework.scala b/modules/tests/shared/src/main/scala/ffstest/FFramework.scala
index 9b7770bea..69008e823 100644
--- a/modules/tests/shared/src/main/scala/ffstest/FFramework.scala
+++ b/modules/tests/shared/src/main/scala/ffstest/FFramework.scala
@@ -12,7 +12,7 @@ import natchez.Fields
 import munit.CatsEffectSuite
 import org.typelevel.twiddles._
 
-trait FTest extends CatsEffectSuite with FTestPlatform {
+trait FTest extends CatsEffectSuite {
 
   def pureTest(name: String)(f: => Boolean): Unit = test(name)(assert(name, f))
   def fail[A](msg: String): IO[A] = IO.raiseError(new AssertionError(msg))