diff --git a/core/modules/hal/tests/src/Unit/FieldItemNormalizerDenormalizeExceptionsUnitTest.php b/core/modules/hal/tests/src/Unit/FieldItemNormalizerDenormalizeExceptionsUnitTest.php
deleted file mode 100644
index 33fa4dc33b..0000000000
--- a/core/modules/hal/tests/src/Unit/FieldItemNormalizerDenormalizeExceptionsUnitTest.php
+++ /dev/null
@@ -1,30 +0,0 @@
-<?php
-
-namespace Drupal\Tests\hal\Unit;
-
-use Drupal\hal\Normalizer\FieldItemNormalizer;
-use Symfony\Component\Serializer\Exception\InvalidArgumentException;
-
-/**
- * @coversDefaultClass \Drupal\hal\Normalizer\FieldItemNormalizer
- * @group hal
- */
-class FieldItemNormalizerDenormalizeExceptionsUnitTest extends NormalizerDenormalizeExceptionsUnitTestBase {
-
-  /**
-   * Tests that the FieldItemNormalizer::denormalize() throws proper exceptions.
-   *
-   * @param array $context
-   *   Context for FieldItemNormalizer::denormalize().
-   *
-   * @dataProvider providerNormalizerDenormalizeExceptions
-   */
-  public function testFieldItemNormalizerDenormalizeExceptions($context) {
-    $field_item_normalizer = new FieldItemNormalizer();
-    $data = [];
-    $class = [];
-    $this->expectException(InvalidArgumentException::class);
-    $field_item_normalizer->denormalize($data, $class, NULL, $context);
-  }
-
-}
diff --git a/core/modules/hal/tests/src/Unit/FieldNormalizerDenormalizeExceptionsTest.php b/core/modules/hal/tests/src/Unit/FieldNormalizerDenormalizeExceptionsTest.php
new file mode 100644
index 0000000000..cec2a49eee
--- /dev/null
+++ b/core/modules/hal/tests/src/Unit/FieldNormalizerDenormalizeExceptionsTest.php
@@ -0,0 +1,66 @@
+<?php
+
+namespace Drupal\Tests\hal\Unit;
+
+use Drupal\hal\Normalizer\FieldItemNormalizer;
+use Drupal\hal\Normalizer\FieldNormalizer;
+use Drupal\Tests\UnitTestCase;
+use Symfony\Component\Serializer\Exception\InvalidArgumentException;
+
+/**
+ * Tests the exceptions thrown by FieldNormalizer and FieldItemNormalizer.
+ *
+ * @group hal
+ */
+class FieldNormalizerDenormalizeExceptionsTest extends UnitTestCase {
+
+  /**
+   * Tests that the FieldNormalizer::denormalize() throws proper exceptions.
+   *
+   * @covers \Drupal\hal\Normalizer\FieldNormalizer
+   *
+   * @dataProvider providerNormalizerDenormalizeExceptions
+   */
+  public function testFieldNormalizerDenormalizeExceptions($context) {
+    $field_item_normalizer = new FieldNormalizer();
+    $data = [];
+    $class = [];
+    $this->expectException(InvalidArgumentException::class);
+    $field_item_normalizer->denormalize($data, $class, NULL, $context);
+  }
+
+  /**
+   * Tests that the FieldItemNormalizer::denormalize() throws proper exceptions.
+   *
+   * @covers \Drupal\hal\Normalizer\FieldItemNormalizer
+   *
+   * @dataProvider providerNormalizerDenormalizeExceptions
+   */
+  public function testFieldItemNormalizerDenormalizeExceptions($context) {
+    $field_item_normalizer = new FieldItemNormalizer();
+    $data = [];
+    $class = [];
+    $this->expectException(InvalidArgumentException::class);
+    $field_item_normalizer->denormalize($data, $class, NULL, $context);
+  }
+
+  /**
+   * Provides data for field normalization tests.
+   *
+   * @return array
+   *   The context of the normalizer.
+   */
+  public function providerNormalizerDenormalizeExceptions() {
+    $mock = $this->getMockBuilder('\Drupal\Core\Field\Plugin\DataType\FieldItem')
+      ->setMethods(['getParent'])
+      ->getMock();
+    $mock->expects($this->any())
+      ->method('getParent')
+      ->will($this->returnValue(NULL));
+    return [
+      [[]],
+      [['target_instance' => $mock]],
+    ];
+  }
+
+}
diff --git a/core/modules/hal/tests/src/Unit/FieldNormalizerDenormalizeExceptionsUnitTest.php b/core/modules/hal/tests/src/Unit/FieldNormalizerDenormalizeExceptionsUnitTest.php
deleted file mode 100644
index 2ac34ebbbd..0000000000
--- a/core/modules/hal/tests/src/Unit/FieldNormalizerDenormalizeExceptionsUnitTest.php
+++ /dev/null
@@ -1,30 +0,0 @@
-<?php
-
-namespace Drupal\Tests\hal\Unit;
-
-use Drupal\hal\Normalizer\FieldNormalizer;
-use Symfony\Component\Serializer\Exception\InvalidArgumentException;
-
-/**
- * @coversDefaultClass \Drupal\hal\Normalizer\FieldNormalizer
- * @group hal
- */
-class FieldNormalizerDenormalizeExceptionsUnitTest extends NormalizerDenormalizeExceptionsUnitTestBase {
-
-  /**
-   * Tests that the FieldNormalizer::denormalize() throws proper exceptions.
-   *
-   * @param array $context
-   *   Context for FieldNormalizer::denormalize().
-   *
-   * @dataProvider providerNormalizerDenormalizeExceptions
-   */
-  public function testFieldNormalizerDenormalizeExceptions($context) {
-    $field_item_normalizer = new FieldNormalizer();
-    $data = [];
-    $class = [];
-    $this->expectException(InvalidArgumentException::class);
-    $field_item_normalizer->denormalize($data, $class, NULL, $context);
-  }
-
-}
diff --git a/core/modules/hal/tests/src/Unit/NormalizerDenormalizeExceptionsUnitTestBase.php b/core/modules/hal/tests/src/Unit/NormalizerDenormalizeExceptionsUnitTestBase.php
deleted file mode 100644
index 43bbfb4b57..0000000000
--- a/core/modules/hal/tests/src/Unit/NormalizerDenormalizeExceptionsUnitTestBase.php
+++ /dev/null
@@ -1,33 +0,0 @@
-<?php
-
-namespace Drupal\Tests\hal\Unit;
-
-use Drupal\Tests\UnitTestCase;
-
-/**
- * Common ancestor for FieldItemNormalizerDenormalizeExceptionsUnitTest and
- * FieldNormalizerDenormalizeExceptionsUnitTest as they have the same
- * dataProvider.
- */
-abstract class NormalizerDenormalizeExceptionsUnitTestBase extends UnitTestCase {
-
-  /**
-   * Provides data for FieldItemNormalizerDenormalizeExceptionsUnitTest::testFieldItemNormalizerDenormalizeExceptions()
-   * and for FieldNormalizerDenormalizeExceptionsUnitTest::testFieldNormalizerDenormalizeExceptions().
-   *
-   * @return array Test data.
-   */
-  public function providerNormalizerDenormalizeExceptions() {
-    $mock = $this->getMockBuilder('\Drupal\Core\Field\Plugin\DataType\FieldItem')
-      ->setMethods(['getParent'])
-      ->getMock();
-    $mock->expects($this->any())
-      ->method('getParent')
-      ->will($this->returnValue(NULL));
-    return [
-      [[]],
-      [['target_instance' => $mock]],
-    ];
-  }
-
-}