diff --git a/core/tests/Drupal/Tests/Core/DrupalContainerNotInitializedTest.php b/core/tests/Drupal/Tests/Core/DrupalContainerNotInitializedTest.php
deleted file mode 100644
index 9bdf238..0000000
--- a/core/tests/Drupal/Tests/Core/DrupalContainerNotInitializedTest.php
+++ /dev/null
@@ -1,112 +0,0 @@
-<?php
-
-/**
- * @file
- * Contains \Drupal\Tests\Core\DrupalTest.
- */
-
-namespace Drupal\Tests\Core;
-
-use Drupal\Core\DependencyInjection\ContainerNotInitializedException;
-use Drupal\Core\Url;
-
-/**
- * Tests the case where Drupal::$container is not initialized.
- *
- * @group DrupalTest
- */
-class DrupalContainerNotInitializedTest extends \PHPUnit_Framework_TestCase {
-
-  /**
-   * Tests the case where \Drupal::$container is not initialized.
-   *
-   * @dataProvider methodsWithExceptionProvider
-   *
-   * @param string $method
-   *   The static method to call on \Drupal::
-   * @param array $args
-   *   Arguments to pass into \Drupal::$method(..)
-   *
-   * @expectedException \Drupal\Core\DependencyInjection\ContainerNotInitializedException
-   * @expectedExceptionMessage \Drupal::$container is not initialized yet. \Drupal::setContainer() must be called with a real container.
-   */
-  public function testContainerNotInitializedException($method, $args = array()) {
-    call_user_func_array(['Drupal', $method], $args);
-  }
-
-  /**
-   * Tests the case where \Drupal::$container was unset.
-   *
-   * @dataProvider methodsWithExceptionProvider
-   *
-   * @param string $method
-   *   The static method to call on \Drupal::
-   * @param array $args
-   *   Arguments to pass into \Drupal::$method(..)
-   *
-   * @expectedException \Drupal\Core\DependencyInjection\ContainerNotInitializedException
-   * @expectedExceptionMessage \Drupal::$container is not initialized yet. \Drupal::setContainer() must be called with a real container.
-   */
-  public function testUnsetContainerException($method, $args = array()) {
-    \Drupal::unsetContainer();
-    call_user_func_array(['Drupal', $method], $args);
-  }
-
-  /**
-   * Data provider for two methods, see "@see" below.
-   *
-   * @return array[]
-   *
-   * @see testContainerNotInitializedException()
-   * @see testUnsetContainerException()
-   */
-  public function methodsWithExceptionProvider() {
-    return array(
-      ['service', ['test_service']],
-      ['request'],
-      ['requestStack'],
-      ['routeMatch'],
-      ['currentUser'],
-      ['entityManager'],
-      ['database'],
-      ['cache', ['test']],
-      ['keyValueExpirable', ['test_collection']],
-      ['lock'],
-      ['config', ['test_config']],
-      ['configFactory'],
-      ['queue', ['test_queue', TRUE]],
-      ['keyValue', ['test_collection']],
-      ['state'],
-      ['httpClient'],
-      ['entityQuery', ['OR']],
-      ['entityQueryAggregate', ['test_entity', 'OR']],
-      ['flood', ['test_service']],
-      ['moduleHandler', ['test_service']],
-      ['typedDataManager', ['test_service']],
-      ['token'],
-      ['urlGenerator'],
-      ['url', ['test_route']],
-      ['linkGenerator'],
-      ['l', ['Test title', new Url('test_route')]],
-      ['translation'],
-      ['languageManager'],
-      ['csrfToken'],
-      ['transliteration'],
-      ['formBuilder'],
-      ['theme'],
-      ['isConfigSyncing'],
-      ['logger', ['test_channel']],
-      ['menuTree'],
-      ['pathValidator'],
-      ['accessManager'],
-    );
-  }
-
-  /**
-   * @expectedException \Drupal\Core\DependencyInjection\ContainerNotInitializedException
-   */
-  public function testGetContainerException() {
-    \Drupal::getContainer(TRUE);
-  }
-
-}
diff --git a/core/tests/Drupal/Tests/Core/DrupalTest.php b/core/tests/Drupal/Tests/Core/DrupalTest.php
index 2f300a3..315ce38 100644
--- a/core/tests/Drupal/Tests/Core/DrupalTest.php
+++ b/core/tests/Drupal/Tests/Core/DrupalTest.php
@@ -26,7 +26,11 @@ class DrupalTest extends UnitTestCase {
    */
   protected $container;
 
+  /**
+   * {@inheritdoc}
+   */
   protected function setUp() {
+    parent::setUp();
     $this->container = $this->getMockBuilder('Symfony\Component\DependencyInjection\ContainerBuilder')
       ->setMethods(array('get'))
       ->getMock();
@@ -43,6 +47,16 @@ public function testSetContainer() {
   }
 
   /**
+   * @covers ::getContainer
+   *
+   * @expectedException \Drupal\Core\DependencyInjection\ContainerNotInitializedException
+   * @expectedExceptionMessage \Drupal::$container is not initialized yet. \Drupal::setContainer() must be called with a real container.
+   */
+  public function testGetContainerException() {
+    \Drupal::getContainer();
+  }
+
+  /**
    * Tests the service() method.
    *
    * @covers ::service