diff --git a/src/Symfony/Component/Uid/Tests/UlidTest.php b/src/Symfony/Component/Uid/Tests/UlidTest.php
index f5f993c09f..86e88d352b 100644
--- a/src/Symfony/Component/Uid/Tests/UlidTest.php
+++ b/src/Symfony/Component/Uid/Tests/UlidTest.php
@@ -125,21 +125,25 @@ class UlidTest extends TestCase
             Ulid::fromString("\x01\x77\x05\x8F\x4D\xAC\xD0\xB2\xA9\x90\xA4\x9A\xF0\x2B\xC0\x08"),
             Ulid::fromBinary("\x01\x77\x05\x8F\x4D\xAC\xD0\xB2\xA9\x90\xA4\x9A\xF0\x2B\xC0\x08")
         );
+    }
 
-        foreach ([
-            '01EW2RYKDCT2SAK454KBR2QG08',
-            '1BVXue8CnY8ogucrHX3TeF',
-            '0177058f-4dac-d0b2-a990-a49af02bc008',
-        ] as $ulid) {
-            try {
-                Ulid::fromBinary($ulid);
+    /**
+     * @dataProvider provideInvalidBinaryFormat
+     */
+    public function testFromBinaryInvalidFormat(string $ulid)
+    {
+        $this->expectException(\InvalidArgumentException::class);
 
-                $this->fail();
-            } catch (\Throwable $e) {
-            }
+        Ulid::fromBinary($ulid);
+    }
 
-            $this->assertInstanceOf(\InvalidArgumentException::class, $e);
-        }
+    public function provideInvalidBinaryFormat()
+    {
+        return [
+            ['01EW2RYKDCT2SAK454KBR2QG08'],
+            ['1BVXue8CnY8ogucrHX3TeF'],
+            ['0177058f-4dac-d0b2-a990-a49af02bc008'],
+        ];
     }
 
     public function testFromBase58()
@@ -148,21 +152,25 @@ class UlidTest extends TestCase
             Ulid::fromString('1BVXue8CnY8ogucrHX3TeF'),
             Ulid::fromBase58('1BVXue8CnY8ogucrHX3TeF')
         );
+    }
 
-        foreach ([
-            "\x01\x77\x05\x8F\x4D\xAC\xD0\xB2\xA9\x90\xA4\x9A\xF0\x2B\xC0\x08",
-            '01EW2RYKDCT2SAK454KBR2QG08',
-            '0177058f-4dac-d0b2-a990-a49af02bc008',
-        ] as $ulid) {
-            try {
-                Ulid::fromBase58($ulid);
+    /**
+     * @dataProvider provideInvalidBase58Format
+     */
+    public function testFromBase58InvalidFormat(string $ulid)
+    {
+        $this->expectException(\InvalidArgumentException::class);
 
-                $this->fail();
-            } catch (\Throwable $e) {
-            }
+        Ulid::fromBase58($ulid);
+    }
 
-            $this->assertInstanceOf(\InvalidArgumentException::class, $e);
-        }
+    public function provideInvalidBase58Format()
+    {
+        return [
+            ["\x01\x77\x05\x8F\x4D\xAC\xD0\xB2\xA9\x90\xA4\x9A\xF0\x2B\xC0\x08"],
+            ['01EW2RYKDCT2SAK454KBR2QG08'],
+            ['0177058f-4dac-d0b2-a990-a49af02bc008'],
+        ];
     }
 
     public function testFromBase32()
@@ -171,21 +179,25 @@ class UlidTest extends TestCase
             Ulid::fromString('01EW2RYKDCT2SAK454KBR2QG08'),
             Ulid::fromBase32('01EW2RYKDCT2SAK454KBR2QG08')
         );
+    }
 
-        foreach ([
-            "\x01\x77\x05\x8F\x4D\xAC\xD0\xB2\xA9\x90\xA4\x9A\xF0\x2B\xC0\x08",
-            '1BVXue8CnY8ogucrHX3TeF',
-            '0177058f-4dac-d0b2-a990-a49af02bc008',
-        ] as $ulid) {
-            try {
-                Ulid::fromBase32($ulid);
+    /**
+     * @dataProvider provideInvalidBase32Format
+     */
+    public function testFromBase32InvalidFormat(string $ulid)
+    {
+        $this->expectException(\InvalidArgumentException::class);
 
-                $this->fail();
-            } catch (\Throwable $e) {
-            }
+        Ulid::fromBase32($ulid);
+    }
 
-            $this->assertInstanceOf(\InvalidArgumentException::class, $e);
-        }
+    public function provideInvalidBase32Format()
+    {
+        return [
+            ["\x01\x77\x05\x8F\x4D\xAC\xD0\xB2\xA9\x90\xA4\x9A\xF0\x2B\xC0\x08"],
+            ['1BVXue8CnY8ogucrHX3TeF'],
+            ['0177058f-4dac-d0b2-a990-a49af02bc008'],
+        ];
     }
 
     public function testFromRfc4122()
