diff --git a/core/modules/config/tests/config_test/src/ConfigTestForm.php b/core/modules/config/tests/config_test/src/ConfigTestForm.php
index 33939aa..6ed1a10 100644
--- a/core/modules/config/tests/config_test/src/ConfigTestForm.php
+++ b/core/modules/config/tests/config_test/src/ConfigTestForm.php
@@ -33,7 +33,7 @@ public function form(array $form, FormStateInterface $form_state) {
       '#default_value' => $entity->id(),
       '#required' => TRUE,
       '#machine_name' => array(
-        'exists' => '\Drupal\config_test\Entity\ConfigTest::load',
+        'exists' => $this->entity->getEntityType()->getClass() . '::load',
         'replace_pattern' => '[^a-z0-9_.]+',
       ),
     );
diff --git a/core/modules/config/tests/config_test/src/Entity/ConfigQueryTest.php b/core/modules/config/tests/config_test/src/Entity/ConfigQueryTest.php
index c314fc6..2336b1c 100644
--- a/core/modules/config/tests/config_test/src/Entity/ConfigQueryTest.php
+++ b/core/modules/config/tests/config_test/src/Entity/ConfigQueryTest.php
@@ -21,6 +21,7 @@
  *     }
  *   },
  *   config_prefix = "query",
+ *   class = "Drupal\config_test\Entity\ConfigQueryTest",
  *   entity_keys = {
  *     "id" = "id",
  *     "label" = "label"
diff --git a/core/modules/image/src/Form/ImageStyleEditForm.php b/core/modules/image/src/Form/ImageStyleEditForm.php
index 99f766c..eef33d4 100644
--- a/core/modules/image/src/Form/ImageStyleEditForm.php
+++ b/core/modules/image/src/Form/ImageStyleEditForm.php
@@ -8,7 +8,6 @@
 namespace Drupal\image\Form;
 
 use Drupal\Core\Entity\EntityInterface;
-use Drupal\Core\Entity\EntityStorageInterface;
 use Drupal\Core\Form\FormStateInterface;
 use Drupal\image\ConfigurableImageEffectInterface;
 use Drupal\image\ImageEffectManager;
@@ -30,13 +29,10 @@ class ImageStyleEditForm extends ImageStyleFormBase {
   /**
    * Constructs an ImageStyleEditForm object.
    *
-   * @param \Drupal\Core\Entity\EntityStorageInterface $image_style_storage
-   *   The storage.
    * @param \Drupal\image\ImageEffectManager $image_effect_manager
    *   The image effect manager service.
    */
-  public function __construct(EntityStorageInterface $image_style_storage, ImageEffectManager $image_effect_manager) {
-    parent::__construct($image_style_storage);
+  public function __construct(ImageEffectManager $image_effect_manager) {
     $this->imageEffectManager = $image_effect_manager;
   }
 
@@ -45,7 +41,6 @@ public function __construct(EntityStorageInterface $image_style_storage, ImageEf
    */
   public static function create(ContainerInterface $container) {
     return new static(
-      $container->get('entity.manager')->getStorage('image_style'),
       $container->get('plugin.manager.image.effect')
     );
   }