diff --git a/core/modules/block/tests/src/Kernel/Migrate/d6/MigrateBlockTest.php b/core/modules/block/tests/src/Kernel/Migrate/d6/MigrateBlockTest.php
index c78dc57..794e213 100644
--- a/core/modules/block/tests/src/Kernel/Migrate/d6/MigrateBlockTest.php
+++ b/core/modules/block/tests/src/Kernel/Migrate/d6/MigrateBlockTest.php
@@ -95,7 +95,7 @@ public function assertEntity($id, $visibility, $region, $theme, $weight, array $
    */
   public function testBlockMigration() {
     $blocks = Block::loadMultiple();
-    $this->assertCount(14, $blocks);
+    $this->assertCount(15, $blocks);
 
     // Check user blocks.
     $visibility = [
@@ -200,7 +200,7 @@ public function testBlockMigration() {
       'block_count' => 7,
       'feed' => '5',
     ];
-    $this->assertEntity('aggregator', [], 'sidebar_second', 'bartik', -2, $settings);
+    $this->assertEntity('aggregator', [], 'sidebar_second', 'bartik', -8, $settings);
 
     // Check book block.
     $settings = [
@@ -210,7 +210,7 @@ public function testBlockMigration() {
       'label_display' => '0',
       'block_mode' => 'book pages',
     ];
-    $this->assertEntity('book', [], 'sidebar_second', 'bartik', -4, $settings);
+    $this->assertEntity('book', [], 'sidebar_second', 'bartik', -9, $settings);
 
     // Check forum block settings.
     $settings = [
@@ -247,7 +247,7 @@ public function testBlockMigration() {
       'top_all_num' => 8,
       'top_last_num' => 9,
     ];
-    $this->assertEntity('statistics', [], 'sidebar_second', 'bartik', 0, $settings);
+    $this->assertEntity('statistics', [], 'sidebar_second', 'bartik', -7, $settings);
 
     // Check custom blocks.
     $visibility = [
diff --git a/core/modules/content_translation/tests/src/Kernel/Migrate/d6/MigrateBlockContentTranslationTest.php b/core/modules/content_translation/tests/src/Kernel/Migrate/d6/MigrateBlockContentTranslationTest.php
index 99c898d..42797a0 100644
--- a/core/modules/content_translation/tests/src/Kernel/Migrate/d6/MigrateBlockContentTranslationTest.php
+++ b/core/modules/content_translation/tests/src/Kernel/Migrate/d6/MigrateBlockContentTranslationTest.php
@@ -53,7 +53,7 @@ protected function setUp() {
    * Tests the migration of block title translation.
    */
   public function testBlockContentTranslation() {
-    /** @var \Drupal\Core\language\LanguageManager $language_manager */
+    /** @var \Drupal\language\ConfigurableLanguageManagerInterface $language_manager */
     $language_manager = $this->container->get('language_manager');
 
     $config = $language_manager->getLanguageConfigOverride('zu', 'block.block.user_1');