diff --git a/test/api/v2/groups/GET-groups.test.js b/test/api/v2/groups/GET-groups.test.js
index 9661115726..203fdd0acc 100644
--- a/test/api/v2/groups/GET-groups.test.js
+++ b/test/api/v2/groups/GET-groups.test.js
@@ -2,7 +2,7 @@ import {
   generateGroup,
   generateUser,
   resetHabiticaDB,
-} from '../../../helpers/api-integration.helper';
+} from '../../../helpers/api-integration/v2';
 
 describe('GET /groups', () => {
   const NUMBER_OF_PUBLIC_GUILDS = 3;
diff --git a/test/api/v2/groups/GET-groups_id.test.js b/test/api/v2/groups/GET-groups_id.test.js
index 2d23219737..1de69da586 100644
--- a/test/api/v2/groups/GET-groups_id.test.js
+++ b/test/api/v2/groups/GET-groups_id.test.js
@@ -2,7 +2,7 @@ import {
   createAndPopulateGroup,
   generateUser,
   translate as t,
-} from '../../../helpers/api-integration.helper';
+} from '../../../helpers/api-integration/v2';
 import {
   find,
   each,
diff --git a/test/api/v2/groups/POST-groups.test.js b/test/api/v2/groups/POST-groups.test.js
index d14ea1bee4..8da165aaf7 100644
--- a/test/api/v2/groups/POST-groups.test.js
+++ b/test/api/v2/groups/POST-groups.test.js
@@ -2,7 +2,7 @@ import {
   generateGroup,
   generateUser,
   translate as t,
-} from '../../../helpers/api-integration.helper';
+} from '../../../helpers/api-integration/v2';
 
 describe('POST /groups', () => {
   context('All groups', () => {
diff --git a/test/api/v2/groups/POST-groups_id.test.js b/test/api/v2/groups/POST-groups_id.test.js
index eabf3e58c6..a12f3d0274 100644
--- a/test/api/v2/groups/POST-groups_id.test.js
+++ b/test/api/v2/groups/POST-groups_id.test.js
@@ -2,7 +2,7 @@ import {
   generateGroup,
   generateUser,
   translate as t,
-} from '../../../helpers/api-integration.helper';
+} from '../../../helpers/api-integration/v2';
 
 describe('POST /groups/:id', () => {
   context('user is not the leader of the group', () => {
diff --git a/test/api/v2/groups/POST-groups_id_join.test.js b/test/api/v2/groups/POST-groups_id_join.test.js
index f553c3c8ea..bc53ac80af 100644
--- a/test/api/v2/groups/POST-groups_id_join.test.js
+++ b/test/api/v2/groups/POST-groups_id_join.test.js
@@ -2,7 +2,7 @@ import {
   createAndPopulateGroup,
   generateUser,
   translate as t,
-} from '../../../helpers/api-integration.helper';
+} from '../../../helpers/api-integration/v2';
 import { each, find } from 'lodash';
 
 describe('POST /groups/:id/join', () => {
diff --git a/test/api/v2/groups/POST-groups_id_leave.test.js b/test/api/v2/groups/POST-groups_id_leave.test.js
index 994b8fd0b8..f381142560 100644
--- a/test/api/v2/groups/POST-groups_id_leave.test.js
+++ b/test/api/v2/groups/POST-groups_id_leave.test.js
@@ -1,7 +1,7 @@
 import {
   checkExistence,
   createAndPopulateGroup,
-} from '../../../helpers/api-integration.helper';
+} from '../../../helpers/api-integration/v2';
 import { find } from 'lodash';
 
 describe('POST /groups/:id/leave', () => {
diff --git a/test/api/v2/groups/POST-groups_id_removeMember.test.js b/test/api/v2/groups/POST-groups_id_removeMember.test.js
index 0cd29f0455..ccedd69e9d 100644
--- a/test/api/v2/groups/POST-groups_id_removeMember.test.js
+++ b/test/api/v2/groups/POST-groups_id_removeMember.test.js
@@ -1,7 +1,7 @@
 import {
   createAndPopulateGroup,
   translate as t,
-} from '../../../helpers/api-integration.helper';
+} from '../../../helpers/api-integration/v2';
 
 describe('POST /groups/:id/removeMember', () => {
   context('user is not member of the group', () => {
diff --git a/test/api/v2/groups/chat/DELETE-groups_id_chat.test.js b/test/api/v2/groups/chat/DELETE-groups_id_chat.test.js
index c38e6c3565..dc575b0ec6 100644
--- a/test/api/v2/groups/chat/DELETE-groups_id_chat.test.js
+++ b/test/api/v2/groups/chat/DELETE-groups_id_chat.test.js
@@ -1,7 +1,7 @@
 import {
   createAndPopulateGroup,
   translate as t,
-} from '../../../../helpers/api-integration.helper';
+} from '../../../../helpers/api-integration/v2';
 
 describe('DELETE /groups/:id/chat', () => {
   let group, message, user;
diff --git a/test/api/v2/groups/chat/GET-groups_id_chat.test.js b/test/api/v2/groups/chat/GET-groups_id_chat.test.js
index b62e859c18..d6dc691af7 100644
--- a/test/api/v2/groups/chat/GET-groups_id_chat.test.js
+++ b/test/api/v2/groups/chat/GET-groups_id_chat.test.js
@@ -1,6 +1,6 @@
 import {
   createAndPopulateGroup,
-} from '../../../../helpers/api-integration.helper';
+} from '../../../../helpers/api-integration/v2';
 
 describe('GET /groups/:id/chat', () => {
   context('group with multiple messages', () => {
diff --git a/test/api/v2/groups/chat/POST-groups_id_chat.test.js b/test/api/v2/groups/chat/POST-groups_id_chat.test.js
index f02ae4e435..cc280077aa 100644
--- a/test/api/v2/groups/chat/POST-groups_id_chat.test.js
+++ b/test/api/v2/groups/chat/POST-groups_id_chat.test.js
@@ -1,7 +1,7 @@
 import {
   createAndPopulateGroup,
   translate as t,
-} from '../../../../helpers/api-integration.helper';
+} from '../../../../helpers/api-integration/v2';
 
 describe('POST /groups/:id/chat', () => {
   let group, user;
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 5ab1893afe..0b6a54c429 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
@@ -2,7 +2,7 @@ import {
   createAndPopulateGroup,
   generateUser,
   translate as t,
-} from '../../../../helpers/api-integration.helper';
+} from '../../../../helpers/api-integration/v2';
 
 describe('POST /groups/:id/chat/:id/clearflags', () => {
   let guild;
diff --git a/test/api/v2/groups/chat/POST-groups_id_chat_id_flag.test.js b/test/api/v2/groups/chat/POST-groups_id_chat_id_flag.test.js
index febbdd9134..cd813061b2 100644
--- a/test/api/v2/groups/chat/POST-groups_id_chat_id_flag.test.js
+++ b/test/api/v2/groups/chat/POST-groups_id_chat_id_flag.test.js
@@ -2,7 +2,7 @@ import {
   createAndPopulateGroup,
   generateUser,
   translate as t,
-} from '../../../../helpers/api-integration.helper';
+} from '../../../../helpers/api-integration/v2';
 
 describe('POST /groups/:id/chat/:id/flag', () => {
   context('another member\'s message', () => {
diff --git a/test/api/v2/groups/chat/POST-groups_id_chat_id_like.test.js b/test/api/v2/groups/chat/POST-groups_id_chat_id_like.test.js
index 80fd1f3adb..9c8ff4c586 100644
--- a/test/api/v2/groups/chat/POST-groups_id_chat_id_like.test.js
+++ b/test/api/v2/groups/chat/POST-groups_id_chat_id_like.test.js
@@ -2,7 +2,7 @@ import {
   createAndPopulateGroup,
   generateUser,
   translate as t,
-} from '../../../../helpers/api-integration.helper';
+} from '../../../../helpers/api-integration/v2';
 
 describe('POST /groups/:id/chat/:id/like', () => {
   context('another member\'s message', () => {
diff --git a/test/api/v2/register/POST-register.test.js b/test/api/v2/register/POST-register.test.js
index d62e15787f..48981c55b2 100644
--- a/test/api/v2/register/POST-register.test.js
+++ b/test/api/v2/register/POST-register.test.js
@@ -2,7 +2,7 @@ import {
   generateUser,
   requester,
   translate as t,
-} from '../../../helpers/api-integration.helper';
+} from '../../../helpers/api-integration/v2';
 import { v4 as generateRandomUserName } from 'uuid';
 import { each } from 'lodash';
 
diff --git a/test/api/v2/status/GET-status.test.js b/test/api/v2/status/GET-status.test.js
index 681da16499..6aac4346a1 100644
--- a/test/api/v2/status/GET-status.test.js
+++ b/test/api/v2/status/GET-status.test.js
@@ -1,4 +1,4 @@
-import {requester} from '../../../helpers/api-integration.helper';
+import {requester} from '../../../helpers/api-integration/v2';
 
 describe('Status', () => {
   it('returns a status of up when server is up', async () => {
diff --git a/test/api/v2/user/DELETE-user.test.js b/test/api/v2/user/DELETE-user.test.js
index ab450715e6..db0eeca1c8 100644
--- a/test/api/v2/user/DELETE-user.test.js
+++ b/test/api/v2/user/DELETE-user.test.js
@@ -3,7 +3,7 @@ import {
   createAndPopulateGroup,
   generateGroup,
   generateUser,
-} from '../../../helpers/api-integration.helper';
+} from '../../../helpers/api-integration/v2';
 import { find } from 'lodash';
 
 describe('DELETE /user', () => {
diff --git a/test/api/v2/user/GET-user.test.js b/test/api/v2/user/GET-user.test.js
index b2aaf7d066..c1e22d020a 100644
--- a/test/api/v2/user/GET-user.test.js
+++ b/test/api/v2/user/GET-user.test.js
@@ -1,6 +1,6 @@
 import {
   generateUser,
-} from '../../../helpers/api-integration.helper';
+} from '../../../helpers/api-integration/v2';
 
 describe('GET /user', () => {
   let user;
diff --git a/test/api/v2/user/GET-user_tags.test.js b/test/api/v2/user/GET-user_tags.test.js
index f03be34b04..fd2032dc96 100644
--- a/test/api/v2/user/GET-user_tags.test.js
+++ b/test/api/v2/user/GET-user_tags.test.js
@@ -1,6 +1,6 @@
 import {
   generateUser,
-} from '../../../helpers/api-integration.helper';
+} from '../../../helpers/api-integration/v2';
 
 describe('GET /user/tags', () => {
   let user;
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 0ea13437a7..9c774c84b6 100644
--- a/test/api/v2/user/GET-user_tags_id.test.js
+++ b/test/api/v2/user/GET-user_tags_id.test.js
@@ -1,7 +1,7 @@
 import {
   generateUser,
   translate as t,
-} from '../../../helpers/api-integration.helper';
+} from '../../../helpers/api-integration/v2';
 
 describe('GET /user/tags/id', () => {
   let user;
diff --git a/test/api/v2/user/PUT-user.test.js b/test/api/v2/user/PUT-user.test.js
index 68664e6ed3..556fbfee91 100644
--- a/test/api/v2/user/PUT-user.test.js
+++ b/test/api/v2/user/PUT-user.test.js
@@ -1,7 +1,7 @@
 import {
   generateUser,
   translate as t,
-} from '../../../helpers/api-integration.helper';
+} from '../../../helpers/api-integration/v2';
 
 import { each, get } from 'lodash';
 
diff --git a/test/api/v2/user/anonymized/GET-user_anonymized.test.js b/test/api/v2/user/anonymized/GET-user_anonymized.test.js
index 6933074046..3bfb4d1dcb 100644
--- a/test/api/v2/user/anonymized/GET-user_anonymized.test.js
+++ b/test/api/v2/user/anonymized/GET-user_anonymized.test.js
@@ -1,6 +1,6 @@
 import {
   generateUser,
-} from '../../../../helpers/api-integration.helper';
+} from '../../../../helpers/api-integration/v2';
 import { each } from 'lodash';
 
 describe('GET /user/anonymized', () => {
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 7e7d9954f6..0b1f244ff7 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
@@ -1,7 +1,7 @@
 import {
   generateUser,
   translate as t,
-} from '../../../../helpers/api-integration.helper';
+} from '../../../../helpers/api-integration/v2';
 
 import { each } from 'lodash';
 
diff --git a/test/api/v2/user/pushDevice/POST-pushDevice.test.js b/test/api/v2/user/pushDevice/POST-pushDevice.test.js
index 75a5270547..97cfc4dbb9 100644
--- a/test/api/v2/user/pushDevice/POST-pushDevice.test.js
+++ b/test/api/v2/user/pushDevice/POST-pushDevice.test.js
@@ -1,6 +1,6 @@
 import {
   generateUser,
-} from '../../../../helpers/api-integration.helper';
+} from '../../../../helpers/api-integration/v2';
 
 describe('POST /user/pushDevice', () => {
   let user;
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 2d0a1615d2..68eb20faef 100644
--- a/test/api/v2/user/tasks/DELETE-tasks_id.test.js
+++ b/test/api/v2/user/tasks/DELETE-tasks_id.test.js
@@ -1,7 +1,7 @@
 import {
   generateUser,
   translate as t,
-} from '../../../../helpers/api-integration.helper';
+} from '../../../../helpers/api-integration/v2';
 
 describe('DELETE /user/tasks/:id', () => {
   let user, task;
diff --git a/test/api/v2/user/tasks/GET-tasks.test.js b/test/api/v2/user/tasks/GET-tasks.test.js
index 3d750cab8c..5cca2f2696 100644
--- a/test/api/v2/user/tasks/GET-tasks.test.js
+++ b/test/api/v2/user/tasks/GET-tasks.test.js
@@ -1,6 +1,6 @@
 import {
   generateUser,
-} from '../../../../helpers/api-integration.helper';
+} from '../../../../helpers/api-integration/v2';
 
 describe('GET /user/tasks/', () => {
   let user;
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 c57f9c0038..cd9e1e73be 100644
--- a/test/api/v2/user/tasks/GET-tasks_id.test.js
+++ b/test/api/v2/user/tasks/GET-tasks_id.test.js
@@ -1,7 +1,7 @@
 import {
   generateUser,
   translate as t,
-} from '../../../../helpers/api-integration.helper';
+} from '../../../../helpers/api-integration/v2';
 
 describe('GET /user/tasks/:id', () => {
   let user, task;
diff --git a/test/api/v2/user/tasks/POST-tasks.test.js b/test/api/v2/user/tasks/POST-tasks.test.js
index 6ddc1d33fd..5f43224803 100644
--- a/test/api/v2/user/tasks/POST-tasks.test.js
+++ b/test/api/v2/user/tasks/POST-tasks.test.js
@@ -1,7 +1,7 @@
 import {
   generateUser,
   translate as t,
-} from '../../../../helpers/api-integration.helper';
+} from '../../../../helpers/api-integration/v2';
 
 describe('POST /user/tasks', () => {
   let user;
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 90a5065db4..037322a6b7 100644
--- a/test/api/v2/user/tasks/PUT-tasks_id.test.js
+++ b/test/api/v2/user/tasks/PUT-tasks_id.test.js
@@ -1,6 +1,6 @@
 import {
   generateUser,
-} from '../../../../helpers/api-integration.helper';
+} from '../../../../helpers/api-integration/v2';
 
 describe('PUT /user/tasks/:id', () => {
   let user, task;
diff --git a/test/helpers/api-integration.helper.js b/test/helpers/api-integration.helper.js
deleted file mode 100644
index 5ed81347e9..0000000000
--- a/test/helpers/api-integration.helper.js
+++ /dev/null
@@ -1,14 +0,0 @@
-/* eslint-disable no-use-before-define */
-
-// Import requester function, set it up for v2, export it
-import { requester } from './api-integration/requester'
-requester.setApiVersion('v2');
-export { requester };
-
-export { translate } from './api-integration/translate';
-export { checkExistence, resetHabiticaDB } from './api-integration/mongo';
-export {
- generateUser,
- generateGroup,
- createAndPopulateGroup,
-} from  './api-integration/v2/object-generators';
diff --git a/test/helpers/api-integration/v2/index.js b/test/helpers/api-integration/v2/index.js
new file mode 100644
index 0000000000..68d5e2d4e3
--- /dev/null
+++ b/test/helpers/api-integration/v2/index.js
@@ -0,0 +1,14 @@
+/* eslint-disable no-use-before-define */
+
+// Import requester function, set it up for v2, export it
+import { requester } from '../requester'
+requester.setApiVersion('v2');
+export { requester };
+
+export { translate } from '../translate';
+export { checkExistence, resetHabiticaDB } from '../mongo';
+export {
+ generateUser,
+ generateGroup,
+ createAndPopulateGroup,
+} from  './object-generators';