diff --git a/core/modules/system/lib/Drupal/system/Tests/System/ExceptionControllerTest.php b/core/tests/Drupal/Tests/Core/Controller/ExceptionControllerTest.php
similarity index 53%
rename from core/modules/system/lib/Drupal/system/Tests/System/ExceptionControllerTest.php
rename to core/tests/Drupal/Tests/Core/Controller/ExceptionControllerTest.php
index 939432d16c81..020daab9866d 100644
--- a/core/modules/system/lib/Drupal/system/Tests/System/ExceptionControllerTest.php
+++ b/core/tests/Drupal/Tests/Core/Controller/ExceptionControllerTest.php
@@ -1,21 +1,26 @@
 <?php
 
 /**
- * Definition of Drupal\system\Tests\System\ExceptionControllerTest.
+ * @file
+ * Contains \Drupal\Tests\Core\Controller\ExceptionControllerTest
  */
 
 namespace Drupal\system\Tests\System;
 
-use \Drupal\Core\ContentNegotiation;
-use \Drupal\Core\Controller\ExceptionController;
-use \Drupal\simpletest\UnitTestBase;
-use \Symfony\Component\HttpFoundation\Request;
-use \Symfony\Component\HttpKernel\Exception\FlattenException;
+use Drupal\Core\ContentNegotiation;
+use Drupal\Core\Controller\ExceptionController;
+use Drupal\Tests\UnitTestCase;
+use Symfony\Component\HttpFoundation\Request;
+use Symfony\Component\HttpKernel\Exception\FlattenException;
 
 /**
  * Tests exception controller.
+ *
+ * @see \Drupal\Core\Controller\ExceptionController
+ *
+ * @group Drupal
  */
-class ExceptionControllerTest extends UnitTestBase {
+class ExceptionControllerTest extends UnitTestCase {
 
   public static function getInfo() {
     return array(
@@ -33,7 +38,8 @@ class ExceptionControllerTest extends UnitTestBase {
     $flat_exception = FlattenException::create($exception, 405);
     $exception_controller = new ExceptionController(new ContentNegotiation());
     $response = $exception_controller->execute($flat_exception, new Request());
-    $this->assertEqual($response->getStatusCode(), 405, 'HTTP status of response is correct.');
-    $this->assertEqual($response->getContent(), 'Method Not Allowed', 'HTTP response body is correct.');
+    $this->assertEquals($response->getStatusCode(), 405, 'HTTP status of response is correct.');
+    $this->assertEquals($response->getContent(), 'Method Not Allowed', 'HTTP response body is correct.');
   }
+
 }