diff --git a/mysql-test/columnstore/basic/r/mcol-5005.result b/mysql-test/columnstore/basic/r/mcol-5005.result
index 19a5b7a3e..e70fa3623 100644
--- a/mysql-test/columnstore/basic/r/mcol-5005.result
+++ b/mysql-test/columnstore/basic/r/mcol-5005.result
@@ -58,7 +58,8 @@ t4	CREATE TABLE `t4` (
   `a` varchar(15) DEFAULT NULL
 ) ENGINE=Columnstore DEFAULT CHARSET=latin2 COLLATE=latin2_general_ci
 SELECT `schema`, tablename, columnname, charsetnum FROM calpontsys.syscolumn
-WHERE `schema`='mcol5005' AND tablename in ('t1', 't2', 't3', 't4');
+WHERE `schema`='mcol5005' AND tablename in ('t1', 't2', 't3', 't4')
+ORDER BY tablename, columnname, charsetnum;
 schema	tablename	columnname	charsetnum
 mcol5005	t1	a	227
 mcol5005	t1	b	33
diff --git a/mysql-test/columnstore/basic/r/mcol641-create.result b/mysql-test/columnstore/basic/r/mcol641-create.result
index 50560b968..52e1ef005 100644
--- a/mysql-test/columnstore/basic/r/mcol641-create.result
+++ b/mysql-test/columnstore/basic/r/mcol641-create.result
@@ -11,7 +11,17 @@ CREATE TABLE cs3(d1 DECIMAL(38) UNSIGNED ZEROFILL, d2 DECIMAL(38,10) UNSIGNED ZE
 Warnings:
 Warning	1618	ZEROFILL is ignored in ColumnStore
 CREATE TABLE cs4(d1 DECIMAL(18), d2 DECIMAL(18,10), d3 DECIMAL(18,18)) ENGINE=columnstore;
-SELECT TABLE_SCHEMA,TABLE_NAME,COLUMN_NAME,DATA_TYPE,COLUMN_LENGTH,COLUMN_POSITION,COLUMN_DEFAULT,NUMERIC_PRECISION,NUMERIC_SCALE FROM information_schema.columnstore_columns WHERE table_name = 'cs1' OR table_name = 'cs2' OR table_name = 'cs3' OR table_name = 'cs4' ORDER BY table_name,column_name ASC;
+SELECT TABLE_SCHEMA,TABLE_NAME,COLUMN_NAME,DATA_TYPE,COLUMN_LENGTH,COLUMN_POSITION,COLUMN_DEFAULT,NUMERIC_PRECISION,NUMERIC_SCALE FROM information_schema.columnstore_columns WHERE table_name = 'cs1' OR table_name = 'cs2' OR table_name = 'cs3' OR table_name = 'cs4'
+ORDER BY
+TABLE_SCHEMA,
+TABLE_NAME,
+COLUMN_NAME,
+DATA_TYPE,
+COLUMN_LENGTH,
+COLUMN_POSITION,
+COLUMN_DEFAULT,
+NUMERIC_PRECISION,
+NUMERIC_SCALE;
 TABLE_SCHEMA	TABLE_NAME	COLUMN_NAME	DATA_TYPE	COLUMN_LENGTH	COLUMN_POSITION	COLUMN_DEFAULT	NUMERIC_PRECISION	NUMERIC_SCALE
 test_mcol641_create	cs1	d1	decimal	16	0	NULL	38	0
 test_mcol641_create	cs1	d2	decimal	16	1	NULL	38	10
@@ -40,7 +50,17 @@ ALTER TABLE cs2 ADD COLUMN (d5 DECIMAL(38,5), d6 DECIMAL(35,15));
 ERROR 42000: The storage engine for the table doesn't support Multiple actions in alter table statement is currently not supported by Columnstore.
 ALTER TABLE cs3 MODIFY d1 DECIMAL(38) SIGNED;
 ERROR HY000: Internal error: CAL0001: Alter table Failed:  Altertable: Error in the action type  
-SELECT TABLE_SCHEMA,TABLE_NAME,COLUMN_NAME,DATA_TYPE,COLUMN_LENGTH,COLUMN_POSITION,COLUMN_DEFAULT,NUMERIC_PRECISION,NUMERIC_SCALE FROM information_schema.columnstore_columns WHERE table_schema = 'test_mcol641_create' ORDER BY table_name,column_name ASC;
+SELECT TABLE_SCHEMA,TABLE_NAME,COLUMN_NAME,DATA_TYPE,COLUMN_LENGTH,COLUMN_POSITION,COLUMN_DEFAULT,NUMERIC_PRECISION,NUMERIC_SCALE FROM information_schema.columnstore_columns WHERE table_schema = 'test_mcol641_create'
+ORDER BY
+TABLE_SCHEMA,
+TABLE_NAME,
+COLUMN_NAME,
+DATA_TYPE,
+COLUMN_LENGTH,
+COLUMN_POSITION,
+COLUMN_DEFAULT,
+NUMERIC_PRECISION,
+NUMERIC_SCALE;
 TABLE_SCHEMA	TABLE_NAME	COLUMN_NAME	DATA_TYPE	COLUMN_LENGTH	COLUMN_POSITION	COLUMN_DEFAULT	NUMERIC_PRECISION	NUMERIC_SCALE
 test_mcol641_create	cs1	d1	decimal	16	0	NULL	38	0
 test_mcol641_create	cs1	d2	decimal	16	1	NULL	38	10
diff --git a/mysql-test/columnstore/basic/r/mcs229_data_compression_type.result b/mysql-test/columnstore/basic/r/mcs229_data_compression_type.result
index 2b54b6977..b9803b8cf 100644
--- a/mysql-test/columnstore/basic/r/mcs229_data_compression_type.result
+++ b/mysql-test/columnstore/basic/r/mcs229_data_compression_type.result
@@ -37,16 +37,16 @@ t2	CREATE TABLE `t2` (
   `t2_DATE` date DEFAULT NULL,
   `t2_TIME` time DEFAULT NULL
 ) ENGINE=Columnstore DEFAULT CHARSET=utf8mb3 COLLATE=utf8mb3_general_ci
-SELECT `schema`, tablename, columnname, compressiontype FROM calpontsys.syscolumn WHERE `schema`='mcs229_db' ORDER BY 2;
+SELECT `schema`, tablename, columnname, compressiontype FROM calpontsys.syscolumn WHERE `schema`='mcs229_db' ORDER BY 2,3,4;
 schema	tablename	columnname	compressiontype
+mcs229_db	t1	t1_date	2
+mcs229_db	t1	t1_decimal	2
 mcs229_db	t1	t1_int	2
 mcs229_db	t1	t1_text	2
-mcs229_db	t1	t1_date	2
 mcs229_db	t1	t1_time	2
-mcs229_db	t1	t1_decimal	2
 mcs229_db	t2	t2_date	2
+mcs229_db	t2	t2_decimal	2
 mcs229_db	t2	t2_int	2
 mcs229_db	t2	t2_text	2
 mcs229_db	t2	t2_time	2
-mcs229_db	t2	t2_decimal	2
 DROP DATABASE mcs229_db;
diff --git a/mysql-test/columnstore/basic/t/mcol-5005.test b/mysql-test/columnstore/basic/t/mcol-5005.test
index 1cbca1eb1..988a4ab16 100644
--- a/mysql-test/columnstore/basic/t/mcol-5005.test
+++ b/mysql-test/columnstore/basic/t/mcol-5005.test
@@ -52,7 +52,8 @@ SHOW CREATE TABLE t3;
 SHOW CREATE TABLE t4;
 
 SELECT `schema`, tablename, columnname, charsetnum FROM calpontsys.syscolumn
-WHERE `schema`='mcol5005' AND tablename in ('t1', 't2', 't3', 't4');
+WHERE `schema`='mcol5005' AND tablename in ('t1', 't2', 't3', 't4')
+ORDER BY tablename, columnname, charsetnum;
 
 DROP DATABASE mcol5005;
 
diff --git a/mysql-test/columnstore/basic/t/mcol641-create.test b/mysql-test/columnstore/basic/t/mcol641-create.test
index 89b6c1f25..ee1f23e35 100644
--- a/mysql-test/columnstore/basic/t/mcol641-create.test
+++ b/mysql-test/columnstore/basic/t/mcol641-create.test
@@ -19,7 +19,17 @@ CREATE TABLE cs2(d1 DECIMAL(38) SIGNED, d2 DECIMAL(38,10) SIGNED, d3 DECIMAL(38,
 #This must raise a warning
 CREATE TABLE cs3(d1 DECIMAL(38) UNSIGNED ZEROFILL, d2 DECIMAL(38,10) UNSIGNED ZEROFILL, d3 DECIMAL(38,38) UNSIGNED ZEROFILL) ENGINE=columnstore;
 CREATE TABLE cs4(d1 DECIMAL(18), d2 DECIMAL(18,10), d3 DECIMAL(18,18)) ENGINE=columnstore;
-SELECT TABLE_SCHEMA,TABLE_NAME,COLUMN_NAME,DATA_TYPE,COLUMN_LENGTH,COLUMN_POSITION,COLUMN_DEFAULT,NUMERIC_PRECISION,NUMERIC_SCALE FROM information_schema.columnstore_columns WHERE table_name = 'cs1' OR table_name = 'cs2' OR table_name = 'cs3' OR table_name = 'cs4' ORDER BY table_name,column_name ASC;
+SELECT TABLE_SCHEMA,TABLE_NAME,COLUMN_NAME,DATA_TYPE,COLUMN_LENGTH,COLUMN_POSITION,COLUMN_DEFAULT,NUMERIC_PRECISION,NUMERIC_SCALE FROM information_schema.columnstore_columns WHERE table_name = 'cs1' OR table_name = 'cs2' OR table_name = 'cs3' OR table_name = 'cs4'
+ORDER BY
+TABLE_SCHEMA,
+TABLE_NAME,
+COLUMN_NAME,
+DATA_TYPE,
+COLUMN_LENGTH,
+COLUMN_POSITION,
+COLUMN_DEFAULT,
+NUMERIC_PRECISION,
+NUMERIC_SCALE;
 
 ALTER TABLE cs1 DROP COLUMN d4;
 ALTER TABLE cs1 ADD COLUMN d7 DECIMAL(38,37);
@@ -34,7 +44,17 @@ ALTER TABLE cs2 ADD COLUMN (d5 DECIMAL(38,5), d6 DECIMAL(35,15));
 # Bug. This must work fine.
 --error 1815
 ALTER TABLE cs3 MODIFY d1 DECIMAL(38) SIGNED;
-SELECT TABLE_SCHEMA,TABLE_NAME,COLUMN_NAME,DATA_TYPE,COLUMN_LENGTH,COLUMN_POSITION,COLUMN_DEFAULT,NUMERIC_PRECISION,NUMERIC_SCALE FROM information_schema.columnstore_columns WHERE table_schema = 'test_mcol641_create' ORDER BY table_name,column_name ASC;
+SELECT TABLE_SCHEMA,TABLE_NAME,COLUMN_NAME,DATA_TYPE,COLUMN_LENGTH,COLUMN_POSITION,COLUMN_DEFAULT,NUMERIC_PRECISION,NUMERIC_SCALE FROM information_schema.columnstore_columns WHERE table_schema = 'test_mcol641_create'
+ORDER BY
+TABLE_SCHEMA,
+TABLE_NAME,
+COLUMN_NAME,
+DATA_TYPE,
+COLUMN_LENGTH,
+COLUMN_POSITION,
+COLUMN_DEFAULT,
+NUMERIC_PRECISION,
+NUMERIC_SCALE;
 
 # This must return an error
 --error 1815
diff --git a/mysql-test/columnstore/basic/t/mcs229_data_compression_type.test b/mysql-test/columnstore/basic/t/mcs229_data_compression_type.test
index b3af73432..3737eaa68 100644
--- a/mysql-test/columnstore/basic/t/mcs229_data_compression_type.test
+++ b/mysql-test/columnstore/basic/t/mcs229_data_compression_type.test
@@ -49,7 +49,7 @@ CREATE TABLE t2
 --replace_regex /( COLLATE=latin1_swedish_ci)//
 SHOW CREATE TABLE t2;
 
-SELECT `schema`, tablename, columnname, compressiontype FROM calpontsys.syscolumn WHERE `schema`='mcs229_db' ORDER BY 2;
+SELECT `schema`, tablename, columnname, compressiontype FROM calpontsys.syscolumn WHERE `schema`='mcs229_db' ORDER BY 2,3,4;
 
 # Clean UP
 DROP DATABASE mcs229_db;