core/modules/serialization/src/Normalizer/AnyNormalizer.php       | 8 ++++----
 .../serialization/tests/src/Kernel/AnyNormalizerTest.php}         | 8 +++-----
 2 files changed, 7 insertions(+), 9 deletions(-)

diff --git a/core/modules/serialization/src/Normalizer/AnyNormalizer.php b/core/modules/serialization/src/Normalizer/AnyNormalizer.php
index 9a8063f..a9afcb4 100644
--- a/core/modules/serialization/src/Normalizer/AnyNormalizer.php
+++ b/core/modules/serialization/src/Normalizer/AnyNormalizer.php
@@ -2,17 +2,17 @@
 
 namespace Drupal\serialization\Normalizer;
 
+use Drupal\Core\TypedData\Plugin\DataType\Any;
+
 /**
  * Converts 'any' typed data objects to arrays.
  */
 class AnyNormalizer extends NormalizerBase {
 
   /**
-   * The interface or class that this Normalizer supports.
-   *
-   * @var string
+   * {@inheritdoc}
    */
-  protected $supportedInterfaceOrClass = 'Drupal\Core\TypedData\Plugin\DataType\Any';
+  protected $supportedInterfaceOrClass = Any::class;
 
   /**
    * {@inheritdoc}
diff --git a/core/tests/Drupal/Tests/Core/TypedData/AnyNormalizeTest.php b/core/modules/serialization/tests/src/Kernel/AnyNormalizerTest.php
similarity index 94%
rename from core/tests/Drupal/Tests/Core/TypedData/AnyNormalizeTest.php
rename to core/modules/serialization/tests/src/Kernel/AnyNormalizerTest.php
index 8f26b74..8f69b08 100644
--- a/core/tests/Drupal/Tests/Core/TypedData/AnyNormalizeTest.php
+++ b/core/modules/serialization/tests/src/Kernel/AnyNormalizerTest.php
@@ -1,17 +1,15 @@
 <?php
 
-namespace Drupal\Tests\Core\TypedData;
+namespace Drupal\Tests\serialization\Kernel;
 
 use Drupal\Core\TypedData\DataDefinition;
 use Drupal\KernelTests\KernelTestBase;
 
 /**
- * Tests the normalization of 'any' typed data on many different situations.
- *
- * @coversDefaultClass \Drupal\Tests\Core\TypedData\AnyNormalizeTest
+ * @coversDefaultClass \Drupal\serialization\Normalizer\AnyNormalizer
  * @group typedData
  */
-class AnyNormalizeTest extends KernelTestBase {
+class AnyNormalizerTest extends KernelTestBase {
 
   /**
    * {@inheritdoc}