diff --git a/Tests/PHPCI/Plugin/Util/ExecutorTest.php b/Tests/PHPCI/Plugin/Util/ExecutorTest.php
index e9083cec..3d0a3614 100644
--- a/Tests/PHPCI/Plugin/Util/ExecutorTest.php
+++ b/Tests/PHPCI/Plugin/Util/ExecutorTest.php
@@ -49,7 +49,7 @@ class ExecutorTest extends \PHPUnit_Framework_TestCase
                           ->shouldBeCalledTimes(1)
                           ->willReturn($this->prophesize('PHPCI\Plugin')->reveal());
 
-        $this->testedExecutor->executePlugin($pluginName, $options);
+        $this->testedExecutor->executePlugin($pluginName, $options, 'test');
     }
 
     public function testExecutePlugin_KeepsCalledNameSpace()
@@ -61,7 +61,7 @@ class ExecutorTest extends \PHPUnit_Framework_TestCase
           ->shouldBeCalledTimes(1)
           ->willReturn($this->prophesize('PHPCI\Plugin')->reveal());
 
-        $this->testedExecutor->executePlugin($pluginClass, $options);
+        $this->testedExecutor->executePlugin($pluginClass, $options, 'test');
     }
 
     public function testExecutePlugin_CallsExecuteOnFactoryBuildPlugin()
@@ -76,7 +76,7 @@ class ExecutorTest extends \PHPUnit_Framework_TestCase
         $this->mockFactory->buildPlugin(Argument::any(), Argument::any())->willReturn($mockPlugin->reveal());
         $this->mockFactory->getResourceFor('PHPCI\Model\Build')->willReturn($build);
 
-        $this->testedExecutor->executePlugin($pluginName, $options);
+        $this->testedExecutor->executePlugin($pluginName, $options, 'test');
     }
 
     public function testExecutePlugin_ReturnsPluginSuccess()
@@ -91,7 +91,7 @@ class ExecutorTest extends \PHPUnit_Framework_TestCase
 
         $this->mockFactory->buildPlugin(Argument::any(), Argument::any())->willReturn($mockPlugin->reveal());
 
-        $returnValue = $this->testedExecutor->executePlugin($pluginName, $options);
+        $returnValue = $this->testedExecutor->executePlugin($pluginName, $options, 'test');
 
         $this->assertEquals($expectedReturnValue, $returnValue);
     }
@@ -103,7 +103,7 @@ class ExecutorTest extends \PHPUnit_Framework_TestCase
 
         $this->mockBuildLogger->logFailure('Plugin does not exist: ' . $pluginName)->shouldBeCalledTimes(1);
 
-        $this->testedExecutor->executePlugin($pluginName, $options);
+        $this->testedExecutor->executePlugin($pluginName, $options, 'test');
     }
 
     public function testExecutePlugin_LogsFailureWhenExceptionsAreThrownByPlugin()
@@ -121,7 +121,7 @@ class ExecutorTest extends \PHPUnit_Framework_TestCase
         $this->mockBuildLogger->logFailure('Exception: ' . $expectedException->getMessage(), $expectedException)
                               ->shouldBeCalledTimes(1);
 
-        $this->testedExecutor->executePlugin($pluginName, $options);
+        $this->testedExecutor->executePlugin($pluginName, $options, 'test');
     }
 
     public function testExecutePlugins_CallsEachPluginForStage()
diff --git a/Tests/PHPCI/Plugin/Util/Fake/ExamplePluginFull.php b/Tests/PHPCI/Plugin/Util/Fake/ExamplePluginFull.php
index fa81a352..73ea98cc 100644
--- a/Tests/PHPCI/Plugin/Util/Fake/ExamplePluginFull.php
+++ b/Tests/PHPCI/Plugin/Util/Fake/ExamplePluginFull.php
@@ -14,7 +14,7 @@ use PHPCI\Builder;
 use PHPCI\Model\Build;
 use PHPCI\Plugin;
 
-class ExamplePluginFull implements Plugin {
+class ExamplePluginFull extends Plugin\AbstractPlugin {
     /**
      * @var array
      */
diff --git a/Tests/PHPCI/Plugin/Util/Fake/ExamplePluginWithNoConstructorArgs.php b/Tests/PHPCI/Plugin/Util/Fake/ExamplePluginWithNoConstructorArgs.php
index 544ec4e3..efc27623 100644
--- a/Tests/PHPCI/Plugin/Util/Fake/ExamplePluginWithNoConstructorArgs.php
+++ b/Tests/PHPCI/Plugin/Util/Fake/ExamplePluginWithNoConstructorArgs.php
@@ -12,7 +12,7 @@ namespace Tests\PHPCI\Plugin\Util\Fake;
 
 use PHPCI\Plugin;
 
-class ExamplePluginWithNoConstructorArgs implements Plugin
+class ExamplePluginWithNoConstructorArgs extends Plugin\AbstractPlugin
 {
     public function execute()
     {
diff --git a/Tests/PHPCI/Plugin/Util/Fake/ExamplePluginWithSingleOptionalArg.php b/Tests/PHPCI/Plugin/Util/Fake/ExamplePluginWithSingleOptionalArg.php
index 9c78da6f..f9d636ed 100644
--- a/Tests/PHPCI/Plugin/Util/Fake/ExamplePluginWithSingleOptionalArg.php
+++ b/Tests/PHPCI/Plugin/Util/Fake/ExamplePluginWithSingleOptionalArg.php
@@ -12,7 +12,7 @@ namespace Tests\PHPCI\Plugin\Util\Fake;
 
 use PHPCI\Plugin;
 
-class ExamplePluginWithSingleOptionalArg implements Plugin
+class ExamplePluginWithSingleOptionalArg extends Plugin\AbstractPlugin
 {
     function __construct($optional = null)
     {
diff --git a/Tests/PHPCI/Plugin/Util/Fake/ExamplePluginWithSingleRequiredArg.php b/Tests/PHPCI/Plugin/Util/Fake/ExamplePluginWithSingleRequiredArg.php
index b623d7b1..411c4859 100644
--- a/Tests/PHPCI/Plugin/Util/Fake/ExamplePluginWithSingleRequiredArg.php
+++ b/Tests/PHPCI/Plugin/Util/Fake/ExamplePluginWithSingleRequiredArg.php
@@ -12,7 +12,7 @@ namespace Tests\PHPCI\Plugin\Util\Fake;
 
 use PHPCI\Plugin;
 
-class ExamplePluginWithSingleRequiredArg implements Plugin
+class ExamplePluginWithSingleRequiredArg extends Plugin\AbstractPlugin
 {
 
     public $RequiredArgument;
diff --git a/Tests/PHPCI/Plugin/Util/Fake/ExamplePluginWithSingleTypedRequiredArg.php b/Tests/PHPCI/Plugin/Util/Fake/ExamplePluginWithSingleTypedRequiredArg.php
index b256c58c..17e5a64c 100644
--- a/Tests/PHPCI/Plugin/Util/Fake/ExamplePluginWithSingleTypedRequiredArg.php
+++ b/Tests/PHPCI/Plugin/Util/Fake/ExamplePluginWithSingleTypedRequiredArg.php
@@ -12,7 +12,7 @@ namespace Tests\PHPCI\Plugin\Util\Fake;
 
 use PHPCI\Plugin;
 
-class ExamplePluginWithSingleTypedRequiredArg implements Plugin
+class ExamplePluginWithSingleTypedRequiredArg extends Plugin\AbstractPlugin
 {
 
     public $RequiredArgument;