diff --git a/core/modules/block/lib/Drupal/block/Tests/BlockTemplateSuggestionsUnitTest.php b/core/modules/block/lib/Drupal/block/Tests/BlockTemplateSuggestionsUnitTest.php
index 4078132..c7dca92 100644
--- a/core/modules/block/lib/Drupal/block/Tests/BlockTemplateSuggestionsUnitTest.php
+++ b/core/modules/block/lib/Drupal/block/Tests/BlockTemplateSuggestionsUnitTest.php
@@ -19,7 +19,8 @@ class BlockTemplateSuggestionsUnitTest extends WebTestBase {
    *
    * @var array
    */
-  public static $modules = array('block');
+  // TODO: the dependency on views module is added to get around a plugin error.
+  public static $modules = array('block', 'views');
 
   public static function getInfo() {
     return array(
diff --git a/core/modules/locale/lib/Drupal/locale/Tests/LocaleContentTest.php b/core/modules/locale/lib/Drupal/locale/Tests/LocaleContentTest.php
index 61bfcf3..628d40f 100644
--- a/core/modules/locale/lib/Drupal/locale/Tests/LocaleContentTest.php
+++ b/core/modules/locale/lib/Drupal/locale/Tests/LocaleContentTest.php
@@ -19,7 +19,8 @@ class LocaleContentTest extends WebTestBase {
    *
    * @var array
    */
-  public static $modules = array('locale');
+  // TODO: the dependency on block module is added to get around a plugin error.
+  public static $modules = array('locale', 'block');
 
   public static function getInfo() {
     return array(
diff --git a/core/modules/system/lib/Drupal/system/Plugin/PluginUIBase.php b/core/modules/system/lib/Drupal/system/Plugin/PluginUIBase.php
index c8c6ad2..179981b 100644
--- a/core/modules/system/lib/Drupal/system/Plugin/PluginUIBase.php
+++ b/core/modules/system/lib/Drupal/system/Plugin/PluginUIBase.php
@@ -19,7 +19,7 @@ public function form($form, &$form_state, $plugin, $facet) {
       '#title' => t('Search'),
       '#autocomplete_path' => 'system/autocomplete/' . $this->getPluginId(),
     );
-    $form['submit'] = array(
+    $form['right']['submit'] = array(
       '#type' => 'submit',
       '#value' => t('Next'),
     );
diff --git a/core/modules/system/lib/Drupal/system/Plugin/block/block/SystemMenuBlock.php b/core/modules/system/lib/Drupal/system/Plugin/block/block/SystemMenuBlock.php
index 4011c99..3f79e84 100644
--- a/core/modules/system/lib/Drupal/system/Plugin/block/block/SystemMenuBlock.php
+++ b/core/modules/system/lib/Drupal/system/Plugin/block/block/SystemMenuBlock.php
@@ -32,6 +32,8 @@ public function access() {
    */
   public function build() {
     list($plugin, $derivative) = explode(':', $this->getPluginId());
-    return menu_tree($derivative);
+    // Derivatives are prefixed with 'menu-'.
+    $menu = substr($derivative, 5);
+    return menu_tree($menu);
   }
 }