diff --git a/core/modules/field/migration_templates/d7_field_instance_widget_settings.yml b/core/modules/field/migration_templates/d7_field_instance_widget_settings.yml
index e75285d..b3f335c 100755
--- a/core/modules/field/migration_templates/d7_field_instance_widget_settings.yml
+++ b/core/modules/field/migration_templates/d7_field_instance_widget_settings.yml
@@ -44,6 +44,7 @@ process:
         phone_textfield: telephone_default
         options_onoff: boolean_checkbox
         entityreference_autocomplete: entity_reference_autocomplete
+        taxonomy_autocomplete: entity_reference_autocomplete
   'options/settings':
     plugin: field_instance_widget_settings
     source:
diff --git a/core/modules/field/src/Tests/Migrate/d7/MigrateFieldInstanceWidgetSettingsTest.php b/core/modules/field/src/Tests/Migrate/d7/MigrateFieldInstanceWidgetSettingsTest.php
index 1161f79..6225788 100644
--- a/core/modules/field/src/Tests/Migrate/d7/MigrateFieldInstanceWidgetSettingsTest.php
+++ b/core/modules/field/src/Tests/Migrate/d7/MigrateFieldInstanceWidgetSettingsTest.php
@@ -25,75 +25,34 @@ class MigrateFieldInstanceWidgetSettingsTest extends MigrateDrupal7TestBase {
    * @var array
    */
   public static $modules = array(
+    'comment',
+    'datetime',
+    'entity_reference',
     'field',
-    'telephone',
-    'link',
     'file',
     'image',
-    'datetime',
+    'link',
     'node',
+    'taxonomy',
+    'telephone',
     'text',
   );
 
   /**
-   * Creates a node type.
-   *
-   * @param string $id
-   *   The node type ID.
-   */
-  protected function createNodeType($id) {
-    NodeType::create(array(
-      'type' => $id,
-      'label' => $this->randomString(),
-    ))->save();
-  }
-
-  /**
    * {@inheritdoc}
    */
   protected function setUp() {
     parent::setUp();
 
     $this->installEntitySchema('node');
-
-    $this->createNodeType('page');
-    $this->createNodeType('article');
-    $this->createNodeType('blog');
-    $this->createNodeType('book');
-    $this->createNodeType('forum');
-    $this->createNodeType('test_content_type');
-
-    // Add some id mappings for the dependent migrations.
-    $id_mappings = [
-      'd7_field' => [
-        [['comment', 'comment_body'], ['comment', 'comment_body']],
-        [['node', 'body'], ['node', 'body']],
-        [['node', 'field_tags'], ['node', 'field_tags']],
-        [['node', 'field_image'], ['node', 'field_image']],
-        [['node', 'taxonomy_forums'], ['node', 'taxonomy_forums']],
-        [['node', 'field_boolean'], ['node', 'field_boolean']],
-        [['node', 'field_email'], ['node', 'field_email']],
-        [['node', 'field_phone'], ['node', 'field_phone']],
-        [['node', 'field_date'], ['node', 'field_date']],
-        [['node', 'field_date_with_end_time'], ['node', 'field_date_with_end_time']],
-        [['node', 'field_file'], ['node', 'field_file']],
-        [['node', 'field_float'], ['node', 'field_float']],
-        [['node', 'field_images'], ['node', 'field_images']],
-        [['node', 'field_integer'], ['node', 'field_integer']],
-        [['node', 'field_link'], ['node', 'field_link']],
-        [['node', 'field_text_list'], ['node', 'field_text_list']],
-        [['node', 'field_integer_list'], ['node', 'field_integer_list']],
-        [['node', 'field_long_text'], ['node', 'field_long_text']],
-        [['node', 'field_term_reference'], ['node', 'field_term_reference']],
-        [['node', 'field_text'], ['node', 'field_text']],
-        [['node', 'field_integer'], ['node', 'field_integer']],
-        [['user', 'field_file'], ['user', 'field_file']],
-      ],
-      // We don't actually need any ID lookups from the d7_field_instance
-      // migration -- it's merely a sensible dependency.
-      'd7_field_instance' => [],
-    ];
-    $this->prepareMigrations($id_mappings);
+    $this->installEntitySchema('comment');
+    $this->installEntitySchema('taxonomy_term');
+    $this->installConfig(static::$modules);
+
+    $this->executeMigration('d7_node_type');
+    $this->executeMigration('d7_comment_type');
+    $this->executeMigration('d7_field');
+    $this->executeMigration('d7_field_instance');
     $this->executeMigration('d7_field_instance_widget_settings');
   }
 
@@ -143,7 +102,7 @@ public function testWidgetSettings() {
 
     $this->assertEntity('node.article.default', 'node', 'article');
     $this->assertComponent('node.article.default', 'body', 'text_textarea_with_summary', -4);
-    $this->assertComponent('node.article.default', 'field_tags', 'taxonomy_autocomplete', -4);
+    $this->assertComponent('node.article.default', 'field_tags', 'entity_reference_autocomplete', -4);
     $this->assertComponent('node.article.default', 'field_image', 'image_image', -1);
 
     $this->assertEntity('node.blog.default', 'node', 'blog');
@@ -169,7 +128,7 @@ public function testWidgetSettings() {
     $this->assertComponent('node.test_content_type.default', 'field_integer_list', 'options_buttons', 12);
     $this->assertComponent('node.test_content_type.default', 'field_long_text', 'text_textarea_with_summary', 13);
     $this->assertComponent('node.test_content_type.default', 'field_phone', 'telephone_default', 6);
-    $this->assertComponent('node.test_content_type.default', 'field_term_reference', 'taxonomy_autocomplete', 14);
+    $this->assertComponent('node.test_content_type.default', 'field_term_reference', 'entity_reference_autocomplete', 14);
     $this->assertComponent('node.test_content_type.default', 'field_text', 'text_textfield', 15);
     $this->assertComponent('node.test_content_type.default', 'field_text_list', 'options_select', 11);
   }
diff --git a/core/modules/node/src/Tests/Migrate/d7/MigrateNodeTest.php b/core/modules/node/src/Tests/Migrate/d7/MigrateNodeTest.php
index f6681f8..bfc1d25 100644
--- a/core/modules/node/src/Tests/Migrate/d7/MigrateNodeTest.php
+++ b/core/modules/node/src/Tests/Migrate/d7/MigrateNodeTest.php
@@ -107,6 +107,15 @@ protected function assertRevision($id, $title, $uid, $log, $timestamp) {
   public function testNode() {
     $this->assertEntity(1, 'test_content_type', 'en', 'A Node', '2', TRUE, '1421727515', '1441032132', TRUE, FALSE);
     $this->assertRevision(1, 'A Node', '2', NULL, '1441032132');
+
+    $node = Node::load(1);
+    $this->assertTrue($node->field_boolean->value);
+    $this->assertIdentical('99-99-99-99', $node->field_phone->value);
+    $this->assertIdentical('1', $node->field_float->value);
+    $this->assertIdentical('5', $node->field_integer->value);
+    $this->assertIdentical('Some more text', $node->field_text_list[0]->value);
+    $this->assertIdentical('7', $node->field_integer_list[0]->value);
+    $this->assertIdentical('qwerty', $node->field_text->value);
   }
 
 }