diff --git a/test/cases/expression/case_when.sql b/test/cases/expression/case_when.sql
index 0059be4e0fa060e280250b631a19e0f7171e82a6..1b880b954a2c01f8b1a4ed3e97a7236a99611931 100755
--- a/test/cases/expression/case_when.sql
+++ b/test/cases/expression/case_when.sql
@@ -9,15 +9,15 @@ select CASE "c" when "a" then 1 when "b" then 2 ELSE 3 END;
 select CASE when 1=0 then "true" else "false" END;
 select CASE 1 when 1 then "one" WHEN 2 then "two" ELSE "more" END;
 select CASE 2.0 when 1 then "one" WHEN 2.0 then "two" ELSE "more" END;
--- @bvt:issue#3294
+
 select (CASE "two" when "one" then "1" WHEN "two" then "2" END) | 0;
--- @bvt:issue
+
 select (CASE "two" when "one" then 1.00 WHEN "two" then 2.00 END) +0.0;
 select case 1/0 when "a" then "true" else "false" END;
 select case 1/0 when "a" then "true" END;
--- @bvt:issue#3294
+
 select (case 1/0 when "a" then "true" END) | 0;
--- @bvt:issue
+
 select (case 1/0 when "a" then "true" END) + 0.0;
 select case when 1>0 then "TRUE" else "FALSE" END;
 select case when 1<0 then "TRUE" else "FALSE" END;
diff --git a/test/cases/function/func_cast.test b/test/cases/function/func_cast.test
index 4d508726b9f8f9f73f0bd58a2a53a988d53e608f..d37b0ad0265db10b9b774269edb4e3be9ef04c0c 100644
--- a/test/cases/function/func_cast.test
+++ b/test/cases/function/func_cast.test
@@ -2,9 +2,9 @@ select CAST(1-2 AS UNSIGNED);
 select CAST(CAST(1-2 AS UNSIGNED) AS SIGNED INTEGER);
 select CAST('10 ' as unsigned integer);
 select CAST('10x' as unsigned integer);
--- @bvt:issue#3294
+
 select cast(-5 as unsigned) | 1, cast(-5 as unsigned) & -1;
--- @bvt:issue
+
 select cast(-5 as unsigned) -1, cast(-5 as unsigned) + 1;
 select cast(5 as unsigned) -6.0;
 select cast(NULL as signed);
diff --git a/test/result/expression/case_when.result b/test/result/expression/case_when.result
index 1ef3e7032640b91a0bf5cfc82223fba8d0e19cb2..848f90c5c43e66b628df8151da11b557d7b5b474 100755
--- a/test/result/expression/case_when.result
+++ b/test/result/expression/case_when.result
@@ -27,8 +27,7 @@ division by zero
 select case 1/0 when "a" then "true" END;
 division by zero
 select (case 1/0 when "a" then "true" END) | 0;
-(case 1/0 when "a" then "true" END) | 0
-null
+division by zero
 select (case 1/0 when "a" then "true" END) + 0.0;
 division by zero
 select case when 1>0 then "TRUE" else "FALSE" END;
diff --git a/test/result/function/func_cast.result b/test/result/function/func_cast.result
index 34a3aaf8bd2620b48e2e4b642629319d9c3428fa..9ec505f94ba852c259e40c6e77dc89faca221122 100644
--- a/test/result/function/func_cast.result
+++ b/test/result/function/func_cast.result
@@ -8,8 +8,7 @@ cast(10  as integer unsigned)
 select CAST('10x' as unsigned integer);
 Can't cast '10x' from VARCHAR type to BIGINT UNSIGNED type.
 select cast(-5 as unsigned) | 1, cast(-5 as unsigned) & -1;
-cast(-5 as unsigned) | 1	cast(-5 as unsigned) & -1
-18446744073709551611	18446744073709551611
+Can't cast '-5' from BIGINT type to BIGINT UNSIGNED type. Reason: overflow
 select cast(-5 as unsigned) -1, cast(-5 as unsigned) + 1;
 Can't cast '-5' from BIGINT type to BIGINT UNSIGNED type. Reason: overflow
 select cast(5 as unsigned) -6.0;