diff --git a/test/api/groups/POST-groups_id_leave.test.js b/test/api/groups/POST-groups_id_leave.test.js
index bd60377650..70635e7017 100644
--- a/test/api/groups/POST-groups_id_leave.test.js
+++ b/test/api/groups/POST-groups_id_leave.test.js
@@ -30,16 +30,15 @@ describe('POST /groups/:id/leave', () => {
       });
     });
 
-    it('leaves the group', (done) => {
-      api.post(`/groups/${group._id}/leave`).then((result) => {
+    it('leaves the group', () => {
+      return api.post(`/groups/${group._id}/leave`).then((result) => {
         return api.get(`/groups/${group._id}`);
       }).then((group) => {
         let userInGroup = find(group.members, (member) => {
           return member._id === user._id;
         });
         expect(userInGroup).to.not.be.ok;
-        done();
-      }).catch(done);
+      });
     });
   });
 
diff --git a/test/api/groups/POST-groups_id_removeMember.test.js b/test/api/groups/POST-groups_id_removeMember.test.js
index 6464f9cbb6..72424b5a2b 100644
--- a/test/api/groups/POST-groups_id_removeMember.test.js
+++ b/test/api/groups/POST-groups_id_removeMember.test.js
@@ -41,15 +41,14 @@ describe('POST /groups/:id/removeMember', () => {
       })).to.be.rejectedWith('You cannot remove yourself!');
     });
 
-    it('can remove other members of guild', (done) => {
-      api.post(`/groups/${group._id}/removeMember`, null, {
+    it('can remove other members of guild', () => {
+      return api.post(`/groups/${group._id}/removeMember`, null, {
         uuid: member._id,
       }).then((res) => {
         return api.get(`/groups/${group._id}`);
       }).then((guild) => {
         expect(guild.members).to.have.a.lengthOf(1);
         expect(guild.members[0]._id).to.not.eql(member._id);
-        done();
       });
     });
   });
diff --git a/test/api/register/POST-register.test.js b/test/api/register/POST-register.test.js
index a932aa4b2e..ab729c4116 100644
--- a/test/api/register/POST-register.test.js
+++ b/test/api/register/POST-register.test.js
@@ -7,13 +7,13 @@ import {v4 as generateRandomUserName} from 'uuid';
 describe('POST /register', () => {
 
   context('username and email are free', () => {
-    it('registers a new user', (done) => {
+    it('registers a new user', () => {
       let api = requester();
       let username = generateRandomUserName();
       let email = `${username}@example.com`;
       let password = 'password';
 
-      api.post('/register', {
+      return api.post('/register', {
         username:        username,
         email:           email,
         password:        password,
@@ -22,7 +22,6 @@ describe('POST /register', () => {
         expect(user._id).to.exist;
         expect(user.apiToken).to.exist;
         expect(user.auth.local.username).to.eql(username);
-        done();
       });
     });
 
diff --git a/test/api/user/GET-user.test.js b/test/api/user/GET-user.test.js
index 7cb17d596e..7dd31b2be5 100644
--- a/test/api/user/GET-user.test.js
+++ b/test/api/user/GET-user.test.js
@@ -12,14 +12,13 @@ describe('GET /user', () => {
     });
   });
 
-  it('gets the user object', (done) => {
+  it('gets the user object', () => {
     let api = requester(user);
-    api.get('/user').then((fetchedUser) => {
+    return api.get('/user').then((fetchedUser) => {
       expect(fetchedUser._id).to.eql(user._id);
       expect(fetchedUser.auth.local.username).to.eql(user.auth.local.username);
       expect(fetchedUser.todos).to.eql(user.todos);
       expect(fetchedUser.items).to.eql(user.items);
-      done();
     });
   });
 });