diff --git a/lib/classes/Utils.test.js b/lib/classes/Utils.test.js
index 6d0ab2d34..f7b3ff583 100644
--- a/lib/classes/Utils.test.js
+++ b/lib/classes/Utils.test.js
@@ -2,7 +2,7 @@
 
 const path = require('path');
 const os = require('os');
-const expect = require('chai').expect;
+const chai = require('chai');
 const sinon = require('sinon');
 const Serverless = require('../../lib/Serverless');
 const testUtils = require('../../tests/utils');
@@ -10,6 +10,8 @@ const configUtils = require('../utils/config');
 const serverlessVersion = require('../../package.json').version;
 const segment = require('../utils/segment');
 const proxyquire = require('proxyquire');
+chai.use(require('chai-as-promised'));
+const expect = require('chai').expect;
 
 describe('Utils', () => {
   let utils;
@@ -83,7 +85,7 @@ describe('Utils', () => {
 
       serverless.utils.writeFileSync(tmpFilePath, { foo: 'bar' });
 
-      return serverless.yamlParser.parse(tmpFilePath).then((obj) => {
+      return expect(serverless.yamlParser.parse(tmpFilePath)).to.be.fulfilled.then((obj) => {
         expect(obj.foo).to.equal('bar');
       });
     });
@@ -93,7 +95,7 @@ describe('Utils', () => {
 
       serverless.utils.writeFileSync(tmpFilePath, { foo: 'bar' });
 
-      return serverless.yamlParser.parse(tmpFilePath).then((obj) => {
+      return expect(serverless.yamlParser.parse(tmpFilePath)).to.be.fulfilled.then((obj) => {
         expect(obj.foo).to.equal('bar');
       });
     });
@@ -108,7 +110,8 @@ describe('Utils', () => {
       const tmpFilePath = testUtils.getTmpFilePath('anything.json');
 
       // note: use return when testing promises otherwise you'll have unhandled rejection errors
-      return serverless.utils.writeFile(tmpFilePath, { foo: 'bar' }).then(() => {
+      return expect(serverless.utils.writeFile(tmpFilePath, { foo: 'bar' }))
+      .to.be.fulfilled.then(() => {
         const obj = serverless.utils.readFileSync(tmpFilePath);
 
         expect(obj.foo).to.equal('bar');
@@ -178,7 +181,7 @@ describe('Utils', () => {
       serverless.utils.writeFileSync(tmpFilePath, { foo: 'bar' });
 
       // note: use return when testing promises otherwise you'll have unhandled rejection errors
-      return serverless.utils.readFile(tmpFilePath).then((obj) => {
+      return expect(serverless.utils.readFile(tmpFilePath)).to.be.fulfilled.then((obj) => {
         expect(obj.foo).to.equal('bar');
       });
     });
@@ -349,7 +352,7 @@ describe('Utils', () => {
       // help is a whitelisted option
       serverless.processedInput.options = options;
 
-      return utils.logStat(serverless).then(() => {
+      return expect(utils.logStat(serverless)).to.be.fulfilled.then(() => {
         expect(trackStub.calledOnce).to.equal(true);
         expect(getConfigStub.calledOnce).to.equal(true);
 
@@ -365,7 +368,7 @@ describe('Utils', () => {
         frameworkId: '1234wasd',
       });
 
-      return utils.logStat(serverless).then(() => {
+      return expect(utils.logStat(serverless)).to.be.fulfilled.then(() => {
         expect(getConfigStub.calledOnce).to.equal(true);
         expect(isDockerContainerStub.calledOnce).to.equal(true);
         expect(trackStub.calledOnce).to.equal(true);
@@ -398,9 +401,12 @@ describe('Utils', () => {
             ],
           },
         },
+        package: {
+          path: 'foo',
+        },
       };
 
-      return utils.logStat(serverless).then(() => {
+      return expect(utils.logStat(serverless)).to.be.fulfilled.then(() => {
         expect(getConfigStub.calledOnce).to.equal(true);
         expect(trackStub.calledOnce).to.equal(true);
 
@@ -436,10 +442,13 @@ describe('Utils', () => {
             ],
           },
         },
+        package: {
+          path: 'foo',
+        },
       };
 
 
-      return utils.logStat(serverless).then(() => {
+      return expect(utils.logStat(serverless)).to.be.fulfilled.then(() => {
         expect(getConfigStub.calledOnce).to.equal(true);
         expect(trackStub.calledOnce).to.equal(true);
 
@@ -473,9 +482,12 @@ describe('Utils', () => {
             ],
           },
         },
+        package: {
+          path: 'foo',
+        },
       };
 
-      return utils.logStat(serverless).then(() => {
+      return expect(utils.logStat(serverless)).to.be.fulfilled.then(() => {
         expect(getConfigStub.calledOnce).to.equal(true);
         expect(trackStub.calledOnce).to.equal(true);
 
@@ -511,9 +523,12 @@ describe('Utils', () => {
             ],
           },
         },
+        package: {
+          path: 'foo',
+        },
       };
 
-      return utils.logStat(serverless).then(() => {
+      return expect(utils.logStat(serverless)).to.be.fulfilled.then(() => {
         expect(getConfigStub.calledOnce).to.equal(true);
         expect(trackStub.calledOnce).to.equal(true);
 
@@ -549,9 +564,12 @@ describe('Utils', () => {
             ],
           },
         },
+        package: {
+          path: 'foo',
+        },
       };
 
-      return utils.logStat(serverless).then(() => {
+      return expect(utils.logStat(serverless)).to.be.fulfilled.then(() => {
         expect(getConfigStub.calledOnce).to.equal(true);
         expect(trackStub.calledOnce).to.equal(true);
 
@@ -585,9 +603,12 @@ describe('Utils', () => {
             ],
           },
         },
+        package: {
+          path: 'foo',
+        },
       };
 
-      return utils.logStat(serverless).then(() => {
+      return expect(utils.logStat(serverless)).to.be.fulfilled.then(() => {
         expect(getConfigStub.calledOnce).to.equal(true);
         expect(trackStub.calledOnce).to.equal(true);
 
@@ -623,9 +644,12 @@ describe('Utils', () => {
             ],
           },
         },
+        package: {
+          path: 'foo',
+        },
       };
 
-      return utils.logStat(serverless).then(() => {
+      return expect(utils.logStat(serverless)).to.be.fulfilled.then(() => {
         expect(getConfigStub.calledOnce).to.equal(true);
         expect(trackStub.calledOnce).to.equal(true);
 
@@ -648,7 +672,7 @@ describe('Utils', () => {
         },
       };
 
-      return utils.logStat(serverless).then(() => {
+      return expect(utils.logStat(serverless)).to.be.fulfilled.then(() => {
         expect(getConfigStub.calledOnce).to.equal(true);
         expect(trackStub.calledOnce).to.equal(true);
 
@@ -711,7 +735,7 @@ describe('Utils', () => {
         package: {},
       };
 
-      return utils.logStat(serverless).then(() => {
+      return expect(utils.logStat(serverless)).to.be.fulfilled.then(() => {
         expect(trackStub.calledOnce).to.equal(true);
         expect(getConfigStub.calledOnce).to.equal(true);