diff --git a/core/modules/block_content/tests/src/Unit/Menu/BlockContentLocalTasksTest.php b/core/modules/block_content/tests/src/Unit/Menu/BlockContentLocalTasksTest.php
deleted file mode 100644
index 9c01796..0000000
--- a/core/modules/block_content/tests/src/Unit/Menu/BlockContentLocalTasksTest.php
+++ /dev/null
@@ -1,85 +0,0 @@
-<?php
-
-/**
- * @file
- * Contains \Drupal\Tests\block_content\Unit\Menu\BlockContentLocalTasksTest.
- */
-
-namespace Drupal\Tests\block_content\Unit\Menu;
-
-use Drupal\Tests\Core\Menu\LocalTaskIntegrationTestBase;
-use Symfony\Component\DependencyInjection\ContainerBuilder;
-
-/**
- * Tests existence of block_content local tasks.
- *
- * @group block_content
- */
-class BlockContentLocalTasksTest extends LocalTaskIntegrationTestBase {
-
-  protected function setUp() {
-    $this->directoryList = array(
-      'block' => 'core/modules/block',
-      'block_content' => 'core/modules/block_content',
-    );
-    parent::setUp();
-
-    $config_factory = $this->getConfigFactoryStub(array('system.theme' => array(
-      'default' => 'test_c',
-    )));
-
-    $themes = array();
-    $themes['test_a'] = (object) array(
-      'status' => 0,
-    );
-    $themes['test_b'] = (object) array(
-      'status' => 1,
-      'info' => array(
-        'name' => 'test_b',
-      ),
-    );
-    $themes['test_c'] = (object) array(
-      'status' => 1,
-      'info' => array(
-        'name' => 'test_c',
-      ),
-    );
-    $theme_handler = $this->getMock('Drupal\Core\Extension\ThemeHandlerInterface');
-    $theme_handler->expects($this->any())
-      ->method('listInfo')
-      ->will($this->returnValue($themes));
-
-    $container = new ContainerBuilder();
-    $container->set('config.factory', $config_factory);
-    $container->set('theme_handler', $theme_handler);
-    \Drupal::setContainer($container);
-  }
-
-  /**
-   * Checks block_content listing local tasks.
-   *
-   * @dataProvider getBlockContentListingRoutes
-   */
-  public function testBlockContentListLocalTasks($route) {
-    $this->assertLocalTasks($route, array(
-      0 => array(
-        'block.admin_display',
-        'entity.block_content.collection',
-      ),
-      1 => array(
-        'block_content.list_sub',
-        'entity.block_content_type.collection',
-      ),
-    ));
-  }
-
-  /**
-   * Provides a list of routes to test.
-   */
-  public function getBlockContentListingRoutes() {
-    return array(
-      array('entity.block_content.collection', 'entity.block_content_type.collection'),
-    );
-  }
-
-}
diff --git a/core/modules/config_translation/src/Tests/ConfigTranslationListUiTest.php b/core/modules/config_translation/src/Tests/ConfigTranslationListUiTest.php
index 4ceec20..d018673 100644
--- a/core/modules/config_translation/src/Tests/ConfigTranslationListUiTest.php
+++ b/core/modules/config_translation/src/Tests/ConfigTranslationListUiTest.php
@@ -192,9 +192,9 @@ public function doCustomContentTypeListTest() {
     $block_content_type->save();
 
     // Get the custom block type listing.
-    $this->drupalGet('admin/structure/block/block-content/types');
+    $this->drupalGet('admin/structure/block-content');
 
-    $translate_link = 'admin/structure/block/block-content/manage/' . $block_content_type->id() . '/translate';
+    $translate_link = 'admin/structure/block-content/manage/' . $block_content_type->id() . '/translate';
     // Test if the link to translate the custom block type is on the page.
     $this->assertLinkByHref($translate_link);
 
@@ -413,7 +413,7 @@ public function doFieldListTest() {
         'field' => 'node.' . $content_type->id() . '.body',
       ),
       array(
-        'list' => 'admin/structure/block/block-content/manage/basic/fields',
+        'list' => 'admin/structure/block-content/manage/basic/fields',
         'field' => 'block_content.basic.body',
       ),
     );