diff --git a/src/routes/tasks.js b/src/routes/tasks.js
index 2c909940a..90bcddc26 100644
--- a/src/routes/tasks.js
+++ b/src/routes/tasks.js
@@ -44,12 +44,10 @@ async function list(req, res, next) {
 
     if (req.query.type && typeof req.query.type !== 'string') return next(new HttpError(400, 'type must be a string'));
 
-    let [error, result] = await safe(tasks.listByTypePaged(req.query.type || null, page, perPage));
+    const [error, result] = await safe(tasks.listByTypePaged(req.query.type || null, page, perPage));
     if (error) return next(BoxError.toHttpError(error));
 
-    result = result.map(tasks.removePrivateFields);
-
-    next(new HttpSuccess(200, { tasks: result }));
+    next(new HttpSuccess(200, { tasks: result.map(tasks.removePrivateFields) }));
 }
 
 async function stopTask(req, res, next) {
diff --git a/src/routes/test/tasks-test.js b/src/routes/test/tasks-test.js
index 4a3abf03c..980d0b1d8 100644
--- a/src/routes/test/tasks-test.js
+++ b/src/routes/test/tasks-test.js
@@ -39,12 +39,12 @@ describe('Tasks API', function () {
     it('can get logs', async function () {
         const taskId = await tasks.add(tasks._TASK_CRASH, [ 'ping' ]);
 
-        return new Promise((resolve) => {
+        return new Promise((resolve, reject) => {
             tasks.startTask(taskId, {}, async function () {
                 const response = await superagent.get(`${serverUrl}/api/v1/tasks/${taskId}/logs`)
                     .query({ access_token: owner.token });
 
-                expect(response.status).to.equal(200);
+                if (response.status !== 200) return reject(new Error('Expecting 200'));
                 resolve();
             });
         });
@@ -53,13 +53,14 @@ describe('Tasks API', function () {
     it('cannot stop inactive task', async function () {
         const taskId = await tasks.add(tasks._TASK_IDENTITY, [ 'ping' ]);
 
-        return new Promise((resolve) => {
+        return new Promise((resolve, reject) => {
             tasks.startTask(taskId, {}, async function () {
                 const response = await superagent.post(`${serverUrl}/api/v1/tasks/${taskId}/stop`)
                     .query({ access_token: owner.token })
+                    .send({})
                     .ok(() => true);
 
-                expect(response.status).to.equal(409);
+                if (response.status !== 409) return reject(new Error('Expecting 409'));
                 resolve();
             });
         });