diff --git a/tests/queries/0_stateless/02969_mysql_cast_type_aliases.reference b/tests/queries/0_stateless/02969_mysql_cast_type_aliases.reference
old mode 100755
new mode 100644
index cd9ed5eb39f..5555c918500
--- a/tests/queries/0_stateless/02969_mysql_cast_type_aliases.reference
+++ b/tests/queries/0_stateless/02969_mysql_cast_type_aliases.reference
@@ -1,54 +1,28 @@
 -- Uppercase tests
-mysql_type	result	native_type
 Binary(N)	foo	FixedString(3)
-mysql_type	result	native_type
 Char	44	String
-mysql_type	result	native_type
 Date	2021-02-03	Date
-mysql_type	result	native_type
 DateTime	2021-02-03 12:01:02	DateTime
-mysql_type	result	native_type
 Decimal	45	Decimal(10, 0)
-mysql_type	result	native_type
 Decimal(M)	46	Decimal(4, 0)
-mysql_type	result	native_type
 Decimal(M, D)	47.21	Decimal(4, 2)
-mysql_type	result	native_type
 Double	48.11	Float64
-mysql_type	result	native_type
-JSON	{"foo":"bar"}	Object('json')
-mysql_type	result	native_type
+JSON	{"foo":"bar"}	Object(\'json\')
 Real	49.22	Float32
-mysql_type	result	native_type
 Signed	50	Int64
-mysql_type	result	native_type
 Unsigned	52	UInt64
-mysql_type	result	native_type
 Year	2007	UInt16
 -- Lowercase tests
-mysql_type	result	native_type
 Binary(N)	foo	FixedString(3)
-mysql_type	result	native_type
 Char	44	String
-mysql_type	result	native_type
 Date	2021-02-03	Date
-mysql_type	result	native_type
 DateTime	2021-02-03 12:01:02	DateTime
-mysql_type	result	native_type
 Decimal	45	Decimal(10, 0)
-mysql_type	result	native_type
 Decimal(M)	46	Decimal(4, 0)
-mysql_type	result	native_type
 Decimal(M, D)	47.21	Decimal(4, 2)
-mysql_type	result	native_type
 Double	48.11	Float64
-mysql_type	result	native_type
-JSON	{"foo":"bar"}	Object('json')
-mysql_type	result	native_type
+JSON	{"foo":"bar"}	Object(\'json\')
 Real	49.22	Float32
-mysql_type	result	native_type
 Signed	50	Int64
-mysql_type	result	native_type
 Unsigned	52	UInt64
-mysql_type	result	native_type
 Year	2007	UInt16
diff --git a/tests/queries/0_stateless/02969_mysql_cast_type_aliases.sh b/tests/queries/0_stateless/02969_mysql_cast_type_aliases.sh
deleted file mode 100755
index 35218bec549..00000000000
--- a/tests/queries/0_stateless/02969_mysql_cast_type_aliases.sh
+++ /dev/null
@@ -1,52 +0,0 @@
-#!/usr/bin/env bash
-# Tags: no-fasttest
-# Tag no-fasttest: requires mysql client
-
-CURDIR=$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)
-# shellcheck source=../shell_config.sh
-. "$CURDIR"/../shell_config.sh
-
-# See https://dev.mysql.com/doc/refman/8.0/en/cast-functions.html#function_cast
-# Tests are in order of the type appearance in the docs
-
-echo "-- Uppercase tests"
-#### Not supported as it is translated to FixedString without arguments
-# ${MYSQL_CLIENT} --execute "SELECT 'Binary' AS mysql_type, CAST('' AS BINARY) AS result, toTypeName(result) AS native_type;"
-${MYSQL_CLIENT} --execute "SELECT 'Binary(N)' AS mysql_type, CAST('foo' AS BINARY(3)) AS result, toTypeName(result) AS native_type;"
-${MYSQL_CLIENT} --execute "SELECT 'Char' AS mysql_type, CAST(44 AS CHAR) AS result, toTypeName(result) AS native_type;"
-${MYSQL_CLIENT} --execute "SELECT 'Date' AS mysql_type, CAST('2021-02-03' AS DATE) AS result, toTypeName(result) AS native_type;"
-${MYSQL_CLIENT} --execute "SELECT 'DateTime' AS mysql_type, CAST('2021-02-03 12:01:02' AS DATETIME) AS result, toTypeName(result) AS native_type;"
-${MYSQL_CLIENT} --execute "SELECT 'Decimal' AS mysql_type, CAST(45.1 AS DECIMAL) AS result, toTypeName(result) AS native_type;"
-${MYSQL_CLIENT} --execute "SELECT 'Decimal(M)' AS mysql_type, CAST(46.2 AS DECIMAL(4)) AS result, toTypeName(result) AS native_type;"
-${MYSQL_CLIENT} --execute "SELECT 'Decimal(M, D)' AS mysql_type, CAST(47.21 AS DECIMAL(4, 2)) AS result, toTypeName(result) AS native_type;"
-${MYSQL_CLIENT} --execute "SELECT 'Double' AS mysql_type, CAST(48.11 AS DOUBLE) AS result, toTypeName(result) AS native_type;"
-${MYSQL_CLIENT} --execute "SET allow_experimental_object_type = 1; SELECT 'JSON' AS mysql_type, CAST('{\"foo\":\"bar\"}' AS JSON) AS result, toTypeName(result) AS native_type;"
-${MYSQL_CLIENT} --execute "SELECT 'Real' AS mysql_type, CAST(49.22 AS REAL) AS result, toTypeName(result) AS native_type;"
-${MYSQL_CLIENT} --execute "SELECT 'Signed' AS mysql_type, CAST(50 AS SIGNED) AS result, toTypeName(result) AS native_type;"
-${MYSQL_CLIENT} --execute "SELECT 'Unsigned' AS mysql_type, CAST(52 AS UNSIGNED) AS result, toTypeName(result) AS native_type;"
-#### Could be added as an alias, but SIGNED INTEGER in CAST context means UInt64, 
-#### while INTEGER SIGNED as a column definition means UInt32.
-# ${MYSQL_CLIENT} --execute "SELECT 'Signed integer' AS mysql_type, CAST(51 AS SIGNED INTEGER) AS result, toTypeName(result) AS native_type;"
-# ${MYSQL_CLIENT} --execute "SELECT 'Unsigned integer' AS mysql_type, CAST(53 AS UNSIGNED INTEGER) AS result, toTypeName(result) AS native_type;"
-${MYSQL_CLIENT} --execute "SELECT 'Year' AS mysql_type, CAST(2007 AS YEAR) AS result, toTypeName(result) AS native_type;"
-#### Currently, expects UInt64 as an argument
-# ${MYSQL_CLIENT} --execute "SELECT 'Time' AS mysql_type, CAST('12:45' AS TIME) AS result, toTypeName(result) AS native_type;"
-
-echo "-- Lowercase tests"
-# ${MYSQL_CLIENT} --execute "select 'Binary' as mysql_type, cast('' as binary) as result, toTypeName(result) as native_type;"
-${MYSQL_CLIENT} --execute "select 'Binary(N)' as mysql_type, cast('foo' as binary(3)) as result, toTypeName(result) as native_type;"
-${MYSQL_CLIENT} --execute "select 'Char' as mysql_type, cast(44 as char) as result, toTypeName(result) as native_type;"
-${MYSQL_CLIENT} --execute "select 'Date' as mysql_type, cast('2021-02-03' as date) as result, toTypeName(result) as native_type;"
-${MYSQL_CLIENT} --execute "select 'DateTime' as mysql_type, cast('2021-02-03 12:01:02' as datetime) as result, toTypeName(result) as native_type;"
-${MYSQL_CLIENT} --execute "select 'Decimal' as mysql_type, cast(45.1 as decimal) as result, toTypeName(result) as native_type;"
-${MYSQL_CLIENT} --execute "select 'Decimal(M)' as mysql_type, cast(46.2 as decimal(4)) as result, toTypeName(result) as native_type;"
-${MYSQL_CLIENT} --execute "select 'Decimal(M, D)' as mysql_type, cast(47.21 as decimal(4, 2)) as result, toTypeName(result) as native_type;"
-${MYSQL_CLIENT} --execute "select 'Double' as mysql_type, cast(48.11 as double) as result, toTypeName(result) as native_type;"
-${MYSQL_CLIENT} --execute "set allow_experimental_object_type = 1; select 'JSON' as mysql_type, cast('{\"foo\":\"bar\"}' as json) as result, toTypeName(result) as native_type;"
-${MYSQL_CLIENT} --execute "select 'Real' as mysql_type, cast(49.22 as real) as result, toTypeName(result) as native_type;"
-${MYSQL_CLIENT} --execute "select 'Signed' as mysql_type, cast(50 as signed) as result, toTypeName(result) as native_type;"
-${MYSQL_CLIENT} --execute "select 'Unsigned' as mysql_type, cast(52 as unsigned) as result, toTypeName(result) as native_type;"
-# ${MYSQL_CLIENT} --execute "select 'Signed integer' as mysql_type, cast(51 as signed integer) as result, toTypeName(result) as native_type;"
-# ${MYSQL_CLIENT} --execute "select 'Unsigned integer' as mysql_type, cast(53 as unsigned integer) as result, toTypeName(result) as native_type;"
-${MYSQL_CLIENT} --execute "select 'Year' as mysql_type, cast(2007 as year) as result, toTypeName(result) as native_type;"
-# ${MYSQL_CLIENT} --execute "select 'Time' as mysql_type, cast('12:45' as time) as result, toTypeName(result) as native_type;"
diff --git a/tests/queries/0_stateless/02969_mysql_cast_type_aliases.sql b/tests/queries/0_stateless/02969_mysql_cast_type_aliases.sql
new file mode 100755
index 00000000000..7b5735cdebc
--- /dev/null
+++ b/tests/queries/0_stateless/02969_mysql_cast_type_aliases.sql
@@ -0,0 +1,46 @@
+-- See https://dev.mysql.com/doc/refman/8.0/en/cast-functions.html#function_cast
+-- Tests are in order of the type appearance in the docs
+
+SET allow_experimental_object_type = 1;
+
+SELECT '-- Uppercase tests';
+-- Not supported as it is translated to FixedString without arguments
+-- SELECT 'Binary' AS mysql_type, CAST('' AS BINARY) AS result, toTypeName(result) AS native_type;
+SELECT 'Binary(N)' AS mysql_type, CAST('foo' AS BINARY(3)) AS result, toTypeName(result) AS native_type;
+SELECT 'Char' AS mysql_type, CAST(44 AS CHAR) AS result, toTypeName(result) AS native_type;
+SELECT 'Date' AS mysql_type, CAST('2021-02-03' AS DATE) AS result, toTypeName(result) AS native_type;
+SELECT 'DateTime' AS mysql_type, CAST('2021-02-03 12:01:02' AS DATETIME) AS result, toTypeName(result) AS native_type;
+SELECT 'Decimal' AS mysql_type, CAST(45.1 AS DECIMAL) AS result, toTypeName(result) AS native_type;
+SELECT 'Decimal(M)' AS mysql_type, CAST(46.2 AS DECIMAL(4)) AS result, toTypeName(result) AS native_type;
+SELECT 'Decimal(M, D)' AS mysql_type, CAST(47.21 AS DECIMAL(4, 2)) AS result, toTypeName(result) AS native_type;
+SELECT 'Double' AS mysql_type, CAST(48.11 AS DOUBLE) AS result, toTypeName(result) AS native_type;
+SELECT 'JSON' AS mysql_type, CAST('{\"foo\":\"bar\"}' AS JSON) AS result, toTypeName(result) AS native_type;
+SELECT 'Real' AS mysql_type, CAST(49.22 AS REAL) AS result, toTypeName(result) AS native_type;
+SELECT 'Signed' AS mysql_type, CAST(50 AS SIGNED) AS result, toTypeName(result) AS native_type;
+SELECT 'Unsigned' AS mysql_type, CAST(52 AS UNSIGNED) AS result, toTypeName(result) AS native_type;
+-- Could be added as an alias, but SIGNED INTEGER in CAST context means UInt64, 
+-- while INTEGER SIGNED as a column definition means UInt32.
+-- SELECT 'Signed integer' AS mysql_type, CAST(51 AS SIGNED INTEGER) AS result, toTypeName(result) AS native_type;
+-- SELECT 'Unsigned integer' AS mysql_type, CAST(53 AS UNSIGNED INTEGER) AS result, toTypeName(result) AS native_type;
+SELECT 'Year' AS mysql_type, CAST(2007 AS YEAR) AS result, toTypeName(result) AS native_type;
+-- Currently, expects UInt64 as an argument
+-- SELECT 'Time' AS mysql_type, CAST('12:45' AS TIME) AS result, toTypeName(result) AS native_type;
+
+SELECT '-- Lowercase tests';
+-- select 'Binary' as mysql_type, cast('' as binary) as result, toTypeName(result) as native_type;
+select 'Binary(N)' as mysql_type, cast('foo' as binary(3)) as result, toTypeName(result) as native_type;
+select 'Char' as mysql_type, cast(44 as char) as result, toTypeName(result) as native_type;
+select 'Date' as mysql_type, cast('2021-02-03' as date) as result, toTypeName(result) as native_type;
+select 'DateTime' as mysql_type, cast('2021-02-03 12:01:02' as datetime) as result, toTypeName(result) as native_type;
+select 'Decimal' as mysql_type, cast(45.1 as decimal) as result, toTypeName(result) as native_type;
+select 'Decimal(M)' as mysql_type, cast(46.2 as decimal(4)) as result, toTypeName(result) as native_type;
+select 'Decimal(M, D)' as mysql_type, cast(47.21 as decimal(4, 2)) as result, toTypeName(result) as native_type;
+select 'Double' as mysql_type, cast(48.11 as double) as result, toTypeName(result) as native_type;
+select 'JSON' as mysql_type, cast('{\"foo\":\"bar\"}' as json) as result, toTypeName(result) as native_type;
+select 'Real' as mysql_type, cast(49.22 as real) as result, toTypeName(result) as native_type;
+select 'Signed' as mysql_type, cast(50 as signed) as result, toTypeName(result) as native_type;
+select 'Unsigned' as mysql_type, cast(52 as unsigned) as result, toTypeName(result) as native_type;
+-- select 'Signed integer' as mysql_type, cast(51 as signed integer) as result, toTypeName(result) as native_type;
+-- select 'Unsigned integer' as mysql_type, cast(53 as unsigned integer) as result, toTypeName(result) as native_type;
+select 'Year' as mysql_type, cast(2007 as year) as result, toTypeName(result) as native_type;
+-- select 'Time' as mysql_type, cast('12:45' as time) as result, toTypeName(result) as native_type;