@@ -194,20 +206,24 @@ class UlidTest extends TestCase
             Ulid::fromString('0177058f-4dac-d0b2-a990-a49af02bc008'),
             Ulid::fromRfc4122('0177058f-4dac-d0b2-a990-a49af02bc008')
         );
+    }
 
-        foreach ([
-            "\x01\x77\x05\x8F\x4D\xAC\xD0\xB2\xA9\x90\xA4\x9A\xF0\x2B\xC0\x08",
-            '01EW2RYKDCT2SAK454KBR2QG08',
-            '1BVXue8CnY8ogucrHX3TeF',
-        ] as $ulid) {
-            try {
-                Ulid::fromRfc4122($ulid);
+    /**
+     * @dataProvider provideInvalidRfc4122Format
+     */
+    public function testFromRfc4122InvalidFormat(string $ulid)
+    {
+        $this->expectException(\InvalidArgumentException::class);
 
-                $this->fail();
-            } catch (\Throwable $e) {
-            }
+        Ulid::fromRfc4122($ulid);
+    }
 
-            $this->assertInstanceOf(\InvalidArgumentException::class, $e);
-        }
+    public function provideInvalidRfc4122Format()
+    {
+        return [
+            ["\x01\x77\x05\x8F\x4D\xAC\xD0\xB2\xA9\x90\xA4\x9A\xF0\x2B\xC0\x08"],
+            ['01EW2RYKDCT2SAK454KBR2QG08'],
+            ['1BVXue8CnY8ogucrHX3TeF'],
+        ];
     }
 }
diff --git a/src/Symfony/Component/Uid/Tests/UuidTest.php b/src/Symfony/Component/Uid/Tests/UuidTest.php
index faa96e8b77..a5763d894a 100644
--- a/src/Symfony/Component/Uid/Tests/UuidTest.php
+++ b/src/Symfony/Component/Uid/Tests/UuidTest.php
@@ -200,21 +200,25 @@ class UuidTest extends TestCase
             Uuid::fromString("\x01\x77\x05\x8F\x4D\xAC\xD0\xB2\xA9\x90\xA4\x9A\xF0\x2B\xC0\x08"),
             Uuid::fromBinary("\x01\x77\x05\x8F\x4D\xAC\xD0\xB2\xA9\x90\xA4\x9A\xF0\x2B\xC0\x08")
         );
+    }
 
-        foreach ([
-            '01EW2RYKDCT2SAK454KBR2QG08',
-            '1BVXue8CnY8ogucrHX3TeF',
-            '0177058f-4dac-d0b2-a990-a49af02bc008',
-        ] as $ulid) {
-            try {
-                Uuid::fromBinary($ulid);
+    /**
+     * @dataProvider provideInvalidBinaryFormat
+     */
+    public function testFromBinaryInvalidFormat(string $ulid)
+    {
+        $this->expectException(\InvalidArgumentException::class);
 
-                $this->fail();
-            } catch (\Throwable $e) {
-            }
+        Uuid::fromBinary($ulid);
+    }
 
-            $this->assertInstanceOf(\InvalidArgumentException::class, $e);
-        }
+    public function provideInvalidBinaryFormat()
+    {
+        return [
+            ['01EW2RYKDCT2SAK454KBR2QG08'],
+            ['1BVXue8CnY8ogucrHX3TeF'],
+            ['0177058f-4dac-d0b2-a990-a49af02bc008'],
+        ];
     }
 
     public function testFromBase58()
@@ -223,21 +227,25 @@ class UuidTest extends TestCase
             UuidV1::fromString('94fSqj9oxGtsNbkfQNntwx'),
             UuidV1::fromBase58('94fSqj9oxGtsNbkfQNntwx')
         );
+    }
 
