diff --git a/core/modules/image/src/Plugin/Filter/FilterImageStyle.php b/core/modules/image/src/Plugin/Filter/FilterImageStyle.php
index bc93db789b..e07798a6f2 100644
--- a/core/modules/image/src/Plugin/Filter/FilterImageStyle.php
+++ b/core/modules/image/src/Plugin/Filter/FilterImageStyle.php
@@ -10,6 +10,7 @@
 use Drupal\Core\Plugin\ContainerFactoryPluginInterface;
 use Drupal\Core\Render\RenderContext;
 use Drupal\Core\Render\RendererInterface;
+use Drupal\Core\StringTranslation\TranslatableMarkup;
 use Drupal\filter\FilterProcessResult;
 use Drupal\filter\Plugin\FilterBase;
 use Drupal\image\ImageStyleInterface;
@@ -308,9 +309,9 @@ public function calculateDependencies() {
    */
   public function tips($long = FALSE) {
     if ($long) {
-      $image_styles = $this->getAllowedStyles();
-      $list = '<code>' . implode('</code>, <code>', $image_styles) . '</code>';
-      return t('<p>You can display images using site-wide styles by adding a <code>data-image-style</code> attribute, whose values is one of the image style machine names: !image-style-machine-name-list.</p>', ['!image-style-machine-name-list' => $list]);
+      $image_styles = $this->getAllowedImageStyleIds();
+      $list = new TranslatableMarkup('<code>' . implode('</code>, <code>', $image_styles) . '</code>');
+      return t('<p>You can display images using site-wide styles by adding a <code>data-image-style</code> attribute, whose values is one of the image style machine names: @image-style-machine-name-list.</p>', ['@image-style-machine-name-list' => $list]);
     }
     return t('You can display images using site-wide styles by adding a data-image-style attribute.');
   }
diff --git a/core/modules/image/tests/src/Kernel/EditorImageStyleDialogTest.php b/core/modules/image/tests/src/Kernel/EditorImageStyleDialogTest.php
index 9d4418da56..bdcad2829a 100644
--- a/core/modules/image/tests/src/Kernel/EditorImageStyleDialogTest.php
+++ b/core/modules/image/tests/src/Kernel/EditorImageStyleDialogTest.php
@@ -29,7 +29,7 @@ class EditorImageStyleDialogTest extends EntityKernelTestBase {
   /**
    * {@inheritdoc}
    */
-  protected static $modules = [
+  public static $modules = [
     'ckeditor',
     'editor',
     'editor_test',