diff --git a/mysql-test/r/func_misc.result b/mysql-test/r/func_misc.result
index 9400c3b9d6b..5a9f0f68228 100644
--- a/mysql-test/r/func_misc.result
+++ b/mysql-test/r/func_misc.result
@@ -19,6 +19,9 @@ hex(inet_aton('127.1'))
 select hex(inet_aton('127.1.1'));
 hex(inet_aton('127.1.1'))
 7F010001
+select length(uuid()), charset(uuid()), length(unhex(replace(uuid(),_utf8'-',_utf8'')));
+length(uuid())	charset(uuid())	length(unhex(replace(uuid(),_utf8'-',_utf8'')))
+36	utf8	16
 select length(format('nan', 2)) > 0;
 length(format('nan', 2)) > 0
 1
diff --git a/mysql-test/t/func_misc.test b/mysql-test/t/func_misc.test
index adc0a5a9263..e73f2a1b26c 100644
--- a/mysql-test/t/func_misc.test
+++ b/mysql-test/t/func_misc.test
@@ -12,6 +12,8 @@ select hex(inet_aton('127'));
 select hex(inet_aton('127.1'));
 select hex(inet_aton('127.1.1'));
 
+select length(uuid()), charset(uuid()), length(unhex(replace(uuid(),_utf8'-',_utf8'')));
+
 #
 # Test for core dump with nan
 #