diff --git a/src/routes/test/settings-test.js b/src/routes/test/settings-test.js
index 0ec48e0f5..d4031eb0d 100644
--- a/src/routes/test/settings-test.js
+++ b/src/routes/test/settings-test.js
@@ -32,7 +32,7 @@ function setup(done) {
     async.series([
         server.start.bind(server),
 
-        userdb._clear,
+        database._clear,
 
         function createAdmin(callback) {
             var scope1 = nock(config.apiServerOrigin()).get('/api/v1/boxes/' + config.fqdn() + '/setup/verify?setupToken=somesetuptoken').reply(200, {});
@@ -273,6 +273,47 @@ describe('Settings API', function () {
         });
     });
 
+    describe('mail_config', function () {
+        it('get mail_config succeeds', function (done) {
+            superagent.get(SERVER_URL + '/api/v1/settings/mail_config')
+                   .query({ access_token: token })
+                   .end(function (err, res) {
+                expect(res.statusCode).to.equal(200);
+                expect(res.body).to.eql({ enabled: false });
+                done();
+            });
+        });
+
+        it('cannot set without enabled field', function (done) {
+            superagent.post(SERVER_URL + '/api/v1/settings/mail_config')
+                   .query({ access_token: token })
+                   .end(function (err, res) {
+                expect(res.statusCode).to.equal(400);
+                done();
+            });
+        });
+
+        it('set succeeds', function (done) {
+            superagent.post(SERVER_URL + '/api/v1/settings/mail_config')
+                   .query({ access_token: token })
+                   .send({ enabled: true })
+                   .end(function (err, res) {
+                expect(res.statusCode).to.equal(200);
+                done();
+            });
+        });
+
+        it('get succeeds', function (done) {
+            superagent.get(SERVER_URL + '/api/v1/settings/mail_config')
+                   .query({ access_token: token })
+                   .end(function (err, res) {
+                expect(res.statusCode).to.equal(200);
+                expect(res.body).to.eql({ enabled: true });
+                done();
+            });
+        });
+    });
+
     describe('Certificates API', function () {
         // foobar.com
         var validCert0 = '-----BEGIN CERTIFICATE-----\nMIIBujCCAWQCCQCjLyTKzAJ4FDANBgkqhkiG9w0BAQsFADBkMQswCQYDVQQGEwJE\nRTEPMA0GA1UECAwGQmVybGluMQ8wDQYDVQQHDAZCZXJsaW4xEDAOBgNVBAoMB05l\nYnVsb24xDDAKBgNVBAsMA0NUTzETMBEGA1UEAwwKZm9vYmFyLmNvbTAeFw0xNTEw\nMjgxMjM5MjZaFw0xNjEwMjcxMjM5MjZaMGQxCzAJBgNVBAYTAkRFMQ8wDQYDVQQI\nDAZCZXJsaW4xDzANBgNVBAcMBkJlcmxpbjEQMA4GA1UECgwHTmVidWxvbjEMMAoG\nA1UECwwDQ1RPMRMwEQYDVQQDDApmb29iYXIuY29tMFwwDQYJKoZIhvcNAQEBBQAD\nSwAwSAJBAMeYofgwHeNVmGkGe0gj4dnX2ciifDi7X2K/oVHp7mxuHjGMSYP9Z7b6\n+mu0IMf4OedwXStHBeO8mwjKxZmE7p8CAwEAATANBgkqhkiG9w0BAQsFAANBAJI7\nFUUHXjR63UFk8pgxp0c7hEGqj4VWWGsmo8oZnnX8jGVmQDKbk8o3MtDujfqupmMR\nMo7tSAFlG7zkm3GYhpw=\n-----END CERTIFICATE-----';
diff --git a/src/test/settings-test.js b/src/test/settings-test.js
index 9fca9f690..5c95f4839 100644
--- a/src/test/settings-test.js
+++ b/src/test/settings-test.js
@@ -138,14 +138,14 @@ describe('Settings', function () {
             });
         });
 
-        it('can set backup config', function (done) {
+        it('can set update config', function (done) {
             settings.setUpdateConfig({ prerelease: true }, function (error) {
                 expect(error).to.be(null);
                 done();
             });
         });
 
-        it('can get backup config', function (done) {
+        it('can get update config', function (done) {
             settings.getUpdateConfig(function (error, updateConfig) {
                 expect(error).to.be(null);
                 expect(updateConfig.prerelease).to.be(true);
@@ -154,21 +154,20 @@ describe('Settings', function () {
         });
 
         it('can set mail config', function (done) {
-            settings.setMailConfig({ prerelease: true }, function (error) {
+            settings.setMailConfig({ enabled: true }, function (error) {
                 expect(error).to.be(null);
                 done();
             });
         });
 
-        it('can get backup config', function (done) {
-            settings.getUpdateConfig(function (error, updateConfig) {
+        it('can get mail config', function (done) {
+            settings.getMailConfig(function (error, mailConfig) {
                 expect(error).to.be(null);
-                expect(updateConfig.prerelease).to.be(true);
+                expect(mailConfig.enabled).to.be(true);
                 done();
             });
         });
 
-
         it('can get all values', function (done) {
             settings.getAll(function (error, allSettings) {
                 expect(error).to.be(null);