diff --git a/project/Mima.scala b/project/Mima.scala
index d5f5b49da..b15410f87 100644
--- a/project/Mima.scala
+++ b/project/Mima.scala
@@ -8,6 +8,10 @@ object Mima {
     Seq(
       ProblemFilters.exclude[Problem]("scalafix.internal.*"),
       ProblemFilters.exclude[Problem]("scala.meta.internal.*"),
+      // deprecation of TestRegistration, switch to AnyFunSuite; remove after next release
+      ProblemFilters.exclude[FinalMethodProblem]("org.scalatest.funsuite.AnyFunSuite.styleName"),
+      ProblemFilters.exclude[IncompatibleSignatureProblem]("scalafix.testkit.AbstractSemanticRuleSuite.*"),
+      ProblemFilters.exclude[IncompatibleSignatureProblem]("scalafix.testkit.AbstractSyntacticRuleSuite.*"),
       // Exceptions
       ProblemFilters.exclude[ReversedMissingMethodProblem]("scalafix.interfaces.Scalafix.scala38")
     )
diff --git a/scalafix-testkit/src/main/scala/scalafix/testkit/AbstractSemanticRuleSuite.scala b/scalafix-testkit/src/main/scala/scalafix/testkit/AbstractSemanticRuleSuite.scala
index fb35a2a7f..564f0558f 100644
--- a/scalafix-testkit/src/main/scala/scalafix/testkit/AbstractSemanticRuleSuite.scala
+++ b/scalafix-testkit/src/main/scala/scalafix/testkit/AbstractSemanticRuleSuite.scala
@@ -6,9 +6,8 @@ import java.nio.file.Files
 import scala.meta.internal.io.FileIO
 
 import org.scalatest.BeforeAndAfterAll
-import org.scalatest.Suite
-import org.scalatest.TestRegistration
 import org.scalatest.exceptions.TestFailedException
+import org.scalatest.funsuite.AnyFunSuite
 import scalafix.internal.config.ScalaVersion
 import scalafix.internal.patch.PatchInternals
 import scalafix.internal.reflect.ClasspathOps
@@ -24,8 +23,7 @@ import scalafix.internal.v1.Args
 abstract class AbstractSemanticRuleSuite(
     val props: TestkitProperties,
     val isSaveExpect: Boolean
-) extends Suite
-    with TestRegistration
+) extends AnyFunSuite
     with DiffAssertions
     with BeforeAndAfterAll { self =>
 
@@ -91,7 +89,7 @@ abstract class AbstractSemanticRuleSuite(
   }
 
   def runOn(diffTest: RuleTest): Unit = {
-    registerTest(diffTest.path.testName) {
+    test(diffTest.path.testName) {
       evaluateTestBody(diffTest)
     }
   }
diff --git a/scalafix-testkit/src/main/scala/scalafix/testkit/AbstractSyntacticRuleSuite.scala b/scalafix-testkit/src/main/scala/scalafix/testkit/AbstractSyntacticRuleSuite.scala
index 48c433863..3c60236bb 100644
--- a/scalafix-testkit/src/main/scala/scalafix/testkit/AbstractSyntacticRuleSuite.scala
+++ b/scalafix-testkit/src/main/scala/scalafix/testkit/AbstractSyntacticRuleSuite.scala
@@ -2,9 +2,8 @@ package scalafix.testkit
 
 import scala.meta._
 
-import org.scalatest.Suite
 import org.scalatest.Tag
-import org.scalatest.TestRegistration
+import org.scalatest.funsuite.AnyFunSuite
 import scalafix.internal.config.ScalafixConfig
 import scalafix.internal.patch.PatchInternals
 import scalafix.internal.v1.Rules
@@ -19,8 +18,7 @@ import scalafix.v1._
  *   the default rule to use from `check`/`checkDiff`.
  */
 abstract class AbstractSyntacticRuleSuite()
-    extends Suite
-    with TestRegistration
+    extends AnyFunSuite
     with DiffAssertions {
 
   def checkDiff(
@@ -29,7 +27,7 @@ abstract class AbstractSyntacticRuleSuite()
       expected: String,
       testTags: Tag*
   ): Unit = {
-    registerTest(original.label, testTags: _*) {
+    test(original.label, testTags: _*) {
       val scalaVersion = ScalafixConfig.default.scalaVersion
       val doc = SyntacticDocument.fromInput(original, scalaVersion)
       val rules = Rules(List(rule))
@@ -50,7 +48,7 @@ abstract class AbstractSyntacticRuleSuite()
       expected: String,
       testTags: Tag*
   ): Unit = {
-    registerTest(name, testTags: _*) {
+    test(name, testTags: _*) {
       val scalaVersion = ScalafixConfig.default.scalaVersion
       val doc =
         SyntacticDocument.fromInput(Input.String(original), scalaVersion)