diff --git a/mysql-test/columnstore/basic/r/mcol_2000.result b/mysql-test/columnstore/basic/r/mcol_2000.result
index 84d8eeb73..263c9b3bd 100644
--- a/mysql-test/columnstore/basic/r/mcol_2000.result
+++ b/mysql-test/columnstore/basic/r/mcol_2000.result
@@ -30,7 +30,7 @@ cc tinytext character set utf8mb4,
 dd text character set utf8mb4,
 ee mediumtext character set utf8mb4,
 ff longtext character set utf8mb4
-) default charset=koi8r;
+) default charset=koi8r ENGINE=InnoDB;
 create table copy1 like orig;
 alter table copy1 engine=columnstore;
 create table copy2 like copy1;
diff --git a/mysql-test/columnstore/basic/r/mcs12_alter_table.result b/mysql-test/columnstore/basic/r/mcs12_alter_table.result
index 8b8149eab..1a38ed442 100644
--- a/mysql-test/columnstore/basic/r/mcs12_alter_table.result
+++ b/mysql-test/columnstore/basic/r/mcs12_alter_table.result
@@ -152,3 +152,4 @@ i	c	i2
 disconnect addconroot1;
 disconnect addconroot2;
 DROP DATABASE mcs12_db1;
+DROP DATABASE mcs12_db2;
diff --git a/mysql-test/columnstore/basic/r/mcs18_create_drop_users.result b/mysql-test/columnstore/basic/r/mcs18_create_drop_users.result
index 924d721de..d8e1f3506 100644
--- a/mysql-test/columnstore/basic/r/mcs18_create_drop_users.result
+++ b/mysql-test/columnstore/basic/r/mcs18_create_drop_users.result
@@ -1,3 +1,4 @@
+SET default_storage_engine=InnoDB;
 DROP USER IF EXISTS user1@test;
 DROP USER IF EXISTS 'user2'@'%';
 DROP USER IF EXISTS 'user'@'%';
@@ -36,6 +37,3 @@ DROP USER 'user'@'%';
 DROP USER 'user'@'localhost';
 DROP USER 'user'@'127.0.0.1';
 SET default_storage_engine=default;
-SELECT @@default_storage_engine;
-@@default_storage_engine
-InnoDB
diff --git a/mysql-test/columnstore/basic/r/mcs19_grant_revoke.result b/mysql-test/columnstore/basic/r/mcs19_grant_revoke.result
index 322e39959..c9962a0c1 100644
--- a/mysql-test/columnstore/basic/r/mcs19_grant_revoke.result
+++ b/mysql-test/columnstore/basic/r/mcs19_grant_revoke.result
@@ -1,3 +1,4 @@
+SET default_storage_engine=InnoDB;
 DROP DATABASE IF EXISTS mcs19_db;
 DROP USER IF EXISTS 'user'@'localhost';
 DROP USER IF EXISTS 'user1'@'localhost';
@@ -37,7 +38,7 @@ CREATE DATABASE mcs19_db;
 USE mcs19_db;
 CREATE DATABASE mcs19_db1;
 ERROR 42000: Access denied for user 'user1'@'localhost' to database 'mcs19_db1'
-CREATE TABLE t1(col INT);
+CREATE TABLE t1(col INT) ENGINE=InnoDB;
 SHOW CREATE TABLE t1;
 Table	Create Table
 t1	CREATE TABLE `t1` (
@@ -72,9 +73,6 @@ CREATE TABLE mcs19_db.t1;
 ERROR 42000: CREATE command denied to user 'user1'@'localhost' for table 't1'
 connection default;
 SET default_storage_engine=default;
-SELECT @@default_storage_engine;
-@@default_storage_engine
-InnoDB
 DROP DATABASE mcs19_db;
 DROP USER 'user'@'localhost';
 DROP USER 'user1'@'localhost';
diff --git a/mysql-test/columnstore/basic/t/mcol_2000.test b/mysql-test/columnstore/basic/t/mcol_2000.test
index 01479db45..4b00832cd 100644
--- a/mysql-test/columnstore/basic/t/mcol_2000.test
+++ b/mysql-test/columnstore/basic/t/mcol_2000.test
@@ -3,6 +3,7 @@
 #
 
 -- source ../include/have_columnstore.inc
+-- source include/have_innodb.inc
 
 -- disable_warnings
 drop database if exists test_mcol2000;
@@ -53,7 +54,7 @@ create table orig (a integer not null,
                    dd text character set utf8mb4,
                    ee mediumtext character set utf8mb4,
                    ff longtext character set utf8mb4
-                   ) default charset=koi8r;
+                   ) default charset=koi8r ENGINE=InnoDB;
 
 create table copy1 like orig;
 alter table copy1 engine=columnstore;
