diff --git a/integration-tests/kyuubi-kubernetes-it/src/test/scala/org/apache/kyuubi/kubernetes/test/WithKyuubiServerOnKubernetes.scala b/integration-tests/kyuubi-kubernetes-it/src/test/scala/org/apache/kyuubi/kubernetes/test/WithKyuubiServerOnKubernetes.scala
new file mode 100644
index 000000000..f58b51a84
--- /dev/null
+++ b/integration-tests/kyuubi-kubernetes-it/src/test/scala/org/apache/kyuubi/kubernetes/test/WithKyuubiServerOnKubernetes.scala
@@ -0,0 +1,62 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
+ *
+ *    http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.apache.kyuubi.kubernetes.test
+
+import io.fabric8.kubernetes.client.DefaultKubernetesClient
+
+import org.apache.kyuubi.WithKyuubiServer
+import org.apache.kyuubi.config.KyuubiConf
+
+trait WithKyuubiServerOnKubernetes extends WithKyuubiServer {
+  protected val kyuubiServerConf: KyuubiConf = KyuubiConf()
+  protected val connectionConf: Map[String, String]
+  private var miniKubernetesClient: DefaultKubernetesClient = _
+
+  final override protected lazy val conf: KyuubiConf = {
+    connectionConf.foreach { case (k, v) => kyuubiServerConf.set(k, v) }
+    kyuubiServerConf
+  }
+
+  override def beforeAll(): Unit = {
+    miniKubernetesClient = MiniKube.getKubernetesClient
+    super.beforeAll()
+  }
+
+  override def afterAll(): Unit = super.afterAll()
+
+  override protected def getJdbcUrl: String = {
+    val kyuubiServers =
+      miniKubernetesClient.pods().list().getItems
+    assert(kyuubiServers.size() == 1)
+    val kyuubiServer = kyuubiServers.get(0)
+    // Kyuubi server state should be running since mvn compile is quite slowly..
+    if (!"running".equalsIgnoreCase(kyuubiServer.getStatus.getPhase)) {
+      val log =
+        miniKubernetesClient
+          .pods()
+          .withName(kyuubiServer.getMetadata.getName)
+          .getLog
+      throw new IllegalStateException(
+        s"Kyuubi server pod state error: ${kyuubiServer.getStatus.getPhase}, log:\n$log")
+    }
+    val kyuubiServerIp = MiniKube.getIp
+    val kyuubiServerPort =
+      kyuubiServer.getSpec.getContainers.get(0).getPorts.get(0).getHostPort
+    s"jdbc:hive2://$kyuubiServerIp:$kyuubiServerPort/;"
+  }
+}
diff --git a/integration-tests/kyuubi-kubernetes-it/src/test/scala/org/apache/kyuubi/kubernetes/test/deployment/KyuubiOnKubernetesTestsSuite.scala b/integration-tests/kyuubi-kubernetes-it/src/test/scala/org/apache/kyuubi/kubernetes/test/deployment/KyuubiOnKubernetesTestsSuite.scala
index 4ce7fe107..5d15fcf2b 100644
--- a/integration-tests/kyuubi-kubernetes-it/src/test/scala/org/apache/kyuubi/kubernetes/test/deployment/KyuubiOnKubernetesTestsSuite.scala
+++ b/integration-tests/kyuubi-kubernetes-it/src/test/scala/org/apache/kyuubi/kubernetes/test/deployment/KyuubiOnKubernetesTestsSuite.scala
@@ -17,8 +17,7 @@
 
 package org.apache.kyuubi.kubernetes.test.deployment
 
-import org.apache.kyuubi.Logging
-import org.apache.kyuubi.kubernetes.test.MiniKube
+import org.apache.kyuubi.kubernetes.test.WithKyuubiServerOnKubernetes
 import org.apache.kyuubi.operation.SparkQueryTests
 
 /**
@@ -31,34 +30,11 @@ import org.apache.kyuubi.operation.SparkQueryTests
  *  |          |         |                                                   |
  *  ------------         -----------------------------------------------------
  */
-class KyuubiOnKubernetesTestsSuite extends SparkQueryTests with Logging {
-  private lazy val _jdbcUrl: String = {
-    val kubernetesclient = MiniKube.getKubernetesClient
-    val kyuubiServers =
-      kubernetesclient
-        .pods()
-        .list()
-        .getItems
-    assert(kyuubiServers.size() == 1)
-    val kyuubiServer = kyuubiServers.get(0)
-    // Kyuubi server state should be running since mvn compile is quite slowly..
-    if (!"running".equalsIgnoreCase(kyuubiServer.getStatus.getPhase)) {
-      val log =
-        kubernetesclient
-          .pods()
-          .withName(kyuubiServer.getMetadata.getName)
-          .getLog
-      throw new IllegalStateException(
-        s"Kyuubi server pod state error: ${kyuubiServer.getStatus.getPhase}, log:\n$log")
-    }
-    val kyuubiServerIp = MiniKube.getIp
-    val kyuubiServerPort =
-      kyuubiServer.getSpec.getContainers.get(0).getPorts.get(0).getHostPort
-    s"jdbc:hive2://$kyuubiServerIp:$kyuubiServerPort/;"
-  }
+class KyuubiOnKubernetesWithLocalSparkTestsSuite extends WithKyuubiServerOnKubernetes
+  with SparkQueryTests {
+  override protected val connectionConf: Map[String, String] = Map(
+    "spark.master" -> "local",
+    "spark.executor.instances" -> "1")
 
-  override protected def jdbcUrl: String = {
-    assert(_jdbcUrl != null, "Failed to get Kyuubi server")
-    _jdbcUrl
-  }
+  override protected def jdbcUrl: String = getJdbcUrl
 }