diff -u b/core/modules/migrate/src/Entity/Migration.php b/core/modules/migrate/src/Entity/Migration.php
--- b/core/modules/migrate/src/Entity/Migration.php
+++ b/core/modules/migrate/src/Entity/Migration.php
@@ -421,24 +421,23 @@
    * {@inheritdoc}
    */
   public function setStatus($status) {
-    $migrate_status_store = \Drupal::keyValue('migrate_status');
-    $migrate_status_store->set($this->id(), $status);
+    \Drupal::keyValue('migrate_status')->set($this->id(), $status);
   }
 
   /**
    * {@inheritdoc}
    */
   public function getStatus() {
-    $migrate_status_store = \Drupal::keyValue('migrate_status');
-    return $migrate_status_store->get($this->id(), static::STATUS_IDLE);
+    return \Drupal::keyValue('migrate_status')->get($this->id(), static::STATUS_IDLE);
   }
 
   /**
    * {@inheritdoc}
    */
   public function getStatusLabel() {
-    if (isset($this->statusLabels[$this->getStatus()])) {
-      return $this->statusLabels[$this->getStatus()];
+    $status = $this->getStatus();
+    if (isset($this->statusLabels[$status])) {
+      return $this->statusLabels[$status];
     }
     else {
       return '';
@@ -449,16 +448,14 @@
    * {@inheritdoc}
    */
   public function setMigrationResult($result) {
-    $migrate_result_store = \Drupal::keyValue('migrate_result');
-    $migrate_result_store->set($this->id(), $result);
+    \Drupal::keyValue('migrate_result')->set($this->id(), $result);
   }
 
   /**
    * {@inheritdoc}
    */
   public function getMigrationResult() {
-    $migrate_result_store = \Drupal::keyValue('migrate_result');
-    return $migrate_result_store->get($this->id(), static::RESULT_INCOMPLETE);
+    return \Drupal::keyValue('migrate_result')->get($this->id(), static::RESULT_INCOMPLETE);
   }
 
   /**
diff -u b/core/modules/migrate/tests/src/Unit/MigrateTestCase.php b/core/modules/migrate/tests/src/Unit/MigrateTestCase.php
--- b/core/modules/migrate/tests/src/Unit/MigrateTestCase.php
+++ b/core/modules/migrate/tests/src/Unit/MigrateTestCase.php
@@ -20,6 +20,8 @@
   protected $migrationConfiguration = [];
 
   /**
+   * Local store for mocking setStatus()/getStatus().
+   *
    * @var \Drupal\migrate\Entity\MigrationInterface::STATUS_*
    */
   protected $migrationStatus = MigrationInterface::STATUS_IDLE;
@@ -52,14 +54,14 @@
     // on the test class and use a return callback.
     $migration->expects($this->any())
       ->method('getStatus')
-      ->will($this->returnCallback(function() {
+      ->willReturnCallback(function() {
         return $this->migrationStatus;
-      }));
+      });
     $migration->expects($this->any())
       ->method('setStatus')
-      ->will($this->returnCallback(function($status) {
+      ->willReturnCallback(function($status) {
         $this->migrationStatus = $status;
-      }));
+      });
 
     $migration->method('getMigrationDependencies')
       ->willReturn([