diff --git a/core/lib/Drupal/Core/Condition/ConditionManager.php b/core/lib/Drupal/Core/Condition/ConditionManager.php
index c1e309a..0999b37 100644
--- a/core/lib/Drupal/Core/Condition/ConditionManager.php
+++ b/core/lib/Drupal/Core/Condition/ConditionManager.php
@@ -8,7 +8,6 @@
 namespace Drupal\Core\Condition;
 
 use Drupal\Core\Cache\CacheBackendInterface;
-use Drupal\Core\Executable\ExecutableManagerInterface;
 use Drupal\Core\Executable\ExecutableInterface;
 use Drupal\Core\Extension\ModuleHandlerInterface;
 use Drupal\Core\Plugin\Context\ContextAwarePluginManagerTrait;
@@ -23,7 +22,7 @@
  *
  * @ingroup plugin_api
  */
-class ConditionManager extends DefaultPluginManager implements ExecutableManagerInterface {
+class ConditionManager extends DefaultPluginManager implements ConditionManagerInterface {
 
   use ContextAwarePluginManagerTrait;
 
@@ -46,7 +45,7 @@ public function __construct(\Traversable $namespaces, CacheBackendInterface $cac
   }
 
   /**
-   * Override of Drupal\Component\Plugin\PluginManagerBase::createInstance().
+   * {@inheritdoc}
    */
   public function createInstance($plugin_id, array $configuration = array()) {
     $plugin = $this->factory->createInstance($plugin_id, $configuration);
@@ -62,9 +61,10 @@ public function createInstance($plugin_id, array $configuration = array()) {
   }
 
   /**
-   * Implements Drupal\Core\Executable\ExecutableManagerInterface::execute().
+   * {@inheritdoc}
    */
   public function execute(ExecutableInterface $condition) {
+    /** @var \Drupal\Core\Condition\ConditionInterface $condition */
     $result = $condition->evaluate();
     return $condition->isNegated() ? !$result : $result;
   }
diff --git a/core/lib/Drupal/Core/Condition/ConditionManagerInterface.php b/core/lib/Drupal/Core/Condition/ConditionManagerInterface.php
new file mode 100644
index 0000000..7b58402
--- /dev/null
+++ b/core/lib/Drupal/Core/Condition/ConditionManagerInterface.php
@@ -0,0 +1,19 @@
+<?php
+
+/**
+ * @file
+ * Contains \Drupal\Core\Condition\ConditionManagerInterface.
+ */
+
+namespace Drupal\Core\Condition;
+
+use Drupal\Component\Plugin\PluginManagerInterface;
+use Drupal\Core\Executable\ExecutableManagerInterface;
+use Drupal\Core\Plugin\Context\ContextAwarePluginManagerInterface;
+
+/**
+ * Provides an interface for a plugin manager for condition plugins.
+ */
+interface ConditionManagerInterface extends PluginManagerInterface, ExecutableManagerInterface, ContextAwarePluginManagerInterface {
+
+}
diff --git a/core/lib/Drupal/Core/Condition/ConditionPluginBase.php b/core/lib/Drupal/Core/Condition/ConditionPluginBase.php
index 4b4a07b..ff569ae 100644
--- a/core/lib/Drupal/Core/Condition/ConditionPluginBase.php
+++ b/core/lib/Drupal/Core/Condition/ConditionPluginBase.php
@@ -7,6 +7,7 @@
 
 namespace Drupal\Core\Condition;
 
+use Drupal\Core\Executable\ExecutableManagerInterface;
 use Drupal\Core\Executable\ExecutablePluginBase;
 use Drupal\Core\Form\FormStateInterface;
 use Drupal\Core\Plugin\ContextAwarePluginAssignmentTrait;
diff --git a/core/modules/block/src/BlockAccessControlHandler.php b/core/modules/block/src/BlockAccessControlHandler.php
index 6160f84..720aa6f 100644
--- a/core/modules/block/src/BlockAccessControlHandler.php
+++ b/core/modules/block/src/BlockAccessControlHandler.php
@@ -10,11 +10,11 @@
 use Drupal\Component\Plugin\Exception\ContextException;
 use Drupal\Core\Access\AccessResult;
 use Drupal\Core\Condition\ConditionAccessResolverTrait;
+use Drupal\Core\Condition\ConditionManagerInterface;
 use Drupal\Core\Entity\EntityAccessControlHandler;
 use Drupal\Core\Entity\EntityHandlerInterface;
 use Drupal\Core\Entity\EntityInterface;
 use Drupal\Core\Entity\EntityTypeInterface;
-use Drupal\Core\Executable\ExecutableManagerInterface;
 use Drupal\Core\Plugin\Context\ContextHandlerInterface;
 use Drupal\Core\Plugin\ContextAwarePluginInterface;
 use Drupal\Core\Session\AccountInterface;
@@ -32,7 +32,7 @@ class BlockAccessControlHandler extends EntityAccessControlHandler implements En
   /**
    * The condition plugin manager.
    *
-   * @var \Drupal\Core\Executable\ExecutableManagerInterface
+   * @var \Drupal\Core\Condition\ConditionManagerInterface
    */
   protected $manager;
 
@@ -59,12 +59,12 @@ public static function createInstance(ContainerInterface $container, EntityTypeI
    *
    * @param \Drupal\Core\Entity\EntityTypeInterface $entity_type
    *   The entity type definition.
-   * @param \Drupal\Core\Executable\ExecutableManagerInterface $manager
+   * @param \Drupal\Core\Condition\ConditionManagerInterface $manager
    *   The ConditionManager for checking visibility of blocks.
    * @param \Drupal\Core\Plugin\Context\ContextHandlerInterface $context_handler
    *   The ContextHandler for applying contexts to conditions properly.
    */
-  public function __construct(EntityTypeInterface $entity_type, ExecutableManagerInterface $manager, ContextHandlerInterface $context_handler) {
+  public function __construct(EntityTypeInterface $entity_type, ConditionManagerInterface $manager, ContextHandlerInterface $context_handler) {
     parent::__construct($entity_type);
     $this->manager = $manager;
     $this->contextHandler = $context_handler;
diff --git a/core/modules/block/src/BlockForm.php b/core/modules/block/src/BlockForm.php
index 23d6ca0..653b2da 100644
--- a/core/modules/block/src/BlockForm.php
+++ b/core/modules/block/src/BlockForm.php
@@ -9,9 +9,9 @@
 
 use Drupal\block\Event\BlockContextEvent;
 use Drupal\block\Event\BlockEvents;
+use Drupal\Core\Condition\ConditionManagerInterface;
 use Drupal\Core\Entity\EntityForm;
 use Drupal\Core\Entity\EntityManagerInterface;
-use Drupal\Core\Executable\ExecutableManagerInterface;
 use Drupal\Core\Form\FormState;
 use Drupal\Core\Form\FormStateInterface;
 use Drupal\Core\Language\LanguageManagerInterface;
@@ -41,7 +41,7 @@ class BlockForm extends EntityForm {
   /**
    * The condition plugin manager.
    *
-   * @var \Drupal\Core\Condition\ConditionManager
+   * @var \Drupal\Core\Condition\ConditionManagerInterface
    */
   protected $manager;
 
@@ -64,14 +64,14 @@ class BlockForm extends EntityForm {
    *
    * @param \Drupal\Core\Entity\EntityManagerInterface $entity_manager
    *   The entity manager.
-   * @param \Drupal\Core\Executable\ExecutableManagerInterface $manager
+   * @param \Drupal\Core\Condition\ConditionManagerInterface $manager
    *   The ConditionManager for building the visibility UI.
    * @param \Symfony\Component\EventDispatcher\EventDispatcherInterface $dispatcher
    *   The EventDispatcher for gathering administrative contexts.
    * @param \Drupal\Core\Language\LanguageManagerInterface $language
    *   The language manager.
    */
-  public function __construct(EntityManagerInterface $entity_manager, ExecutableManagerInterface $manager, EventDispatcherInterface $dispatcher, LanguageManagerInterface $language) {
+  public function __construct(EntityManagerInterface $entity_manager, ConditionManagerInterface $manager, EventDispatcherInterface $dispatcher, LanguageManagerInterface $language) {
     $this->storage = $entity_manager->getStorage('block');
     $this->manager = $manager;
     $this->dispatcher = $dispatcher;
diff --git a/core/modules/block/src/Entity/Block.php b/core/modules/block/src/Entity/Block.php
index 0edc961..d522f4e 100644
--- a/core/modules/block/src/Entity/Block.php
+++ b/core/modules/block/src/Entity/Block.php
@@ -109,7 +109,7 @@ class Block extends ConfigEntityBase implements BlockInterface, EntityWithPlugin
   /**
    * The condition plugin manager.
    *
-   * @var \Drupal\Core\Executable\ExecutableManagerInterface
+   * @var \Drupal\Core\Condition\ConditionManagerInterface
    */
   protected $conditionPluginManager;
 
@@ -272,7 +272,7 @@ public function getVisibilityCondition($instance_id) {
   /**
    * Gets the condition plugin manager.
    *
-   * @return \Drupal\Core\Executable\ExecutableManagerInterface
+   * @return \Drupal\Core\Condition\ConditionManagerInterface
    *   The condition plugin manager.
    */
   protected function conditionPluginManager() {
diff --git a/core/modules/block/tests/src/Unit/BlockFormTest.php b/core/modules/block/tests/src/Unit/BlockFormTest.php
index 4f563db..60671c8 100644
--- a/core/modules/block/tests/src/Unit/BlockFormTest.php
+++ b/core/modules/block/tests/src/Unit/BlockFormTest.php
@@ -19,7 +19,7 @@ class BlockFormTest extends UnitTestCase {
   /**
    * The condition plugin manager.
    *
-   * @var \Drupal\Core\Executable\ExecutableManagerInterface|\PHPUnit_Framework_MockObject_MockObject
+   * @var \Drupal\Core\Condition\ConditionManagerInterface|\PHPUnit_Framework_MockObject_MockObject
    */
   protected $conditionManager;
 
@@ -57,7 +57,7 @@ class BlockFormTest extends UnitTestCase {
   protected function setUp() {
     parent::setUp();
 
-    $this->conditionManager = $this->getMock('Drupal\Core\Executable\ExecutableManagerInterface');
+    $this->conditionManager = $this->getMock('Drupal\Core\Condition\ConditionManagerInterface');
     $this->language = $this->getMock('Drupal\Core\Language\LanguageManagerInterface');
     $this->dispatcher = $this->getMock('Symfony\Component\EventDispatcher\EventDispatcherInterface');
 
diff --git a/core/modules/views/tests/src/Unit/Plugin/Block/ViewsBlockTest.php b/core/modules/views/tests/src/Unit/Plugin/Block/ViewsBlockTest.php
index 2c03f23..caebcb8 100644
--- a/core/modules/views/tests/src/Unit/Plugin/Block/ViewsBlockTest.php
+++ b/core/modules/views/tests/src/Unit/Plugin/Block/ViewsBlockTest.php
@@ -7,7 +7,6 @@
 
 namespace Drupal\Tests\views\Unit\Plugin\Block {
 
-use Drupal\Core\DependencyInjection\ContainerBuilder;
 use Drupal\Tests\UnitTestCase;
 use Drupal\views\Plugin\Block\ViewsBlock;
 
@@ -61,14 +60,7 @@ class ViewsBlockTest extends UnitTestCase {
    * {@inheritdoc}
    */
   protected function setUp() {
-    parent::setUp(); // TODO: Change the autogenerated stub
-    $condition_plugin_manager = $this->getMock('Drupal\Core\Executable\ExecutableManagerInterface');
-    $condition_plugin_manager->expects($this->any())
-      ->method('getDefinitions')
-      ->will($this->returnValue(array()));
-    $container = new ContainerBuilder();
-    $container->set('plugin.manager.condition', $condition_plugin_manager);
-    \Drupal::setContainer($container);
+    parent::setUp();
 
     $this->executable = $this->getMockBuilder('Drupal\views\ViewExecutable')
       ->disableOriginalConstructor()