diff --git a/core/modules/migrate_drupal/config/install/migrate.migration.d6_block.yml b/core/modules/migrate_drupal/config/install/migrate.migration.d6_block.yml
index 4c15527..6d1f398 100644
--- a/core/modules/migrate_drupal/config/install/migrate.migration.d6_block.yml
+++ b/core/modules/migrate_drupal/config/install/migrate.migration.d6_block.yml
@@ -84,6 +84,6 @@ process:
 destination:
   plugin: entity:block
 migration_dependencies:
-  optional:
+  required:
     - d6_menu
     - d6_custom_block
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 5901c67..4cfea2f 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
@@ -48,10 +48,9 @@ process:
 destination:
   plugin: entity:comment
 migration_dependencies:
-  optional:
-    - d6_comment_type
   required:
     - d6_node
+    - d6_comment_type
     - d6_user
     - d6_comment_entity_display
     - d6_comment_entity_form_display
diff --git a/core/modules/migrate_drupal/config/install/migrate.migration.d6_node.yml b/core/modules/migrate_drupal/config/install/migrate.migration.d6_node.yml
index e927c18..cc210c8 100644
--- a/core/modules/migrate_drupal/config/install/migrate.migration.d6_node.yml
+++ b/core/modules/migrate_drupal/config/install/migrate.migration.d6_node.yml
@@ -35,6 +35,5 @@ migration_dependencies:
     - d6_node_type
     - d6_node_settings
     - d6_filter_format
-  optional:
     - d6_field_instance_widget_settings
     - d6_field_formatter_settings
diff --git a/core/modules/migrate_drupal/config/install/migrate.migration.d6_user_picture_file.yml b/core/modules/migrate_drupal/config/install/migrate.migration.d6_user_picture_file.yml
index d142dbb..8e3fd25 100644
--- a/core/modules/migrate_drupal/config/install/migrate.migration.d6_user_picture_file.yml
+++ b/core/modules/migrate_drupal/config/install/migrate.migration.d6_user_picture_file.yml
@@ -22,3 +22,6 @@ migration_dependencies:
   # migration as an optional dependency to ensure it runs first.
   optional:
     - d6_file
+dependencies:
+  module:
+    - file
diff --git a/core/modules/migrate_drupal/src/Tests/d6/MigrateBlockTest.php b/core/modules/migrate_drupal/src/Tests/d6/MigrateBlockTest.php
index a22bacb..70d9260 100644
--- a/core/modules/migrate_drupal/src/Tests/d6/MigrateBlockTest.php
+++ b/core/modules/migrate_drupal/src/Tests/d6/MigrateBlockTest.php
@@ -52,7 +52,10 @@ public function setUp() {
         array(array(11), array(2)),
         array(array(12), array(1)),
         array(array(13), array(2)),
-      )
+      ),
+      'd6_menu' => array(
+        array(array('menu1'), array('menu')),
+      ),
     ));
 
     // Set Bartik and Seven as the default public and admin theme.
diff --git a/core/modules/migrate_drupal/src/Tests/d6/MigrateNodeTestBase.php b/core/modules/migrate_drupal/src/Tests/d6/MigrateNodeTestBase.php
index 45511ed..746023e 100644
--- a/core/modules/migrate_drupal/src/Tests/d6/MigrateNodeTestBase.php
+++ b/core/modules/migrate_drupal/src/Tests/d6/MigrateNodeTestBase.php
@@ -34,6 +34,18 @@ protected function setUp() {
         array(array(1), array('filtered_html')),
         array(array(2), array('full_html')),
       ),
+      'd6_field_instance_widget_settings' => array(
+        array(
+          array('page', 'field_test'),
+          array('node', 'page', 'default', 'test'),
+        ),
+      ),
+      'd6_field_formatter_settings' => array(
+        array(
+          array('page', 'default', 'node', 'field_test'),
+          array('node', 'page', 'default', 'field_test'),
+        ),
+      ),
     );
     $this->prepareIdMappings($id_mappings);