diff --git a/kyuubi-hive-jdbc/pom.xml b/kyuubi-hive-jdbc/pom.xml
index ec057e2cf..27712a0d4 100644
--- a/kyuubi-hive-jdbc/pom.xml
+++ b/kyuubi-hive-jdbc/pom.xml
@@ -34,6 +34,11 @@
     <packaging>jar</packaging>
 
     <dependencies>
+        <dependency>
+            <groupId>org.scala-lang</groupId>
+            <artifactId>scala-library</artifactId>
+            <scope>provided</scope>
+        </dependency>
 
         <dependency>
             <groupId>org.apache.hive</groupId>
@@ -70,6 +75,7 @@
             <artifactId>kyuubi-common_${scala.binary.version}</artifactId>
             <version>${project.version}</version>
             <type>test-jar</type>
+            <scope>test</scope>
         </dependency>
 
         <dependency>
@@ -78,11 +84,13 @@
             <version>${project.version}</version>
             <scope>test</scope>
         </dependency>
+
         <dependency>
             <groupId>org.apache.kyuubi</groupId>
             <artifactId>kyuubi-spark-sql-engine_${scala.binary.version}</artifactId>
             <version>${project.version}</version>
             <type>test-jar</type>
+            <scope>test</scope>
         </dependency>
 
         <dependency>
@@ -91,6 +99,12 @@
             <scope>test</scope>
         </dependency>
 
+        <dependency>
+            <groupId>org.apache.iceberg</groupId>
+            <artifactId>${iceberg.name}</artifactId>
+            <scope>test</scope>
+        </dependency>
+
         <!--
           Spark requires `commons-collections` and `commons-io` but got them from transitive
           dependencies of `hadoop-client`. As we are using Hadoop Shaded Client, we need add
diff --git a/kyuubi-hive-jdbc/src/main/java/org/apache/kyuubi/jdbc/KyuubiDatabaseMetaData.java b/kyuubi-hive-jdbc/src/main/java/org/apache/kyuubi/jdbc/KyuubiDatabaseMetaData.java
index dc4aeff49..1a45bf936 100644
--- a/kyuubi-hive-jdbc/src/main/java/org/apache/kyuubi/jdbc/KyuubiDatabaseMetaData.java
+++ b/kyuubi-hive-jdbc/src/main/java/org/apache/kyuubi/jdbc/KyuubiDatabaseMetaData.java
@@ -60,11 +60,10 @@ public class KyuubiDatabaseMetaData extends HiveDatabaseMetaData {
         if (tStatus.getStatusCode() != TStatusCode.SUCCESS_STATUS) {
             throw new HiveSQLException(tStatus);
         }
-        new HiveQueryResultSet.Builder(conn)
+        return new HiveQueryResultSet.Builder(conn)
                 .setClient(client)
                 .setSessionHandle(sessHandle)
                 .setStmtHandle(getTableResp.getOperationHandle())
                 .build();
-        return super.getTables(catalog, schemaPattern, tableNamePattern, types);
     }
 }
diff --git a/kyuubi-hive-jdbc/src/test/scala/org/apache/kyuubi/jdbc/KyuubiDriverSuite.scala b/kyuubi-hive-jdbc/src/test/scala/org/apache/kyuubi/jdbc/KyuubiDriverSuite.scala
index e92806d3b..b1f68111f 100644
--- a/kyuubi-hive-jdbc/src/test/scala/org/apache/kyuubi/jdbc/KyuubiDriverSuite.scala
+++ b/kyuubi-hive-jdbc/src/test/scala/org/apache/kyuubi/jdbc/KyuubiDriverSuite.scala
@@ -19,33 +19,55 @@ package org.apache.kyuubi.jdbc
 
 import java.util.Properties
 
+import org.apache.kyuubi.IcebergSuiteMixin
 import org.apache.kyuubi.engine.spark.WithSparkSQLEngine
 import org.apache.kyuubi.engine.spark.shim.SparkCatalogShim
+import org.apache.kyuubi.tags.IcebergTest
 
-class KyuubiDriverSuite extends WithSparkSQLEngine {
+@IcebergTest
+class KyuubiDriverSuite extends WithSparkSQLEngine with IcebergSuiteMixin {
+
+  override def withKyuubiConf: Map[String, String] = extraConfigs -
+    "spark.sql.defaultCatalog" -
+    "spark.sql.catalog.spark_catalog"
+
+  override def afterAll(): Unit = {
+    super.afterAll()
+    for ((k, _) <- withKyuubiConf) {
+      System.clearProperty(k)
+    }
+  }
 
   test("get tables with kyuubi driver") {
     val kyuubiDriver = new KyuubiDriver()
     val connection = kyuubiDriver.connect(getJdbcUrl, new Properties())
+    assert(connection.isInstanceOf[KyuubiConnection])
+    val metaData = connection.getMetaData
+    assert(metaData.isInstanceOf[KyuubiDatabaseMetaData])
     val statement = connection.createStatement()
-    val table = s"${SparkCatalogShim.SESSION_CATALOG}.default.kyuubi_hive_jdbc"
+    val table1 = s"${SparkCatalogShim.SESSION_CATALOG}.default.kyuubi_hive_jdbc"
+    val table2 = s"$catalog.default.hdp_cat_tbl"
     try {
-      statement.execute(s"CREATE TABLE ${table}(key int) using parquet")
-      assert(connection.isInstanceOf[KyuubiConnection])
-      val metaData = connection.getMetaData
-      assert(metaData.isInstanceOf[KyuubiDatabaseMetaData])
-      val resultSet = metaData.getTables(SparkCatalogShim.SESSION_CATALOG, "default", "%", null)
-      assert(resultSet.next())
-      assert(resultSet.getString(1) === SparkCatalogShim.SESSION_CATALOG)
-      assert(resultSet.getString(2) === "default")
-      assert(resultSet.getString(3) === "kyuubi_hive_jdbc")
+      statement.execute(s"CREATE TABLE $table1(key int) USING parquet")
+      statement.execute(s"CREATE TABLE $table2(key int) USING $format")
+
+      val resultSet1 = metaData.getTables(SparkCatalogShim.SESSION_CATALOG, "default", "%", null)
+      assert(resultSet1.next())
+      assert(resultSet1.getString(1) === SparkCatalogShim.SESSION_CATALOG)
+      assert(resultSet1.getString(2) === "default")
+      assert(resultSet1.getString(3) === "kyuubi_hive_jdbc")
+
+      val resultSet2 = metaData.getTables(catalog, "default", "%", null)
+      assert(resultSet2.next())
+      assert(resultSet2.getString(1) === catalog)
+      assert(resultSet2.getString(2) === "default")
+      assert(resultSet2.getString(3) === "hdp_cat_tbl")
     } finally {
-      statement.execute(s"DROP TABLE ${table}")
+      statement.execute(s"DROP TABLE IF EXISTS $table1")
+      statement.execute(s"DROP TABLE IF EXISTS $table2")
       statement.close()
       connection.close()
     }
     connection
   }
-
-  override def withKyuubiConf: Map[String, String] = Map.empty
 }