diff --git a/core/src/test/java/org/apache/calcite/rel/rel2sql/RelToSqlConverterTest.java b/core/src/test/java/org/apache/calcite/rel/rel2sql/RelToSqlConverterTest.java
index 28d7a49278df..7fa8502c3209 100644
--- a/core/src/test/java/org/apache/calcite/rel/rel2sql/RelToSqlConverterTest.java
+++ b/core/src/test/java/org/apache/calcite/rel/rel2sql/RelToSqlConverterTest.java
@@ -7457,9 +7457,9 @@ private void checkLiteral2(String expression, String expected) {
    * <a href="https://issues.apache.org/jira/browse/CALCITE-6149">[CALCITE-6149]
    * unparse for CAST Nullable with ClickHouseSqlDialect</a>. */
   @Test void testClickhouseNullableFieldCast() {
-    final String query = "SELECT CASE WHEN \"product_name\" IS NULL THEN \"product_name\"+ 1 END\n"
+    final String query = "SELECT CASE WHEN \"product_id\" IS NULL THEN CAST(\"product_id\" AS TINYINT) END, CAST(\"product_id\" AS TINYINT)\n"
         + "FROM \"foodmart\".\"product\"";
-    final String expectedSql = "SELECT CAST(NULL AS `Nullable(Int32)`)\n"
+    final String expectedSql = "SELECT CAST(NULL AS `Nullable(Int8)`), CAST(`product_id` AS `Int8`)\n"
         + "FROM `foodmart`.`product`";
 
     sql(query).withClickHouse().ok(expectedSql);