diff --git a/mysql-test/columnstore/basic/t/mcs247_from_unixtime_funtion.test b/mysql-test/columnstore/basic/t/mcs247_from_unixtime_funtion.test
index 42efb2fdc..82d8989e3 100644
--- a/mysql-test/columnstore/basic/t/mcs247_from_unixtime_funtion.test
+++ b/mysql-test/columnstore/basic/t/mcs247_from_unixtime_funtion.test
@@ -3,6 +3,7 @@
 # Author: Bharath, bharath.bokka@mariadb.com
 #
 -- source ../include/have_columnstore.inc
+--source ../include/disable_11.8.inc
 
 if (!`SELECT from_unixtime(3600*24)='1970-01-02 00:00:00'`)
 {
diff --git a/mysql-test/columnstore/basic/t/mdev-25080.test b/mysql-test/columnstore/basic/t/mdev-25080.test
index bb8c171fc..fac17b117 100644
--- a/mysql-test/columnstore/basic/t/mdev-25080.test
+++ b/mysql-test/columnstore/basic/t/mdev-25080.test
@@ -3,6 +3,7 @@
 --echo # in outer select to foreign engines
 
 --source ../include/have_columnstore.inc
+--source ../include/disable_11.8.inc
 
 if (!$MASTER_MYPORT)
 {
diff --git a/mysql-test/columnstore/devregression/t/mcs7238_regression_MCOL-830.test b/mysql-test/columnstore/devregression/t/mcs7238_regression_MCOL-830.test
index 5237779c4..2faf9eb5c 100644
--- a/mysql-test/columnstore/devregression/t/mcs7238_regression_MCOL-830.test
+++ b/mysql-test/columnstore/devregression/t/mcs7238_regression_MCOL-830.test
@@ -5,6 +5,7 @@
 # -------------------------------------------------------------- #
 #
 --source ../include/have_columnstore.inc
+--source ../include/disable_11.8.inc
 
 --source ../include/cross_engine.inc
 
diff --git a/mysql-test/columnstore/include/disable_11.8.inc b/mysql-test/columnstore/include/disable_11.8.inc
new file mode 100644
index 000000000..3fad024a0
--- /dev/null
+++ b/mysql-test/columnstore/include/disable_11.8.inc
@@ -0,0 +1,4 @@
+if (`SELECT (sys.version_major(), sys.version_minor(), sys.version_patch()) >= (11, 8, 0)`)
+{ 
+    skip MCOL-6173, MCOL-6174, ;
+}