diff --git a/tests/tests/classes/Plugin.js b/tests/tests/classes/Plugin.js
index 42a24618e..78b17d88e 100644
--- a/tests/tests/classes/Plugin.js
+++ b/tests/tests/classes/Plugin.js
@@ -5,40 +5,156 @@
  */
 
 const expect = require('chai').expect;
-const Plugin = require('../../../lib/classes/Plugin')({});
+const Serverless = require('../../../lib/Serverless');
+
+// create a new Serverless instance
+const serverless = new Serverless({
+  interactive: false,
+});
+
+const Plugin = require('../../../lib/classes/Plugin')(serverless);
+
+// action mocks
+const actionMock = () => { return { foo: 'bar' }; };
+const actionMockConfig = {
+  handler: 'actionMock',
+  context: 'action',
+  contextAction: 'mock',
+  options: [
+    {
+      option: 'mockOption',
+      shortcut: 'm',
+      description: 'Mock option',
+    },
+  ],
+  parameters: [
+    {
+      parameter: 'mockParam',
+      description: 'Mock param',
+      position: '0->',
+    },
+  ],
+};
+
+// hook mocks
+const hookMock = () => { return true; };
+const hookMockConfig = {
+  action: 'actionMock',
+  event: 'pre',
+};
 
 const SPlugin = new Plugin();
 
 describe('Plugin class', () => {
 
-  after((done) => {
-    done();
-  });
-
-  it('should have a name', () => {
+  it('should return a valid name', () => {
     const name = SPlugin.getName();
-
-    expect(name.length).to.be.at.least(1);
+    expect(name).to.be.equal('Plugin');
   });
 
-  it('should register actions', (done) => {
-    const actions = SPlugin.registerActions();
+  describe('Add action', () => {
 
-    actions.then((result) => {
+    before((done) => {
+      SPlugin.addAction(actionMock, actionMockConfig);
       done();
-    }).catch((error) => {
-      done(new Error(error));
     });
+
+    after((done) => {
+      done();
+    });
+
+    it('should have an options property when adding an action', () => {
+      expect(serverless.commands.action.mock).to.have.property('options');
+    });
+
+    it('should have an action property when adding an action', () => {
+      expect(serverless.actions).to.have.property('actionMock');
+    });
+
+    it('should have a mock property when adding an action', () => {
+      expect(serverless.commands.action).to.have.property('mock');
+    });
+
+    it('should have a parameters property when adding an action', () => {
+      expect(serverless.commands.action.mock).to.have.property('parameters');
+    });
+
+    it('should add a context action when adding an action', () => {
+      expect(serverless.commands.action.mock.contextAction).to.equal('mock');
+    });
+
+    it('should add a handler when adding an action', () => {
+      expect(serverless.commands.action.mock.handler).to.equal('actionMock');
+    });
+
+    it('should add a context when adding an action', () => {
+      expect(serverless.commands.action.mock.context).to.equal('action');
+    });
+
+    it('should have a specified options array when adding an action', () => {
+      expect(serverless.commands.action.mock.options.length).to.equal(1);
+    });
+
+    it('should have an option inside the options array when adding an action', () => {
+      expect(serverless.commands.action.mock.options[0].option).to.equal('mockOption');
+    });
+
+    it('should have a shortcut inside the options array when adding an action', () => {
+      expect(serverless.commands.action.mock.options[0].shortcut).to.equal('m');
+    });
+
+    it('should have a description inside the options array when adding an action', () => {
+      expect(serverless.commands.action.mock.options[0].description).to.equal('Mock option');
+    });
+
+    it('should have a specified parameters array when adding an action', () => {
+      expect(serverless.commands.action.mock.parameters.length).to.equal(1);
+    });
+
+    it('should have a parameter inside the parameters array when adding an action', () => {
+      expect(serverless.commands.action.mock.parameters[0].parameter).to.equal('mockParam');
+    });
+
+    it('should have a description inside the parameters array when adding an action', () => {
+      expect(serverless.commands.action.mock.parameters[0].description).to.equal('Mock param');
+    });
+
+    it('should have a position inside the parameters array when adding an action', () => {
+      expect(serverless.commands.action.mock.parameters[0].position).to.equal('0->');
+    });
+
+    // this test adds an additional hook
+    it('should runs the specified action', () => {
+      return serverless.actions.actionMock({ baz: 'abc' }).then((evt) => {
+        expect(evt).to.have.property('foo');
+      });
+    });
+
   });
 
-  it('should register hooks', (done) => {
-    const hooks = SPlugin.registerHooks();
+  describe('Add a hook', () => {
 
-    hooks.then((result) => {
+    before((done) => {
+      SPlugin.addHook(hookMock, hookMockConfig);
       done();
-    }).catch((error) => {
-      done(new Error(error));
     });
+
+    after((done) => {
+      done();
+    });
+
+    it('should have a specified preHooks array when adding a pre hook', () => {
+      expect(serverless.hooks.actionMockPre.length).to.equal(2);
+    });
+
+    it('should have an empty postHooks array when adding a pre hook', () => {
+      expect(serverless.hooks.actionMockPost.length).to.equal(0);
+    });
+
+    it('should have a function as a hook', () => {
+      expect(serverless.hooks.actionMockPre[0]).to.be.a('function');
+    });
+
   });
 
 });