diff --git a/test/unit/lib/gui/app.js b/test/unit/lib/gui/app.js
index 32bf5e403..86079422f 100644
--- a/test/unit/lib/gui/app.js
+++ b/test/unit/lib/gui/app.js
@@ -4,7 +4,7 @@ const _ = require('lodash');
 const proxyquire = require('proxyquire');
 const Promise = require('bluebird');
 
-const ToolRunner = require('lib/gui/tool-runner');
+const {ToolRunner} = require('lib/gui/tool-runner');
 const {stubTool, stubConfig} = require('../../utils');
 
 describe('lib/gui/app', () => {
diff --git a/test/unit/lib/gui/tool-runner/index.js b/test/unit/lib/gui/tool-runner/index.js
index 624eb54c8..ccf975cfe 100644
--- a/test/unit/lib/gui/tool-runner/index.js
+++ b/test/unit/lib/gui/tool-runner/index.js
@@ -98,7 +98,7 @@ describe('lib/gui/tool-runner/index', () => {
                 removeReferenceImage,
                 revertReferenceImage
             }
-        });
+        }).ToolRunner;
 
         sandbox.stub(reportBuilder, 'imageHandler').value({updateCacheExpectedPath: sinon.stub()});
         sandbox.stub(logger, 'warn');
@@ -312,7 +312,7 @@ describe('lib/gui/tool-runner/index', () => {
         const mkUndoTestData_ = async (stubResult, {stateName = 'plain'} = {}) => {
             reportBuilder.undoAcceptImage.withArgs(sinon.match({
                 fullName: 'some-title'
-            }), 'plain').resolves(stubResult);
+            }), 'plain').returns(stubResult);
             const tests = [{
                 id: 'some-id',
                 fullTitle: () => 'some-title',