diff --git a/src/test/mail-test.js b/src/test/mail-test.js
index 25a28b0bf..4c1db04d9 100644
--- a/src/test/mail-test.js
+++ b/src/test/mail-test.js
@@ -75,23 +75,43 @@ describe('Mail', function () {
 
     describe('mailbox name', function () {
         it('allows valid names', function () {
-            expect(mail._validateName('1')).to.be(null); // single char
-            expect(mail._validateName('ap')).to.be(null); // alpha
-            expect(mail._validateName('aP')).to.be(null); // caps
-            expect(mail._validateName('0P')).to.be(null); // number
-            expect(mail._validateName('a.p.x')).to.be(null); // dot
-            expect(mail._validateName('a-p-x')).to.be(null); // hyphen
-            expect(mail._validateName('a-p_x')).to.be(null); // underscore
+            expect(mail.validateName('1')).to.be(null); // single char
+            expect(mail.validateName('ap')).to.be(null); // alpha
+            expect(mail.validateName('aP')).to.be(null); // caps
+            expect(mail.validateName('0P')).to.be(null); // number
+            expect(mail.validateName('a.p.x')).to.be(null); // dot
+            expect(mail.validateName('a-p-x')).to.be(null); // hyphen
+            expect(mail.validateName('a-p_x')).to.be(null); // underscore
         });
 
         it('disallows invalid names', function () {
-            expect(mail._validateName('@')).to.be.an(Error);
-            expect(mail._validateName('a+p')).to.be.an(Error);
-            expect(mail._validateName('a#p')).to.be.an(Error);
-            expect(mail._validateName('a!')).to.be.an(Error);
+            expect(mail.validateName('@')).to.be.an(Error);
+            expect(mail.validateName('a+p')).to.be.an(Error);
+            expect(mail.validateName('a#p')).to.be.an(Error);
+            expect(mail.validateName('a!')).to.be.an(Error);
         });
     });
 
+    describe('mailbox display name', function () {
+        it('allows valid names', function () {
+            expect(mail.validateDisplayName('1')).to.be(null); // single char
+            expect(mail.validateDisplayName('ap')).to.be(null); // alpha
+            expect(mail.validateDisplayName('aP')).to.be(null); // caps
+            expect(mail.validateDisplayName('0P')).to.be(null); // number
+            expect(mail.validateDisplayName('a p.x')).to.be(null); // space
+            expect(mail.validateDisplayName('a-p-x')).to.be(null); // hyphen
+            expect(mail.validateDisplayName('a-p_x')).to.be(null); // underscore
+        });
+
+        it('disallows invalid names', function () {
+            expect(mail.validateDisplayName('@')).to.be.an(Error);
+            expect(mail.validateDisplayName('a<p')).to.be.an(Error);
+            expect(mail.validateDisplayName('a>p')).to.be.an(Error);
+            expect(mail.validateDisplayName('a"x"')).to.be.an(Error);
+        });
+    });
+
+
     describe('mailboxes', function () {
         it('add user mailbox succeeds', async function () {
             await mail.addMailbox('girish', domain.domain, { ownerId: 'uid-0', ownerType: mail.OWNERTYPE_USER, active: true }, auditSource);