diff --git a/core/modules/system/lib/Drupal/system/Tests/Bootstrap/MiscUnitTest.php b/core/tests/Drupal/Tests/Core/Bootstrap/MiscUnitTest.php
similarity index 82%
rename from core/modules/system/lib/Drupal/system/Tests/Bootstrap/MiscUnitTest.php
rename to core/tests/Drupal/Tests/Core/Bootstrap/MiscUnitTest.php
index f94c419..3bad941 100644
--- a/core/modules/system/lib/Drupal/system/Tests/Bootstrap/MiscUnitTest.php
+++ b/core/tests/Drupal/Tests/Core/Bootstrap/MiscUnitTest.php
@@ -5,14 +5,14 @@
  * Definition of Drupal\system\Tests\Bootstrap\MiscUnitTest.
  */
 
-namespace Drupal\system\Tests\Bootstrap;
+namespace Drupal\Tests\Core\Bootstrap;
 
-use Drupal\simpletest\UnitTestBase;
+use Drupal\Tests\UnitTestCase;
 
 /**
  * Tests miscellaneous functions in bootstrap.inc.
  */
-class MiscUnitTest extends UnitTestBase {
+class MiscUnitTest extends UnitTestCase {
 
   public static function getInfo() {
     return array(
@@ -22,6 +22,12 @@ public static function getInfo() {
     );
   }
 
+  function setUp() {
+    // @todo think about removing this and converting to components.
+    // Some procedural functions called from within require common.inc.
+    require_once __DIR__ . '/../../../../../includes/common.inc';
+  }
+
   /**
    * Tests that the drupal_check_memory_limit() function works as expected.
    */
diff --git a/core/modules/system/lib/Drupal/system/Tests/Bootstrap/OverrideServerVariablesUnitTest.php b/core/tests/Drupal/Tests/Core/Bootstrap/OverrideServerVariablesUnitTest.php
similarity index 89%
rename from core/modules/system/lib/Drupal/system/Tests/Bootstrap/OverrideServerVariablesUnitTest.php
rename to core/tests/Drupal/Tests/Core/Bootstrap/OverrideServerVariablesUnitTest.php
index 0717b10..8ae83d5 100644
--- a/core/modules/system/lib/Drupal/system/Tests/Bootstrap/OverrideServerVariablesUnitTest.php
+++ b/core/tests/Drupal/Tests/Core/Bootstrap/OverrideServerVariablesUnitTest.php
@@ -5,14 +5,14 @@
  * Definition of Drupal\system\Tests\Bootstrap\OverrideServerVariablesUnitTest.
  */
 
-namespace Drupal\system\Tests\Bootstrap;
+namespace Drupal\Tests\Core\Bootstrap;
 
-use Drupal\simpletest\UnitTestBase;
+use Drupal\Tests\UnitTestCase;
 
 /**
  * Tests for overriding server variables via the API.
  */
-class OverrideServerVariablesUnitTest extends UnitTestBase {
+class OverrideServerVariablesUnitTest extends UnitTestCase {
   public static function getInfo() {
     return array(
       'name' => 'Overriding server variables',
@@ -47,7 +47,7 @@ function testDrupalOverrideServerVariablesProvidedURL() {
       // $_SERVER variables were modified correctly.
       drupal_override_server_variables(array('url' => $url));
       foreach ($expected_server_values as $key => $value) {
-        $this->assertIdentical($_SERVER[$key], $value);
+        $this->assertSame($_SERVER[$key], $value);
       }
       // Restore the original value of $_SERVER.
       $_SERVER = $original_server;
diff --git a/core/modules/system/lib/Drupal/system/Tests/Bootstrap/ResettableStaticUnitTest.php b/core/tests/Drupal/Tests/Core/Bootstrap/ResettableStaticUnitTest.php
similarity index 61%
rename from core/modules/system/lib/Drupal/system/Tests/Bootstrap/ResettableStaticUnitTest.php
rename to core/tests/Drupal/Tests/Core/Bootstrap/ResettableStaticUnitTest.php
index 23a84b8..1f0ed10 100644
--- a/core/modules/system/lib/Drupal/system/Tests/Bootstrap/ResettableStaticUnitTest.php
+++ b/core/tests/Drupal/Tests/Core/Bootstrap/ResettableStaticUnitTest.php
@@ -5,14 +5,14 @@
  * Definition of Drupal\system\Tests\Bootstrap\ResettableStaticUnitTest.
  */
 
-namespace Drupal\system\Tests\Bootstrap;
+namespace Drupal\Tests\Core\Bootstrap;
 
-use Drupal\simpletest\UnitTestBase;
+use Drupal\Tests\UnitTestCase;
 
 /**
  * Tests that resetting static variables works.
  */
-class ResettableStaticUnitTest extends UnitTestBase {
+class ResettableStaticUnitTest extends UnitTestCase {
 
   public static function getInfo() {
     return array(
@@ -31,21 +31,21 @@ public static function getInfo() {
   function testDrupalStatic() {
     $name = __CLASS__ . '_' . __METHOD__;
     $var = &drupal_static($name, 'foo');
-    $this->assertEqual($var, 'foo', 'Variable returned by drupal_static() was set to its default.');
+    $this->assertEquals($var, 'foo', 'Variable returned by drupal_static() was set to its default.');
 
     // Call the specific reset and the global reset each twice to ensure that
     // multiple resets can be issued without odd side effects.
     $var = 'bar';
     drupal_static_reset($name);
-    $this->assertEqual($var, 'foo', 'Variable was reset after first invocation of name-specific reset.');
+    $this->assertEquals($var, 'foo', 'Variable was reset after first invocation of name-specific reset.');
     $var = 'bar';
     drupal_static_reset($name);
-    $this->assertEqual($var, 'foo', 'Variable was reset after second invocation of name-specific reset.');
+    $this->assertEquals($var, 'foo', 'Variable was reset after second invocation of name-specific reset.');
     $var = 'bar';
     drupal_static_reset();
-    $this->assertEqual($var, 'foo', 'Variable was reset after first invocation of global reset.');
+    $this->assertEquals($var, 'foo', 'Variable was reset after first invocation of global reset.');
     $var = 'bar';
     drupal_static_reset();
-    $this->assertEqual($var, 'foo', 'Variable was reset after second invocation of global reset.');
+    $this->assertEquals($var, 'foo', 'Variable was reset after second invocation of global reset.');
   }
 }
diff --git a/core/tests/bootstrap.php b/core/tests/bootstrap.php
index 08d8871..180a0cb 100644
--- a/core/tests/bootstrap.php
+++ b/core/tests/bootstrap.php
@@ -18,8 +18,8 @@
 }
 
 require __DIR__ . "/../../core/lib/Drupal.php";
-// Look into removing this later.
-define('REQUEST_TIME', (int) $_SERVER['REQUEST_TIME']);
+// @todo Look into removing this later.
+require_once __DIR__ . '/../includes/bootstrap.inc';
 
 // Set sane locale settings, to ensure consistent string, dates, times and
 // numbers handling.