diff --git a/test/api/v2/groups/GET-groups_id.test.js b/test/api/v2/groups/GET-groups_id.test.js
index 55fe7fa9c0..5c6f6925b6 100644
--- a/test/api/v2/groups/GET-groups_id.test.js
+++ b/test/api/v2/groups/GET-groups_id.test.js
@@ -146,9 +146,7 @@ describe('GET /groups/:id', () => {
       let nonAdmin;
 
       beforeEach(async () => {
-        return generateUser().then((user) => {
-          nonAdmin = user;
-        });
+        nonAdmin = await generateUser();
       });
 
       it('does not include messages with a flag count of 2 or greater', async () => {
@@ -334,9 +332,7 @@ describe('GET /groups/:id', () => {
     let user;
 
     beforeEach(async () => {
-      return generateUser().then((_user) => {
-        user = _user;
-      });
+      user = await generateUser();
     });
 
     it('returns error if group does not exist', async () => {
diff --git a/test/api/v2/groups/chat/POST-groups_id_chat_id_clearflags.test.js b/test/api/v2/groups/chat/POST-groups_id_chat_id_clearflags.test.js
index 7cb5f20c59..54cb954943 100644
--- a/test/api/v2/groups/chat/POST-groups_id_chat_id_clearflags.test.js
+++ b/test/api/v2/groups/chat/POST-groups_id_chat_id_clearflags.test.js
@@ -29,9 +29,7 @@ describe('POST /groups/:id/chat/:id/clearflags', () => {
     let nonadmin;
 
     beforeEach(async () => {
-      return generateUser().then((user) => {
-        nonadmin = user;
-      });
+      nonadmin = await generateUser();
     });
 
     it('cannot clear flags', async () => {
diff --git a/test/api/v2/user/DELETE-user.test.js b/test/api/v2/user/DELETE-user.test.js
index e035aec072..245a175cfd 100644
--- a/test/api/v2/user/DELETE-user.test.js
+++ b/test/api/v2/user/DELETE-user.test.js
@@ -11,9 +11,7 @@ describe('DELETE /user', () => {
   let user;
 
   beforeEach(async () => {
-    return generateUser().then((usr) => {
-      user = usr;
-    });
+    user = await generateUser();
   });
 
   it('deletes the user', async () => {
diff --git a/test/api/v2/user/GET-user_tags.test.js b/test/api/v2/user/GET-user_tags.test.js
index 92a6e3d6f3..f03be34b04 100644
--- a/test/api/v2/user/GET-user_tags.test.js
+++ b/test/api/v2/user/GET-user_tags.test.js
@@ -6,9 +6,7 @@ describe('GET /user/tags', () => {
   let user;
 
   beforeEach(async () => {
-    return generateUser().then((usr) => {
-      user = usr;
-    });
+    user = await generateUser();
   });
 
   it('gets the user\'s tags', async () => {
diff --git a/test/api/v2/user/GET-user_tags_id.test.js b/test/api/v2/user/GET-user_tags_id.test.js
index 3e185f07ae..1c6f76ded1 100644
--- a/test/api/v2/user/GET-user_tags_id.test.js
+++ b/test/api/v2/user/GET-user_tags_id.test.js
@@ -7,9 +7,7 @@ describe('GET /user/tags/id', () => {
   let user;
 
   beforeEach(async () => {
-    return generateUser().then((usr) => {
-      user = usr;
-    });
+    user = await generateUser();
   });
 
   it('gets a user\'s tag by id', async () => {
diff --git a/test/api/v2/user/PUT-user.test.js b/test/api/v2/user/PUT-user.test.js
index 2055125e94..dfe955af22 100644
--- a/test/api/v2/user/PUT-user.test.js
+++ b/test/api/v2/user/PUT-user.test.js
@@ -9,9 +9,7 @@ describe('PUT /user', () => {
   let user;
 
   beforeEach(async () => {
-    return generateUser().then((usr) => {
-      user = usr;
-    });
+    user = await generateUser();
   });
 
   context('allowed operations', () => {
diff --git a/test/api/v2/user/batch-update/POST-user_batch-update.test.js b/test/api/v2/user/batch-update/POST-user_batch-update.test.js
index 30a85c3607..9d8072c0ba 100644
--- a/test/api/v2/user/batch-update/POST-user_batch-update.test.js
+++ b/test/api/v2/user/batch-update/POST-user_batch-update.test.js
@@ -9,9 +9,7 @@ describe('POST /user/batch-update', () => {
   let user;
 
   beforeEach(async () => {
-    return generateUser().then((usr) => {
-      user = usr;
-    });
+    user = await generateUser();
   });
 
   context('allowed operations', () => {
diff --git a/test/api/v2/user/pushDevice/POST-pushDevice.test.js b/test/api/v2/user/pushDevice/POST-pushDevice.test.js
index f75e1a541b..75a5270547 100644
--- a/test/api/v2/user/pushDevice/POST-pushDevice.test.js
+++ b/test/api/v2/user/pushDevice/POST-pushDevice.test.js
@@ -6,9 +6,7 @@ describe('POST /user/pushDevice', () => {
   let user;
 
   beforeEach(async () => {
-    return generateUser().then((_user) => {
-      user = _user;
-    });
+    user = await generateUser();
   });
 
   it('registers a device id', async () => {
diff --git a/test/api/v2/user/tasks/DELETE-tasks_id.test.js b/test/api/v2/user/tasks/DELETE-tasks_id.test.js
index f7e8e2347b..2df05d894c 100644
--- a/test/api/v2/user/tasks/DELETE-tasks_id.test.js
+++ b/test/api/v2/user/tasks/DELETE-tasks_id.test.js
@@ -7,10 +7,8 @@ describe('DELETE /user/tasks/:id', () => {
   let user, task;
 
   beforeEach(async () => {
-    return generateUser().then((_user) => {
-      user = _user;
-      task = user.todos[0];
-    });
+    user = await generateUser();
+    task = user.todos[0];
   });
 
   it('deletes a task', async () => {
diff --git a/test/api/v2/user/tasks/GET-tasks_id.test.js b/test/api/v2/user/tasks/GET-tasks_id.test.js
index 275296cb36..9f092c1693 100644
--- a/test/api/v2/user/tasks/GET-tasks_id.test.js
+++ b/test/api/v2/user/tasks/GET-tasks_id.test.js
@@ -7,10 +7,8 @@ describe('GET /user/tasks/:id', () => {
   let user, task;
 
   beforeEach(async () => {
-    return generateUser().then((_user) => {
-      user = _user;
-      task = user.todos[0];
-    });
+    user = await generateUser();
+    task = user.todos[0];
   });
 
   it('gets a task', async () => {
diff --git a/test/api/v2/user/tasks/POST-tasks.test.js b/test/api/v2/user/tasks/POST-tasks.test.js
index 3615cede5a..096c48678e 100644
--- a/test/api/v2/user/tasks/POST-tasks.test.js
+++ b/test/api/v2/user/tasks/POST-tasks.test.js
@@ -8,9 +8,7 @@ describe('POST /user/tasks', () => {
   let user;
 
   beforeEach(async () => {
-    return generateUser().then((_user) => {
-      user = _user;
-    });
+    user = await generateUser();
   });
 
   it('creates a task', async () => {
diff --git a/test/api/v2/user/tasks/PUT-tasks_id.test.js b/test/api/v2/user/tasks/PUT-tasks_id.test.js
index 054ed7fcd2..7d63168d8e 100644
--- a/test/api/v2/user/tasks/PUT-tasks_id.test.js
+++ b/test/api/v2/user/tasks/PUT-tasks_id.test.js
@@ -7,10 +7,8 @@ describe('PUT /user/tasks/:id', () => {
   let user, task;
 
   beforeEach(async () => {
-    return generateUser().then((_user) => {
-      user = _user;
-      task = user.todos[0];
-    });
+    user = await generateUser();
+    task = user.todos[0];
   });
 
   it('does not update the id of the task', async () => {