diff --git a/core/modules/image/lib/Drupal/image/Tests/ImageFieldDefaultImagesTest.php b/core/modules/image/lib/Drupal/image/Tests/ImageFieldDefaultImagesTest.php
index 1d6a3e8..f7670fe 100644
--- a/core/modules/image/lib/Drupal/image/Tests/ImageFieldDefaultImagesTest.php
+++ b/core/modules/image/lib/Drupal/image/Tests/ImageFieldDefaultImagesTest.php
@@ -17,8 +17,7 @@ class ImageFieldDefaultImagesTest extends ImageFieldTestBase {
    *
    * @var array
    */
-  // TODO: the dependency on block module is added to get around a plugin error.
-  public static $modules = array('field_ui', 'block');
+  public static $modules = array('field_ui');
 
   public static function getInfo() {
     return array(
diff --git a/core/modules/image/lib/Drupal/image/Tests/ImageFieldDisplayTest.php b/core/modules/image/lib/Drupal/image/Tests/ImageFieldDisplayTest.php
index 76be94c..c07acf6 100644
--- a/core/modules/image/lib/Drupal/image/Tests/ImageFieldDisplayTest.php
+++ b/core/modules/image/lib/Drupal/image/Tests/ImageFieldDisplayTest.php
@@ -17,8 +17,7 @@ class ImageFieldDisplayTest extends ImageFieldTestBase {
    *
    * @var array
    */
-  // TODO: the dependency on block module is added to get around a plugin error.
-  public static $modules = array('field_ui', 'block');
+  public static $modules = array('field_ui');
 
   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 ef2805c..0302ba9 100644
--- a/core/modules/locale/lib/Drupal/locale/Tests/LocaleContentTest.php
+++ b/core/modules/locale/lib/Drupal/locale/Tests/LocaleContentTest.php
@@ -19,8 +19,7 @@ class LocaleContentTest extends WebTestBase {
    *
    * @var array
    */
-  // TODO: the dependency on block module is added to get around a plugin error.
-  public static $modules = array('locale', 'block');
+  public static $modules = array('locale');
 
   public static function getInfo() {
     return array(
diff --git a/core/modules/node/lib/Drupal/node/Tests/NodeFieldMultilingualTestCase.php b/core/modules/node/lib/Drupal/node/Tests/NodeFieldMultilingualTestCase.php
index b3df341..9c3dd06 100644
--- a/core/modules/node/lib/Drupal/node/Tests/NodeFieldMultilingualTestCase.php
+++ b/core/modules/node/lib/Drupal/node/Tests/NodeFieldMultilingualTestCase.php
@@ -20,8 +20,7 @@ class NodeFieldMultilingualTestCase extends WebTestBase {
    *
    * @var array
    */
-  // TODO: the dependency on block module is added to get around a plugin error.
-  public static $modules = array('node', 'language', 'block');
+  public static $modules = array('node', 'language');
 
   public static function getInfo() {
     return array(
diff --git a/core/modules/path/lib/Drupal/path/Tests/PathLanguageTest.php b/core/modules/path/lib/Drupal/path/Tests/PathLanguageTest.php
index f516c54..e6fd10d 100644
--- a/core/modules/path/lib/Drupal/path/Tests/PathLanguageTest.php
+++ b/core/modules/path/lib/Drupal/path/Tests/PathLanguageTest.php
@@ -17,8 +17,7 @@ class PathLanguageTest extends PathTestBase {
    *
    * @var array
    */
-  // TODO: the dependency on block module is added to get around a plugin error.
-  public static $modules = array('path', 'locale', 'translation', 'block');
+  public static $modules = array('path', 'locale', 'translation');
 
   public static function getInfo() {
     return array(
diff --git a/core/modules/path/lib/Drupal/path/Tests/PathTaxonomyTermTest.php b/core/modules/path/lib/Drupal/path/Tests/PathTaxonomyTermTest.php
index 2f83bf6..421870d 100644
--- a/core/modules/path/lib/Drupal/path/Tests/PathTaxonomyTermTest.php
+++ b/core/modules/path/lib/Drupal/path/Tests/PathTaxonomyTermTest.php
@@ -17,8 +17,7 @@ class PathTaxonomyTermTest extends PathTestBase {
    *
    * @var array
    */
-  // TODO: the dependency on block module is added to get around a plugin error.
-  public static $modules = array('taxonomy', 'block');
+  public static $modules = array('taxonomy');
 
   public static function getInfo() {
     return array(
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 3f79e84..f570fa0 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
@@ -20,11 +20,9 @@ class SystemMenuBlock extends BlockBase {
    * Implements BlockInterface::access().
    */
   public function access() {
-    global $user;
-    if (!$user->uid) {
-      return FALSE;
-    }
-    return TRUE;
+    // @todo The 'Tools' menu should be available to anonymous users.
+    list($plugin, $derivative) = explode(':', $this->getPluginId());
+    return ($GLOBALS['user']->uid || $derivative == 'menu-tools');
   }
 
   /**