diff --git a/core/modules/migrate_drupal/config/install/migrate.migration.d6_comment.yml b/core/modules/migrate_drupal/config/install/migrate.migration.d6_comment.yml
index dc38654..31b45f7 100644
--- a/core/modules/migrate_drupal/config/install/migrate.migration.d6_comment.yml
+++ b/core/modules/migrate_drupal/config/install/migrate.migration.d6_comment.yml
@@ -4,6 +4,7 @@ migration_groups:
   - Drupal 6
 source:
   plugin: d6_comment
+  timestamp: 0
   constants:
     entity_type: node
 process:
diff --git a/core/modules/migrate_drupal/config/install/migrate.migration.d6_custom_block.yml b/core/modules/migrate_drupal/config/install/migrate.migration.d6_custom_block.yml
index cfb9748..37944a5 100644
--- a/core/modules/migrate_drupal/config/install/migrate.migration.d6_custom_block.yml
+++ b/core/modules/migrate_drupal/config/install/migrate.migration.d6_custom_block.yml
@@ -17,6 +17,7 @@ process:
   'body/value': body
 destination:
   plugin: entity:block_content
+  no_stub: 1
 migration_dependencies:
   required:
     - d6_filter_format
diff --git a/core/modules/migrate_drupal/config/schema/migrate_drupal.source.schema.yml b/core/modules/migrate_drupal/config/schema/migrate_drupal.source.schema.yml
index e28173f..3c5d16d 100644
--- a/core/modules/migrate_drupal/config/schema/migrate_drupal.source.schema.yml
+++ b/core/modules/migrate_drupal/config/schema/migrate_drupal.source.schema.yml
@@ -40,6 +40,8 @@ migrate.source.d6_comment:
   type: migrate_source_sql
   label: 'Drupal 6 comment'
   mapping:
+    timestamp:
+      type: integer
     constants:
       type: mapping
       label: 'Constants'
diff --git a/core/modules/migrate_drupal/src/Tests/d6/MigrateBlockTest.php b/core/modules/migrate_drupal/src/Tests/d6/MigrateBlockTest.php
index abd0d69..ab49b63 100644
--- a/core/modules/migrate_drupal/src/Tests/d6/MigrateBlockTest.php
+++ b/core/modules/migrate_drupal/src/Tests/d6/MigrateBlockTest.php
@@ -49,10 +49,8 @@ protected function setUp() {
     }
     $this->prepareMigrations(array(
       'd6_custom_block'  => array(
-        array(array(10), array(1)),
-        array(array(11), array(2)),
-        array(array(12), array(1)),
-        array(array(13), array(2)),
+        array(array(1), array(1)),
+        array(array(2), array(2)),
       ),
       'd6_menu' => array(
         array(array('menu1'), array('menu')),