diff --git a/core/modules/migrate_drupal/config/install/migrate.migration.d6_block_content_body_field.yml b/core/modules/migrate_drupal/config/install/migrate.migration.d6_block_content_body_field.yml
new file mode 100644
index 0000000..5f604d6
--- /dev/null
+++ b/core/modules/migrate_drupal/config/install/migrate.migration.d6_block_content_body_field.yml
@@ -0,0 +1,25 @@
+id: d6_block_content_body_field
+label: Drupal 6 block content body field configuration
+migration_groups:
+  - Drupal 6
+source:
+  # We do an empty source and a proper destination to have an idmap for
+  # migration_dependencies.
+  plugin: empty
+  constants:
+    entity_type: block_content
+    bundle: basic
+    field_name: body
+    label: Body
+    display_summary: false
+process:
+  entity_type: 'constants/entity_type'
+  bundle: 'constants/bundle'
+  field_name: 'constants/field_name'
+  label: 'constants/label'
+  'settings/display_summary': 'constants/display_summary'
+destination:
+  plugin: entity:field_config
+migration_dependencies:
+  required:
+    - d6_block_content_type
diff --git a/core/modules/migrate_drupal/config/install/migrate.migration.d6_block_content_type.yml b/core/modules/migrate_drupal/config/install/migrate.migration.d6_block_content_type.yml
new file mode 100644
index 0000000..6a439b4
--- /dev/null
+++ b/core/modules/migrate_drupal/config/install/migrate.migration.d6_block_content_type.yml
@@ -0,0 +1,20 @@
+id: d6_block_content_type
+label: Drupal 6 block content type
+migration_groups:
+  - Drupal 6
+source:
+  # We do an empty source and a proper destination to have an idmap for
+  # migration_dependencies.
+  plugin: empty
+  constants:
+    label: Basic
+    id: basic
+    revision: false
+    description: ''
+process:
+  id: 'constants/id'
+  label: 'constants/label'
+  revision: 'constants/revision'
+  description: 'constants/description'
+destination:
+  plugin: entity:block_content_type
\ No newline at end of file
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 3f68aaa..cfb9748 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
@@ -20,3 +20,4 @@ destination:
 migration_dependencies:
   required:
     - d6_filter_format
+    - d6_block_content_body_field
diff --git a/core/modules/migrate_drupal/src/Tests/d6/MigrateBlockContentTest.php b/core/modules/migrate_drupal/src/Tests/d6/MigrateBlockContentTest.php
index 30f6481..8373030 100644
--- a/core/modules/migrate_drupal/src/Tests/d6/MigrateBlockContentTest.php
+++ b/core/modules/migrate_drupal/src/Tests/d6/MigrateBlockContentTest.php
@@ -28,21 +28,12 @@ class MigrateBlockContentTest extends MigrateDrupalTestBase {
    */
   protected function setUp() {
     parent::setUp();
-    $block_content_type = entity_create('block_content_type', array(
-      'id' => 'basic',
-      'label' => 'Basic',
-      'revision' => FALSE
-    ));
-    $block_content_type->save();
-    $field = entity_create('field_config', array(
-      // The field storage is guaranteed to exist because it is supplied by the
-      // block_content module.
-      'field_storage' => FieldStorageConfig::loadByName('block_content', 'body'),
-      'bundle' => $block_content_type->id(),
-      'label' => 'Body',
-      'settings' => array('display_summary' => FALSE),
-    ));
-    $field->save();
+    $migration = entity_load('migration', 'd6_block_content_type');
+    $executable = new MigrateExecutable($migration, $this);
+    $executable->import();
+    $migration = entity_load('migration', 'd6_block_content_body_field');
+    $executable = new MigrateExecutable($migration, $this);
+    $executable->import();
 
     $this->prepareMigrations(array(
       'd6_filter_format' => array(
diff --git a/core/modules/migrate_drupal/src/Tests/d6/MigrateDrupal6Test.php b/core/modules/migrate_drupal/src/Tests/d6/MigrateDrupal6Test.php
index 4dd02c4..11e3b29 100644
--- a/core/modules/migrate_drupal/src/Tests/d6/MigrateDrupal6Test.php
+++ b/core/modules/migrate_drupal/src/Tests/d6/MigrateDrupal6Test.php
@@ -61,6 +61,8 @@ class MigrateDrupal6Test extends MigrateFullDrupalTestBase {
     'd6_aggregator_feed',
     'd6_aggregator_item',
     'd6_block',
+    'd6_block_content_body_field',
+    'd6_block_content_type',
     'd6_book_settings',
     'd6_cck_field_values:*',
     'd6_cck_field_revision:*',