diff --git a/core/lib/Drupal/Core/Entity/EntityStorageBase.php b/core/lib/Drupal/Core/Entity/EntityStorageBase.php
index f67a9835d5..86a1ad0406 100644
--- a/core/lib/Drupal/Core/Entity/EntityStorageBase.php
+++ b/core/lib/Drupal/Core/Entity/EntityStorageBase.php
@@ -343,9 +343,9 @@ protected function postLoad(array &$entities) {
       $function($entities);
     }
     // Call hook_entity_load_alter().
-    $this->moduleHandler->alter('entity_load', $entities, $this->entityTypeId);
+    $this->moduleHandler()->alter('entity_load', $entities, $this->entityTypeId);
     // Call hook_ENTITY_TYPE_load_alter().
-    $this->moduleHandler->alter($this->entityTypeId . '_load', $entities);
+    $this->moduleHandler()->alter($this->entityTypeId . '_load', $entities);
   }
 
   /**
diff --git a/core/tests/Drupal/Tests/Core/Config/Entity/ConfigEntityStorageTest.php b/core/tests/Drupal/Tests/Core/Config/Entity/ConfigEntityStorageTest.php
index 1cf57dfa5c..84642d0de7 100644
--- a/core/tests/Drupal/Tests/Core/Config/Entity/ConfigEntityStorageTest.php
+++ b/core/tests/Drupal/Tests/Core/Config/Entity/ConfigEntityStorageTest.php
@@ -493,6 +493,8 @@ public function testSaveChangedUuid() {
 
     $this->moduleHandler->getImplementations('entity_load')->willReturn([]);
     $this->moduleHandler->getImplementations('test_entity_type_load')->willReturn([]);
+    $this->moduleHandler->alter('entity_load', Argument::type('array'), $this->entityTypeId)->shouldBeCalled();
+    $this->moduleHandler->alter('test_entity_type_load', Argument::type('array'))->shouldBeCalled();
 
     $this->entityQuery->condition('uuid', 'baz')->willReturn($this->entityQuery);
     $this->entityQuery->execute()->willReturn(['foo']);
@@ -524,6 +526,8 @@ public function testLoad() {
 
     $this->moduleHandler->getImplementations('entity_load')->willReturn([]);
     $this->moduleHandler->getImplementations('test_entity_type_load')->willReturn([]);
+    $this->moduleHandler->alter('entity_load', Argument::type('array'), $this->entityTypeId)->shouldBeCalled();
+    $this->moduleHandler->alter('test_entity_type_load', Argument::type('array'))->shouldBeCalled();
 
     $entity = $this->entityStorage->load('foo');
     $this->assertInstanceOf(EntityInterface::class, $entity);
@@ -560,6 +564,8 @@ public function testLoadMultipleAll() {
 
     $this->moduleHandler->getImplementations('entity_load')->willReturn([]);
     $this->moduleHandler->getImplementations('test_entity_type_load')->willReturn([]);
+    $this->moduleHandler->alter('entity_load', Argument::type('array'), $this->entityTypeId)->shouldBeCalled();
+    $this->moduleHandler->alter('test_entity_type_load', Argument::type('array'))->shouldBeCalled();
 
     $entities = $this->entityStorage->loadMultiple();
     $expected['foo'] = 'foo';
@@ -591,6 +597,8 @@ public function testLoadMultipleIds() {
 
     $this->moduleHandler->getImplementations('entity_load')->willReturn([]);
     $this->moduleHandler->getImplementations('test_entity_type_load')->willReturn([]);
+    $this->moduleHandler->alter('entity_load', Argument::type('array'), $this->entityTypeId)->shouldBeCalled();
+    $this->moduleHandler->alter('test_entity_type_load', Argument::type('array'))->shouldBeCalled();
 
     $entities = $this->entityStorage->loadMultiple(['foo']);
     $this->assertContainsOnlyInstancesOf(EntityInterface::class, $entities);
diff --git a/core/tests/Drupal/Tests/Core/Entity/KeyValueStore/KeyValueEntityStorageTest.php b/core/tests/Drupal/Tests/Core/Entity/KeyValueStore/KeyValueEntityStorageTest.php
index 32d043da9e..adbe90c8b3 100644
--- a/core/tests/Drupal/Tests/Core/Entity/KeyValueStore/KeyValueEntityStorageTest.php
+++ b/core/tests/Drupal/Tests/Core/Entity/KeyValueStore/KeyValueEntityStorageTest.php
@@ -327,15 +327,21 @@ public function testSaveUpdate(EntityInterface $entity) {
       ->with('test_entity_type_load')
       ->will($this->returnValue([]));
     $this->moduleHandler->expects($this->at(2))
+      ->method('alter')
+      ->with('entity_load');
+    $this->moduleHandler->expects($this->at(3))
+      ->method('alter')
+      ->with('test_entity_type_load');
+    $this->moduleHandler->expects($this->at(4))
       ->method('invokeAll')
       ->with('test_entity_type_presave');
-    $this->moduleHandler->expects($this->at(3))
+    $this->moduleHandler->expects($this->at(5))
       ->method('invokeAll')
       ->with('entity_presave');
-    $this->moduleHandler->expects($this->at(4))
+    $this->moduleHandler->expects($this->at(6))
       ->method('invokeAll')
       ->with('test_entity_type_update');
-    $this->moduleHandler->expects($this->at(5))
+    $this->moduleHandler->expects($this->at(7))
       ->method('invokeAll')
       ->with('entity_update');
     $this->keyValueStore->expects($this->once())