diff --git a/core/modules/system/src/Tests/Image/ToolkitGdTest.php b/core/modules/system/src/Tests/Image/ToolkitGdTest.php
index 0b52e0a..4804a0f 100644
--- a/core/modules/system/src/Tests/Image/ToolkitGdTest.php
+++ b/core/modules/system/src/Tests/Image/ToolkitGdTest.php
@@ -304,7 +304,7 @@ function testManipulations() {
 
         // Check that saved image reloads without raising PHP errors.
         $image_reloaded = $this->imageFactory->get($file_path);
-        $resource = $image_reloaded->getToolkit()->getResource();
+        $resource = $image_reloaded->getResource();
       }
     }
   }
@@ -325,14 +325,13 @@ function testTransparentColorOutOfRange() {
     // can be loaded correctly.
     $file = 'image-test-transparent-out-of-range.gif';
     $image = $this->imageFactory->get(drupal_get_path('module', 'simpletest') . '/files/' . $file);
-    $toolkit = $image->getToolkit();
 
     if (!$image->isValid()) {
       $this->fail(String::format('Could not load image %file.', array('%file' => $file)));
     }
     else {
       // All images should be converted to truecolor when loaded.
-      $image_truecolor = imageistruecolor($toolkit->getResource());
+      $image_truecolor = imageistruecolor($image->getResource());
       $this->assertTrue($image_truecolor, String::format('Image %file after load is a truecolor image.', array('%file' => $file)));
     }
   }
diff --git a/core/modules/system/tests/src/Unit/ImageToolkit/GDToolkitTest.php b/core/modules/system/tests/src/Unit/ImageToolkit/GDToolkitTest.php
index 8e0b955..931ba33 100644
--- a/core/modules/system/tests/src/Unit/ImageToolkit/GDToolkitTest.php
+++ b/core/modules/system/tests/src/Unit/ImageToolkit/GDToolkitTest.php
@@ -43,7 +43,7 @@ class GDToolkitTest extends UnitTestCase {
    */
   protected function setUp() {
     // Use the Druplicon image.
-    $this->source = __DIR__ . '/../../../../../misc/druplicon.png';
+    $this->source = __DIR__ . '/../../../../../../misc/druplicon.png';
   }
 
   /**