-        foreach ([
-            "\x41\x4C\x08\x92\x57\x1B\x11\xEB\xBF\x70\x93\xF9\xB0\x82\x2C\x57",
-            '219G494NRV27NVYW4KZ6R84B2Q',
-            '414c0892-571b-11eb-bf70-93f9b0822c57',
-        ] as $ulid) {
-            try {
-                UuidV1::fromBase58($ulid);
+    /**
+     * @dataProvider provideInvalidBase58Format
+     */
+    public function testFromBase58InvalidFormat(string $ulid)
+    {
+        $this->expectException(\InvalidArgumentException::class);
 
-                $this->fail();
-            } catch (\Throwable $e) {
-            }
+        Uuid::fromBase58($ulid);
+    }
 
-            $this->assertInstanceOf(\InvalidArgumentException::class, $e);
-        }
+    public function provideInvalidBase58Format()
+    {
+        return [
+            ["\x41\x4C\x08\x92\x57\x1B\x11\xEB\xBF\x70\x93\xF9\xB0\x82\x2C\x57"],
+            ['219G494NRV27NVYW4KZ6R84B2Q'],
+            ['414c0892-571b-11eb-bf70-93f9b0822c57'],
+        ];
     }
 
     public function testFromBase32()
@@ -246,21 +254,25 @@ class UuidTest extends TestCase
             UuidV5::fromString('2VN0S74HBDBB0AQRXAHFVG35KK'),
             UuidV5::fromBase32('2VN0S74HBDBB0AQRXAHFVG35KK')
         );
+    }
 
-        foreach ([
-            "\x5B\xA8\x32\x72\x45\x6D\x5A\xC0\xAB\xE3\xAA\x8B\xF7\x01\x96\x73",
-            'CKTRYycTes6WAqSQJsTDaz',
-            '5ba83272-456d-5ac0-abe3-aa8bf7019673',
-        ] as $ulid) {
-            try {
-                Ulid::fromBase32($ulid);
+    /**
+     * @dataProvider provideInvalidBase32Format
+     */
+    public function testFromBase32InvalidFormat(string $ulid)
+    {
+        $this->expectException(\InvalidArgumentException::class);
 
-                $this->fail();
-            } catch (\Throwable $e) {
-            }
+        Uuid::fromBase32($ulid);
+    }
 
-            $this->assertInstanceOf(\InvalidArgumentException::class, $e);
-        }
+    public function provideInvalidBase32Format()
+    {
+        return [
+            ["\x5B\xA8\x32\x72\x45\x6D\x5A\xC0\xAB\xE3\xAA\x8B\xF7\x01\x96\x73"],
+            ['CKTRYycTes6WAqSQJsTDaz'],
+            ['5ba83272-456d-5ac0-abe3-aa8bf7019673'],
+        ];
     }
 
     public function testFromRfc4122()
@@ -269,20 +281,24 @@ class UuidTest extends TestCase
             UuidV6::fromString('1eb571b4-14c0-6893-bf70-2d4c83cf755a'),
             UuidV6::fromRfc4122('1eb571b4-14c0-6893-bf70-2d4c83cf755a')
         );
+    }
 
-        foreach ([
-            "\x1E\xB5\x71\xB4\x14\xC0\x68\x93\xBF\x70\x2D\x4C\x83\xCF\x75\x5A",
-            '0YPNRV8560D29VYW1D9J1WYXAT',
-            '4nwTLZ2TdMtTVDE5AwVjaR',
-        ] as $ulid) {
-            try {
-                Ulid::fromRfc4122($ulid);
+    /**
+     * @dataProvider provideInvalidRfc4122Format
+     */
+    public function testFromRfc4122InvalidFormat(string $ulid)
+    {
+        $this->expectException(\InvalidArgumentException::class);
 
-                $this->fail();
-            } catch (\Throwable $e) {
-            }
+        Uuid::fromRfc4122($ulid);
+    }
 
-            $this->assertInstanceOf(\InvalidArgumentException::class, $e);
-        }
+    public function provideInvalidRfc4122Format()
+    {
+        return [
+            ["\x1E\xB5\x71\xB4\x14\xC0\x68\x93\xBF\x70\x2D\x4C\x83\xCF\x75\x5A"],
+            ['0YPNRV8560D29VYW1D9J1WYXAT'],
+            ['4nwTLZ2TdMtTVDE5AwVjaR'],
+        ];
     }
 }