diff --git a/mysql-test/columnstore/basic/t/mcol_4222.test b/mysql-test/columnstore/basic/t/mcol_4222.test
index a48fb9b5c..cd5203bdd 100644
--- a/mysql-test/columnstore/basic/t/mcol_4222.test
+++ b/mysql-test/columnstore/basic/t/mcol_4222.test
@@ -3,6 +3,7 @@
 # Author: Bharath, bharath.bokka@mariadb.com
 #
 -- source ../include/have_columnstore.inc
+-- source include/have_innodb.inc
 
 --disable_warnings
 DROP DATABASE IF EXISTS mcol_4222_db;
diff --git a/mysql-test/columnstore/basic/t/mcs10_drop_db_table.test b/mysql-test/columnstore/basic/t/mcs10_drop_db_table.test
index 4d42ec2c0..2699ead99 100644
--- a/mysql-test/columnstore/basic/t/mcs10_drop_db_table.test
+++ b/mysql-test/columnstore/basic/t/mcs10_drop_db_table.test
@@ -2,6 +2,7 @@
 #This test verifies drop databases and tables with engine=columnstore.
 #
 -- source ../include/have_columnstore.inc
+-- source include/have_innodb.inc
 
 --disable_warnings
 DROP DATABASE IF EXISTS mcs10_db1;
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 fe470a933..3d7fb8756 100644
--- a/mysql-test/columnstore/basic/t/mcs11_show_db_table.test
+++ b/mysql-test/columnstore/basic/t/mcs11_show_db_table.test
@@ -2,6 +2,7 @@
 #This test verifies show databases and tables with engine=columnstore.
 #
 -- source ../include/have_columnstore.inc
+-- source include/have_innodb.inc
 
 --disable_warnings
 DROP DATABASE IF EXISTS mcs11_db1;
diff --git a/mysql-test/columnstore/basic/t/mcs12_alter_table.test b/mysql-test/columnstore/basic/t/mcs12_alter_table.test
index 885aed9c2..ab15ff173 100644
--- a/mysql-test/columnstore/basic/t/mcs12_alter_table.test
+++ b/mysql-test/columnstore/basic/t/mcs12_alter_table.test
@@ -2,6 +2,7 @@
 # Test ALTER TABLE schemas in various possible ways.
 #
 -- source ../include/have_columnstore.inc
+-- source include/have_innodb.inc
 
 --disable_warnings
 DROP DATABASE IF EXISTS mcs12_db1;
@@ -84,3 +85,4 @@ disconnect addconroot1;
 disconnect addconroot2;
 
 DROP DATABASE mcs12_db1;
+DROP DATABASE mcs12_db2;
diff --git a/mysql-test/columnstore/basic/t/mcs14_truncate_table.test b/mysql-test/columnstore/basic/t/mcs14_truncate_table.test
index 286d0d829..77e2fe8ce 100644
--- a/mysql-test/columnstore/basic/t/mcs14_truncate_table.test
+++ b/mysql-test/columnstore/basic/t/mcs14_truncate_table.test
@@ -2,6 +2,7 @@
 # Test TRUNCATE TABLE in various possible scenarios.
 #
 -- source ../include/have_columnstore.inc
+-- source include/have_innodb.inc
 
 --disable_warnings
 DROP DATABASE IF EXISTS mcs14_db1;
diff --git a/mysql-test/columnstore/basic/t/mcs18_create_drop_users.test b/mysql-test/columnstore/basic/t/mcs18_create_drop_users.test
index 23ffe21a0..8275a9864 100644
--- a/mysql-test/columnstore/basic/t/mcs18_create_drop_users.test
+++ b/mysql-test/columnstore/basic/t/mcs18_create_drop_users.test
@@ -3,6 +3,9 @@
 # Author: Bharath, bharath.bokka@mariadb.com
 #
 -- source ../include/have_columnstore.inc
