diff -u b/core/modules/field/migration_templates/d7_field_instance_widget_settings.yml b/core/modules/field/migration_templates/d7_field_instance_widget_settings.yml
--- b/core/modules/field/migration_templates/d7_field_instance_widget_settings.yml
+++ b/core/modules/field/migration_templates/d7_field_instance_widget_settings.yml
@@ -15,12 +15,12 @@
       plugin: migration
       migration: d7_field
       source:
-        - entity_type
         - field_name
+        - entity_type
     -
       plugin: extract
       index:
-        - 1
+        - 0
     -
       plugin: skip_on_empty
       method: row
diff -u b/core/modules/field/src/Tests/Migrate/d7/MigrateFieldInstanceWidgetSettingsTest.php b/core/modules/field/src/Tests/Migrate/d7/MigrateFieldInstanceWidgetSettingsTest.php
--- b/core/modules/field/src/Tests/Migrate/d7/MigrateFieldInstanceWidgetSettingsTest.php
+++ b/core/modules/field/src/Tests/Migrate/d7/MigrateFieldInstanceWidgetSettingsTest.php
@@ -10,7 +10,6 @@
 use Drupal\Core\Entity\Display\EntityFormDisplayInterface;
 use Drupal\Core\Entity\Entity\EntityFormDisplay;
 use Drupal\migrate_drupal\Tests\d7\MigrateDrupal7TestBase;
-use Drupal\node\Entity\NodeType;
 
 /**
  * Migrate field widget settings.
diff -u b/core/modules/node/src/Tests/Migrate/d7/MigrateNodeTest.php b/core/modules/node/src/Tests/Migrate/d7/MigrateNodeTest.php
--- b/core/modules/node/src/Tests/Migrate/d7/MigrateNodeTest.php
+++ b/core/modules/node/src/Tests/Migrate/d7/MigrateNodeTest.php
@@ -18,7 +18,17 @@
  */
 class MigrateNodeTest extends MigrateDrupal7TestBase {
 
-  static $modules = array('node', 'text', 'filter', 'entity_reference');
+  static $modules = array(
+    'comment',
+    'datetime',
+    'entity_reference',
+    'filter',
+    'image',
+    'link',
+    'node',
+    'telephone',
+    'text',
+  );
 
   /**
    * {@inheritdoc}
@@ -27,13 +37,17 @@
     parent::setUp();
 
     $this->installEntitySchema('node');
-    $this->installConfig(['node']);
+    $this->installEntitySchema('comment');
+    $this->installConfig(static::$modules);
     $this->installSchema('node', ['node_access']);
     $this->installSchema('system', ['sequences']);
 
     $this->executeMigration('d7_user_role');
     $this->executeMigration('d7_user');
     $this->executeMigration('d7_node_type');
+    $this->executeMigration('d7_comment_type');
+    $this->executeMigration('d7_field');
+    $this->executeMigration('d7_field_instance');
     $this->executeMigration('d7_node__test_content_type');
   }
 
only in patch2:
unchanged:
--- a/core/modules/node/migration_templates/d7_node.yml
+++ b/core/modules/node/migration_templates/d7_node.yml
@@ -30,3 +30,5 @@ migration_dependencies:
   required:
     - d7_user
     - d7_node_type
+  optional:
+    - d7_field_instance