diff --git a/src/groupdb.js b/src/groupdb.js
index 177b57817..2f21d65f5 100644
--- a/src/groupdb.js
+++ b/src/groupdb.js
@@ -76,7 +76,7 @@ function getWithMembers(groupId, callback) {
 function getAll(callback) {
     assert.strictEqual(typeof callback, 'function');
 
-    database.query('SELECT ' + GROUPS_FIELDS + ' FROM userGroups', function (error, results) {
+    database.query('SELECT ' + GROUPS_FIELDS + ' FROM userGroups ORDER BY name', function (error, results) {
         if (error) return callback(new BoxError(BoxError.DATABASE_ERROR, error));
 
         callback(null, results);
diff --git a/src/routes/test/groups-test.js b/src/routes/test/groups-test.js
index 246cf3c26..2c220e614 100644
--- a/src/routes/test/groups-test.js
+++ b/src/routes/test/groups-test.js
@@ -86,7 +86,7 @@ describe('Groups API', function () {
 
     it('create fails due to mising token', function (done) {
         superagent.post(SERVER_URL + '/api/v1/groups')
-            .send({ name: GROUP_NAME})
+            .send({ name: GROUP_NAME })
             .end(function (error, result) {
                 expect(result.statusCode).to.equal(401);
                 done();
@@ -96,7 +96,7 @@ describe('Groups API', function () {
     it('create succeeds', function (done) {
         superagent.post(SERVER_URL + '/api/v1/groups')
             .query({ access_token: token })
-            .send({ name: GROUP_NAME})
+            .send({ name: GROUP_NAME })
             .end(function (error, result) {
                 expect(result.statusCode).to.equal(201);
                 groupObject = result.body;