diff --git a/mysql-test/columnstore/basic/t/mcs114_comments.test b/mysql-test/columnstore/basic/t/mcs114_comments.test
index ad7406d16..66bc469c2 100644
--- a/mysql-test/columnstore/basic/t/mcs114_comments.test
+++ b/mysql-test/columnstore/basic/t/mcs114_comments.test
@@ -2,6 +2,7 @@
 # Test comments
 # Author: Bharath, bharath.bokka@mariadb.com
 #
+--source ../include/disable_11.4.inc
 -- source ../include/have_columnstore.inc
 
 --disable_warnings
diff --git a/mysql-test/columnstore/basic/t/mcs11_show_db_table.test b/mysql-test/columnstore/basic/t/mcs11_show_db_table.test
index f5469d63d..c0948a830 100644
--- a/mysql-test/columnstore/basic/t/mcs11_show_db_table.test
+++ b/mysql-test/columnstore/basic/t/mcs11_show_db_table.test
@@ -1,6 +1,7 @@
 #
 #This test verifies show databases and tables with engine=columnstore.
 #
+--source ../include/disable_11.4.inc
 -- source ../include/have_columnstore.inc
 --source ../include/detect_maxscale.inc
 -- source include/have_innodb.inc
diff --git a/mysql-test/columnstore/basic/t/mcs12_alter_table.test b/mysql-test/columnstore/basic/t/mcs12_alter_table.test
index 175086f43..dd8dda7fa 100644
--- a/mysql-test/columnstore/basic/t/mcs12_alter_table.test
+++ b/mysql-test/columnstore/basic/t/mcs12_alter_table.test
@@ -1,6 +1,7 @@
 #
 # Test ALTER TABLE schemas in various possible ways.
 #
+--source ../include/disable_11.4.inc
 -- source ../include/have_columnstore.inc
 -- source include/have_innodb.inc
 -- source ../include/check_maxscale.inc
diff --git a/mysql-test/columnstore/basic/t/mcs1_create_table_data_types.test b/mysql-test/columnstore/basic/t/mcs1_create_table_data_types.test
index bacda2ef9..167c65d8f 100644
--- a/mysql-test/columnstore/basic/t/mcs1_create_table_data_types.test
+++ b/mysql-test/columnstore/basic/t/mcs1_create_table_data_types.test
@@ -2,6 +2,7 @@
 # Test CREATE TABLE with all data types supported in Columnstore
 # Author: Bharath, bharath.bokka@mariadb.com
 #
+--source ../include/disable_11.4.inc
 -- source ../include/have_columnstore.inc
 --source ../include/charset.inc
 
diff --git a/mysql-test/columnstore/basic/t/mcs45_write_crossengine_join.test b/mysql-test/columnstore/basic/t/mcs45_write_crossengine_join.test
index 2ebaadbc9..f3ab5ec94 100644
--- a/mysql-test/columnstore/basic/t/mcs45_write_crossengine_join.test
+++ b/mysql-test/columnstore/basic/t/mcs45_write_crossengine_join.test
@@ -2,6 +2,7 @@
 # Update and Delete using Cross engine join
 # Author: Bharath, bharath.bokka@mariadb.com
 #
+--source ../include/disable_11.4.inc
 -- source include/have_innodb.inc
 -- source ../include/have_columnstore.inc
 
diff --git a/mysql-test/columnstore/bugfixes/mcol-4740.test b/mysql-test/columnstore/bugfixes/mcol-4740.test
index 85075fd99..b950908cb 100644
--- a/mysql-test/columnstore/bugfixes/mcol-4740.test
+++ b/mysql-test/columnstore/bugfixes/mcol-4740.test
@@ -1,7 +1,7 @@
 #
 # MCOL-4740 UPDATE involving multi-tables returns wrong "Rows matched"
 #
-
+--source ../include/disable_11.4.inc
 --source ../include/have_columnstore.inc
 
 --disable_warnings
@@ -79,4 +79,4 @@ SET main.status = 1;
 
 SELECT status FROM test1;
 
-DROP DATABASE mcol_4740;
\ No newline at end of file
+DROP DATABASE mcol_4740;
diff --git a/mysql-test/columnstore/bugfixes/mcol-5480.test b/mysql-test/columnstore/bugfixes/mcol-5480.test
index ab32e1503..37de6bb1c 100644
--- a/mysql-test/columnstore/bugfixes/mcol-5480.test
+++ b/mysql-test/columnstore/bugfixes/mcol-5480.test
@@ -2,7 +2,7 @@
 # MCOL-5480 LDI loads values incorrectly for MEDIUMINT, TIME and TIMESTAMP
 # when cpimport is used for batch insert
 #
-
+--source ../include/disable_11.4.inc
 --source ../include/have_columnstore.inc
 --source ../include/detect_maxscale.inc
 
diff --git a/mysql-test/columnstore/bugfixes/mcol-5669.test b/mysql-test/columnstore/bugfixes/mcol-5669.test
index 5420034d8..c40e987f7 100644
--- a/mysql-test/columnstore/bugfixes/mcol-5669.test
+++ b/mysql-test/columnstore/bugfixes/mcol-5669.test
@@ -1,3 +1,4 @@
+--source ../include/disable_11.4.inc
 --source include/have_innodb.inc
 --source ../include/have_columnstore.inc
 --disable_warnings
diff --git a/mysql-test/columnstore/include/disable_11.4.inc b/mysql-test/columnstore/include/disable_11.4.inc
new file mode 100644
index 000000000..308d65d5a
--- /dev/null
+++ b/mysql-test/columnstore/include/disable_11.4.inc
@@ -0,0 +1,4 @@
+if (`SELECT (sys.version_major(), sys.version_minor()) != (10, 6)`)
+{
+    skip Temporary disabled due to incompatibility with 11.4;
+}