diff --git a/src/Routers/UsersRouter.js b/src/Routers/UsersRouter.js
index 592bdc0b..4cba3edb 100644
--- a/src/Routers/UsersRouter.js
+++ b/src/Routers/UsersRouter.js
@@ -75,7 +75,7 @@ export class UsersRouter extends ClassesRouter {
     }
 
     let user;
-    return req.database.find('_User', { username: req.body.username })
+    return req.config.database.find('_User', { username: req.body.username })
       .then((results) => {
         if (!results.length) {
           throw new Parse.Error(Parse.Error.OBJECT_NOT_FOUND, 'Invalid username/password.');
diff --git a/src/middlewares.js b/src/middlewares.js
index c1a8eb71..b9a8d6ec 100644
--- a/src/middlewares.js
+++ b/src/middlewares.js
@@ -84,7 +84,6 @@ function handleParseHeaders(req, res, next) {
 
   info.app = cache.apps.get(info.appId);
   req.config = new Config(info.appId, mount);
-  req.database = req.config.database;
   req.info = info;
 
   var isMaster = (info.masterKey === req.config.masterKey);
diff --git a/src/testing-routes.js b/src/testing-routes.js
index f36b49e4..f91c14a1 100644
--- a/src/testing-routes.js
+++ b/src/testing-routes.js
@@ -32,7 +32,7 @@ function clearApp(req, res) {
   if (!req.auth.isMaster) {
     return res.status(401).send({"error": "unauthorized"});
   }
-  req.database.deleteEverything().then(() => {
+  return req.config.database.deleteEverything().then(() => {
     res.status(200).send({});
   });
 }
@@ -42,7 +42,7 @@ function dropApp(req, res) {
   if (!req.auth.isMaster) {
     return res.status(401).send({"error": "unauthorized"});
   }
-  req.database.deleteEverything().then(() => {
+  return req.config.database.deleteEverything().then(() => {
     cache.apps.remove(req.config.applicationId);
     res.status(200).send({});
   });