diff --git a/tests/queries/0_stateless/01559_misplaced_codec_diagnostics.reference b/tests/queries/0_stateless/01559_misplaced_codec_diagnostics.reference
index d5bdb816bf2..e69de29bb2d 100644
--- a/tests/queries/0_stateless/01559_misplaced_codec_diagnostics.reference
+++ b/tests/queries/0_stateless/01559_misplaced_codec_diagnostics.reference
@@ -1 +0,0 @@
-Unknown data type family: CODEC
diff --git a/tests/queries/0_stateless/01559_misplaced_codec_diagnostics.sh b/tests/queries/0_stateless/01559_misplaced_codec_diagnostics.sh
deleted file mode 100755
index 8a3242c7036..00000000000
--- a/tests/queries/0_stateless/01559_misplaced_codec_diagnostics.sh
+++ /dev/null
@@ -1,7 +0,0 @@
-#!/usr/bin/env bash
-
-CURDIR=$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)
-# shellcheck source=../shell_config.sh
-. "$CURDIR"/../shell_config.sh
-
-${CLICKHOUSE_CLIENT} --query "CREATE TABLE t (c CODEC(NONE)) ENGINE = Memory" 2>&1 | grep -oF 'Unknown data type family: CODEC' | uniq
diff --git a/tests/queries/0_stateless/01559_misplaced_codec_diagnostics.sql b/tests/queries/0_stateless/01559_misplaced_codec_diagnostics.sql
new file mode 100644
index 00000000000..ab1cfc89be1
--- /dev/null
+++ b/tests/queries/0_stateless/01559_misplaced_codec_diagnostics.sql
@@ -0,0 +1 @@
+CREATE TABLE t (c CODEC(NONE)) ENGINE = Memory -- { clientError SYNTAX_ERROR }
\ No newline at end of file
diff --git a/tests/queries/0_stateless/02302_column_decl_null_before_defaul_value.sql b/tests/queries/0_stateless/02302_column_decl_null_before_defaul_value.sql
index 3825df1e557..a2c2fc7cba2 100644
--- a/tests/queries/0_stateless/02302_column_decl_null_before_defaul_value.sql
+++ b/tests/queries/0_stateless/02302_column_decl_null_before_defaul_value.sql
@@ -56,6 +56,6 @@ ALTER TABLE null_before ALTER COLUMN id TYPE INT NULL; -- { clientError SYNTAX_E
 select 'modify column, NULL modifier is not allowed';
 DROP TABLE IF EXISTS null_before SYNC;
 CREATE TABLE null_before (id INT NOT NULL) ENGINE=MergeTree() ORDER BY tuple();
-ALTER TABLE null_before MODIFY COLUMN id NULL DEFAULT 1; -- { serverError UNKNOWN_TYPE }
+ALTER TABLE null_before MODIFY COLUMN id NULL DEFAULT 1; -- { clientError SYNTAX_ERROR }
 
 DROP TABLE IF EXISTS null_before SYNC;