diff --git a/core/tests/Drupal/Tests/Core/Image/ImageTest.php b/core/tests/Drupal/Tests/Core/Image/ImageTest.php
index 828a1a1..97a172f 100644
--- a/core/tests/Drupal/Tests/Core/Image/ImageTest.php
+++ b/core/tests/Drupal/Tests/Core/Image/ImageTest.php
@@ -92,19 +92,31 @@ protected function getToolkitOperationMock($class_name, ImageToolkitInterface $t
   /**
    * Get an image with a mocked toolkit, for testing.
    *
+   * @param bool $load_expected
+   *   (optional) Whether the load() method is expected to ba called. Defaults
+   *   to TRUE.
    * @param array $stubs
    *   (optional) Array containing toolkit methods to be replaced with stubs.
    *
    * @return \Drupal\Core\Image\Image
    *   An image object.
    */
-  protected function getTestImage(array $stubs = array()) {
+  protected function getTestImage($load_expected = TRUE, array $stubs = array()) {
+    if (!$load_expected && !in_array('load', $stubs)) {
+      $stubs += array('load');
+    }
+
     $this->toolkit = $this->getToolkitMock($stubs);
 
     $this->toolkit->expects($this->any())
       ->method('getPluginId')
       ->will($this->returnValue('gd'));
 
+    if (!$load_expected) {
+      $this->toolkit->expects($this->never())
+        ->method('load');
+    }
+
     $this->image = new Image($this->toolkit, $this->source);
   }
 
@@ -136,7 +148,7 @@ protected function getTestImageForOperation($class_name) {
    * Tests \Drupal\Core\Image\Image::getHeight().
    */
   public function testGetHeight() {
-    $this->getTestImage();
+    $this->getTestImage(FALSE);
     $this->assertEquals(100, $this->image->getHeight());
   }
 
@@ -144,7 +156,7 @@ public function testGetHeight() {
    * Tests \Drupal\Core\Image\Image::getWidth().
    */
   public function testGetWidth() {
-    $this->getTestImage();
+    $this->getTestImage(FALSE);
     $this->assertEquals(88, $this->image->getWidth());
   }
 
@@ -152,7 +164,7 @@ public function testGetWidth() {
    * Tests \Drupal\Core\Image\Image::getFileSize
    */
   public function testGetFileSize() {
-    $this->getTestImage();
+    $this->getTestImage(FALSE);
     $this->assertEquals(3905, $this->image->getFileSize());
   }
 
@@ -160,7 +172,7 @@ public function testGetFileSize() {
    * Tests \Drupal\Core\Image\Image::getToolkit()->getType().
    */
   public function testGetType() {
-    $this->getTestImage();
+    $this->getTestImage(FALSE);
     $this->assertEquals(IMAGETYPE_PNG, $this->image->getToolkit()->getType());
   }
 
@@ -168,7 +180,7 @@ public function testGetType() {
    * Tests \Drupal\Core\Image\Image::getMimeType().
    */
   public function testGetMimeType() {
-    $this->getTestImage();
+    $this->getTestImage(FALSE);
     $this->assertEquals('image/png', $this->image->getMimeType());
   }
 
@@ -176,7 +188,7 @@ public function testGetMimeType() {
    * Tests \Drupal\Core\Image\Image::isValid().
    */
   public function testIsValid() {
-    $this->getTestImage();
+    $this->getTestImage(FALSE);
     $this->assertTrue($this->image->isValid());
     $this->assertTrue(is_readable($this->image->getSource()));
   }
@@ -185,7 +197,7 @@ public function testIsValid() {
    * Tests \Drupal\Core\Image\Image::getToolkitId().
    */
   public function testGetToolkitId() {
-    $this->getTestImage();
+    $this->getTestImage(FALSE);
     $this->assertEquals('gd', $this->image->getToolkitId());
   }