diff --git a/mysql-test/columnstore/basic/t/cal_named_udfs.test b/mysql-test/columnstore/basic/t/cal_named_udfs.test
index d097511b8..bd03af5bc 100644
--- a/mysql-test/columnstore/basic/t/cal_named_udfs.test
+++ b/mysql-test/columnstore/basic/t/cal_named_udfs.test
@@ -24,3 +24,4 @@ select calgetsqlcount();
 
 DROP TABLE t1;
 DROP DATABASE cal_test_db;
+--source ../include/drop_functions.inc
diff --git a/mysql-test/columnstore/basic/t/mcs98_moda_function.test b/mysql-test/columnstore/basic/t/mcs98_moda_function.test
index 148f355b4..9b02a79a2 100644
--- a/mysql-test/columnstore/basic/t/mcs98_moda_function.test
+++ b/mysql-test/columnstore/basic/t/mcs98_moda_function.test
@@ -101,4 +101,4 @@ SELECT moda(floor(rl)) FROM t2;
 SELECT t, moda(tu) 'q1' FROM t2 GROUP BY t HAVING moda(tu) > 5;
 # Clean UP
 DROP DATABASE mcs98_db;
-
+--source ../include/drop_functions.inc
diff --git a/mysql-test/columnstore/basic/t/mcs_named_udfs.test b/mysql-test/columnstore/basic/t/mcs_named_udfs.test
index 84859b2c6..00ca03aa5 100644
--- a/mysql-test/columnstore/basic/t/mcs_named_udfs.test
+++ b/mysql-test/columnstore/basic/t/mcs_named_udfs.test
@@ -25,3 +25,4 @@ select mcslastinsertid("t1");
 
 DROP TABLE t1;
 DROP DATABASE cal_test_db;
+--source ../include/drop_functions.inc