diff --git a/core/modules/update/lib/Drupal/update/Tests/UpdateCoreUnitTest.php b/core/modules/update/tests/Drupal/update/Tests/UpdateCoreUnitTest.php
similarity index 80%
rename from core/modules/update/lib/Drupal/update/Tests/UpdateCoreUnitTest.php
rename to core/modules/update/tests/Drupal/update/Tests/UpdateCoreUnitTest.php
index ac26bd7..1dbedd8 100644
--- a/core/modules/update/lib/Drupal/update/Tests/UpdateCoreUnitTest.php
+++ b/core/modules/update/tests/Drupal/update/Tests/UpdateCoreUnitTest.php
@@ -7,12 +7,12 @@
 
 namespace Drupal\update\Tests;
 
-use Drupal\simpletest\UnitTestBase;
+use Drupal\Tests\UnitTestCase;
 
 /**
  * Tests update functionality unrelated to the database.
  */
-class UpdateCoreUnitTest extends UnitTestBase {
+class UpdateCoreUnitTest extends UnitTestCase {
 
   /**
    * Modules to enable.
@@ -31,7 +31,7 @@ public static function getInfo() {
 
   function setUp() {
     parent::setUp();
-    module_load_include('inc', 'update', 'update.fetch');
+    require __DIR__ . '/../../../../update.fetch.inc';
   }
 
   /**
@@ -47,14 +47,14 @@ function testUpdateBuildFetchUrl() {
     $site_key = '';
     $expected = 'http://www.example.com/' . $project['name'] . '/' . DRUPAL_CORE_COMPATIBILITY;
     $url = _update_build_fetch_url($project, $site_key);
-    $this->assertEqual($url, $expected, "'$url' when no site_key provided should be '$expected'.");
+    $this->assertEquals($url, $expected, "'$url' when no site_key provided should be '$expected'.");
 
     //For disabled projects it shouldn't add the site key either.
     $site_key = 'site_key';
     $project['project_type'] = 'disabled';
     $expected = 'http://www.example.com/' . $project['name'] . '/' . DRUPAL_CORE_COMPATIBILITY;
     $url = _update_build_fetch_url($project, $site_key);
-    $this->assertEqual($url, $expected, "'$url' should be '$expected' for disabled projects.");
+    $this->assertEquals($url, $expected, "'$url' should be '$expected' for disabled projects.");
 
     //for enabled projects, adding the site key
     $project['project_type'] = '';
@@ -62,7 +62,7 @@ function testUpdateBuildFetchUrl() {
     $expected .= '?site_key=site_key';
     $expected .= '&list=' . rawurlencode('module1,module2');
     $url = _update_build_fetch_url($project, $site_key);
-    $this->assertEqual($url, $expected, "When site_key provided, '$url' should be '$expected'.");
+    $this->assertEquals($url, $expected, "When site_key provided, '$url' should be '$expected'.");
 
     // http://drupal.org/node/1481156 test incorrect logic when URL contains
     // a question mark.
@@ -71,7 +71,7 @@ function testUpdateBuildFetchUrl() {
     $expected .= '&site_key=site_key';
     $expected .= '&list=' . rawurlencode('module1,module2');
     $url = _update_build_fetch_url($project, $site_key);
-    $this->assertEqual($url, $expected, "When ? is present, '$url' should be '$expected'.");
+    $this->assertEquals($url, $expected, "When ? is present, '$url' should be '$expected'.");
 
   }
 }