diff --git a/core/tests/Drupal/Tests/Core/Image/ImageTest.php b/core/tests/Drupal/Tests/Core/Image/ImageTest.php
index 8e45a18..63649f4 100644
--- a/core/tests/Drupal/Tests/Core/Image/ImageTest.php
+++ b/core/tests/Drupal/Tests/Core/Image/ImageTest.php
@@ -8,6 +8,7 @@
 namespace Drupal\Tests\Core\Image;
 
 use Drupal\Core\Image\Image;
+use Drupal\Core\ImageToolkit\ImageToolkitInterface;
 use Drupal\Tests\UnitTestCase;
 
 /**
@@ -84,14 +85,16 @@ protected function getToolkitMock(array $stubs = array()) {
    *
    * @param string $class_name
    *   The name of the GD toolkit operation class to be mocked.
+   * @param ImageToolkitInterface $toolkit
+   *   The image toolkit object.
    *
    * @return \PHPUnit_Framework_MockObject_MockObject
    */
-  protected function getToolkitOperationMock($class_name) {
+  protected function getToolkitOperationMock($class_name, ImageToolkitInterface $toolkit) {
     $mock_builder = $this->getMockBuilder('Drupal\\system\\Plugin\\ImageToolkit\\Operation\\gd\\' . $class_name);
     return $mock_builder
       ->setMethods(array('apply', 'prepareArguments'))
-      ->disableOriginalConstructor()
+      ->setConstructorArgs(array(array(), '', array(), $toolkit))
       ->getMock();
   }
 
@@ -100,6 +103,9 @@ protected function getToolkitOperationMock($class_name) {
    *
    * @param array $stubs
    *   (optional) Array containing toolkit methods to be replaced with stubs.
+   *
+   * @return Image
+   *   An image object.
    */
   protected function getTestImage(array $stubs = array()) {
     $this->toolkit = $this->getToolkitMock();
@@ -116,10 +122,13 @@ protected function getTestImage(array $stubs = array()) {
    *
    * @param string $class_name
    *   The name of the GD toolkit operation class to be mocked.
+   *
+   * @return Image
+   *   An image object.
    */
   protected function getTestImageForOperation($class_name) {
-    $this->toolkit = $this->getToolkitMock(array('getToolkitOperation', 'getPluginId', 'getInfo'));
-    $this->toolkitOperation = $this->getToolkitOperationMock($class_name);
+    $this->toolkit = $this->getToolkitMock(array('getToolkitOperation', 'getPluginId'));
+    $this->toolkitOperation = $this->getToolkitOperationMock($class_name, $this->toolkit);
 
     $this->toolkit->expects($this->any())
       ->method('getPluginId')