diff --git a/core/core.services.yml b/core/core.services.yml
index c73db7f11d79e7a58d81b6e9b1b6a90ebc260b4e..bb4b1bcede8dc49f8daeb96b46c3687239e61ac5 100644
--- a/core/core.services.yml
+++ b/core/core.services.yml
@@ -353,6 +353,7 @@ services:
     arguments: ['@database']
   plugin.manager.condition:
     class: Drupal\Core\Condition\ConditionManager
+    arguments: ['%container.namespaces%']
   kernel_destruct_subscriber:
     class: Drupal\Core\EventSubscriber\KernelDestructionSubscriber
     tags:
diff --git a/core/modules/node/lib/Drupal/node/Tests/Condition/NodeConditionTest.php b/core/modules/node/lib/Drupal/node/Tests/Condition/NodeConditionTest.php
index a8058f7806176bf7ee6fc2d78c41cc0dc52b5cf9..b1863213fffc2a01f7e7913ebc196d0b827a6bb2 100644
--- a/core/modules/node/lib/Drupal/node/Tests/Condition/NodeConditionTest.php
+++ b/core/modules/node/lib/Drupal/node/Tests/Condition/NodeConditionTest.php
@@ -8,7 +8,6 @@
 namespace Drupal\node\Tests\Condition;
 
 use Drupal\simpletest\DrupalUnitTestBase;
-use Drupal\Core\Condition\ConditionManager;
 
 /**
  * Tests the node conditions.
@@ -38,7 +37,7 @@ protected function setUp() {
    * Tests conditions.
    */
   function testConditions() {
-    $manager = new ConditionManager($this->container->getParameter('container.namespaces'));
+    $manager = $this->container->get('plugin.manager.condition');
 
     // Get some nodes of various types to check against.
     $page = entity_create('node', array('type' => 'page', 'title' => $this->randomName()));