diff --git a/kyuubi-common/src/test/scala/org/apache/kyuubi/operation/JDBCTests.scala b/kyuubi-common/src/test/scala/org/apache/kyuubi/operation/JDBCTests.scala
index ae43cbc4f..660a1f046 100644
--- a/kyuubi-common/src/test/scala/org/apache/kyuubi/operation/JDBCTests.scala
+++ b/kyuubi-common/src/test/scala/org/apache/kyuubi/operation/JDBCTests.scala
@@ -26,7 +26,7 @@ import org.apache.hive.service.rpc.thrift.{TExecuteStatementReq, TFetchResultsRe
 import org.apache.kyuubi.KYUUBI_VERSION
 
 trait JDBCTests extends BasicJDBCTests {
-  test("execute statement -  select null") {
+  test("execute statement - select null") {
     withJdbcStatement() { statement =>
       val resultSet = statement.executeQuery("SELECT NULL AS col")
       assert(resultSet.next())
@@ -38,7 +38,7 @@ trait JDBCTests extends BasicJDBCTests {
     }
   }
 
-  test("execute statement -  select boolean") {
+  test("execute statement - select boolean") {
     withJdbcStatement() { statement =>
       val resultSet = statement.executeQuery("SELECT false AS col")
       assert(resultSet.next())
@@ -50,7 +50,7 @@ trait JDBCTests extends BasicJDBCTests {
     }
   }
 
-  test("execute statement -  select tinyint") {
+  test("execute statement - select tinyint") {
     withJdbcStatement() { statement =>
       val resultSet = statement.executeQuery("SELECT 1Y AS col")
       assert(resultSet.next())
@@ -62,7 +62,7 @@ trait JDBCTests extends BasicJDBCTests {
     }
   }
 
-  test("execute statement -  select smallint") {
+  test("execute statement - select smallint") {
     withJdbcStatement() { statement =>
       val resultSet = statement.executeQuery("SELECT 1S AS col")
       assert(resultSet.next())
@@ -74,7 +74,7 @@ trait JDBCTests extends BasicJDBCTests {
     }
   }
 
-  test("execute statement -  select int") {
+  test("execute statement - select int") {
     withJdbcStatement() { statement =>
       val resultSet = statement.executeQuery("SELECT 4 AS col")
       assert(resultSet.next())
@@ -86,7 +86,7 @@ trait JDBCTests extends BasicJDBCTests {
     }
   }
 
-  test("execute statement -  select long") {
+  test("execute statement - select long") {
     withJdbcStatement() { statement =>
       val resultSet = statement.executeQuery("SELECT 4L AS col")
       assert(resultSet.next())
@@ -98,7 +98,7 @@ trait JDBCTests extends BasicJDBCTests {
     }
   }
 
-  test("execute statement -  select float") {
+  test("execute statement - select float") {
     withJdbcStatement() { statement =>
       val resultSet = statement.executeQuery("SELECT cast(1.2 as float) AS col")
       assert(resultSet.next())
@@ -110,7 +110,7 @@ trait JDBCTests extends BasicJDBCTests {
     }
   }
 
-  test("execute statement -  select double") {
+  test("execute statement - select double") {
     withJdbcStatement() { statement =>
       val resultSet = statement.executeQuery("SELECT 4.2D AS col")
       assert(resultSet.next())
@@ -122,7 +122,7 @@ trait JDBCTests extends BasicJDBCTests {
     }
   }
 
-  test("execute statement -  select string") {
+  test("execute statement - select string") {
     withJdbcStatement() { statement =>
       val resultSet = statement.executeQuery("SELECT 'kentyao' AS col")
       assert(resultSet.next())
@@ -134,7 +134,7 @@ trait JDBCTests extends BasicJDBCTests {
     }
   }
 
-  test("execute statement -  select binary") {
+  test("execute statement - select binary") {
     withJdbcStatement() { statement =>
       val resultSet = statement.executeQuery("SELECT cast('kyuubi' as binary) AS col")
       assert(resultSet.next())
@@ -146,7 +146,7 @@ trait JDBCTests extends BasicJDBCTests {
     }
   }
 
-  test("execute statement -  select date") {
+  test("execute statement - select date") {
     withJdbcStatement() { statement =>
       val resultSet = statement.executeQuery("SELECT DATE '2018-11-17' AS col")
       assert(resultSet.next())
@@ -158,7 +158,7 @@ trait JDBCTests extends BasicJDBCTests {
     }
   }
 
-  test("execute statement -  select timestamp") {
+  test("execute statement - select timestamp") {
     withJdbcStatement() { statement =>
       val resultSet = statement.executeQuery("SELECT TIMESTAMP '2018-11-17 13:33:33' AS col")
       assert(resultSet.next())
@@ -170,7 +170,7 @@ trait JDBCTests extends BasicJDBCTests {
     }
   }
 
-  test("execute statement -  select interval") {
+  test("execute statement - select interval") {
     withJdbcStatement() { statement =>
       val resultSet = statement.executeQuery("SELECT interval '1' day AS col")
       assert(resultSet.next())
@@ -182,7 +182,7 @@ trait JDBCTests extends BasicJDBCTests {
     }
   }
 
-  test("execute statement -  select array") {
+  test("execute statement - select array") {
     withJdbcStatement() { statement =>
       val resultSet = statement.executeQuery(
         "SELECT array() AS col1, array(1) AS col2, array(null) AS col3")
diff --git a/kyuubi-main/src/test/scala/org/apache/kyuubi/operation/KyuubiOperationHiveSuite.scala b/kyuubi-main/src/test/scala/org/apache/kyuubi/operation/KyuubiOperationHiveCatalogSuite.scala
similarity index 94%
rename from kyuubi-main/src/test/scala/org/apache/kyuubi/operation/KyuubiOperationHiveSuite.scala
rename to kyuubi-main/src/test/scala/org/apache/kyuubi/operation/KyuubiOperationHiveCatalogSuite.scala
index 0d89fe547..41a741521 100644
--- a/kyuubi-main/src/test/scala/org/apache/kyuubi/operation/KyuubiOperationHiveSuite.scala
+++ b/kyuubi-main/src/test/scala/org/apache/kyuubi/operation/KyuubiOperationHiveCatalogSuite.scala
@@ -22,7 +22,7 @@ import java.nio.file.Files
 import org.apache.kyuubi.{Utils, WithKyuubiServer}
 import org.apache.kyuubi.config.KyuubiConf
 
-class KyuubiOperationHiveSuite extends WithKyuubiServer with HiveJDBCTests {
+class KyuubiOperationHiveCatalogSuite extends WithKyuubiServer with HiveJDBCTests {
 
   private val metastore = {
     val dir = Utils.createTempDir()
diff --git a/kyuubi-main/src/test/scala/org/apache/kyuubi/operation/KyuubiOperationPerConnectionSuite.scala b/kyuubi-main/src/test/scala/org/apache/kyuubi/operation/KyuubiOperationPerConnectionSuite.scala
index 277c0c858..f6af36b41 100644
--- a/kyuubi-main/src/test/scala/org/apache/kyuubi/operation/KyuubiOperationPerConnectionSuite.scala
+++ b/kyuubi-main/src/test/scala/org/apache/kyuubi/operation/KyuubiOperationPerConnectionSuite.scala
@@ -26,7 +26,7 @@ import org.apache.kyuubi.config.KyuubiConf
 /**
  * UT with Connection level engine shared cost much time, only run basic jdbc tests.
  */
-class KyuubiOperationPerConnectionSuite extends WithKyuubiServer with BasicJDBCTests {
+class KyuubiOperationPerConnectionSuite extends WithKyuubiServer with JDBCTestUtils {
 
   override protected def jdbcUrl: String = getJdbcUrl
 
diff --git a/kyuubi-main/src/test/scala/org/apache/kyuubi/operation/KyuubiOperationYarnClusterSuite.scala b/kyuubi-main/src/test/scala/org/apache/kyuubi/operation/KyuubiOperationYarnClusterSuite.scala
index fb8fabbbe..6a1b95b18 100644
--- a/kyuubi-main/src/test/scala/org/apache/kyuubi/operation/KyuubiOperationYarnClusterSuite.scala
+++ b/kyuubi-main/src/test/scala/org/apache/kyuubi/operation/KyuubiOperationYarnClusterSuite.scala
@@ -21,8 +21,9 @@ import org.apache.kyuubi.WithKyuubiServerOnYarn
 import org.apache.kyuubi.config.KyuubiConf
 import org.apache.kyuubi.config.KyuubiConf.ENGINE_INIT_TIMEOUT
 
-class KyuubiOperationYarnClusterSuite extends WithKyuubiServerOnYarn
-  with JDBCTestUtils {
+class KyuubiOperationYarnClusterSuite extends WithKyuubiServerOnYarn with JDBCTestUtils {
+
+  override protected def jdbcUrl: String = getJdbcUrl
 
   override protected val kyuubiServerConf: KyuubiConf = {
     KyuubiConf().set(ENGINE_INIT_TIMEOUT, 300000L)
@@ -40,6 +41,4 @@ class KyuubiOperationYarnClusterSuite extends WithKyuubiServerOnYarn
       assert(resultSet.getString("id").startsWith("application_"))
     }
   }
-
-  override protected def jdbcUrl: String = getJdbcUrl
 }
diff --git a/kyuubi-main/src/test/scala/org/apache/kyuubi/operation/tpcds/OutputSchemaTPCDSSuite.scala b/kyuubi-main/src/test/scala/org/apache/kyuubi/operation/tpcds/OutputSchemaTPCDSSuite.scala
index 7c5f9d200..edbac8da2 100644
--- a/kyuubi-main/src/test/scala/org/apache/kyuubi/operation/tpcds/OutputSchemaTPCDSSuite.scala
+++ b/kyuubi-main/src/test/scala/org/apache/kyuubi/operation/tpcds/OutputSchemaTPCDSSuite.scala
@@ -17,7 +17,7 @@
 
 package org.apache.kyuubi.operation.tpcds
 
-import java.nio.charset.Charset
+import java.nio.charset.StandardCharsets
 import java.nio.file.{Files, Path, Paths}
 
 import org.apache.kyuubi.{DeltaSuiteMixin, WithKyuubiServer}
@@ -73,12 +73,10 @@ class OutputSchemaTPCDSSuite extends WithKyuubiServer
   }
 
   private val regenerateGoldenFiles = sys.env.get("KYUUBI_UPDATE").contains("1")
-  protected val baseResourcePath: Path = {
-    java.nio.file.Paths.get("src", "test", "resources")
-  }
+  protected val baseResourcePath: Path = Paths.get("src", "test", "resources")
 
   private def fileToString(file: Path): String = {
-    new String(Files.readAllBytes(file), Charset.forName("UTF-8"))
+    new String(Files.readAllBytes(file), StandardCharsets.UTF_8)
   }
 
   private def runQuery(query: String, goldenFile: Path): Unit = {