diff --git a/tests/Doctrine/Tests/Models/Enums/TypedCard.php b/tests/Doctrine/Tests/Models/Enums/TypedCard.php
new file mode 100644
index 00000000000..c80a8b6ed6f
--- /dev/null
+++ b/tests/Doctrine/Tests/Models/Enums/TypedCard.php
@@ -0,0 +1,20 @@
+<?php
+
+declare(strict_types=1);
+
+namespace Doctrine\Tests\Models\Enums;
+
+use Doctrine\ORM\Mapping\Column;
+use Doctrine\ORM\Mapping\Entity;
+use Doctrine\ORM\Mapping\GeneratedValue;
+use Doctrine\ORM\Mapping\Id;
+
+#[Entity]
+class TypedCard
+{
+    #[Id, GeneratedValue, Column]
+    public int $id;
+
+    #[Column]
+    public Suit $suit;
+}
diff --git a/tests/Doctrine/Tests/ORM/Functional/EnumTest.php b/tests/Doctrine/Tests/ORM/Functional/EnumTest.php
index 2b0b45fc61e..9758423a08c 100644
--- a/tests/Doctrine/Tests/ORM/Functional/EnumTest.php
+++ b/tests/Doctrine/Tests/ORM/Functional/EnumTest.php
@@ -4,11 +4,16 @@
 
 namespace Doctrine\Tests\ORM\Functional;
 
+use Doctrine\ORM\Mapping\Driver\AttributeDriver;
+use Doctrine\ORM\Tools\SchemaTool;
 use Doctrine\Tests\Models\Enums\Card;
 use Doctrine\Tests\Models\Enums\Suit;
+use Doctrine\Tests\Models\Enums\TypedCard;
 use Doctrine\Tests\OrmFunctionalTestCase;
 use ValueError;
 
+use function dirname;
+
 /**
  * @requires PHP 8.1
  */
@@ -16,20 +21,26 @@ class EnumTest extends OrmFunctionalTestCase
 {
     public function setUp(): void
     {
+        $this->_em         = $this->getEntityManager(null, new AttributeDriver([dirname(__DIR__, 2) . '/Models/Enums']));
+        $this->_schemaTool = new SchemaTool($this->_em);
+
         parent::setUp();
 
         if ($this->isSecondLevelCacheEnabled) {
             $this->markTestSkipped();
         }
-
-        $this->setUpEntitySchema([
-            Card::class,
-        ]);
     }
 
-    public function testEnumMapping(): void
+    /**
+     * @param class-string $cardClass
+     *
+     * @dataProvider provideCardClasses
+     */
+    public function testEnumMapping(string $cardClass): void
     {
-        $card       = new Card();
+        $this->setUpEntitySchema([$cardClass]);
+
+        $card       = new $cardClass();
         $card->suit = Suit::Clubs;
 
         $this->_em->persist($card);
@@ -42,9 +53,16 @@ public function testEnumMapping(): void
         $this->assertEquals(Suit::Clubs, $fetchedCard->suit);
     }
 
-    public function testEnumWithNonMatchingDatabaseValueThrowsException(): void
+    /**
+     * @param class-string $cardClass
+     *
+     * @dataProvider provideCardClasses
+     */
+    public function testEnumWithNonMatchingDatabaseValueThrowsException(string $cardClass): void
     {
-        $card       = new Card();
+        $this->setUpEntitySchema([$cardClass]);
+
+        $card       = new $cardClass();
         $card->suit = Suit::Clubs;
 
         $this->_em->persist($card);
@@ -63,4 +81,15 @@ public function testEnumWithNonMatchingDatabaseValueThrowsException(): void
 
         $this->_em->find(Card::class, $card->id);
     }
+
+    /**
+     * @return array<string, array{class-string}>
+     */
+    public function provideCardClasses(): array
+    {
+        return [
+            Card::class => [Card::class],
+            TypedCard::class => [TypedCard::class],
+        ];
+    }
 }