diff --git a/kyuubi-common/src/test/scala/org/apache/kyuubi/KyuubiFunSuite.scala b/kyuubi-common/src/test/scala/org/apache/kyuubi/KyuubiFunSuite.scala
index 3c23be5f7..91ff1126e 100644
--- a/kyuubi-common/src/test/scala/org/apache/kyuubi/KyuubiFunSuite.scala
+++ b/kyuubi-common/src/test/scala/org/apache/kyuubi/KyuubiFunSuite.scala
@@ -22,13 +22,14 @@ import scala.collection.mutable.ArrayBuffer
 // scalastyle:off
 import org.apache.log4j.{Appender, AppenderSkeleton, Level, Logger}
 import org.apache.log4j.spi.LoggingEvent
-import org.scalatest.{BeforeAndAfterAll, BeforeAndAfterEach, FunSuite, Outcome}
+import org.scalatest.{BeforeAndAfterAll, BeforeAndAfterEach, Outcome}
 import org.scalatest.concurrent.Eventually
+import org.scalatest.funsuite.AnyFunSuite
 
 import org.apache.kyuubi.config.KyuubiConf
 import org.apache.kyuubi.config.internal.Tests.IS_TESTING
 
-trait KyuubiFunSuite extends FunSuite
+trait KyuubiFunSuite extends AnyFunSuite
   with BeforeAndAfterAll
   with BeforeAndAfterEach
   with Eventually
diff --git a/scalastyle-config.xml b/scalastyle-config.xml
index 9518b1ca3..743a3e4cf 100644
--- a/scalastyle-config.xml
+++ b/scalastyle-config.xml
@@ -135,11 +135,17 @@ This file is divided into 3 sections:
   <!-- ??? usually shouldn't be checked into the code base. -->
   <check level="error" class="org.scalastyle.scalariform.NotImplementedErrorUsage" enabled="true"/>
 
+  // remove this after upgrade to scalatest 3.2.x
   <check customId="funsuite" level="error" class="org.scalastyle.scalariform.TokenChecker" enabled="true">
     <parameters><parameter name="regex">^FunSuite[A-Za-z]*$</parameter></parameters>
     <customMessage>Tests must extend org.apache.kyuubi.KyuubiFunSuite instead.</customMessage>
   </check>
 
+  <check customId="anyfunsuite" level="error" class="org.scalastyle.scalariform.TokenChecker" enabled="true">
+    <parameters><parameter name="regex">^AnyFunSuite[A-Za-z]*$</parameter></parameters>
+    <customMessage>Tests must extend org.apache.kyuubi.KyuubiFunSuite instead.</customMessage>
+  </check>
+
   <check customId="println" level="error" class="org.scalastyle.scalariform.TokenChecker" enabled="true">
     <parameters><parameter name="regex">^println$</parameter></parameters>
     <customMessage><![CDATA[Are you sure you want to println? If yes, wrap the code block with