diff --git a/.github/workflows/tpcds.yml b/.github/workflows/tpcds.yml
index 45820737..3fa20fa2 100644
--- a/.github/workflows/tpcds.yml
+++ b/.github/workflows/tpcds.yml
@@ -31,6 +31,7 @@ jobs:
       fail-fast: false
       matrix:
         spark: [ 3.3, 3.4 ]
+        scala: [ 2.12, 2.13 ]
     steps:
       - uses: actions/checkout@v3
       - uses: actions/setup-java@v3
@@ -41,6 +42,7 @@ jobs:
       - run: >-
           ./gradlew clean slowTest --no-daemon --refresh-dependencies
           -Dspark_binary_version=${{ matrix.spark }}
+          -Dscala_binary_version=${{ matrix.scala }}
           -PmavenCentralMirror=https://maven-central.storage-download.googleapis.com/maven2/
       - name: Upload test logs
         if: failure()
diff --git a/gradle.properties b/gradle.properties
index 31d65d4d..4930d619 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -48,7 +48,7 @@ commons_codec_version=1.16.0
 jakarta_annotation_api_version=1.3.5
 
 # Test only
-kyuubi_version=1.7.1
+kyuubi_version=1.8.0
 testcontainers_scala_version=0.41.0
 scalatest_version=3.2.15
 flexmark_version=0.62.2
diff --git a/spark-3.3/build.gradle b/spark-3.3/build.gradle
index 682625e8..3e2970f1 100644
--- a/spark-3.3/build.gradle
+++ b/spark-3.3/build.gradle
@@ -80,9 +80,7 @@ project(":clickhouse-spark-it-${spark_binary_version}_$scala_binary_version") {
 
         testImplementation("com.clickhouse:clickhouse-jdbc:$clickhouse_jdbc_version:all") { transitive = false }
 
-        if (scala_binary_version == "2.12") {
-            testImplementation "org.apache.kyuubi:kyuubi-spark-connector-tpcds_${scala_binary_version}:$kyuubi_version"
-        }
+        testImplementation "org.apache.kyuubi:kyuubi-spark-connector-tpcds_${scala_binary_version}:$kyuubi_version"
     }
 
     test {
diff --git a/spark-3.4/build.gradle b/spark-3.4/build.gradle
index ad33aba9..2162699c 100644
--- a/spark-3.4/build.gradle
+++ b/spark-3.4/build.gradle
@@ -80,9 +80,7 @@ project(":clickhouse-spark-it-${spark_binary_version}_$scala_binary_version") {
 
         testImplementation("com.clickhouse:clickhouse-jdbc:$clickhouse_jdbc_version:all") { transitive = false }
 
-        if (scala_binary_version == "2.12") {
-            testImplementation "org.apache.kyuubi:kyuubi-spark-connector-tpcds_${scala_binary_version}:$kyuubi_version"
-        }
+        testImplementation "org.apache.kyuubi:kyuubi-spark-connector-tpcds_${scala_binary_version}:$kyuubi_version"
     }
 
     test {