diff --git a/src/routes/test/user-test.js b/src/routes/test/user-test.js
index 8c62f834e..e7aa82de4 100644
--- a/src/routes/test/user-test.js
+++ b/src/routes/test/user-test.js
@@ -18,7 +18,7 @@ var config = require('../../config.js'),
 
 var SERVER_URL = 'http://localhost:' + config.get('port');
 
-var USERNAME_0 = 'admin', PASSWORD = 'Foobar?1337', EMAIL = 'silly@me.com', EMAIL_0_NEW = 'stupid@me.com';
+var USERNAME_0 = 'admin', PASSWORD = 'Foobar?1337', EMAIL = 'silly@me.com', EMAIL_0_NEW = 'stupid@me.com', DISPLAY_NAME_0_NEW = 'New Name';
 var USERNAME_1 = 'userTheFirst', EMAIL_1 = 'tao@zen.mac';
 var USERNAME_2 = 'userTheSecond', EMAIL_2 = 'user@foo.bar';
 var USERNAME_3 = 'userTheThird', EMAIL_3 = 'user3@foo.bar';
@@ -203,6 +203,7 @@ describe('User API', function () {
             expect(res.body.username).to.equal(USERNAME_0);
             expect(res.body.email).to.equal(EMAIL);
             expect(res.body.admin).to.be.ok();
+            expect(res.body.displayName).to.be.a('string');
             expect(res.body.password).to.not.be.ok();
             expect(res.body.salt).to.not.be.ok();
             done();
@@ -525,7 +526,39 @@ describe('User API', function () {
                .send({ password: PASSWORD, email: EMAIL_0_NEW })
                .end(function (error, result) {
             expect(result.statusCode).to.equal(204);
-            done(error);
+
+            superagent.get(SERVER_URL + '/api/v1/users/' + USERNAME_0)
+                  .query({ access_token: token })
+                  .end(function (err, res) {
+                expect(res.statusCode).to.equal(200);
+                expect(res.body.username).to.equal(USERNAME_0);
+                expect(res.body.email).to.equal(EMAIL_0_NEW);
+                expect(res.body.admin).to.be.ok();
+                expect(res.body.displayName).to.equal('');
+
+                done();
+            });
+        });
+    });
+
+    it('change displayName succeeds', function (done) {
+        superagent.put(SERVER_URL + '/api/v1/users/' + USERNAME_0)
+               .query({ access_token: token })
+               .send({ password: PASSWORD, email: EMAIL_0_NEW, displayName: DISPLAY_NAME_0_NEW })
+               .end(function (error, result) {
+            expect(result.statusCode).to.equal(204);
+
+            superagent.get(SERVER_URL + '/api/v1/users/' + USERNAME_0)
+                  .query({ access_token: token })
+                  .end(function (err, res) {
+                expect(res.statusCode).to.equal(200);
+                expect(res.body.username).to.equal(USERNAME_0);
+                expect(res.body.email).to.equal(EMAIL_0_NEW);
+                expect(res.body.admin).to.be.ok();
+                expect(res.body.displayName).to.equal(DISPLAY_NAME_0_NEW);
+
+                done();
+            });
         });
     });
 
diff --git a/src/test/user-test.js b/src/test/user-test.js
index 1ac99f7f3..9a73b3de2 100644
--- a/src/test/user-test.js
+++ b/src/test/user-test.js
@@ -21,6 +21,7 @@ var PASSWORD = 'sTrOnG#$34134';
 var NEW_PASSWORD = 'oTHER@#$235';
 var IS_ADMIN = true;
 var DISPLAY_NAME = 'Nobody cares';
+var DISPLAY_NAME_NEW = 'Somone cares';
 var userObject = null;
 
 function cleanupUsers(done) {
@@ -300,6 +301,9 @@ describe('User', function () {
             user.get(USERNAME, function (error, result) {
                 expect(error).to.not.be.ok();
                 expect(result).to.be.ok();
+                expect(result.email).to.equal(EMAIL);
+                expect(result.username).to.equal(USERNAME);
+                expect(result.displayName).to.equal(DISPLAY_NAME);
 
                 done();
             });
@@ -311,7 +315,7 @@ describe('User', function () {
         after(cleanupUsers);
 
         it('fails due to unknown userid', function (done) {
-            user.update(USERNAME+USERNAME, USERNAME_NEW, EMAIL_NEW, function (error) {
+            user.update(USERNAME+USERNAME, USERNAME_NEW, EMAIL_NEW, DISPLAY_NAME_NEW, function (error) {
                 expect(error).to.be.a(UserError);
                 expect(error.reason).to.equal(UserError.NOT_FOUND);
 
@@ -320,7 +324,7 @@ describe('User', function () {
         });
 
         it('fails due to invalid username', function (done) {
-            user.update(USERNAME, '', EMAIL_NEW, function (error) {
+            user.update(USERNAME, '', EMAIL_NEW, DISPLAY_NAME_NEW, function (error) {
                 expect(error).to.be.a(UserError);
                 expect(error.reason).to.equal(UserError.BAD_USERNAME);
 
@@ -329,7 +333,7 @@ describe('User', function () {
         });
 
         it('fails due to invalid email', function (done) {
-            user.update(USERNAME, USERNAME_NEW, 'brokenemailaddress', function (error) {
+            user.update(USERNAME, USERNAME_NEW, 'brokenemailaddress', DISPLAY_NAME_NEW, function (error) {
                 expect(error).to.be.a(UserError);
                 expect(error.reason).to.equal(UserError.BAD_EMAIL);
 
@@ -338,7 +342,7 @@ describe('User', function () {
         });
 
         it('succeeds', function (done) {
-            user.update(USERNAME, USERNAME_NEW, EMAIL_NEW, function (error) {
+            user.update(USERNAME, USERNAME_NEW, EMAIL_NEW, DISPLAY_NAME_NEW, function (error) {
                 expect(error).to.not.be.ok();
 
                 user.get(USERNAME, function (error, result) {
@@ -346,6 +350,7 @@ describe('User', function () {
                     expect(result).to.be.ok();
                     expect(result.email).to.equal(EMAIL_NEW);
                     expect(result.username).to.equal(USERNAME_NEW);
+                    expect(result.displayName).to.equal(DISPLAY_NAME_NEW);
 
                     done();
                 });