diff --git a/core/modules/color/lib/Drupal/color/Tests/ColorTest.php b/core/modules/color/lib/Drupal/color/Tests/ColorTest.php
index 8182b57..9ddd06a 100644
--- a/core/modules/color/lib/Drupal/color/Tests/ColorTest.php
+++ b/core/modules/color/lib/Drupal/color/Tests/ColorTest.php
@@ -48,7 +48,6 @@ function setUp() {
       ),
     );
     theme_enable(array_keys($this->themes));
-    menu_router_rebuild();
 
     // Array filled with valid and not valid color values
     $this->colorTests = array(
diff --git a/core/modules/system/system.module b/core/modules/system/system.module
index a6dbbe3..bb3c889 100644
--- a/core/modules/system/system.module
+++ b/core/modules/system/system.module
@@ -740,7 +740,7 @@ function system_menu() {
     if (!empty($theme->status)) {
       $items['admin/appearance/settings/' . $theme->name] = array(
         'title' => $theme->info['name'],
-        'route_name' => 'system_theme_settings_' . $theme->name,
+        'route_name' => 'system_theme_settings_dynamic',
         'type' => MENU_LOCAL_TASK,
       );
     }