diff --git a/modules/ctools_block/ctools_block.info.yml b/modules/ctools_block/ctools_block.info.yml
new file mode 100644
index 0000000..444e609
--- /dev/null
+++ b/modules/ctools_block/ctools_block.info.yml
@@ -0,0 +1,9 @@
+name: Chaos tools blocks
+type: module
+description: 'Provides improvements to blocks that will one day be added to Drupal core.'
+package: Chaos tool suite
+version: 3.x
+core: 8.x
+dependencies:
+  - ctools
+  - block
diff --git a/modules/ctools_block/src/Plugin/Block/EntityField.php b/modules/ctools_block/src/Plugin/Block/EntityField.php
new file mode 100644
index 0000000..a3b4209
--- /dev/null
+++ b/modules/ctools_block/src/Plugin/Block/EntityField.php
@@ -0,0 +1,351 @@
+<?php
+
+/**
+ * @file
+ * Contains \Drupal\ctools\Plugin\Block\EntityField.
+ */
+
+namespace Drupal\ctools_block\Plugin\Block;
+
+use Drupal\Component\Utility\NestedArray;
+use Drupal\Core\Block\BlockBase;
+use Drupal\Core\Cache\CacheableMetadata;
+use Drupal\Core\Entity\EntityFieldManagerInterface;
+use Drupal\Core\Entity\EntityTypeManagerInterface;
+use Drupal\Core\Entity\FieldableEntityInterface;
+use Drupal\Core\Field\FieldTypePluginManagerInterface;
+use Drupal\Core\Field\FormatterPluginManager;
+use Drupal\Core\Form\FormStateInterface;
+use Drupal\Core\Plugin\ContainerFactoryPluginInterface;
+use Drupal\Core\Plugin\ContextAwarePluginInterface;
+use Drupal\Core\Session\AccountInterface;
+use Symfony\Component\DependencyInjection\ContainerInterface;
+
+/**
+ * Provides a block to a field on an entity.
+ *
+ * @Block(
+ *   id = "entity_field",
+ *   deriver = "Drupal\ctools_block\Plugin\Deriver\EntityFieldDeriver",
+ * )
+ */
+class EntityField extends BlockBase implements ContextAwarePluginInterface, ContainerFactoryPluginInterface {
+
+  /**
+   * The entity type manager.
+   *
+   * @var \Drupal\Core\Entity\EntityTypeManagerInterface
+   */
+  protected $entityTypeManager;
+
+  /**
+   * The entity field manager.
+   *
+   * @var \Drupal\Core\Entity\EntityFieldManagerInterface
+   */
+  protected $entityFieldManager;
+
+  /**
+   * The field type manager.
+   *
+   * @var \Drupal\Core\Field\FieldTypePluginManagerInterface
+   */
+  protected $fieldTypeManager;
+
+  /**
+   * The formatter manager.
+   *
+   * @var \Drupal\Core\Field\FormatterPluginManager
+   */
+  protected $formatterManager;
+
+  /**
+   * The entity type id.
+   *
+   * @var string
+   */
+  protected $entityTypeId;
+
+  /**
+   * The field name.
+   *
+   * @var string
+   */
+  protected $fieldName;
+
+  /**
+   * The field definition.
+   *
+   * @var \Drupal\Core\Field\FieldDefinitionInterface
+   */
+  protected $fieldDefinition;
+
+  /**
+   * The field storage definition.
+   *
+   * @var \Drupal\Core\Field\FieldStorageDefinitionInterface
+   */
+  protected $fieldStorageDefinition;
+
+  /**
+   * Constructs a new EntityField.
+   *
+   * @param array $configuration
+   *   A configuration array containing information about the plugin instance.
+   * @param string $plugin_id
+   *   The plugin ID for the plugin instance.
+   * @param mixed $plugin_definition
+   *   The plugin implementation definition.
+   * @param \Drupal\Core\Entity\EntityTypeManagerInterface $entity_type_manager
+   *   The entity type manager.
+   * @param \Drupal\Core\Entity\EntityFieldManagerInterface $entity_field_manager
+   *   The entity field manager.
+   * @param \Drupal\Core\Field\FormatterPluginManager $formatter_manager
+   *   The formatter manager.
+   */
+  public function __construct(array $configuration, $plugin_id, $plugin_definition, EntityTypeManagerInterface $entity_type_manager, EntityFieldManagerInterface $entity_field_manager, FieldTypePluginManagerInterface $field_type_manager, FormatterPluginManager $formatter_manager) {
+    $this->entityTypeManager = $entity_type_manager;
+    $this->entityFieldManager = $entity_field_manager;
+    $this->fieldTypeManager = $field_type_manager;
+    $this->formatterManager = $formatter_manager;
+
+    // Get the entity type and field name from the plugin id.
+    list (, $entity_type_id, $field_name) = explode(':', $plugin_id);
+    $this->entityTypeId = $entity_type_id;
+    $this->fieldName = $field_name;
+
+    parent::__construct($configuration, $plugin_id, $plugin_definition);
+  }
+
+  /**
+   * {@inheritdoc}
+   */
+  public static function create(ContainerInterface $container, array $configuration, $plugin_id, $plugin_definition) {
+    return new static(
+      $configuration,
+      $plugin_id,
+      $plugin_definition,
+      $container->get('entity_type.manager'),
+      $container->get('entity_field.manager'),
+      $container->get('plugin.manager.field.field_type'),
+      $container->get('plugin.manager.field.formatter')
+    );
+  }
+
+  /**
+   * {@inheritdoc}
+   */
+  public function build() {
+    /** @var \Drupal\Core\Entity\FieldableEntityInterface $entity */
+    $entity = $this->getContextValue('entity');
+
+    $build = [];
+
+    if ($entity instanceof FieldableEntityInterface && $entity->hasField($this->fieldName)) {
+      /** @var \Drupal\Core\Field\FieldItemListInterface $field */
+      $field = $entity->{$this->fieldName};
+
+      $access_handler = $this->entityTypeManager->getAccessControlHandler($this->entityTypeId);
+      if ($access_handler->access($entity, 'view') && $access_handler->fieldAccess('view', $this->getFieldDefinition(), NULL, $field)) {
+        $display_settings = $this->getConfiguration()['formatter'];
+        $build['field'] = $field->view($display_settings);
+      }
+    }
+
+    CacheableMetadata::createFromObject($entity)
+      ->applyTo($build);
+
+    return $build;
+  }
+
+  /**
+   * @inheritDoc
+   */
+  protected function blockAccess(AccountInterface $account) {
+    $access_handler = $this->entityTypeManager->getAccessControlHandler($this->entityTypeId);
+    return $access_handler->fieldAccess('view', $this->getFieldDefinition(), $account, NULL, TRUE);
+  }
+
+  /**
+   * {@inheritdoc}
+   */
+  public function defaultConfiguration() {
+    $field_type_definition = $this->getFieldTypeDefinition();
+    return [
+      'formatter' => [
+        'label' => 'above',
+        'type' => $field_type_definition['default_formatter'] ?: '',
+        'settings' => [],
+        'third_party_settings' => [],
+        'weight' => 0.0,
+      ],
+    ];
+  }
+
+  /**
+   * {@inheritdoc}
+   */
+  public function blockForm($form, FormStateInterface $form_state) {
+    $config = $this->getConfiguration();
+
+    $form['formatter_label'] = [
+      '#type' => 'select',
+      '#title' => $this->t('Label'),
+      '#options' => [
+        'above' => $this->t('Above'),
+        'inline' => $this->t('Inline'),
+        'hidden' => '- ' . $this->t('Hidden') . ' -',
+        'visually_hidden' => '- ' . $this->t('Visually Hidden') . ' -',
+      ],
+      '#default_value' => $form_state->getValue('formatter_label') ?: $config['formatter']['label'],
+    ];
+
+    $form['formatter_type'] = [
+      '#type' => 'select',
+      '#title' => $this->t('Formatter'),
+      '#options' => $this->getFormatterOptions(),
+      '#default_value' => $form_state->getValue('formatter_type') ?: $config['formatter']['type'],
+      '#ajax' => array(
+        'callback' => array(get_class($this), 'formatterSettingsAjaxCallback'),
+        'wrapper' => 'formatter-settings-wrapper',
+        'effect' => 'fade',
+      ),
+    ];
+
+    // Add the formatter settings to the form via AJAX.
+    $form['#process'][] = array($this, 'formatterSettingsProcessCallback');
+    $form['formatter_settings_wrapper'] = array(
+      '#prefix' => '<div id="formatter-settings-wrapper">',
+      '#suffix' => '</div>',
+    );
+    $form['formatter_settings_wrapper']['formatter_settings'] = array(
+      '#tree' => TRUE,
+      // The settings from the formatter plugin will be added in the
+      // ::formatterSettingsProcessCallback method.
+    );
+
+    return $form;
+  }
+
+  /**
+   * Render API callback: builds the formatter settings elements.
+   */
+  public function formatterSettingsProcessCallback(array &$element, FormStateInterface $form_state, array &$complete_form) {
+    $config = $this->getConfiguration();
+    $parents_base = $element['#parents'];
+    $formatter_parent = array_merge($parents_base, ['formatter_type']);
+    $formatter_settings_parent = array_merge($parents_base, ['formatter_settings']);
+
+    $settings_element =& $element['formatter_settings_wrapper']['formatter_settings'];
+
+    // Set the #parents on the formatter_settings so they end up as a peer to
+    // formatter_type.
+    $settings_element['#parents'] = $formatter_settings_parent;
+
+    // Get the formatter name in a way that works regardless of whether we're
+    // getting the value via AJAX or not.
+    $formatter_name = NestedArray::getValue($form_state->getUserInput(), $formatter_parent) ?: $element['formatter_type']['#default_value'];
+
+    // Place the formatter settings on the form if a formatter is selected.
+    $formatter = $this->getFormatter($formatter_name, $form_state->getValue('formatter_label'), $form_state->getValue($formatter_settings_parent, $config['formatter']['settings']), $config['formatter']['third_party_settings']);
+    $settings_element = array_merge($formatter->settingsForm($settings_element, $form_state), $settings_element);
+
+    // Store the array parents for our element so that we can use it to pull out
+    // the formatter settings in our AJAX callback.
+    $complete_form['#formatter_array_parents'] = $element['#array_parents'];
+
+    return $element;
+  }
+
+  /**
+   * Render API callback: gets the layout settings elements.
+   */
+  public static function formatterSettingsAjaxCallback(array $form, FormStateInterface $form_state) {
+    $formatter_array_parents = $form['#formatter_array_parents'];
+    return NestedArray::getValue($form, array_merge($formatter_array_parents, ['formatter_settings_wrapper']));
+  }
+
+  /**
+   * {@inheritdoc}
+   */
+  public function blockSubmit($form, FormStateInterface $form_state) {
+    $this->configuration['formatter']['label'] = $form_state->getValue('formatter_label');
+    $this->configuration['formatter']['type'] = $form_state->getValue('formatter_type');
+    $this->configuration['formatter']['settings'] = $form_state->getValue('formatter_settings');
+  }
+
+  /**
+   * Gets the field definition.
+   *
+   * @return \Drupal\Core\Field\FieldDefinitionInterface
+   */
+  protected function getFieldDefinition() {
+    if (empty($this->fieldDefinition)) {
+      $field_map = $this->entityFieldManager->getFieldMap();
+      $bundle = reset($field_map[$this->entityTypeId][$this->fieldName]['bundles']);
+      $field_definitions = $this->entityFieldManager->getFieldDefinitions($this->entityTypeId, $bundle);
+      $this->fieldDefinition = $field_definitions[$this->fieldName];
+    }
+    return $this->fieldDefinition;
+  }
+
+  /**
+   * Gets the field storage definition.
+   *
+   * @return \Drupal\Core\Field\FieldStorageDefinitionInterface
+   */
+  protected function getFieldStorageDefinition() {
+    if (empty($this->fieldStorageDefinition)) {
+      $field_definitions = $this->entityFieldManager->getFieldStorageDefinitions($this->entityTypeId);
+      $this->fieldStorageDefinition = $field_definitions[$this->fieldName];
+    }
+    return $this->fieldStorageDefinition;
+  }
+
+  /**
+   * Gets field type definition.
+   *
+   * @return array
+   *   The field type definition.
+   */
+  protected function getFieldTypeDefinition() {
+    return $this->fieldTypeManager->getDefinition($this->getFieldStorageDefinition()->getType());
+  }
+
+  /**
+   * Gets the formatter options for this field type.
+   *
+   * @return array
+   *   The formatter options.
+   */
+  protected function getFormatterOptions() {
+    return $this->formatterManager->getOptions($this->getFieldStorageDefinition()->getType());
+  }
+
+  /**
+   * Gets the formatter object.
+   *
+   * @param string $type
+   *   The formatter name.
+   * @param string $label
+   *   The label option for the formatter.
+   * @param array $settings
+   *   The formatter settings.
+   * @param array $third_party_settings
+   *   The formatter third party settings.
+   *
+   * @return \Drupal\Core\Field\FormatterInterface
+   *   The formatter object.
+   */
+  protected function getFormatter($type, $label, array $settings, array $third_party_settings) {
+     return $this->formatterManager->createInstance($type, [
+      'field_definition' => $this->getFieldDefinition(),
+      'view_mode' => 'default',
+      'prepare' => TRUE,
+      'label' => $label,
+      'settings' => $settings,
+      'third_party_settings' => $third_party_settings,
+    ]);
+  }
+
+}
diff --git a/modules/ctools_block/src/Plugin/Deriver/EntityFieldDeriver.php b/modules/ctools_block/src/Plugin/Deriver/EntityFieldDeriver.php
new file mode 100644
index 0000000..b9a35bd
--- /dev/null
+++ b/modules/ctools_block/src/Plugin/Deriver/EntityFieldDeriver.php
@@ -0,0 +1,55 @@
+<?php
+
+/**
+ * @file
+ * Contains \Drupal\ctools\Plugin\Derivative\EntityFieldDeriver.
+ */
+
+namespace Drupal\ctools_block\Plugin\Deriver;
+
+use Drupal\Core\Plugin\Context\ContextDefinition;
+use Drupal\ctools\Plugin\Deriver\EntityDeriverBase;
+
+/**
+ * Provides entity field block definitions for every field.
+ */
+class EntityFieldDeriver extends EntityDeriverBase {
+
+  /**
+   * {@inheritdoc}
+   */
+  public function getDerivativeDefinitions($base_plugin_definition) {
+    $entity_type_labels = $this->entityManager->getEntityTypeLabels();
+    foreach ($this->entityManager->getFieldMap() as $entity_type_id => $entity_field_map) {
+      foreach ($this->entityManager->getFieldStorageDefinitions($entity_type_id) as $field_definition) {
+        $field_name = $field_definition->getName();
+        $field_info = $entity_field_map[$field_name];
+        $derivative_id = $entity_type_id . ":" . $field_name;
+
+        // Get the admin label for both base and configurable fields.
+        if ($field_definition->isBaseField()) {
+          $admin_label = $field_definition->getLabel();
+        }
+        else {
+          // We take the field label used on the first bundle.
+          $first_bundle = reset($field_info['bundles']);
+          $bundle_field_definitions = $this->entityManager->getFieldDefinitions($entity_type_id, $first_bundle);
+          $admin_label = $bundle_field_definitions[$field_name]->getLabel();
+        }
+
+        // Set plugin definition for derivative.
+        $derivative = $base_plugin_definition;
+        $derivative['category'] = $this->t('@entity fields', array('@entity' => $entity_type_labels[$entity_type_id]));
+        $derivative['admin_label'] = $admin_label;
+        $derivative['context'] = [
+          'entity' => new ContextDefinition('entity:' . $entity_type_id, $entity_type_labels[$entity_type_id], TRUE),
+        ];
+
+        $this->derivatives[$derivative_id] = $derivative;
+
+      }
+    }
+    return $this->derivatives;
+  }
+
+}
diff --git a/modules/ctools_block/src/Tests/EntityFieldBlockTest.php b/modules/ctools_block/src/Tests/EntityFieldBlockTest.php
new file mode 100644
index 0000000..3918942
--- /dev/null
+++ b/modules/ctools_block/src/Tests/EntityFieldBlockTest.php
@@ -0,0 +1,102 @@
+<?php
+
+/**
+ * @file
+ * Contains \Drupal\ctools_block\Tests\EntityFieldBlockTest.
+ */
+
+namespace Drupal\ctools_block\Tests;
+
+use Drupal\Core\Entity\Entity\EntityViewDisplay;
+use Drupal\simpletest\WebTestBase;
+
+/**
+ * Tests the entity field block.
+ *
+ * @group ctools_block
+ */
+class EntityFieldBlockTest extends WebTestBase {
+
+  /**
+   * @todo Allow strict config schema once we figure out how to make it work
+   * without hurling exceptions at us.
+   */
+  protected $strictConfigSchema = false;
+
+  /**
+   * {@inheritdoc}
+   */
+  public static $modules = array('ctools_block', 'ctools_block_field_test');
+
+  public function testBodyField() {
+    $block = $this->drupalPlaceBlock('entity_field:node:body', [
+      'formatter' => [
+        'type' => 'text_default',
+      ],
+      'context_mapping' => [
+        'entity' => '@node.node_route_context:node',
+      ],
+    ]);
+    $node = $this->drupalCreateNode(['type' => 'ctools_block_field_test']);
+    $this->drupalGet('node/' . $node->id());
+    $this->assertText($block->label());
+  }
+
+  function testImageField() {
+    $block = $this->drupalPlaceBlock('entity_field:node:field_ctools_block_image', [
+      'formatter' => [
+        'type' => 'image',
+      ],
+      'context_mapping' => [
+        'entity' => '@node.node_route_context:node',
+      ],
+    ]);
+    $node = $this->drupalCreateNode(['type' => 'ctools_block_field_test']);
+    $this->drupalGet('node/' . $node->id());
+    $this->assertText($block->label());
+  }
+
+  function testNodeBaseFields() {
+    $block = $this->drupalPlaceBlock('entity_field:node:uid', [
+      'formatter' => [
+        'type' => 'entity',
+      ],
+      'context_mapping' => [
+        'entity' => '@node.node_route_context:node',
+      ],
+    ]);
+    $node = $this->drupalCreateNode(['type' => 'ctools_block_field_test']);
+    $this->drupalGet('node/' . $node->id());
+    $this->assertText($block->label());
+  }
+
+  function testRenderCache() {
+    /** @var \Drupal\Core\Entity\Entity\EntityViewDisplay $view */
+    EntityViewDisplay::load('node.ctools_block_field_test.default')
+      ->removeComponent('body')
+      ->save();
+
+    $this->drupalPlaceBlock('entity_field:node:body', [
+      'formatter' => [
+        'type' => 'text_default',
+      ],
+      'context_mapping' => [
+        'entity' => '@node.node_route_context:node',
+      ],
+    ]);
+    $a = $this->drupalCreateNode(['type' => 'ctools_block_field_test']);
+    $b = $this->drupalCreateNode(['type' => 'ctools_block_field_test']);
+
+    $this->drupalGet('node/' . $a->id());
+    $this->assertText($a->body->value);
+    $this->drupalGet('node/' . $b->id());
+    $this->assertText($b->body->value);
+
+    $text = 'This is my text. Are you not entertained?';
+    $a->body->value = $text;
+    $a->save();
+    $this->drupalGet('node/' . $a->id());
+    $this->assertText($text);
+  }
+
+}
diff --git a/modules/ctools_block/tests/modules/ctools_block_field_test/config/install/core.base_field_override.node.ctools_block_field_test.promote.yml b/modules/ctools_block/tests/modules/ctools_block_field_test/config/install/core.base_field_override.node.ctools_block_field_test.promote.yml
new file mode 100644
index 0000000..905df26
--- /dev/null
+++ b/modules/ctools_block/tests/modules/ctools_block_field_test/config/install/core.base_field_override.node.ctools_block_field_test.promote.yml
@@ -0,0 +1,21 @@
+langcode: en
+status: true
+dependencies:
+  config:
+    - node.type.ctools_block_field_test
+id: node.ctools_block_field_test.promote
+field_name: promote
+entity_type: node
+bundle: ctools_block_field_test
+label: 'Promoted to front page'
+description: ''
+required: false
+translatable: true
+default_value:
+  -
+    value: 0
+default_value_callback: ''
+settings:
+  on_label: 'On'
+  off_label: 'Off'
+field_type: boolean
diff --git a/modules/ctools_block/tests/modules/ctools_block_field_test/config/install/core.entity_form_display.node.ctools_block_field_test.default.yml b/modules/ctools_block/tests/modules/ctools_block_field_test/config/install/core.entity_form_display.node.ctools_block_field_test.default.yml
new file mode 100644
index 0000000..66b1af3
--- /dev/null
+++ b/modules/ctools_block/tests/modules/ctools_block_field_test/config/install/core.entity_form_display.node.ctools_block_field_test.default.yml
@@ -0,0 +1,69 @@
+langcode: en
+status: true
+dependencies:
+  config:
+    - field.field.node.ctools_block_field_test.body
+    - field.field.node.ctools_block_field_test.field_ctools_block_image
+    - node.type.ctools_block_field_test
+  module:
+    - image
+    - path
+    - text
+id: node.ctools_block_field_test.default
+targetEntityType: node
+bundle: ctools_block_field_test
+mode: default
+content:
+  body:
+    type: text_textarea_with_summary
+    weight: 31
+    settings:
+      rows: 9
+      summary_rows: 3
+      placeholder: ''
+    third_party_settings: {  }
+  created:
+    type: datetime_timestamp
+    weight: 10
+    settings: {  }
+    third_party_settings: {  }
+  field_ctools_block_image:
+    weight: 32
+    settings:
+      progress_indicator: throbber
+      preview_image_style: thumbnail
+    third_party_settings: {  }
+    type: image_image
+  path:
+    type: path
+    weight: 30
+    settings: {  }
+    third_party_settings: {  }
+  promote:
+    type: boolean_checkbox
+    settings:
+      display_label: true
+    weight: 15
+    third_party_settings: {  }
+  sticky:
+    type: boolean_checkbox
+    settings:
+      display_label: true
+    weight: 16
+    third_party_settings: {  }
+  title:
+    type: string_textfield
+    weight: -5
+    settings:
+      size: 60
+      placeholder: ''
+    third_party_settings: {  }
+  uid:
+    type: entity_reference_autocomplete
+    weight: 5
+    settings:
+      match_operator: CONTAINS
+      size: 60
+      placeholder: ''
+    third_party_settings: {  }
+hidden: {  }
diff --git a/modules/ctools_block/tests/modules/ctools_block_field_test/config/install/core.entity_view_display.node.ctools_block_field_test.default.yml b/modules/ctools_block/tests/modules/ctools_block_field_test/config/install/core.entity_view_display.node.ctools_block_field_test.default.yml
new file mode 100644
index 0000000..74a0057
--- /dev/null
+++ b/modules/ctools_block/tests/modules/ctools_block_field_test/config/install/core.entity_view_display.node.ctools_block_field_test.default.yml
@@ -0,0 +1,33 @@
+langcode: en
+status: true
+dependencies:
+  config:
+    - field.field.node.ctools_block_field_test.body
+    - field.field.node.ctools_block_field_test.field_ctools_block_image
+    - node.type.ctools_block_field_test
+  module:
+    - image
+    - text
+    - user
+id: node.ctools_block_field_test.default
+targetEntityType: node
+bundle: ctools_block_field_test
+mode: default
+content:
+  body:
+    label: hidden
+    type: text_default
+    weight: 101
+    settings: {  }
+    third_party_settings: {  }
+  field_ctools_block_image:
+    weight: 102
+    label: above
+    settings:
+      image_style: ''
+      image_link: ''
+    third_party_settings: {  }
+    type: image
+  links:
+    weight: 100
+hidden: {  }
diff --git a/modules/ctools_block/tests/modules/ctools_block_field_test/config/install/core.entity_view_display.node.ctools_block_field_test.teaser.yml b/modules/ctools_block/tests/modules/ctools_block_field_test/config/install/core.entity_view_display.node.ctools_block_field_test.teaser.yml
new file mode 100644
index 0000000..55d5da5
--- /dev/null
+++ b/modules/ctools_block/tests/modules/ctools_block_field_test/config/install/core.entity_view_display.node.ctools_block_field_test.teaser.yml
@@ -0,0 +1,25 @@
+langcode: en
+status: true
+dependencies:
+  config:
+    - core.entity_view_mode.node.teaser
+    - field.field.node.ctools_block_field_test.body
+    - node.type.ctools_block_field_test
+  module:
+    - text
+    - user
+id: node.ctools_block_field_test.teaser
+targetEntityType: node
+bundle: ctools_block_field_test
+mode: teaser
+content:
+  body:
+    label: hidden
+    type: text_summary_or_trimmed
+    weight: 101
+    settings:
+      trim_length: 600
+    third_party_settings: {  }
+  links:
+    weight: 100
+hidden: {  }
diff --git a/modules/ctools_block/tests/modules/ctools_block_field_test/config/install/field.field.node.ctools_block_field_test.body.yml b/modules/ctools_block/tests/modules/ctools_block_field_test/config/install/field.field.node.ctools_block_field_test.body.yml
new file mode 100644
index 0000000..99e7a81
--- /dev/null
+++ b/modules/ctools_block/tests/modules/ctools_block_field_test/config/install/field.field.node.ctools_block_field_test.body.yml
@@ -0,0 +1,21 @@
+langcode: en
+status: true
+dependencies:
+  config:
+    - field.storage.node.body
+    - node.type.ctools_block_field_test
+  module:
+    - text
+id: node.ctools_block_field_test.body
+field_name: body
+entity_type: node
+bundle: ctools_block_field_test
+label: Body
+description: ''
+required: false
+translatable: true
+default_value: {  }
+default_value_callback: ''
+settings:
+  display_summary: true
+field_type: text_with_summary
diff --git a/modules/ctools_block/tests/modules/ctools_block_field_test/config/install/field.field.node.ctools_block_field_test.field_ctools_block_image.yml b/modules/ctools_block/tests/modules/ctools_block_field_test/config/install/field.field.node.ctools_block_field_test.field_ctools_block_image.yml
new file mode 100644
index 0000000..ad1909d
--- /dev/null
+++ b/modules/ctools_block/tests/modules/ctools_block_field_test/config/install/field.field.node.ctools_block_field_test.field_ctools_block_image.yml
@@ -0,0 +1,37 @@
+langcode: en
+status: true
+dependencies:
+  config:
+    - field.storage.node.field_ctools_block_image
+    - node.type.ctools_block_field_test
+  module:
+    - image
+id: node.ctools_block_field_test.field_ctools_block_image
+field_name: field_ctools_block_image
+entity_type: node
+bundle: ctools_block_field_test
+label: Image
+description: ''
+required: false
+translatable: false
+default_value: {  }
+default_value_callback: ''
+settings:
+  file_directory: '[date:custom:Y]-[date:custom:m]'
+  file_extensions: 'png gif jpg jpeg'
+  max_filesize: ''
+  max_resolution: ''
+  min_resolution: ''
+  alt_field: true
+  alt_field_required: true
+  title_field: false
+  title_field_required: false
+  default_image:
+    uuid: ''
+    alt: ''
+    title: ''
+    width: null
+    height: null
+  handler: 'default:file'
+  handler_settings: {  }
+field_type: image
diff --git a/modules/ctools_block/tests/modules/ctools_block_field_test/config/install/field.storage.node.field_ctools_block_image.yml b/modules/ctools_block/tests/modules/ctools_block_field_test/config/install/field.storage.node.field_ctools_block_image.yml
new file mode 100644
index 0000000..4d8c78f
--- /dev/null
+++ b/modules/ctools_block/tests/modules/ctools_block_field_test/config/install/field.storage.node.field_ctools_block_image.yml
@@ -0,0 +1,29 @@
+langcode: en
+status: true
+dependencies:
+  module:
+    - file
+    - image
+    - node
+id: node.field_ctools_block_image
+field_name: field_ctools_block_image
+entity_type: node
+type: image
+settings:
+  uri_scheme: public
+  default_image:
+    uuid: ''
+    alt: ''
+    title: ''
+    width: null
+    height: null
+  target_type: file
+  display_field: false
+  display_default: false
+module: image
+locked: false
+cardinality: 1
+translatable: true
+indexes: {  }
+persist_with_no_fields: false
+custom_storage: false
diff --git a/modules/ctools_block/tests/modules/ctools_block_field_test/config/install/node.type.ctools_block_field_test.yml b/modules/ctools_block/tests/modules/ctools_block_field_test/config/install/node.type.ctools_block_field_test.yml
new file mode 100644
index 0000000..655c70f
--- /dev/null
+++ b/modules/ctools_block/tests/modules/ctools_block_field_test/config/install/node.type.ctools_block_field_test.yml
@@ -0,0 +1,16 @@
+langcode: en
+status: true
+dependencies:
+  module:
+    - menu_ui
+third_party_settings:
+  menu_ui:
+    available_menus: {  }
+    parent: ''
+name: 'CTools block field test'
+type: ctools_block_field_test
+description: 'A content type used for the ctools_block field tests.'
+help: ''
+new_revision: false
+preview_mode: 0
+display_submitted: true
diff --git a/modules/ctools_block/tests/modules/ctools_block_field_test/ctools_block_field_test.info.yml b/modules/ctools_block/tests/modules/ctools_block_field_test/ctools_block_field_test.info.yml
new file mode 100644
index 0000000..723f4c5
--- /dev/null
+++ b/modules/ctools_block/tests/modules/ctools_block_field_test/ctools_block_field_test.info.yml
@@ -0,0 +1,17 @@
+name: 'Chaos tools blocks test'
+type: module
+description: 'Support module for Chaos tools blocks tests.'
+core: 8.x
+package: Testing
+version: 8.0.1
+dependencies:
+  - ctools_block_field_test
+  - image
+  - menu_ui
+  - node
+  - path
+  - text
+  - user
+features:
+  required:
+    - field.storage.node.field_ctools_block_image