diff --git a/core/modules/search/lib/Drupal/search/Tests/SearchExpressionInsertExtractTest.php b/core/modules/search/tests/Drupal/search/Tests/SearchExpressionInsertExtractTest.php
similarity index 76%
rename from core/modules/search/lib/Drupal/search/Tests/SearchExpressionInsertExtractTest.php
rename to core/modules/search/tests/Drupal/search/Tests/SearchExpressionInsertExtractTest.php
index b7ea84a..fd9d99c 100644
--- a/core/modules/search/lib/Drupal/search/Tests/SearchExpressionInsertExtractTest.php
+++ b/core/modules/search/tests/Drupal/search/Tests/SearchExpressionInsertExtractTest.php
@@ -7,14 +7,14 @@
 
 namespace Drupal\search\Tests;
 
-use Drupal\simpletest\UnitTestBase;
+use Drupal\Tests\UnitTestCase;
 
 /**
  * Tests search_expression_insert() and search_expression_extract().
  *
  * @see http://drupal.org/node/419388 (issue)
  */
-class SearchExpressionInsertExtractTest extends UnitTestBase {
+class SearchExpressionInsertExtractTest extends UnitTestCase {
   public static function getInfo() {
     return array(
       'name' => 'Search expression insert/extract',
@@ -24,7 +24,7 @@ public static function getInfo() {
   }
 
   function setUp() {
-    drupal_load('module', 'search');
+    require __DIR__ . '/../../../../search.module';
     parent::setUp();
   }
 
@@ -47,10 +47,10 @@ function testInsertExtract() {
     foreach ($cases as $index => $case) {
       $after_insert = search_expression_insert($base_expression, $case[0], $case[1]);
       if (empty($case[2])) {
-        $this->assertEqual($after_insert, $base_expression, "Empty insert does not change expression in case $index");
+        $this->assertEquals($after_insert, $base_expression, "Empty insert does not change expression in case $index");
       }
       else {
-        $this->assertEqual($after_insert, $base_expression . ' ' . $case[2], "Insert added correct expression for case $index");
+        $this->assertEquals($after_insert, $base_expression . ' ' . $case[2], "Insert added correct expression for case $index");
       }
 
       $retrieved = search_expression_extract($after_insert, $case[0]);
@@ -58,11 +58,11 @@ function testInsertExtract() {
         $this->assertFalse(isset($retrieved), "Empty retrieval results in unset value in case $index");
       }
       else {
-        $this->assertEqual($retrieved, $case[3], "Value is retrieved for case $index");
+        $this->assertEquals($retrieved, $case[3], "Value is retrieved for case $index");
       }
 
       $after_clear = search_expression_insert($after_insert, $case[0]);
-      $this->assertEqual(trim($after_clear), $base_expression, "After clearing, base expression is restored for case $index");
+      $this->assertEquals(trim($after_clear), $base_expression, "After clearing, base expression is restored for case $index");
 
       $cleared = search_expression_extract($after_clear, $case[0]);
       $this->assertFalse(isset($cleared), "After clearing, value could not be retrieved for case $index");