diff --git a/psalm.xml b/psalm.xml
index 3426c45..5a02993 100644
--- a/psalm.xml
+++ b/psalm.xml
@@ -9,12 +9,22 @@
         <directory name="src" />
         <ignoreFiles>
             <directory name="vendor" />
-
-            <file name="src/Core/User/AdvancedUserInterface.php" />
         </ignoreFiles>
     </projectFiles>
 
     <issueHandlers>
+        <UndefinedClass>
+            <errorLevel type="suppress">
+                <file name="src/Core/Encoder/EncoderAwareInterface.php" />
+                <file name="src/Core/User/AdvancedUserInterface.php" />
+            </errorLevel>
+        </UndefinedClass>
+        <UnrecognizedStatement>
+            <errorLevel type="suppress">
+                <file name="src/Core/Encoder/EncoderAwareInterface.php" />
+                <file name="src/Core/User/AdvancedUserInterface.php" />
+            </errorLevel>
+        </UnrecognizedStatement>
         <DuplicateClass>
             <errorLevel type="suppress">
                 <file name="src/Core/User/UserInterface.php" />
diff --git a/src/Core/Encoder/EncoderAwareInterface.php b/src/Core/Encoder/EncoderAwareInterface.php
new file mode 100644
index 0000000..72014b0
--- /dev/null
+++ b/src/Core/Encoder/EncoderAwareInterface.php
@@ -0,0 +1,29 @@
+<?php
+
+declare(strict_types=1);
+
+namespace SyliusLabs\Polyfill\Symfony\Security\Core\Encoder;
+
+use Symfony\Component\Security\Core\Encoder\EncoderAwareInterface as SymfonyEncoderAwareInterface;
+
+if (\interface_exists(SymfonyEncoderAwareInterface::class)) {
+    interface EncoderAwareInterface extends SymfonyEncoderAwareInterface
+    {
+    }
+} else {
+    /**
+     * @link https://github.com/symfony/symfony/blob/5.4/src/Symfony/Component/Security/Core/Encoder/EncoderAwareInterface.php
+     */
+    interface EncoderAwareInterface
+    {
+        /**
+         * Gets the name of the encoder used to encode the password.
+         *
+         * If the method returns null, the standard way to retrieve the encoder
+         * will be used instead.
+         *
+         * @return string|null
+         */
+        public function getEncoderName();
+    }
+}
diff --git a/tests/Core/Encoder/EncoderAwareInterfaceTest.php b/tests/Core/Encoder/EncoderAwareInterfaceTest.php
new file mode 100644
index 0000000..5193f61
--- /dev/null
+++ b/tests/Core/Encoder/EncoderAwareInterfaceTest.php
@@ -0,0 +1,48 @@
+<?php
+
+declare(strict_types=1);
+
+namespace Tests\SyliusLabs\Polyfill\Symfony\Security\Core\Encoder;
+
+use PHPUnit\Framework\Assert;
+use PHPUnit\Framework\TestCase;
+use SyliusLabs\Polyfill\Symfony\Security\Core\Encoder\EncoderAwareInterface;
+use Symfony\Component\Security\Core\Encoder\EncoderAwareInterface as SymfonyEncoderAwareInterface;
+use Symfony\Component\Security\Core\User\UserInterface;
+
+final class EncoderAwareInterfaceTest extends TestCase
+{
+    /** @test */
+    public function it_extends_symfonys_encoder_aware_interface_if_available(): void
+    {
+        if (!\interface_exists(SymfonyEncoderAwareInterface::class)) {
+            self::markTestSkipped('Symfony EncoderAwareInterface does not exist.');
+        }
+
+        Assert::assertContains(SymfonyEncoderAwareInterface::class, \class_implements(EncoderAwareInterface::class));
+    }
+
+    /** @test */
+    public function it_does_not_extend_symfonys_encoder_aware_interface_if_not_available(): void
+    {
+        if (\interface_exists(SymfonyEncoderAwareInterface::class)) {
+            self::markTestSkipped('Symfony EncoderAwareInterface exists.');
+        }
+
+        Assert::assertNotContains(SymfonyEncoderAwareInterface::class, \class_implements(EncoderAwareInterface::class));
+    }
+
+    /** @test */
+    public function it_contains_expected_methods(): void
+    {
+        $reflectionClass = new \ReflectionClass(EncoderAwareInterface::class);
+        $declaredMethods = array_map(
+            static function (\ReflectionMethod $reflectionMethod): string {
+                return $reflectionMethod->getName();
+            },
+            $reflectionClass->getMethods()
+        );
+
+        Assert::assertContains('getEncoderName', $declaredMethods);
+    }
+}