diff --git a/core/modules/system/tests/src/Functional/Image/ToolkitTestBase.php b/core/modules/system/tests/src/Functional/Image/ToolkitTestBase.php
index 339d0c9..2e92858 100644
--- a/core/modules/system/tests/src/Functional/Image/ToolkitTestBase.php
+++ b/core/modules/system/tests/src/Functional/Image/ToolkitTestBase.php
@@ -2,14 +2,19 @@
 
 namespace Drupal\Tests\system\Functional\Image;
 
+use Drupal\Component\Render\FormattableMarkup;
 use Drupal\FunctionalJavascriptTests\JavascriptTestBase;
-use Drupal\Component\Utility\SafeMarkup;
+use Drupal\Tests\TestFileCreationTrait;
 
 /**
  * Base class for image manipulation testing.
  */
 abstract class ToolkitTestBase extends JavascriptTestBase {
 
+  use TestFileCreationTrait {
+    getTestFiles as drupalGetTestFiles;
+  }
+
   /**
    * Modules to enable.
    *
@@ -99,10 +104,10 @@ public function assertToolkitOperationsCalled(array $expected) {
     // Determine if there were any expected that were not called.
     $uncalled = array_diff($expected, $actual);
     if (count($uncalled)) {
-      $this->assertTrue(FALSE, SafeMarkup::format('Expected operations %expected to be called but %uncalled was not called.', ['%expected' => implode(', ', $expected), '%uncalled' => implode(', ', $uncalled)]));
+      $this->assertTrue(FALSE, new FormattableMarkup('Expected operations %expected to be called but %uncalled was not called.', ['%expected' => implode(', ', $expected), '%uncalled' => implode(', ', $uncalled)]));
     }
     else {
-      $this->assertTrue(TRUE, SafeMarkup::format('All the expected operations were called: %expected', ['%expected' => implode(', ', $expected)]));
+      $this->assertTrue(TRUE, new FormattableMarkup('All the expected operations were called: %expected', ['%expected' => implode(', ', $expected)]));
     }
 
     // Determine if there were any unexpected calls.
@@ -110,7 +115,7 @@ public function assertToolkitOperationsCalled(array $expected) {
     // count it as an error.
     $unexpected = array_diff($actual, $expected);
     if (count($unexpected) && (!in_array('apply', $expected) || count(array_intersect($unexpected, $operations)) !== count($unexpected))) {
-      $this->assertTrue(FALSE, SafeMarkup::format('Unexpected operations were called: %unexpected.', ['%unexpected' => implode(', ', $unexpected)]));
+      $this->assertTrue(FALSE, new FormattableMarkup('Unexpected operations were called: %unexpected.', ['%unexpected' => implode(', ', $unexpected)]));
     }
     else {
       $this->assertTrue(TRUE, 'No unexpected operations were called.');