diff --git a/src/mail.js b/src/mail.js
index cf0c74f69..c75c61ab6 100644
--- a/src/mail.js
+++ b/src/mail.js
@@ -33,7 +33,6 @@ exports = module.exports = {
 
     getMailboxCount,
     listMailboxes,
-    removeMailboxes,
     getMailbox,
     addMailbox,
     updateMailboxOwner,
@@ -49,6 +48,7 @@ exports = module.exports = {
     removeList,
     resolveList,
 
+    _removeMailboxes: removeMailboxes,
     _readDkimPublicKeySync: readDkimPublicKeySync
 };
 
diff --git a/src/routes/test/mail-test.js b/src/routes/test/mail-test.js
index dfcd840f6..52789a8eb 100644
--- a/src/routes/test/mail-test.js
+++ b/src/routes/test/mail-test.js
@@ -649,7 +649,7 @@ describe('Mail API', function () {
 
     describe('aliases', function () {
         after(function (done) {
-            mail.removeMailboxes(DOMAIN_0.domain, function (error) {
+            mail._removeMailboxes(DOMAIN_0.domain, function (error) {
                 if (error) return done(error);
                 done();
             });
@@ -726,7 +726,7 @@ describe('Mail API', function () {
 
     describe('mailinglists', function () {
         after(function (done) {
-            mail.removeMailboxes(DOMAIN_0.domain, function (error) {
+            mail._removeMailboxes(DOMAIN_0.domain, function (error) {
                 if (error) return done(error);
 
                 done();