diff --git a/mysql-test/columnstore/basic/r/mcol6107-invalid-arguments.result b/mysql-test/columnstore/basic/r/mcol6107-invalid-arguments.result
index 409046f8f..867f12ff5 100644
--- a/mysql-test/columnstore/basic/r/mcol6107-invalid-arguments.result
+++ b/mysql-test/columnstore/basic/r/mcol6107-invalid-arguments.result
@@ -14,7 +14,4 @@ select count(i) from cs1 where idbPm('i') = '0.0.1';
 ERROR HY000: Internal error: MCS-1006: Function called with unsupported datatype.
 select count(i) from cs1 where idbSegmentDir('i') = '0.0.1';
 ERROR HY000: Internal error: MCS-1006: Function called with unsupported datatype.
-select count(i) from cs1 where idbSegment(i) = 1;
-count(i)
-0
 DROP DATABASE test_invalid_args;
diff --git a/mysql-test/columnstore/basic/t/mcol6107-invalid-arguments.test b/mysql-test/columnstore/basic/t/mcol6107-invalid-arguments.test
index 6b07970ec..fc638d8f7 100644
--- a/mysql-test/columnstore/basic/t/mcol6107-invalid-arguments.test
+++ b/mysql-test/columnstore/basic/t/mcol6107-invalid-arguments.test
@@ -1,3 +1,5 @@
+--source ../include/have_columnstore.inc
+
 --disable_warnings
 DROP DATABASE IF EXISTS test_invalid_args;
 CREATE DATABASE test_invalid_args;
@@ -7,6 +9,7 @@ USE test_invalid_args;
 create table cs1(i bigint)engine=columnstore;
 
 # incorrect args - idbpartition must receive column name and it received a string literal
+--source ../include/functions.inc
 --error 1815
 select count(i) from cs1 where idbPartition('i') = '0.0.1';
 
@@ -24,8 +27,8 @@ select count(i) from cs1 where idbPm('i') = '0.0.1';
 
 --error 1815
 select count(i) from cs1 where idbSegmentDir('i') = '0.0.1';
+--source ../include/drop_functions.inc
+
 
-#correct arguments
-select count(i) from cs1 where idbSegment(i) = 1;
 # Clean UP
-DROP DATABASE test_invalid_args;
\ No newline at end of file
+DROP DATABASE test_invalid_args;