diff --git a/mysql-test/r/gis.result b/mysql-test/r/gis.result
index ba6c44dfb03..78014137b50 100644
--- a/mysql-test/r/gis.result
+++ b/mysql-test/r/gis.result
@@ -670,10 +670,11 @@ create trigger t1_bu before update on t1 for each row set new.s1 = null;
 insert into t1 values (null,null);
 ERROR 23000: Column 's1' cannot be null
 drop table t1;
+drop procedure if exists fn3;
 create function fn3 () returns point return GeomFromText("point(1 1)");
 show create function fn3;
 Function	sql_mode	Create Function
-fn3		CREATE FUNCTION `test`.`fn3`() RETURNS point
+fn3		CREATE FUNCTION `fn3`() RETURNS point
 return GeomFromText("point(1 1)")
 select astext(fn3());
 astext(fn3())
diff --git a/mysql-test/t/gis.test b/mysql-test/t/gis.test
index 412bdc3314b..aba2f33833a 100644
--- a/mysql-test/t/gis.test
+++ b/mysql-test/t/gis.test
@@ -387,6 +387,9 @@ drop table t1;
 #
 # Bug #10499 (function creation with GEOMETRY datatype)
 #
+--disable_warnings
+drop procedure if exists fn3;
+--enable_warnings
 create function fn3 () returns point return GeomFromText("point(1 1)"); 
 show create function fn3;
 select astext(fn3());