diff --git a/core/modules/menu_ui/migration_templates/d6_menu_settings.yml b/core/modules/menu_ui/migration_templates/menu_settings.yml
similarity index 52%
rename from core/modules/menu_ui/migration_templates/d6_menu_settings.yml
rename to core/modules/menu_ui/migration_templates/menu_settings.yml
index 9f332fb..b59cbc2 100644
--- a/core/modules/menu_ui/migration_templates/d6_menu_settings.yml
+++ b/core/modules/menu_ui/migration_templates/menu_settings.yml
@@ -1,16 +1,13 @@
-id: d6_menu_settings
-label: Drupal 6 menu configuration
+id: menu_settings
+label: Menu UI configuration
 migration_tags:
   - Drupal 6
+  - Drupal 7
 source:
   plugin: variable
   variables:
-    - menu_primary_links_source
-    - menu_secondary_links_source
     - menu_override_parent_selector
 process:
-  main_links: menu_primary_links_source
-  secondary_links: menu_secondary_links_source
   override_parent_selector: menu_override_parent_selector
 destination:
   plugin: config
diff --git a/core/modules/menu_ui/src/Tests/Migrate/MigrateMenuSettingsTest.php b/core/modules/menu_ui/src/Tests/Migrate/MigrateMenuSettingsTest.php
new file mode 100644
index 0000000..46de706
--- /dev/null
+++ b/core/modules/menu_ui/src/Tests/Migrate/MigrateMenuSettingsTest.php
@@ -0,0 +1,35 @@
+<?php
+
+/**
+ * @file
+ * Contains \Drupal\menu_ui\Tests\Migrate\MigrateMenuSettingsTest.
+ */
+
+namespace Drupal\menu_ui\Tests\Migrate;
+
+use Drupal\migrate_drupal\Tests\d7\MigrateDrupal7TestBase;
+
+/**
+ * Tests migration of menu_ui settings.
+ *
+ * @group menu_ui
+ */
+class MigrateMenuSettingsTest extends MigrateDrupal7TestBase {
+
+  public static $modules = ['menu_ui'];
+
+  /**
+   * {@inheritdoc}
+   */
+  protected function setUp() {
+    parent::setUp();
+    $this->installConfig(['menu_ui']);
+    $this->loadDumps(['Variable.php']);
+    $this->executeMigration('menu_settings');
+  }
+
+  public function testMigration() {
+    $this->assertTrue(\Drupal::config('menu_ui.settings')->get('override_parent_selector'));
+  }
+
+}
diff --git a/core/modules/menu_ui/src/Tests/Migrate/d6/MigrateMenuConfigsTest.php b/core/modules/menu_ui/src/Tests/Migrate/d6/MigrateMenuConfigsTest.php
deleted file mode 100644
index f6182fe..0000000
--- a/core/modules/menu_ui/src/Tests/Migrate/d6/MigrateMenuConfigsTest.php
+++ /dev/null
@@ -1,47 +0,0 @@
-<?php
-
-/**
- * @file
- * Contains \Drupal\menu_ui\Tests\Migrate\d6\MigrateMenuConfigsTest.
- */
-
-namespace Drupal\menu_ui\Tests\Migrate\d6;
-
-use Drupal\config\Tests\SchemaCheckTestTrait;
-use Drupal\migrate_drupal\Tests\d6\MigrateDrupal6TestBase;
-
-/**
- * Upgrade variables to menu_ui.settings.yml.
- *
- * @group menu_ui
- */
-class MigrateMenuConfigsTest extends MigrateDrupal6TestBase {
-
-  use SchemaCheckTestTrait;
-
-  /**
-   * Modules to enable.
-   *
-   * @var array
-   */
-  public static $modules = array('menu_ui');
-
-  /**
-   * {@inheritdoc}
-   */
-  protected function setUp() {
-    parent::setUp();
-    $this->loadDumps(['Variable.php']);
-    $this->executeMigration('d6_menu_settings');
-  }
-
-  /**
-   * Tests migration of variables for the Menu UI module.
-   */
-  public function testMenuSettings() {
-    $config = $this->config('menu_ui.settings');
-    $this->assertIdentical(FALSE, $config->get('override_parent_selector'));
-    $this->assertConfigSchema(\Drupal::service('config.typed'), 'menu_ui.settings', $config->get());
-  }
-
-}
diff --git a/core/modules/migrate_drupal/src/Tests/Table/d7/Variable.php b/core/modules/migrate_drupal/src/Tests/Table/d7/Variable.php
index 81f3ccb..b5ba927 100644
--- a/core/modules/migrate_drupal/src/Tests/Table/d7/Variable.php
+++ b/core/modules/migrate_drupal/src/Tests/Table/d7/Variable.php
@@ -212,6 +212,9 @@ public function load() {
       'name' => 'menu_options_test_content_type',
       'value' => 'a:4:{i:0;s:9:"main-menu";i:1;s:10:"management";i:2;s:10:"navigation";i:3;s:9:"user-menu";}',
     ))->values(array(
+      'name' => 'menu_override_parent_selector',
+      'value' => 'b:1;',
+    ))->values(array(
       'name' => 'menu_parent_test_content_type',
       'value' => 's:11:"main-menu:0";',
     ))->values(array(
@@ -464,4 +467,4 @@ public function load() {
   }
 
 }
-#029f6b476578be5d7449a86251be1c77
+#b936ad0308ecdde6a8fe71fd158c6719