diff --git a/core/modules/block/src/Entity/Block.php b/core/modules/block/src/Entity/Block.php
index 4a63d25..44bcefc 100644
--- a/core/modules/block/src/Entity/Block.php
+++ b/core/modules/block/src/Entity/Block.php
@@ -48,7 +48,7 @@ class Block extends ConfigEntityBase implements BlockInterface, EntityWithPlugin
    *
    * @var string
    */
-  public $id;
+  protected $id;
 
   /**
    * The plugin instance settings.
@@ -69,7 +69,7 @@ class Block extends ConfigEntityBase implements BlockInterface, EntityWithPlugin
    *
    * @var int
    */
-  public $weight;
+  protected $weight;
 
   /**
    * The plugin instance ID.
diff --git a/core/modules/migrate_drupal/src/Tests/d6/MigrateBlockTest.php b/core/modules/migrate_drupal/src/Tests/d6/MigrateBlockTest.php
index 313e780..4c23f5a 100644
--- a/core/modules/migrate_drupal/src/Tests/d6/MigrateBlockTest.php
+++ b/core/modules/migrate_drupal/src/Tests/d6/MigrateBlockTest.php
@@ -87,7 +87,7 @@ public function testBlockMigration() {
     $visibility = $test_block_user->getVisibility();
     $this->assertEqual(TRUE, $visibility['request_path']['negate']);
     $this->assertEqual('', $visibility['request_path']['pages']);
-    $this->assertEqual(0, $test_block_user->weight);
+    $this->assertEqual(0, $test_block_user->get('weight'));
 
     $test_block_user_1 = $blocks['user_1'];
     $this->assertNotNull($test_block_user_1);
@@ -96,7 +96,7 @@ public function testBlockMigration() {
     $visibility = $test_block_user_1->getVisibility();
     $this->assertEqual(TRUE, $visibility['request_path']['negate']);
     $this->assertEqual('', $visibility['request_path']['pages']);
-    $this->assertEqual(0, $test_block_user_1->weight);
+    $this->assertEqual(0, $test_block_user_1->get('weight'));
 
     $test_block_user_2 = $blocks['user_2'];
     $this->assertNotNull($test_block_user_2);
@@ -105,7 +105,7 @@ public function testBlockMigration() {
     $visibility = $test_block_user_2->getVisibility();
     $this->assertEqual(TRUE, $visibility['request_path']['negate']);
     $this->assertEqual('', $visibility['request_path']['pages']);
-    $this->assertEqual(-3, $test_block_user_2->weight);
+    $this->assertEqual(-3, $test_block_user_2->get('weight'));
 
     $test_block_user_3 = $blocks['user_3'];
     $this->assertNotNull($test_block_user_3);
@@ -114,7 +114,7 @@ public function testBlockMigration() {
     $visibility = $test_block_user_3->getVisibility();
     $this->assertEqual(TRUE, $visibility['request_path']['negate']);
     $this->assertEqual('', $visibility['request_path']['pages']);
-    $this->assertEqual(-1, $test_block_user_3->weight);
+    $this->assertEqual(-1, $test_block_user_3->get('weight'));
 
     // Check system block
     $test_block_system = $blocks['system'];
@@ -124,7 +124,7 @@ public function testBlockMigration() {
     $visibility = $test_block_system->getVisibility();
     $this->assertEqual(TRUE, $visibility['request_path']['negate']);
     $this->assertEqual('', $visibility['request_path']['pages']);
-    $this->assertEqual(-5, $test_block_system->weight);
+    $this->assertEqual(-5, $test_block_system->get('weight'));
 
     // Check comment block
     $test_block_comment = $blocks['comment'];
@@ -134,7 +134,7 @@ public function testBlockMigration() {
     $visibility = $test_block_comment->getVisibility();
     $this->assertEqual(TRUE, $visibility['request_path']['negate']);
     $this->assertEqual('', $visibility['request_path']['pages']);
-    $this->assertEqual(-6, $test_block_comment->weight);
+    $this->assertEqual(-6, $test_block_comment->get('weight'));
 
     // Check menu blocks
     $test_block_menu = $blocks['menu'];
@@ -144,7 +144,7 @@ public function testBlockMigration() {
     $visibility = $test_block_menu->getVisibility();
     $this->assertEqual(TRUE, $visibility['request_path']['negate']);
     $this->assertEqual('', $visibility['request_path']['pages']);
-    $this->assertEqual(-5, $test_block_menu->weight);
+    $this->assertEqual(-5, $test_block_menu->get('weight'));
 
     $test_block_menu_1 = $blocks['menu_1'];
     $this->assertNotNull($test_block_menu_1);
@@ -153,7 +153,7 @@ public function testBlockMigration() {
     $visibility = $test_block_menu_1->getVisibility();
     $this->assertEqual(TRUE, $visibility['request_path']['negate']);
     $this->assertEqual('', $visibility['request_path']['pages']);
-    $this->assertEqual(-5, $test_block_menu_1->weight);
+    $this->assertEqual(-5, $test_block_menu_1->get('weight'));
 
     // Check node block
     $test_block_node = $blocks['node'];
@@ -163,7 +163,7 @@ public function testBlockMigration() {
     $visibility = $test_block_node->getVisibility();
     $this->assertEqual(TRUE, $visibility['request_path']['negate']);
     $this->assertEqual('', $visibility['request_path']['pages']);
-    $this->assertEqual(-4, $test_block_node->weight);
+    $this->assertEqual(-4, $test_block_node->get('weight'));
 
     // Check custom blocks
     $test_block_block = $blocks['block'];
@@ -173,7 +173,7 @@ public function testBlockMigration() {
     $visibility = $test_block_block->getVisibility();
     $this->assertEqual(FALSE, $visibility['request_path']['negate']);
     $this->assertEqual('<front>', $visibility['request_path']['pages']);
-    $this->assertEqual(0, $test_block_block->weight);
+    $this->assertEqual(0, $test_block_block->get('weight'));
 
     $test_block_block_1 = $blocks['block_1'];
     $this->assertNotNull($test_block_block_1);
@@ -182,6 +182,6 @@ public function testBlockMigration() {
     $visibility = $test_block_block_1->getVisibility();
     $this->assertEqual(FALSE, $visibility['request_path']['negate']);
     $this->assertEqual('node', $visibility['request_path']['pages']);
-    $this->assertEqual(-4, $test_block_block_1->weight);
+    $this->assertEqual(-4, $test_block_block_1->get('weight'));
   }
 }