diff --git a/test/api-legacy/api-helper.js b/test/api-legacy/api-helper.js
index 57817173c2..9ade0a2aa2 100644
--- a/test/api-legacy/api-helper.js
+++ b/test/api-legacy/api-helper.js
@@ -6,6 +6,8 @@ superagentDefaults = require("superagent-defaults");
 global.request = superagentDefaults();
 
 global.mongoose = require("mongoose");
+var Q = require('q');
+mongoose.Promise = Q.Promise;
 
 global.moment = require("moment");
 
diff --git a/test/helpers/common.helper.js b/test/helpers/common.helper.js
index 96064b8142..5e526c1424 100644
--- a/test/helpers/common.helper.js
+++ b/test/helpers/common.helper.js
@@ -1,4 +1,6 @@
 import mongoose from 'mongoose';
+import Q from 'q';
+mongoose.Promise = Q.Promise;
 
 import { wrap as wrapUser } from '../../common/script/index';
 import { model as User } from '../../website/src/models/user';
diff --git a/website/src/models/group.js b/website/src/models/group.js
index fb9ca70ad2..fd4c0bbe0d 100644
--- a/website/src/models/group.js
+++ b/website/src/models/group.js
@@ -305,7 +305,7 @@ let tavernQ = {_id: 'habitrpg', 'quest.key': {$ne: null}};
 
 // we use process.nextTick because at this point the model is not yet avalaible
 process.nextTick(() => {
-  mongoose.model('Group')
+  model // eslint-disable-line no-use-before-define
   .findOne(tavernQ).exec()
   .then(tavern => {
     if (!tavern) return; // No tavern quest
@@ -485,7 +485,7 @@ schema.methods.leave = function leaveGroup (user, keep = 'keep-all') {
       }
 
       update.$inc = {memberCount: -1};
-      return mongoose.model('Group').update({_id: group._id}, update);
+      return model.update({_id: group._id}, update); // eslint-disable-line no-use-before-define
     })(),
   ]).then(() => {
     firebase.removeUserFromGroup(group._id, user._id);