diff --git a/tests/image-stream/tester.js b/tests/image-stream/tester.js
index 14eba877..f243d25e 100644
--- a/tests/image-stream/tester.js
+++ b/tests/image-stream/tester.js
@@ -19,7 +19,7 @@
 const m = require('mochainon')
 const _ = require('lodash')
 const Bluebird = require('bluebird')
-const fs = require('fs')
+const fs = Bluebird.promisifyAll(require('fs'))
 const os = require('os')
 const path = require('path')
 const imageStream = require('../../lib/image-stream/index')
@@ -33,21 +33,6 @@ const doFilesContainTheSameData = (file1, file2) => {
   })
 }
 
-const deleteIfExists = (file) => {
-  return new Bluebird((resolve, reject) => {
-    try {
-      fs.accessSync(file)
-      fs.unlinkSync(file)
-    } catch (error) {
-      if (error.code !== 'ENOENT') {
-        return reject(error)
-      }
-    }
-
-    resolve()
-  })
-}
-
 exports.DEFAULT_IMAGE_TESTS_TIMEOUT = 20000
 
 exports.expectError = function (file, errorMessage, errorDetail) {
@@ -93,7 +78,8 @@ exports.extractFromFilePath = function (file, image) {
     }).then(function (areEqual) {
       m.chai.expect(areEqual).to.be.true
     }).finally(function () {
-      return deleteIfExists(output)
+      return fs.unlinkAsync(output)
+        .catch({ code: 'ENOENT' }, _.noop)
     })
   })
 }