diff --git a/test/api/v3/integration/groups/GET-group-plans.test.js b/test/api/v3/integration/groups/GET-group-plans.test.js
index 42e82d133d..8c050a98a2 100644
--- a/test/api/v3/integration/groups/GET-group-plans.test.js
+++ b/test/api/v3/integration/groups/GET-group-plans.test.js
@@ -1,6 +1,5 @@
 import {
-  generateUser,
-  generateGroup,
+  createAndPopulateGroup,
 } from '../../../../helpers/api-integration/v3';
 
 describe('GET /group-plans', () => {
@@ -8,20 +7,15 @@ describe('GET /group-plans', () => {
   let groupPlan;
 
   before(async () => {
-    user = await generateUser({ balance: 4 });
-    groupPlan = await generateGroup(user,
-      {
-        name: 'public guild - is member',
+    ({ group: groupPlan, groupLeader: user } = await createAndPopulateGroup({
+      groupDetails: {
+        name: 'group plan - is member',
         type: 'guild',
-        privacy: 'public',
+        privacy: 'private',
       },
-      {
-        purchased: {
-          plan: {
-            customerId: 'existings',
-          },
-        },
-      });
+      upgradeToGroupPlan: true,
+      leaderDetails: { balance: 4 },
+    }));
   });
 
   it('returns group plans for the user', async () => {
diff --git a/test/api/v3/integration/groups/GET-groups.test.js b/test/api/v3/integration/groups/GET-groups.test.js
index 3c64528c1e..c36ae943c8 100644
--- a/test/api/v3/integration/groups/GET-groups.test.js
+++ b/test/api/v3/integration/groups/GET-groups.test.js
@@ -19,7 +19,10 @@ describe('GET /groups', () => {
   before(async () => {
     await resetHabiticaDB();
 
-    ({ group: privateGuildUserIsMemberOf, groupLeader: leader, members } = await createAndPopulateGroup({
+    ({ group: privateGuildUserIsMemberOf,
+      groupLeader: leader,
+      members,
+    } = await createAndPopulateGroup({
       groupDetails: {
         name: 'private guild - is member',
         type: 'guild',
diff --git a/test/api/v3/integration/groups/GET-groups_groupId_invites.test.js b/test/api/v3/integration/groups/GET-groups_groupId_invites.test.js
index 2d4e048987..9ed08b392a 100644
--- a/test/api/v3/integration/groups/GET-groups_groupId_invites.test.js
+++ b/test/api/v3/integration/groups/GET-groups_groupId_invites.test.js
@@ -176,8 +176,9 @@ describe('GET /groups/:groupId/invites', () => {
   }).timeout(30000);
 
   it('supports using req.query.lastId to get more invites', async function test () {
+    let group; let invitees;
     this.timeout(30000); // @TODO: times out after 8 seconds
-    const { group, groupLeader: user, invitees } = await createAndPopulateGroup({
+    ({ group, groupLeader: user, invitees } = await createAndPopulateGroup({
       groupDetails: {
         type: 'guild',
         privacy: 'private',
@@ -186,7 +187,7 @@ describe('GET /groups/:groupId/invites', () => {
       leaderDetails: { balance: 4 },
       invites: 32,
       upgradeToGroupPlan: true,
-    });
+    }));
 
     const expectedIds = invitees.map(generatedInvite => generatedInvite._id);
 
diff --git a/test/api/v3/integration/groups/GET-groups_groupId_members.test.js b/test/api/v3/integration/groups/GET-groups_groupId_members.test.js
index b12222992a..42d02fc681 100644
--- a/test/api/v3/integration/groups/GET-groups_groupId_members.test.js
+++ b/test/api/v3/integration/groups/GET-groups_groupId_members.test.js
@@ -76,14 +76,15 @@ describe('GET /groups/:groupId/members', () => {
   });
 
   it('req.query.includeAllPublicFields === true works with guilds', async () => {
-    const { group, groupLeader: user } = await createAndPopulateGroup({
+    let group;
+    ({ group, groupLeader: user } = await createAndPopulateGroup({
       type: 'guild',
       privacy: 'private',
       name: generateUUID(),
       upgradeToGroupPlan: true,
       members: 1,
-    });
-        
+    }));
+
     const [memberRes] = await user.get(`/groups/${group._id}/members?includeAllPublicFields=true`);
 
     expect(memberRes).to.have.all.keys([ // works as: object has all and only these keys