diff --git a/core/tests/Drupal/Tests/Core/Menu/LocalTaskManagerTest.php b/core/tests/Drupal/Tests/Core/Menu/LocalTaskManagerTest.php
index e94660d..4c3718b 100644
--- a/core/tests/Drupal/Tests/Core/Menu/LocalTaskManagerTest.php
+++ b/core/tests/Drupal/Tests/Core/Menu/LocalTaskManagerTest.php
@@ -9,6 +9,7 @@
 
 use Drupal\Core\Cache\Cache;
 use Drupal\Core\Language\Language;
+use Drupal\Core\Menu\LocalTaskManager;
 use Drupal\Tests\UnitTestCase;
 use Symfony\Component\HttpFoundation\Request;
 use Symfony\Component\HttpFoundation\RequestStack;
@@ -89,7 +90,7 @@ class LocalTaskManagerTest extends UnitTestCase {
   protected function setUp() {
     parent::setUp();
 
-    $this->controllerResolver = $this->getMock('Symfony\Component\HttpKernel\Controller\ControllerResolverInterface');
+    $this->controllerResolver = $this->getMock('Drupal\Core\Controller\ControllerResolverInterface');
     $this->request = new Request();
     $this->routeProvider = $this->getMock('Drupal\Core\Routing\RouteProviderInterface');
     $this->routeBuilder = $this->getMock('Drupal\Core\Routing\RouteBuilderInterface');
@@ -168,15 +169,15 @@ public function testGetLocalTaskForRouteWithEmptyCache() {
 
     $this->cacheBackend->expects($this->at(0))
       ->method('get')
-      ->with('local_task:en:menu_local_task_test_tasks_view');
+      ->with('local_task_plugins:en:menu_local_task_test_tasks_view');
 
     $this->cacheBackend->expects($this->at(1))
       ->method('get')
-      ->with('local_task:en');
+      ->with('local_task_plugins:en');
 
     $this->cacheBackend->expects($this->at(2))
       ->method('set')
-      ->with('local_task:en', $definitions, Cache::PERMANENT);
+      ->with('local_task_plugins:en', $definitions, Cache::PERMANENT);
 
     $this->routeBuilder->expects($this->once())
       ->method('rebuildIfNeeded');
@@ -185,7 +186,7 @@ public function testGetLocalTaskForRouteWithEmptyCache() {
 
     $this->cacheBackend->expects($this->at(3))
       ->method('set')
-      ->with('local_task:en:menu_local_task_test_tasks_view', $expected_set, Cache::PERMANENT, array('local_task'));
+      ->with('local_task_plugins:en:menu_local_task_test_tasks_view', $expected_set, Cache::PERMANENT, array('local_task'));
 
     $local_tasks = $this->manager->getLocalTasksForRoute('menu_local_task_test_tasks_view');
     $this->assertEquals($result, $local_tasks);
@@ -207,7 +208,7 @@ public function testGetLocalTaskForRouteWithFilledCache() {
 
     $this->cacheBackend->expects($this->at(0))
       ->method('get')
-      ->with('local_task:en:menu_local_task_test_tasks_view')
+      ->with('local_task_plugins:en:menu_local_task_test_tasks_view')
       ->will($this->returnValue((object) array('data' => $result)));
 
     $this->cacheBackend->expects($this->never())
@@ -243,29 +244,19 @@ public function testGetTitle() {
    * Setups the local task manager for the test.
    */
   protected function setupLocalTaskManager() {
-    $this->manager = $this
-      ->getMockBuilder('Drupal\Core\Menu\LocalTaskManager')
-      ->disableOriginalConstructor()
-      ->setMethods(array('enforcePluginInterface'))
-      ->getMock();
-
-    $property = new \ReflectionProperty('Drupal\Core\Menu\LocalTaskManager', 'controllerResolver');
-    $property->setAccessible(TRUE);
-    $property->setValue($this->manager, $this->controllerResolver);
-
     $request_stack = new RequestStack();
     $request_stack->push($this->request);
-    $property = new \ReflectionProperty('Drupal\Core\Menu\LocalTaskManager', 'requestStack');
-    $property->setAccessible(TRUE);
-    $property->setValue($this->manager, $request_stack);
-
-    $property = new \ReflectionProperty('Drupal\Core\Menu\LocalTaskManager', 'accessManager');
-    $property->setAccessible(TRUE);
-    $property->setValue($this->manager, $this->accessManager);
+    $module_handler = $this->getMock('Drupal\Core\Extension\ModuleHandlerInterface');
+    $module_handler->expects($this->any())
+      ->method('getModuleDirectories')
+      ->willReturn(array());
+    $language_manager = $this->getMock('Drupal\Core\Language\LanguageManagerInterface');
+    $language_manager->expects($this->any())
+      ->method('getCurrentLanguage')
+      ->will($this->returnValue(new Language(array('id' => 'en'))));
 
-    $property = new \ReflectionProperty('Drupal\Core\Menu\LocalTaskManager', 'routeBuilder');
-    $property->setAccessible(TRUE);
-    $property->setValue($this->manager, $this->routeBuilder);
+    $account = $this->getMock('Drupal\Core\Session\AccountInterface');
+    $this->manager = new LocalTaskManager($this->controllerResolver, $request_stack, $this->routeProvider, $this->routeBuilder, $module_handler, $this->cacheBackend, $language_manager, $this->accessManager, $account);
 
     $property = new \ReflectionProperty('Drupal\Core\Menu\LocalTaskManager', 'discovery');
     $property->setAccessible(TRUE);
@@ -275,12 +266,6 @@ protected function setupLocalTaskManager() {
     $property->setAccessible(TRUE);
     $property->setValue($this->manager, $this->factory);
 
-    $language_manager = $this->getMock('Drupal\Core\Language\LanguageManagerInterface');
-    $language_manager->expects($this->any())
-      ->method('getCurrentLanguage')
-      ->will($this->returnValue(new Language(array('id' => 'en'))));
-
-    $this->manager->setCacheBackend($this->cacheBackend, 'local_task:en', array('local_task'));
   }
 
   /**