+-- source include/have_innodb.inc
+
+SET default_storage_engine=InnoDB;
 
 --disable_warnings
 DROP USER IF EXISTS user1@test;
@@ -45,4 +48,3 @@ DROP USER 'user'@'127.0.0.1';
 
 # Clean up
 SET default_storage_engine=default;
-SELECT @@default_storage_engine;
diff --git a/mysql-test/columnstore/basic/t/mcs19_grant_revoke.test b/mysql-test/columnstore/basic/t/mcs19_grant_revoke.test
index 2c79d8b87..dcd0570f1 100644
--- a/mysql-test/columnstore/basic/t/mcs19_grant_revoke.test
+++ b/mysql-test/columnstore/basic/t/mcs19_grant_revoke.test
@@ -3,6 +3,9 @@
 # Author: Bharath, bharath.bokka@mariadb.com
 #
 -- source ../include/have_columnstore.inc
+-- source include/have_innodb.inc
+
+SET default_storage_engine=InnoDB;
 
 --disable_warnings
 DROP DATABASE IF EXISTS mcs19_db;
@@ -37,7 +40,7 @@ CREATE DATABASE mcs19_db;
 USE mcs19_db;
 --error ER_DBACCESS_DENIED_ERROR
 CREATE DATABASE mcs19_db1;
-CREATE TABLE t1(col INT);
+CREATE TABLE t1(col INT) ENGINE=InnoDB;
 SHOW CREATE TABLE t1;
 INSERT INTO t1 VALUES(1);
 SELECT * FROM t1;
@@ -63,7 +66,6 @@ CREATE TABLE mcs19_db.t1;
 # Clean up
 connection default;
 SET default_storage_engine=default;
-SELECT @@default_storage_engine;
 DROP DATABASE mcs19_db;
 DROP USER 'user'@'localhost';
 DROP USER 'user1'@'localhost';
diff --git a/mysql-test/columnstore/basic/t/mcs24_insert_from_another_table.test b/mysql-test/columnstore/basic/t/mcs24_insert_from_another_table.test
index fb70d65a9..1bf8b992a 100644
--- a/mysql-test/columnstore/basic/t/mcs24_insert_from_another_table.test
+++ b/mysql-test/columnstore/basic/t/mcs24_insert_from_another_table.test
@@ -3,6 +3,7 @@
 # Author: Bharath, bharath.bokka@mariadb.com
 #
 -- source ../include/have_columnstore.inc
+-- source include/have_innodb.inc
 
 --disable_warnings
 DROP DATABASE IF EXISTS mcs24_db;
diff --git a/mysql-test/columnstore/basic/t/mcs51_cpimport_select_from.test b/mysql-test/columnstore/basic/t/mcs51_cpimport_select_from.test
index 2661be9a3..d0f0aabe1 100644
--- a/mysql-test/columnstore/basic/t/mcs51_cpimport_select_from.test
+++ b/mysql-test/columnstore/basic/t/mcs51_cpimport_select_from.test
@@ -3,6 +3,7 @@
 # Author: Susil, susil.behera@mariadb.com
 #
 -- source ../include/have_columnstore.inc
+-- source include/have_innodb.inc
 
 --disable_warnings
 DROP DATABASE IF EXISTS mcs51_db1;
diff --git a/mysql-test/columnstore/basic/t/mcs5_create_table_from_other_tables.test b/mysql-test/columnstore/basic/t/mcs5_create_table_from_other_tables.test
index d4bbbe5ad..e3e5224b9 100644
--- a/mysql-test/columnstore/basic/t/mcs5_create_table_from_other_tables.test
+++ b/mysql-test/columnstore/basic/t/mcs5_create_table_from_other_tables.test
@@ -2,6 +2,7 @@
 #Test CREATE TABLE from other tables in Columnstore
 #
 -- source ../include/have_columnstore.inc
+-- source include/have_innodb.inc
 
 --disable_warnings
 DROP DATABASE IF EXISTS mcs5_db;