diff --git a/core/modules/datetime_range/src/Tests/Update/DatetimeRangeViewUpdateTest.php b/core/modules/datetime_range/tests/src/Functional/Update/DatetimeRangeViewUpdateTest.php
similarity index 62%
rename from core/modules/datetime_range/src/Tests/Update/DatetimeRangeViewUpdateTest.php
rename to core/modules/datetime_range/tests/src/Functional/Update/DatetimeRangeViewUpdateTest.php
index d81ed751..a63ac40 100644
--- a/core/modules/datetime_range/src/Tests/Update/DatetimeRangeViewUpdateTest.php
+++ b/core/modules/datetime_range/tests/src/Functional/Update/DatetimeRangeViewUpdateTest.php
@@ -1,8 +1,8 @@
 <?php
 
-namespace Drupal\datetime_range\Tests\Update;
+namespace Drupal\Tests\datetime_range\Functional\Update;
 
-use Drupal\system\Tests\Update\UpdatePathTestBase;
+use Drupal\FunctionalTests\Update\UpdatePathTestBase;
 use Drupal\views\Entity\View;
 
 /**
@@ -20,8 +20,8 @@ class DatetimeRangeViewUpdateTest extends UpdatePathTestBase {
    */
   protected function setDatabaseDumpFiles() {
     $this->databaseDumpFiles = [
-      __DIR__ . '/../../../../system/tests/fixtures/update/drupal-8.bare.standard.php.gz',
-      __DIR__ . '/../../../tests/fixtures/update/datetime_range-filter-values.php',
+      __DIR__ . '/../../../../../system/tests/fixtures/update/drupal-8.bare.standard.php.gz',
+      __DIR__ . '/../../../../tests/fixtures/update/datetime_range-filter-values.php',
     ];
   }
 
@@ -36,17 +36,17 @@ public function testViewsPostUpdateDateRangeFilterValues() {
 
     // Check pre-update filter values.
     $filter1 = $data['display']['default']['display_options']['filters']['field_range_value'];
-    $this->assertIdentical('string', $filter1['plugin_id']);
+    $this->assertSame('string', $filter1['plugin_id']);
 
     // Check pre-update filter with operator going to be mapped.
     $filter2 = $data['display']['default']['display_options']['filters']['field_range_end_value'];
-    $this->assertIdentical('string', $filter2['plugin_id']);
-    $this->assertIdentical('', $filter2['value']);
-    $this->assertIdentical('contains', $filter2['operator']);
+    $this->assertSame('string', $filter2['plugin_id']);
+    $this->assertSame('', $filter2['value']);
+    $this->assertSame('contains', $filter2['operator']);
 
     // Check pre-update sort values.
     $sort = $data['display']['default']['display_options']['sorts']['field_range_value'];
-    $this->assertIdentical('standard', $sort['plugin_id']);
+    $this->assertSame('standard', $sort['plugin_id']);
 
     $this->runUpdates();
 
@@ -56,19 +56,19 @@ public function testViewsPostUpdateDateRangeFilterValues() {
 
     // Check filter values.
     $filter1 = $data['display']['default']['display_options']['filters']['field_range_value'];
-    $this->assertIdentical('datetime', $filter1['plugin_id']);
-    $this->assertIdentical('2017', $filter1['value']['value']);
-    $this->assertIdentical('=', $filter1['operator']);
+    $this->assertSame('datetime', $filter1['plugin_id']);
+    $this->assertSame('2017', $filter1['value']['value']);
+    $this->assertSame('=', $filter1['operator']);
 
     // Check string to datetime operator/value mapping.
     $filter2 = $data['display']['default']['display_options']['filters']['field_range_end_value'];
-    $this->assertIdentical('datetime', $filter2['plugin_id']);
-    $this->assertIdentical('.*', $filter2['value']['value']);
-    $this->assertIdentical('regular_expression', $filter2['operator']);
+    $this->assertSame('datetime', $filter2['plugin_id']);
+    $this->assertSame('.*', $filter2['value']['value']);
+    $this->assertSame('regular_expression', $filter2['operator']);
 
     // Check sort values.
     $sort = $data['display']['default']['display_options']['sorts']['field_range_value'];
-    $this->assertIdentical('datetime', $sort['plugin_id']);
+    $this->assertSame('datetime', $sort['plugin_id']);
   }
 
 }