diff --git a/core/tests/Drupal/FunctionalTests/Entity/EntityFormCorrectUserInputMappingOnFieldDeltaElementsTest.php b/core/tests/Drupal/FunctionalTests/Entity/EntityFormCorrectUserInputMappingOnFieldDeltaElementsTest.php
index 41286f5..4027971 100644
--- a/core/tests/Drupal/FunctionalTests/Entity/EntityFormCorrectUserInputMappingOnFieldDeltaElementsTest.php
+++ b/core/tests/Drupal/FunctionalTests/Entity/EntityFormCorrectUserInputMappingOnFieldDeltaElementsTest.php
@@ -1,20 +1,20 @@
 <?php
 
-namespace Drupal\system\Tests\Entity;
+namespace Drupal\FunctionalTests\Entity;
 
 use Drupal\Core\Entity\ContentEntityInterface;
 use Drupal\Core\Entity\ContentEntityStorageInterface;
 use Drupal\Core\Field\FieldStorageDefinitionInterface;
 use Drupal\field\Entity\FieldConfig;
 use Drupal\field\Entity\FieldStorageConfig;
-use Drupal\simpletest\WebTestBase;
+use Drupal\Tests\BrowserTestBase;
 
 /**
  * Tests the correct mapping of user input on the correct field delta elements.
  *
  * @group Entity
  */
-class EntityFormCorrectUserInputMappingOnFieldDeltaElementsTest extends WebTestBase {
+class EntityFormCorrectUserInputMappingOnFieldDeltaElementsTest extends BrowserTestBase  {
 
   /**
    * The ID of the type of the entity under test.
@@ -31,11 +31,9 @@ class EntityFormCorrectUserInputMappingOnFieldDeltaElementsTest extends WebTestB
   protected $fieldName;
 
   /**
-   * Modules to enable.
-   *
-   * @var array
+   * {@inheritdoc}
    */
-  public static $modules = array('entity_test');
+  public static $modules = ['entity_test'];
 
   /**
    * {@inheritdoc}
@@ -105,7 +103,7 @@ public function testCorrectUserInputMappingOnComplexFields() {
 
     // Assert that after rearranging the field items the user input will be
     // mapped on the correct delta field items.
-    $this->assertEqual($entity->get($this->fieldName)->getValue(), [
+    $this->assertEquals($entity->get($this->fieldName)->getValue(), [
       ['shape' => 'circle', 'color' => 'blue'],
       ['shape' => 'rectangle', 'color' => 'green'],
     ]);