diff --git a/tests/Doctrine/IPv4TypeTest.php b/tests/Doctrine/IPv4TypeTest.php
index 09fc6ca..99e2533 100644
--- a/tests/Doctrine/IPv4TypeTest.php
+++ b/tests/Doctrine/IPv4TypeTest.php
@@ -6,6 +6,7 @@
 use Darsyn\IP\Version\IPv4 as IP;
 use Doctrine\DBAL\Types\Type;
 use PDO;
+use PHPUnit\Framework\Attributes as PHPUnit;
 use PHPUnit\Framework\TestCase;
 
 class IPv4TypeTest extends TestCase
@@ -17,6 +18,7 @@ class IPv4TypeTest extends TestCase
     private $type;
 
     /** @beforeClass */
+    #[PHPUnit\BeforeClass]
     public static function setUpBeforeClassWithoutReturnDeclaration()
     {
         if (class_exists(Type::class)) {
@@ -24,36 +26,20 @@ public static function setUpBeforeClassWithoutReturnDeclaration()
         }
     }
 
-    private function getPlatformMock()
-    {
-        // We have to use MySQL as the platform here, because the AbstractPlatform does not support BINARY types.
-        $mockBuilder = $this->getMockBuilder('Doctrine\DBAL\Platforms\MySqlPlatform');
-        $mockedMethods = ['getBinaryTypeDeclarationSQL'];
-        // MockBuilder::setMethods() was deprecated in favour of MockBuilder::onlyMethods() in PHPUnit v7.5.x
-        method_exists($mockBuilder, 'onlyMethods')
-            ? $mockBuilder->onlyMethods($mockedMethods)
-            : $mockBuilder->setMethods($mockedMethods);
-        return $mockBuilder->getMockForAbstractClass();
-    }
-
     /** @before */
+    #[PHPUnit\Before]
     protected function setUpWithoutReturnDeclaration()
     {
         if (!class_exists('Doctrine\DBAL\Types\Type')) {
             $this->markTestSkipped('Skipping test that requires "doctrine/dbal".');
         }
 
-        $this->platform = $this->getPlatformMock();
-        $this->platform
-            ->expects($this->any())
-            ->method('getBinaryTypeDeclarationSQL')
-            ->will($this->returnValue('DUMMYBINARY()'));
+        $this->platform = new TestPlatform;
         $this->type = Type::getType('ipv4');
     }
 
-    /**
-     * @test
-     */
+    /** @test */
+    #[PHPUnit\Test]
     public function testIpConvertsToDatabaseValue()
     {
         $ip = IP::factory('12.34.56.78');
@@ -64,26 +50,23 @@ public function testIpConvertsToDatabaseValue()
         $this->assertEquals($expected, $actual);
     }
 
-    /**
-     * @test
-     */
+    /** @test */
+    #[PHPUnit\Test]
     public function testInvalidIpConversionForDatabaseValue()
     {
         $this->expectException(\Doctrine\DBAL\Types\ConversionException::class);
         $this->type->convertToDatabaseValue('abcdefg', $this->platform);
     }
 
-    /**
-     * @test
-     */
+    /** @test */
+    #[PHPUnit\Test]
     public function testNullConversionForDatabaseValue()
     {
         $this->assertNull($this->type->convertToDatabaseValue(null, $this->platform));
     }
 
-    /**
-     * @test
-     */
+    /** @test */
+    #[PHPUnit\Test]
     public function testIpConvertsToPHPValue()
     {
         $ip = IP::factory('12.34.56.78');
@@ -93,9 +76,8 @@ public function testIpConvertsToPHPValue()
         $this->assertEquals('12.34.56.78', $dbIp->getDotAddress());
     }
 
-    /**
-     * @test
-     */
+    /** @test */
+    #[PHPUnit\Test]
     public function testIpObjectConvertsToPHPValue()
     {
         $ip = IP::factory('12.34.56.78');
@@ -105,9 +87,8 @@ public function testIpObjectConvertsToPHPValue()
         $this->assertSame($ip, $dbIp);
     }
 
-    /**
-     * @test
-     */
+    /** @test */
+    #[PHPUnit\Test]
     public function testStreamConvertsToPHPValue()
     {
         $ip = IP::factory('12.34.56.78');
@@ -120,42 +101,37 @@ public function testStreamConvertsToPHPValue()
         $this->assertEquals('12.34.56.78', $dbIp->getDotAddress());
     }
 
-    /**
-     * @test
-     */
+    /** @test */
+    #[PHPUnit\Test]
     public function testInvalidIpConversionForPHPValue()
     {
         $this->expectException(\Doctrine\DBAL\Types\ConversionException::class);
         $this->type->convertToPHPValue('abcdefg', $this->platform);
     }
 
-    /**
-     * @test
-     */
+    /** @test */
+    #[PHPUnit\Test]
     public function testNullConversionForPHPValue()
     {
         $this->assertNull($this->type->convertToPHPValue(null, $this->platform));
     }
 
-    /**
-     * @test
-     */
+    /** @test */
+    #[PHPUnit\Test]
     public function testGetName()
     {
         $this->assertEquals('ip', $this->type->getName());
     }
 
-    /**
-     * @test
-     */
+    /** @test */
+    #[PHPUnit\Test]
     public function testGetBinaryTypeDeclarationSQL()
     {
         $this->assertEquals('DUMMYBINARY()', $this->type->getSqlDeclaration(['length' => 4], $this->platform));
     }
 
-    /**
-     * @test
-     */
+    /** @test */
+    #[PHPUnit\Test]
     public function testBindingTypeIsAValidPDOTypeConstant()
     {
         // Get all constants of the PDO class.
@@ -172,9 +148,8 @@ public function testBindingTypeIsAValidPDOTypeConstant()
         $this->assertContains($this->type->getBindingType(), $paramConstants);
     }
 
-    /**
-     * @test
-     */
+    /** @test */
+    #[PHPUnit\Test]
     public function testRequiresSQLCommentHint()
     {
         $this->assertTrue($this->type->requiresSQLCommentHint($this->platform));
diff --git a/tests/Doctrine/IPv6TypeTest.php b/tests/Doctrine/IPv6TypeTest.php
index 0af2c77..2b9ef0c 100644
--- a/tests/Doctrine/IPv6TypeTest.php
+++ b/tests/Doctrine/IPv6TypeTest.php
@@ -6,6 +6,7 @@
 use Darsyn\IP\Version\IPv6 as IP;
 use Doctrine\DBAL\Types\Type;
 use PDO;
+use PHPUnit\Framework\Attributes as PHPUnit;
 use PHPUnit\Framework\TestCase;
 
 class IPv6TypeTest extends TestCase
@@ -17,6 +18,7 @@ class IPv6TypeTest extends TestCase
     private $type;
 
     /** @beforeClass */
+    #[PHPUnit\BeforeClass]
     public static function setUpBeforeClassWithoutReturnDeclaration()
     {
         if (class_exists(Type::class)) {
@@ -24,36 +26,20 @@ public static function setUpBeforeClassWithoutReturnDeclaration()
         }
     }
 
-    private function getPlatformMock()
-    {
-        // We have to use MySQL as the platform here, because the AbstractPlatform does not support BINARY types.
-        $mockBuilder = $this->getMockBuilder('Doctrine\DBAL\Platforms\MySqlPlatform');
-        $mockedMethods = ['getBinaryTypeDeclarationSQL'];
-        // MockBuilder::setMethods() was deprecated in favour of MockBuilder::onlyMethods() in PHPUnit v7.5.x
-        method_exists($mockBuilder, 'onlyMethods')
-            ? $mockBuilder->onlyMethods($mockedMethods)
-            : $mockBuilder->setMethods($mockedMethods);
-        return $mockBuilder->getMockForAbstractClass();
-    }
-
     /** @before */
+    #[PHPUnit\Before]
     protected function setUpWithoutReturnDeclaration()
     {
         if (!class_exists('Doctrine\DBAL\Types\Type')) {
             $this->markTestSkipped('Skipping test that requires "doctrine/dbal".');
         }
 
-        $this->platform = $this->getPlatformMock();
-        $this->platform
-            ->expects($this->any())
-            ->method('getBinaryTypeDeclarationSQL')
-            ->will($this->returnValue('DUMMYBINARY()'));
+        $this->platform = new TestPlatform;
         $this->type = Type::getType('ipv6');
     }
 
-    /**
-     * @test
-     */
+    /** @test */
+    #[PHPUnit\Test]
     public function testIpConvertsToDatabaseValue()
     {
         $ip = IP::factory('::1');
@@ -64,26 +50,23 @@ public function testIpConvertsToDatabaseValue()
         $this->assertEquals($expected, $actual);
     }
 
-    /**
-     * @test
-     */
+    /** @test */
+    #[PHPUnit\Test]
     public function testInvalidIpConversionForDatabaseValue()
     {
         $this->expectException(\Doctrine\DBAL\Types\ConversionException::class);
         $this->type->convertToDatabaseValue('abcdefg', $this->platform);
     }
 
-    /**
-     * @test
-     */
+    /** @test */
+    #[PHPUnit\Test]
     public function testNullConversionForDatabaseValue()
     {
         $this->assertNull($this->type->convertToDatabaseValue(null, $this->platform));
     }
 
-    /**
-     * @test
-     */
+    /** @test */
+    #[PHPUnit\Test]
     public function testIpConvertsToPHPValue()
     {
         $ip = IP::factory('::1');
@@ -93,9 +76,8 @@ public function testIpConvertsToPHPValue()
         $this->assertEquals('::1', $dbIp->getCompactedAddress());
     }
 
-    /**
-     * @test
-     */
+    /** @test */
+    #[PHPUnit\Test]
     public function testIpObjectConvertsToPHPValue()
     {
         $ip = IP::factory('::1');
@@ -105,9 +87,8 @@ public function testIpObjectConvertsToPHPValue()
         $this->assertSame($ip, $dbIp);
     }
 
-    /**
-     * @test
-     */
+    /** @test */
+    #[PHPUnit\Test]
     public function testStreamConvertsToPHPValue()
     {
         $ip = IP::factory('::1');
@@ -120,42 +101,37 @@ public function testStreamConvertsToPHPValue()
         $this->assertEquals('::1', $dbIp->getCompactedAddress());
     }
 
-    /**
-     * @test
-     */
+    /** @test */
+    #[PHPUnit\Test]
     public function testInvalidIpConversionForPHPValue()
     {
         $this->expectException(\Doctrine\DBAL\Types\ConversionException::class);
         $this->type->convertToPHPValue('abcdefg', $this->platform);
     }
 
-    /**
-     * @test
-     */
+    /** @test */
+    #[PHPUnit\Test]
     public function testNullConversionForPHPValue()
     {
         $this->assertNull($this->type->convertToPHPValue(null, $this->platform));
     }
 
-    /**
-     * @test
-     */
+    /** @test */
+    #[PHPUnit\Test]
     public function testGetName()
     {
         $this->assertEquals('ip', $this->type->getName());
     }
 
-    /**
-     * @test
-     */
+    /** @test */
+    #[PHPUnit\Test]
     public function testGetBinaryTypeDeclarationSQL()
     {
         $this->assertEquals('DUMMYBINARY()', $this->type->getSqlDeclaration(['length' => 16], $this->platform));
     }
 
-    /**
-     * @test
-     */
+    /** @test */
+    #[PHPUnit\Test]
     public function testBindingTypeIsAValidPDOTypeConstant()
     {
         // Get all constants of the PDO class.
@@ -172,9 +148,8 @@ public function testBindingTypeIsAValidPDOTypeConstant()
         $this->assertContains($this->type->getBindingType(), $paramConstants);
     }
 
-    /**
-     * @test
-     */
+    /** @test */
+    #[PHPUnit\Test]
     public function testRequiresSQLCommentHint()
     {
         $this->assertTrue($this->type->requiresSQLCommentHint($this->platform));
diff --git a/tests/Doctrine/MultiTypeTest.php b/tests/Doctrine/MultiTypeTest.php
index 7d78910..1c5404e 100644
--- a/tests/Doctrine/MultiTypeTest.php
+++ b/tests/Doctrine/MultiTypeTest.php
@@ -6,6 +6,7 @@
 use Darsyn\IP\Version\Multi as IP;
 use Doctrine\DBAL\Types\Type;
 use PDO;
+use PHPUnit\Framework\Attributes as PHPUnit;
 use PHPUnit\Framework\TestCase;
 
 class MultiTypeTest extends TestCase
@@ -17,6 +18,7 @@ class MultiTypeTest extends TestCase
     private $type;
 
     /** @beforeClass */
+    #[PHPUnit\BeforeClass]
     public static function setUpBeforeClassWithoutReturnDeclaration()
     {
         if (class_exists(Type::class)) {
@@ -24,36 +26,20 @@ public static function setUpBeforeClassWithoutReturnDeclaration()
         }
     }
 
-    private function getPlatformMock()
-    {
-        // We have to use MySQL as the platform here, because the AbstractPlatform does not support BINARY types.
-        $mockBuilder = $this->getMockBuilder('Doctrine\DBAL\Platforms\MySqlPlatform');
-        $mockedMethods = ['getBinaryTypeDeclarationSQL'];
-        // MockBuilder::setMethods() was deprecated in favour of MockBuilder::onlyMethods() in PHPUnit v7.5.x
-        method_exists($mockBuilder, 'onlyMethods')
-            ? $mockBuilder->onlyMethods($mockedMethods)
-            : $mockBuilder->setMethods($mockedMethods);
-        return $mockBuilder->getMockForAbstractClass();
-    }
-
     /** @before */
+    #[PHPUnit\Before]
     protected function setUpWithoutReturnDeclaration()
     {
         if (!class_exists('Doctrine\DBAL\Types\Type')) {
             $this->markTestSkipped('Skipping test that requires "doctrine/dbal".');
         }
 
-        $this->platform = $this->getPlatformMock();
-        $this->platform
-            ->expects($this->any())
-            ->method('getBinaryTypeDeclarationSQL')
-            ->will($this->returnValue('DUMMYBINARY()'));
+        $this->platform = new TestPlatform;
         $this->type = Type::getType('ip_multi');
     }
 
-    /**
-     * @test
-     */
+    /** @test */
+    #[PHPUnit\Test]
     public function testIpConvertsToDatabaseValue()
     {
         $ip = IP::factory('12.34.56.78');
@@ -64,26 +50,23 @@ public function testIpConvertsToDatabaseValue()
         $this->assertEquals($expected, $actual);
     }
 
-    /**
-     * @test
-     */
+    /** @test */
+    #[PHPUnit\Test]
     public function testInvalidIpConversionForDatabaseValue()
     {
         $this->expectException(\Doctrine\DBAL\Types\ConversionException::class);
         $this->type->convertToDatabaseValue('abcdefg', $this->platform);
     }
 
-    /**
-     * @test
-     */
+    /** @test */
+    #[PHPUnit\Test]
     public function testNullConversionForDatabaseValue()
     {
         $this->assertNull($this->type->convertToDatabaseValue(null, $this->platform));
     }
 
-    /**
-     * @test
-     */
+    /** @test */
+    #[PHPUnit\Test]
     public function testIpConvertsToPHPValue()
     {
         $ip = IP::factory('12.34.56.78');
@@ -93,9 +76,8 @@ public function testIpConvertsToPHPValue()
         $this->assertEquals('12.34.56.78', $dbIp->getDotAddress());
     }
 
-    /**
-     * @test
-     */
+    /** @test */
+    #[PHPUnit\Test]
     public function testIpObjectConvertsToPHPValue()
     {
         $ip = IP::factory('12.34.56.78');
@@ -105,9 +87,8 @@ public function testIpObjectConvertsToPHPValue()
         $this->assertSame($ip, $dbIp);
     }
 
-    /**
-     * @test
-     */
+    /** @test */
+    #[PHPUnit\Test]
     public function testStreamConvertsToPHPValue()
     {
         $ip = IP::factory('12.34.56.78');
@@ -120,42 +101,37 @@ public function testStreamConvertsToPHPValue()
         $this->assertEquals('12.34.56.78', $dbIp->getDotAddress());
     }
 
-    /**
-     * @test
-     */
+    /** @test */
+    #[PHPUnit\Test]
     public function testInvalidIpConversionForPHPValue()
     {
         $this->expectException(\Doctrine\DBAL\Types\ConversionException::class);
         $this->type->convertToPHPValue('abcdefg', $this->platform);
     }
 
-    /**
-     * @test
-     */
+    /** @test */
+    #[PHPUnit\Test]
     public function testNullConversionForPHPValue()
     {
         $this->assertNull($this->type->convertToPHPValue(null, $this->platform));
     }
 
-    /**
-     * @test
-     */
+    /** @test */
+    #[PHPUnit\Test]
     public function testGetName()
     {
         $this->assertEquals('ip', $this->type->getName());
     }
 
-    /**
-     * @test
-     */
+    /** @test */
+    #[PHPUnit\Test]
     public function testGetBinaryTypeDeclarationSQL()
     {
         $this->assertEquals('DUMMYBINARY()', $this->type->getSqlDeclaration(['length' => 16], $this->platform));
     }
 
-    /**
-     * @test
-     */
+    /** @test */
+    #[PHPUnit\Test]
     public function testBindingTypeIsAValidPDOTypeConstant()
     {
         // Get all constants of the PDO class.
@@ -172,9 +148,8 @@ public function testBindingTypeIsAValidPDOTypeConstant()
         $this->assertContains($this->type->getBindingType(), $paramConstants);
     }
 
-    /**
-     * @test
-     */
+    /** @test */
+    #[PHPUnit\Test]
     public function testRequiresSQLCommentHint()
     {
         $this->assertTrue($this->type->requiresSQLCommentHint($this->platform));
diff --git a/tests/Doctrine/TestPlatform.php b/tests/Doctrine/TestPlatform.php
new file mode 100644
index 0000000..62e84e5
--- /dev/null
+++ b/tests/Doctrine/TestPlatform.php
@@ -0,0 +1,13 @@
+<?php
+
+namespace Darsyn\IP\Tests\Doctrine;
+
+use Doctrine\DBAL\Platforms\MySqlPlatform;
+
+class TestPlatform extends MySqlPlatform
+{
+    public function getBinaryTypeDeclarationSQL(array $column)
+    {
+        return 'DUMMYBINARY()';
+    }
+}
diff --git a/tests/Formatter/ConsistentFormatterTest.php b/tests/Formatter/ConsistentFormatterTest.php
index e938552..97c2563 100644
--- a/tests/Formatter/ConsistentFormatterTest.php
+++ b/tests/Formatter/ConsistentFormatterTest.php
@@ -5,6 +5,8 @@
 use Darsyn\IP\Exception\Formatter\FormatException;
 use Darsyn\IP\Formatter\ConsistentFormatter as Formatter;
 use Darsyn\IP\Formatter\ProtocolFormatterInterface;
+use Darsyn\IP\Tests\DataProvider\Formatter\ConsistentFormatter as ConsistentFormatterDataProvider;
+use PHPUnit\Framework\Attributes as PHPUnit;
 use PHPUnit\Framework\TestCase;
 
 class ConsistentFormatterTest extends TestCase
@@ -13,14 +15,14 @@ class ConsistentFormatterTest extends TestCase
     private $formatter;
 
     /** @before */
+    #[PHPUnit\Before]
     protected function setUpWithoutReturnDeclaration()
     {
         $this->formatter = new Formatter;
     }
 
-    /**
-     * @test
-     */
+    /** @test */
+    #[PHPUnit\Test]
     public function testFormatterIsInstanceOfInterface()
     {
         $this->assertInstanceOf(ProtocolFormatterInterface::class, $this->formatter);
@@ -30,6 +32,8 @@ public function testFormatterIsInstanceOfInterface()
      * @test
      * @dataProvider \Darsyn\IP\Tests\DataProvider\Formatter\ConsistentFormatter::getValidBinarySequences()
      */
+    #[PHPUnit\Test]
+    #[PHPUnit\DataProviderExternal(ConsistentFormatterDataProvider::class, 'getValidBinarySequences')]
     public function testFormatterReturnsCorrectProtocolString($value, $expected)
     {
         $this->assertSame($expected, $this->formatter->ntop($value));
@@ -39,6 +43,8 @@ public function testFormatterReturnsCorrectProtocolString($value, $expected)
      * @test
      * @dataProvider \Darsyn\IP\Tests\DataProvider\Formatter\ConsistentFormatter::getInvalidBinarySequences()
      */
+    #[PHPUnit\Test]
+    #[PHPUnit\DataProviderExternal(ConsistentFormatterDataProvider::class, 'getInvalidBinarySequences')]
     public function testFormatterThrowsExceptionOnInvalidBinarySequences($value)
     {
         $this->expectException(\Darsyn\IP\Exception\Formatter\FormatException::class);
diff --git a/tests/Formatter/NativeFormatterTest.php b/tests/Formatter/NativeFormatterTest.php
index 9d56919..c2979e7 100644
--- a/tests/Formatter/NativeFormatterTest.php
+++ b/tests/Formatter/NativeFormatterTest.php
@@ -5,6 +5,8 @@
 use Darsyn\IP\Exception\Formatter\FormatException;
 use Darsyn\IP\Formatter\NativeFormatter as Formatter;
 use Darsyn\IP\Formatter\ProtocolFormatterInterface;
+use Darsyn\IP\Tests\DataProvider\Formatter\NativeFormatter as NativeFormatterDataProvider;
+use PHPUnit\Framework\Attributes as PHPUnit;
 use PHPUnit\Framework\TestCase;
 
 class NativeFormatterTest extends TestCase
@@ -13,14 +15,14 @@ class NativeFormatterTest extends TestCase
     private $formatter;
 
     /** @before */
+    #[PHPUnit\Before]
     protected function setUpWithoutReturnDeclaration()
     {
         $this->formatter = new Formatter;
     }
 
-    /**
-     * @test
-     */
+    /** @test */
+    #[PHPUnit\Test]
     public function testFormatterIsInstanceOfInterface()
     {
         $this->assertInstanceOf(ProtocolFormatterInterface::class, $this->formatter);
@@ -30,6 +32,8 @@ public function testFormatterIsInstanceOfInterface()
      * @test
      * @dataProvider \Darsyn\IP\Tests\DataProvider\Formatter\NativeFormatter::getValidBinarySequences()
      */
+    #[PHPUnit\Test]
+    #[PHPUnit\DataProviderExternal(NativeFormatterDataProvider::class, 'getValidBinarySequences')]
     public function testFormatterReturnsCorrectProtocolString($value, $expected)
     {
         $this->assertSame($expected, $this->formatter->ntop($value));
@@ -39,6 +43,8 @@ public function testFormatterReturnsCorrectProtocolString($value, $expected)
      * @test
      * @dataProvider \Darsyn\IP\Tests\DataProvider\Formatter\NativeFormatter::getInvalidBinarySequences()
      */
+    #[PHPUnit\Test]
+    #[PHPUnit\DataProviderExternal(NativeFormatterDataProvider::class, 'getInvalidBinarySequences')]
     public function testFormatterThrowsExceptionOnInvalidBinarySequences($value)
     {
         $this->expectException(\Darsyn\IP\Exception\Formatter\FormatException::class);
diff --git a/tests/Strategy/CompatibleTest.php b/tests/Strategy/CompatibleTest.php
index 6276991..04713b9 100644
--- a/tests/Strategy/CompatibleTest.php
+++ b/tests/Strategy/CompatibleTest.php
@@ -5,6 +5,8 @@
 use Darsyn\IP\Exception\Strategy\ExtractionException;
 use Darsyn\IP\Exception\Strategy\PackingException;
 use Darsyn\IP\Strategy\Compatible;
+use Darsyn\IP\Tests\DataProvider\Strategy\Compatible as CompatibleDataProvider;
+use PHPUnit\Framework\Attributes as PHPUnit;
 use PHPUnit\Framework\TestCase;
 
 class CompatibleTest extends TestCase
@@ -13,6 +15,7 @@ class CompatibleTest extends TestCase
     private $strategy;
 
     /** @before */
+    #[PHPUnit\Before]
     protected function setUpWithoutReturnDeclaration()
     {
         $this->strategy = new Compatible;
@@ -22,6 +25,8 @@ protected function setUpWithoutReturnDeclaration()
      * @test
      * @dataProvider \Darsyn\IP\Tests\DataProvider\Strategy\Compatible::getInvalidIpAddresses()
      */
+    #[PHPUnit\Test]
+    #[PHPUnit\DataProviderExternal(CompatibleDataProvider::class, 'getInvalidIpAddresses')]
     public function testIsEmbeddedReturnsFalseForAStringOtherThan16BytesLong($value)
     {
         $this->assertFalse($this->strategy->isEmbedded($value));
@@ -31,6 +36,8 @@ public function testIsEmbeddedReturnsFalseForAStringOtherThan16BytesLong($value)
      * @test
      * @dataProvider \Darsyn\IP\Tests\DataProvider\Strategy\Compatible::getValidIpAddresses()
      */
+    #[PHPUnit\Test]
+    #[PHPUnit\DataProviderExternal(CompatibleDataProvider::class, 'getValidIpAddresses')]
     public function testIsEmbedded($value, $isEmbedded)
     {
         $this->assertSame($isEmbedded, $this->strategy->isEmbedded($value));
@@ -40,6 +47,8 @@ public function testIsEmbedded($value, $isEmbedded)
      * @test
      * @dataProvider \Darsyn\IP\Tests\DataProvider\Strategy\Compatible::getInvalidIpAddresses()
      */
+    #[PHPUnit\Test]
+    #[PHPUnit\DataProviderExternal(CompatibleDataProvider::class, 'getInvalidIpAddresses')]
     public function testExceptionIsThrownWhenTryingToExtractFromStringsNot16Bytes($value)
     {
         $this->expectException(\Darsyn\IP\Exception\Strategy\ExtractionException::class);
@@ -57,6 +66,8 @@ public function testExceptionIsThrownWhenTryingToExtractFromStringsNot16Bytes($v
      * @test
      * @dataProvider \Darsyn\IP\Tests\DataProvider\Strategy\Compatible::getValidSequences()
      */
+    #[PHPUnit\Test]
+    #[PHPUnit\DataProviderExternal(CompatibleDataProvider::class, 'getValidSequences')]
     public function testCorrectSequenceExtractedFromIpBinary($ipv6, $ipv4)
     {
         $this->assertSame($ipv4, $this->strategy->extract($ipv6));
@@ -66,6 +77,8 @@ public function testCorrectSequenceExtractedFromIpBinary($ipv6, $ipv4)
      * @test
      * @dataProvider \Darsyn\IP\Tests\DataProvider\Strategy\Compatible::getInvalidIpAddresses()
      */
+    #[PHPUnit\Test]
+    #[PHPUnit\DataProviderExternal(CompatibleDataProvider::class, 'getInvalidIpAddresses')]
     public function testExceptionIsThrownWhenTryingToPackStringsNot4Bytes($value)
     {
         $this->expectException(\Darsyn\IP\Exception\Strategy\PackingException::class);
@@ -83,6 +96,8 @@ public function testExceptionIsThrownWhenTryingToPackStringsNot4Bytes($value)
      * @test
      * @dataProvider \Darsyn\IP\Tests\DataProvider\Strategy\Compatible::getValidSequences()
      */
+    #[PHPUnit\Test]
+    #[PHPUnit\DataProviderExternal(CompatibleDataProvider::class, 'getValidSequences')]
     public function testSequenceCorrectlyPackedIntoIpBinaryFromIpBinary($ipv6, $ipv4)
     {
         $this->assertSame($ipv6, $this->strategy->pack($ipv4));
diff --git a/tests/Strategy/DerivedTest.php b/tests/Strategy/DerivedTest.php
index 304023c..ccd329e 100644
--- a/tests/Strategy/DerivedTest.php
+++ b/tests/Strategy/DerivedTest.php
@@ -3,6 +3,8 @@
 namespace Darsyn\IP\Tests\Strategy;
 
 use Darsyn\IP\Strategy\Derived;
+use Darsyn\IP\Tests\DataProvider\Strategy\Derived as DerivedDataProvider;
+use PHPUnit\Framework\Attributes as PHPUnit;
 use PHPUnit\Framework\TestCase;
 
 class DerivedTest extends TestCase
@@ -11,6 +13,7 @@ class DerivedTest extends TestCase
     private $strategy;
 
     /** @before */
+    #[PHPUnit\Before]
     protected function setUpWithoutReturnDeclaration()
     {
         $this->strategy = new Derived;
@@ -20,6 +23,8 @@ protected function setUpWithoutReturnDeclaration()
      * @test
      * @dataProvider \Darsyn\IP\Tests\DataProvider\Strategy\Derived::getInvalidIpAddresses()
      */
+    #[PHPUnit\Test]
+    #[PHPUnit\DataProviderExternal(DerivedDataProvider::class, 'getInvalidIpAddresses')]
     public function testIsEmbeddedReturnsFalseForAStringOtherThan16BytesLong($value)
     {
         $this->assertFalse($this->strategy->isEmbedded($value));
@@ -29,6 +34,8 @@ public function testIsEmbeddedReturnsFalseForAStringOtherThan16BytesLong($value)
      * @test
      * @dataProvider \Darsyn\IP\Tests\DataProvider\Strategy\Derived::getValidIpAddresses()
      */
+    #[PHPUnit\Test]
+    #[PHPUnit\DataProviderExternal(DerivedDataProvider::class, 'getValidIpAddresses')]
     public function testIsEmbedded($value, $isEmbedded)
     {
         $this->assertSame($isEmbedded, $this->strategy->isEmbedded($value));
@@ -38,6 +45,8 @@ public function testIsEmbedded($value, $isEmbedded)
      * @test
      * @dataProvider \Darsyn\IP\Tests\DataProvider\Strategy\Derived::getInvalidIpAddresses()
      */
+    #[PHPUnit\Test]
+    #[PHPUnit\DataProviderExternal(DerivedDataProvider::class, 'getInvalidIpAddresses')]
     public function testExceptionIsThrownWhenTryingToExtractFromStringsNot16Bytes($value)
     {
         $this->expectException(\Darsyn\IP\Exception\Strategy\ExtractionException::class);
@@ -48,6 +57,8 @@ public function testExceptionIsThrownWhenTryingToExtractFromStringsNot16Bytes($v
      * @test
      * @dataProvider \Darsyn\IP\Tests\DataProvider\Strategy\Derived::getValidSequences()
      */
+    #[PHPUnit\Test]
+    #[PHPUnit\DataProviderExternal(DerivedDataProvider::class, 'getValidSequences')]
     public function testCorrectSequenceExtractedFromIpBinary($ipv6, $ipv4)
     {
         $this->assertSame($ipv4, $this->strategy->extract($ipv6));
@@ -57,6 +68,8 @@ public function testCorrectSequenceExtractedFromIpBinary($ipv6, $ipv4)
      * @test
      * @dataProvider \Darsyn\IP\Tests\DataProvider\Strategy\Derived::getInvalidIpAddresses()
      */
+    #[PHPUnit\Test]
+    #[PHPUnit\DataProviderExternal(DerivedDataProvider::class, 'getInvalidIpAddresses')]
     public function testExceptionIsThrownWhenTryingToPackStringsNot4Bytes($value)
     {
         $this->expectException(\Darsyn\IP\Exception\Strategy\PackingException::class);
@@ -67,6 +80,8 @@ public function testExceptionIsThrownWhenTryingToPackStringsNot4Bytes($value)
      * @test
      * @dataProvider \Darsyn\IP\Tests\DataProvider\Strategy\Derived::getValidSequences()
      */
+    #[PHPUnit\Test]
+    #[PHPUnit\DataProviderExternal(DerivedDataProvider::class, 'getValidSequences')]
     public function testSequenceCorrectlyPackedIntoIpBinaryFromIpBinary($ipv6, $ipv4)
     {
         $this->assertSame($ipv6, $this->strategy->pack($ipv4));
diff --git a/tests/Strategy/MappedTest.php b/tests/Strategy/MappedTest.php
index c072b8d..defe191 100644
--- a/tests/Strategy/MappedTest.php
+++ b/tests/Strategy/MappedTest.php
@@ -3,6 +3,8 @@
 namespace Darsyn\IP\Tests\Strategy;
 
 use Darsyn\IP\Strategy\Mapped;
+use Darsyn\IP\Tests\DataProvider\Strategy\Mapped as MappedDataProvider;
+use PHPUnit\Framework\Attributes as PHPUnit;
 use PHPUnit\Framework\TestCase;
 
 class MappedTest extends TestCase
@@ -11,6 +13,7 @@ class MappedTest extends TestCase
     private $strategy;
 
     /** @before */
+    #[PHPUnit\Before]
     protected function setUpWithoutReturnDeclaration()
     {
         $this->strategy = new Mapped;
@@ -20,6 +23,8 @@ protected function setUpWithoutReturnDeclaration()
      * @test
      * @dataProvider \Darsyn\IP\Tests\DataProvider\Strategy\Mapped::getInvalidIpAddresses()
      */
+    #[PHPUnit\Test]
+    #[PHPUnit\DataProviderExternal(MappedDataProvider::class, 'getInvalidIpAddresses')]
     public function testIsEmbeddedReturnsFalseForAStringOtherThan16BytesLong($value)
     {
         $this->assertFalse($this->strategy->isEmbedded($value));
@@ -29,6 +34,8 @@ public function testIsEmbeddedReturnsFalseForAStringOtherThan16BytesLong($value)
      * @test
      * @dataProvider \Darsyn\IP\Tests\DataProvider\Strategy\Mapped::getValidIpAddresses()
      */
+    #[PHPUnit\Test]
+    #[PHPUnit\DataProviderExternal(MappedDataProvider::class, 'getValidIpAddresses')]
     public function testIsEmbedded($value, $isEmbedded)
     {
         $this->assertSame($isEmbedded, $this->strategy->isEmbedded($value));
@@ -38,6 +45,8 @@ public function testIsEmbedded($value, $isEmbedded)
      * @test
      * @dataProvider \Darsyn\IP\Tests\DataProvider\Strategy\Mapped::getInvalidIpAddresses()
      */
+    #[PHPUnit\Test]
+    #[PHPUnit\DataProviderExternal(MappedDataProvider::class, 'getInvalidIpAddresses')]
     public function testExceptionIsThrownWhenTryingToExtractFromStringsNot16Bytes($value)
     {
         $this->expectException(\Darsyn\IP\Exception\Strategy\ExtractionException::class);
@@ -48,6 +57,8 @@ public function testExceptionIsThrownWhenTryingToExtractFromStringsNot16Bytes($v
      * @test
      * @dataProvider \Darsyn\IP\Tests\DataProvider\Strategy\Mapped::getValidSequences()
      */
+    #[PHPUnit\Test]
+    #[PHPUnit\DataProviderExternal(MappedDataProvider::class, 'getValidSequences')]
     public function testCorrectSequenceExtractedFromIpBinary($ipv6, $ipv4)
     {
         $this->assertSame($ipv4, $this->strategy->extract($ipv6));
@@ -57,6 +68,8 @@ public function testCorrectSequenceExtractedFromIpBinary($ipv6, $ipv4)
      * @test
      * @dataProvider \Darsyn\IP\Tests\DataProvider\Strategy\Mapped::getInvalidIpAddresses()
      */
+    #[PHPUnit\Test]
+    #[PHPUnit\DataProviderExternal(MappedDataProvider::class, 'getInvalidIpAddresses')]
     public function testExceptionIsThrownWhenTryingToPackStringsNot4Bytes($value)
     {
         $this->expectException(\Darsyn\IP\Exception\Strategy\PackingException::class);
@@ -67,6 +80,8 @@ public function testExceptionIsThrownWhenTryingToPackStringsNot4Bytes($value)
      * @test
      * @dataProvider \Darsyn\IP\Tests\DataProvider\Strategy\Mapped::getValidSequences()
      */
+    #[PHPUnit\Test]
+    #[PHPUnit\DataProviderExternal(MappedDataProvider::class, 'getValidSequences')]
     public function testSequenceCorrectlyPackedIntoIpBinaryFromIpBinary($ipv6, $ipv4)
     {
         $this->assertSame($ipv6, $this->strategy->pack($ipv4));
diff --git a/tests/Util/BinaryTest.php b/tests/Util/BinaryTest.php
index 8d9f1bc..1fa8d0f 100644
--- a/tests/Util/BinaryTest.php
+++ b/tests/Util/BinaryTest.php
@@ -2,7 +2,9 @@
 
 namespace Darsyn\IP\Tests\Util;
 
+use Darsyn\IP\Tests\DataProvider\Util\Binary as BinaryDataProvider;
 use Darsyn\IP\Util\Binary;
+use PHPUnit\Framework\Attributes as PHPUnit;
 use PHPUnit\Framework\TestCase;
 
 class BinaryTest extends TestCase
@@ -11,6 +13,8 @@ class BinaryTest extends TestCase
      * @test
      * @dataProvider \Darsyn\IP\Tests\DataProvider\Util\Binary::getInvalidHex()
      */
+    #[PHPUnit\Test]
+    #[PHPUnit\DataProviderExternal(BinaryDataProvider::class, 'getInvalidHex')]
     public function testInvalidHexInput($input)
     {
         $this->expectException(\InvalidArgumentException::class);
@@ -21,6 +25,8 @@ public function testInvalidHexInput($input)
      * @test
      * @dataProvider \Darsyn\IP\Tests\DataProvider\Util\Binary::getInvalidHumanReadable()
      */
+    #[PHPUnit\Test]
+    #[PHPUnit\DataProviderExternal(BinaryDataProvider::class, 'getInvalidHumanReadable')]
     public function testInvalidHumanReadableInput($input)
     {
         $this->expectException(\InvalidArgumentException::class);
@@ -28,12 +34,14 @@ public function testInvalidHumanReadableInput($input)
     }
 
     /** @test */
+    #[PHPUnit\Test]
     public function testEmptyHexInput()
     {
         $this->assertSame('', Binary::fromHex(''));
     }
 
     /** @test */
+    #[PHPUnit\Test]
     public function testEmptyHumanReadableInput()
     {
         $this->assertSame('', Binary::fromHumanReadable(''));
@@ -43,7 +51,9 @@ public function testEmptyHumanReadableInput()
      * @test
      * @dataProvider \Darsyn\IP\Tests\DataProvider\Util\Binary::getBinaryData()
      */
-    public function testHexCanConvertAndBackAgain($hex, $humanReadable)
+    #[PHPUnit\Test]
+    #[PHPUnit\DataProviderExternal(BinaryDataProvider::class, 'getBinaryData')]
+    public function testHexCanConvertAndBackAgain($hex, $humanReadableNotUsed)
     {
         $converted = Binary::fromHex($hex);
         $this->assertSame(strtolower($hex), Binary::toHex($converted));
@@ -53,6 +63,8 @@ public function testHexCanConvertAndBackAgain($hex, $humanReadable)
      * @test
      * @dataProvider \Darsyn\IP\Tests\DataProvider\Util\Binary::getBinaryData()
      */
+    #[PHPUnit\Test]
+    #[PHPUnit\DataProviderExternal(BinaryDataProvider::class, 'getBinaryData')]
     public function testHumanReadableCanConvertAndBackAgain($hex, $humanReadable)
     {
         $converted = Binary::fromHumanReadable($humanReadable);
@@ -63,6 +75,8 @@ public function testHumanReadableCanConvertAndBackAgain($hex, $humanReadable)
      * @test
      * @dataProvider \Darsyn\IP\Tests\DataProvider\Util\Binary::getBinaryData()
      */
+    #[PHPUnit\Test]
+    #[PHPUnit\DataProviderExternal(BinaryDataProvider::class, 'getBinaryData')]
     public function testHexCanConvertToHumanReadable($hex, $humanReadable)
     {
         $converted = Binary::fromHex($hex);
@@ -73,6 +87,8 @@ public function testHexCanConvertToHumanReadable($hex, $humanReadable)
      * @test
      * @dataProvider \Darsyn\IP\Tests\DataProvider\Util\Binary::getBinaryData()
      */
+    #[PHPUnit\Test]
+    #[PHPUnit\DataProviderExternal(BinaryDataProvider::class, 'getBinaryData')]
     public function testHumanReadableCanConvertToHex($hex, $humanReadable)
     {
         $converted = Binary::fromHumanReadable($humanReadable);
diff --git a/tests/Util/MbStringTest.php b/tests/Util/MbStringTest.php
index 6de5528..42f8ecb 100644
--- a/tests/Util/MbStringTest.php
+++ b/tests/Util/MbStringTest.php
@@ -4,6 +4,7 @@
 
 use Darsyn\IP\Util\Binary;
 use Darsyn\IP\Util\MbString;
+use PHPUnit\Framework\Attributes as PHPUnit;
 use PHPUnit\Framework\TestCase;
 
 class MbStringTest extends TestCase
@@ -15,24 +16,28 @@ class MbStringTest extends TestCase
     const GRAPHEME_CLUSTER_BYTES = 13;
 
     /** @test */
+    #[PHPUnit\Test]
     public function testGetLengthAscii()
     {
         $this->assertSame(13, MbString::getLength('Hello, World!'));
     }
 
     /** @test */
+    #[PHPUnit\Test]
     public function testGetLengthUnicodeCharacter()
     {
         $this->assertSame(7 + self::EMOJI_BYTES, MbString::getLength('Hello! ' . self::EMOJI));
     }
 
     /** @test */
+    #[PHPUnit\Test]
     public function testGetLengthGraphemeCluster()
     {
         $this->assertSame(15 + self::GRAPHEME_CLUSTER_BYTES, MbString::getLength('Harriet Potter ' . self::GRAPHEME_CLUSTER));
     }
 
     /** @test */
+    #[PHPUnit\Test]
     public function testSubStringAscii()
     {
         $text = 'Hello, World!';
@@ -42,6 +47,7 @@ public function testSubStringAscii()
     }
 
     /** @test */
+    #[PHPUnit\Test]
     public function testSubStringUnicodeCharacter()
     {
         $text = 'Hello! ' . self::EMOJI;
@@ -51,6 +57,7 @@ public function testSubStringUnicodeCharacter()
     }
 
     /** @test */
+    #[PHPUnit\Test]
     public function testSubStringGraphemeCluster()
     {
         $text = 'Harriet Potter ' . self::GRAPHEME_CLUSTER;
@@ -60,6 +67,7 @@ public function testSubStringGraphemeCluster()
     }
 
     /** @test */
+    #[PHPUnit\Test]
     public function testPadStringAscii()
     {
         $this->assertSame('-0--Hello', $result = MbString::padString('Hello', 9, '-0-', STR_PAD_LEFT));
@@ -68,6 +76,7 @@ public function testPadStringAscii()
     }
 
     /** @test */
+    #[PHPUnit\Test]
     public function testPadStringUnicodeCharacter()
     {
         $this->assertSame('---' . self::EMOJI, MbString::padString(self::EMOJI, 3 + self::EMOJI_BYTES, '-', STR_PAD_LEFT));
@@ -76,6 +85,7 @@ public function testPadStringUnicodeCharacter()
     }
 
     /** @test */
+    #[PHPUnit\Test]
     public function testPadStringGraphemeCluster()
     {
         $this->assertSame('--' . self::GRAPHEME_CLUSTER, MbString::padString(self::GRAPHEME_CLUSTER, 2 + self::GRAPHEME_CLUSTER_BYTES, '-', STR_PAD_LEFT));
diff --git a/tests/Version/IPv4Test.php b/tests/Version/IPv4Test.php
index 1aa0162..cdb747d 100644
--- a/tests/Version/IPv4Test.php
+++ b/tests/Version/IPv4Test.php
@@ -6,9 +6,11 @@
 use Darsyn\IP\Exception\InvalidIpAddressException;
 use Darsyn\IP\Exception\WrongVersionException;
 use Darsyn\IP\IpInterface;
+use Darsyn\IP\Tests\DataProvider\IPv4 as IPv4DataProvider;
 use Darsyn\IP\Version\IPv4 as IP;
 use Darsyn\IP\Version\IPv6;
 use Darsyn\IP\Version\Version4Interface;
+use PHPUnit\Framework\Attributes as PHPUnit;
 use PHPUnit\Framework\TestCase;
 
 class IPv4Test extends TestCase
@@ -17,6 +19,8 @@ class IPv4Test extends TestCase
      * @test
      * @dataProvider \Darsyn\IP\Tests\DataProvider\IPv4::getValidIpAddresses()
      */
+    #[PHPUnit\Test]
+    #[PHPUnit\DataProviderExternal(IPv4DataProvider::class, 'getValidIpAddresses')]
     public function testInstantiationWithValidAddresses($value)
     {
         $ip = IP::factory($value);
@@ -28,6 +32,8 @@ public function testInstantiationWithValidAddresses($value)
      * @test
      * @dataProvider \Darsyn\IP\Tests\DataProvider\IPv4::getValidBinarySequences()
      */
+    #[PHPUnit\Test]
+    #[PHPUnit\DataProviderExternal(IPv4DataProvider::class, 'getValidBinarySequences')]
     public function testBinarySequenceIsTheSameOnceInstantiated($value)
     {
         $ip = IP::factory($value);
@@ -38,6 +44,8 @@ public function testBinarySequenceIsTheSameOnceInstantiated($value)
      * @test
      * @dataProvider \Darsyn\IP\Tests\DataProvider\IPv4::getValidProtocolIpAddresses()
      */
+    #[PHPUnit\Test]
+    #[PHPUnit\DataProviderExternal(IPv4DataProvider::class, 'getValidProtocolIpAddresses')]
     public function testProtocolNotationConvertsToCorrectBinarySequence($value, $expectedHex)
     {
         $ip = IP::factory($value);
@@ -48,6 +56,8 @@ public function testProtocolNotationConvertsToCorrectBinarySequence($value, $exp
      * @test
      * @dataProvider \Darsyn\IP\Tests\DataProvider\IPv4::getInvalidIpAddresses()
      */
+    #[PHPUnit\Test]
+    #[PHPUnit\DataProviderExternal(IPv4DataProvider::class, 'getInvalidIpAddresses')]
     public function testExceptionIsThrownOnInstantiationWithInvalidAddresses($value)
     {
         $this->expectException(\Darsyn\IP\Exception\InvalidIpAddressException::class);
@@ -65,6 +75,8 @@ public function testExceptionIsThrownOnInstantiationWithInvalidAddresses($value)
      * @test
      * @dataProvider \Darsyn\IP\Tests\DataProvider\IPv4::getValidIpAddresses()
      */
+    #[PHPUnit\Test]
+    #[PHPUnit\DataProviderExternal(IPv4DataProvider::class, 'getValidIpAddresses')]
     public function testGetBinaryAlwaysReturnsA4ByteString($value)
     {
         $ip = IP::factory($value);
@@ -75,6 +87,8 @@ public function testGetBinaryAlwaysReturnsA4ByteString($value)
      * @test
      * @dataProvider \Darsyn\IP\Tests\DataProvider\IPv4::getValidIpAddresses()
      */
+    #[PHPUnit\Test]
+    #[PHPUnit\DataProviderExternal(IPv4DataProvider::class, 'getValidIpAddresses')]
     public function testDotAddressReturnsCorrectString($value, $expectedHex, $expectedDot)
     {
         $ip = IP::factory($value);
@@ -85,6 +99,8 @@ public function testDotAddressReturnsCorrectString($value, $expectedHex, $expect
      * @test
      * @dataProvider \Darsyn\IP\Tests\DataProvider\IPv4::getValidIpAddresses()
      */
+    #[PHPUnit\Test]
+    #[PHPUnit\DataProviderExternal(IPv4DataProvider::class, 'getValidIpAddresses')]
     public function testGetVersionAlwaysReturns4($value)
     {
         $ip = IP::factory($value);
@@ -95,6 +111,8 @@ public function testGetVersionAlwaysReturns4($value)
      * @test
      * @dataProvider \Darsyn\IP\Tests\DataProvider\IPv4::getValidIpAddresses()
      */
+    #[PHPUnit\Test]
+    #[PHPUnit\DataProviderExternal(IPv4DataProvider::class, 'getValidIpAddresses')]
     public function testIsVersionOnlyReturnsTrueFor4($value)
     {
         $ip = IP::factory($value);
@@ -105,6 +123,8 @@ public function testIsVersionOnlyReturnsTrueFor4($value)
      * @test
      * @dataProvider \Darsyn\IP\Tests\DataProvider\IPv4::getValidIpAddresses()
      */
+    #[PHPUnit\Test]
+    #[PHPUnit\DataProviderExternal(IPv4DataProvider::class, 'getValidIpAddresses')]
     public function testIsVersionOnlyReturnsFalseFor6($value)
     {
         $ip = IP::factory($value);
@@ -115,6 +135,8 @@ public function testIsVersionOnlyReturnsFalseFor6($value)
      * @test
      * @dataProvider \Darsyn\IP\Tests\DataProvider\IPv4::getValidIpAddresses()
      */
+    #[PHPUnit\Test]
+    #[PHPUnit\DataProviderExternal(IPv4DataProvider::class, 'getValidIpAddresses')]
     public function testIsVersion4AlwaysReturnsTrue($value)
     {
         $ip = IP::factory($value);
@@ -125,6 +147,8 @@ public function testIsVersion4AlwaysReturnsTrue($value)
      * @test
      * @dataProvider \Darsyn\IP\Tests\DataProvider\IPv4::getValidIpAddresses()
      */
+    #[PHPUnit\Test]
+    #[PHPUnit\DataProviderExternal(IPv4DataProvider::class, 'getValidIpAddresses')]
     public function testIsVersion6AlwaysReturnsFalse($value)
     {
         $ip = IP::factory($value);
@@ -135,6 +159,8 @@ public function testIsVersion6AlwaysReturnsFalse($value)
      * @test
      * @dataProvider \Darsyn\IP\Tests\DataProvider\IPv4::getValidCidrValues()
      */
+    #[PHPUnit\Test]
+    #[PHPUnit\DataProviderExternal(IPv4DataProvider::class, 'getValidCidrValues')]
     public function testCidrMasks($cidr, $expectedMaskHex)
     {
         $ip = IP::factory('12.34.56.78');
@@ -148,6 +174,8 @@ public function testCidrMasks($cidr, $expectedMaskHex)
      * @test
      * @dataProvider \Darsyn\IP\Tests\DataProvider\IPv4::getInvalidCidrValues()
      */
+    #[PHPUnit\Test]
+    #[PHPUnit\DataProviderExternal(IPv4DataProvider::class, 'getInvalidCidrValues')]
     public function testExceptionIsThrownFromInvalidCidrValues($cidr)
     {
         $this->expectException(\Darsyn\IP\Exception\InvalidCidrException::class);
@@ -167,8 +195,10 @@ public function testExceptionIsThrownFromInvalidCidrValues($cidr)
 
     /**
      * @test
-     * @dataProvider \Darsyn\IP\Tests\DataProvider\Ipv4::getNetworkIpAddresses()
+     * @dataProvider \Darsyn\IP\Tests\DataProvider\IPv4::getNetworkIpAddresses()
      */
+    #[PHPUnit\Test]
+    #[PHPUnit\DataProviderExternal(IPv4DataProvider::class, 'getNetworkIpAddresses')]
     public function testNetworkIp($expected, $cidr)
     {
         $ip = IP::factory('12.34.56.78');
@@ -177,8 +207,10 @@ public function testNetworkIp($expected, $cidr)
 
     /**
      * @test
-     * @dataProvider \Darsyn\IP\Tests\DataProvider\Ipv4::getBroadcastIpAddresses()
+     * @dataProvider \Darsyn\IP\Tests\DataProvider\IPv4::getBroadcastIpAddresses()
      */
+    #[PHPUnit\Test]
+    #[PHPUnit\DataProviderExternal(IPv4DataProvider::class, 'getBroadcastIpAddresses')]
     public function testBroadcastIp($expected, $cidr)
     {
         $ip = IP::factory('12.34.56.78');
@@ -189,6 +221,8 @@ public function testBroadcastIp($expected, $cidr)
      * @test
      * @dataProvider \Darsyn\IP\Tests\DataProvider\IPv4::getValidInRangeIpAddresses()
      */
+    #[PHPUnit\Test]
+    #[PHPUnit\DataProviderExternal(IPv4DataProvider::class, 'getValidInRangeIpAddresses')]
     public function testInRange($first, $second, $cidr)
     {
         $first = IP::factory($first);
@@ -200,6 +234,8 @@ public function testInRange($first, $second, $cidr)
      * @test
      * @dataProvider \Darsyn\IP\Tests\DataProvider\IPv4::getInvalidCidrValues()
      */
+    #[PHPUnit\Test]
+    #[PHPUnit\DataProviderExternal(IPv4DataProvider::class, 'getInvalidCidrValues')]
     public function testInRangeThrowsExceptionOnInvalidCidr($cidr)
     {
         $first = IP::factory('12.34.56.78');
@@ -208,9 +244,8 @@ public function testInRangeThrowsExceptionOnInvalidCidr($cidr)
         $first->inRange($second, $cidr);
     }
 
-    /**
-     * @test
-     */
+    /** @test */
+    #[PHPUnit\Test]
     public function testDifferentVersionsAreNotInRange()
     {
         $ip = IP::factory('12.34.56.78');
@@ -223,6 +258,8 @@ public function testDifferentVersionsAreNotInRange()
      * @test
      * @dataProvider \Darsyn\IP\Tests\DataProvider\IPv4::getCommonCidrValues()
      */
+    #[PHPUnit\Test]
+    #[PHPUnit\DataProviderExternal(IPv4DataProvider::class, 'getCommonCidrValues')]
     public function testCommonCidr($first, $second, $expectedCidr)
     {
         $first = IP::factory($first);
@@ -231,6 +268,7 @@ public function testCommonCidr($first, $second, $expectedCidr)
     }
 
     /** @test */
+    #[PHPUnit\Test]
     public function testCommonCidrThrowsException()
     {
         $first = IP::factory('12.34.56.78');
@@ -243,6 +281,8 @@ public function testCommonCidrThrowsException()
      * @test
      * @dataProvider \Darsyn\IP\Tests\DataProvider\IPv4::getValidIpAddresses()
      */
+    #[PHPUnit\Test]
+    #[PHPUnit\DataProviderExternal(IPv4DataProvider::class, 'getValidIpAddresses')]
     public function testIsMappedAlwaysReturnsFalse($value)
     {
         $ip = IP::factory($value);
@@ -253,6 +293,8 @@ public function testIsMappedAlwaysReturnsFalse($value)
      * @test
      * @dataProvider \Darsyn\IP\Tests\DataProvider\IPv4::getValidIpAddresses()
      */
+    #[PHPUnit\Test]
+    #[PHPUnit\DataProviderExternal(IPv4DataProvider::class, 'getValidIpAddresses')]
     public function testIsDerivedAlwaysReturnsFalse($value)
     {
         $ip = IP::factory($value);
@@ -263,6 +305,8 @@ public function testIsDerivedAlwaysReturnsFalse($value)
      * @test
      * @dataProvider \Darsyn\IP\Tests\DataProvider\IPv4::getValidIpAddresses()
      */
+    #[PHPUnit\Test]
+    #[PHPUnit\DataProviderExternal(IPv4DataProvider::class, 'getValidIpAddresses')]
     public function testIsCompatibleAlwaysReturnsFalse($value)
     {
         $ip = IP::factory($value);
@@ -273,6 +317,8 @@ public function testIsCompatibleAlwaysReturnsFalse($value)
      * @test
      * @dataProvider \Darsyn\IP\Tests\DataProvider\IPv4::getValidIpAddresses()
      */
+    #[PHPUnit\Test]
+    #[PHPUnit\DataProviderExternal(IPv4DataProvider::class, 'getValidIpAddresses')]
     public function testIsEmbeddedAlwaysReturnsFalse($value)
     {
         $ip = IP::factory($value);
@@ -283,6 +329,8 @@ public function testIsEmbeddedAlwaysReturnsFalse($value)
      * @test
      * @dataProvider \Darsyn\IP\Tests\DataProvider\IPv4::getLinkLocalIpAddresses()
      */
+    #[PHPUnit\Test]
+    #[PHPUnit\DataProviderExternal(IPv4DataProvider::class, 'getLinkLocalIpAddresses')]
     public function testIsLinkLocal($value, $isLinkLocal)
     {
         $ip = IP::factory($value);
@@ -293,6 +341,8 @@ public function testIsLinkLocal($value, $isLinkLocal)
      * @test
      * @dataProvider \Darsyn\IP\Tests\DataProvider\IPv4::getLoopbackIpAddresses()
      */
+    #[PHPUnit\Test]
+    #[PHPUnit\DataProviderExternal(IPv4DataProvider::class, 'getLoopbackIpAddresses')]
     public function testIsLoopback($value, $isLoopback)
     {
         $ip = IP::factory($value);
@@ -303,6 +353,8 @@ public function testIsLoopback($value, $isLoopback)
      * @test
      * @dataProvider \Darsyn\IP\Tests\DataProvider\IPv4::getMulticastIpAddresses()
      */
+    #[PHPUnit\Test]
+    #[PHPUnit\DataProviderExternal(IPv4DataProvider::class, 'getMulticastIpAddresses')]
     public function testIsMulticast($value, $isMulticast)
     {
         $ip = IP::factory($value);
@@ -314,6 +366,8 @@ public function testIsMulticast($value, $isMulticast)
      * @test
      * @dataProvider \Darsyn\IP\Tests\DataProvider\IPv4::getPrivateUseIpAddresses()
      */
+    #[PHPUnit\Test]
+    #[PHPUnit\DataProviderExternal(IPv4DataProvider::class, 'getPrivateUseIpAddresses')]
     public function testIsPrivateUse($value, $isPrivateUse)
     {
         $ip = IP::factory($value);
@@ -324,6 +378,8 @@ public function testIsPrivateUse($value, $isPrivateUse)
      * @test
      * @dataProvider \Darsyn\IP\Tests\DataProvider\IPv4::getUnspecifiedIpAddresses()
      */
+    #[PHPUnit\Test]
+    #[PHPUnit\DataProviderExternal(IPv4DataProvider::class, 'getUnspecifiedIpAddresses')]
     public function testIsUnspecified($value, $isUnspecified)
     {
         $ip = IP::factory($value);
@@ -334,6 +390,8 @@ public function testIsUnspecified($value, $isUnspecified)
      * @test
      * @dataProvider \Darsyn\IP\Tests\DataProvider\IPv4::getBenchmarkingIpAddresses()
      */
+    #[PHPUnit\Test]
+    #[PHPUnit\DataProviderExternal(IPv4DataProvider::class, 'getBenchmarkingIpAddresses')]
     public function testIsBenchmarking($value, $isBenchmarking)
     {
         $ip = IP::factory($value);
@@ -344,6 +402,8 @@ public function testIsBenchmarking($value, $isBenchmarking)
      * @test
      * @dataProvider \Darsyn\IP\Tests\DataProvider\IPv4::getDocumentationIpAddresses()
      */
+    #[PHPUnit\Test]
+    #[PHPUnit\DataProviderExternal(IPv4DataProvider::class, 'getDocumentationIpAddresses')]
     public function testIsDocumentation($value, $isDocumentation)
     {
         $ip = IP::factory($value);
@@ -354,6 +414,8 @@ public function testIsDocumentation($value, $isDocumentation)
      * @test
      * @dataProvider \Darsyn\IP\Tests\DataProvider\IPv4::getPublicUseIpAddresses()
      */
+    #[PHPUnit\Test]
+    #[PHPUnit\DataProviderExternal(IPv4DataProvider::class, 'getPublicUseIpAddresses')]
     public function testIsPublicUse($value, $isPublicUse)
     {
         $ip = IP::factory($value);
@@ -364,6 +426,8 @@ public function testIsPublicUse($value, $isPublicUse)
      * @test
      * @dataProvider \Darsyn\IP\Tests\DataProvider\IPv4::getIsBroadcastIpAddresses()
      */
+    #[PHPUnit\Test]
+    #[PHPUnit\DataProviderExternal(IPv4DataProvider::class, 'getIsBroadcastIpAddresses')]
     public function testIsBroadcast($value, $isBroadcast)
     {
         $ip = IP::factory($value);
@@ -374,6 +438,8 @@ public function testIsBroadcast($value, $isBroadcast)
      * @test
      * @dataProvider \Darsyn\IP\Tests\DataProvider\IPv4::getSharedIpAddresses()
      */
+    #[PHPUnit\Test]
+    #[PHPUnit\DataProviderExternal(IPv4DataProvider::class, 'getSharedIpAddresses')]
     public function testIsShared($value, $isShared)
     {
         $ip = IP::factory($value);
@@ -384,6 +450,8 @@ public function testIsShared($value, $isShared)
      * @test
      * @dataProvider \Darsyn\IP\Tests\DataProvider\IPv4::getFutureReservedIpAddresses()
      */
+    #[PHPUnit\Test]
+    #[PHPUnit\DataProviderExternal(IPv4DataProvider::class, 'getFutureReservedIpAddresses')]
     public function testIsFutureReserved($value, $isFutureReserved)
     {
         $ip = IP::factory($value);
@@ -394,6 +462,8 @@ public function testIsFutureReserved($value, $isFutureReserved)
      * @test
      * @dataProvider \Darsyn\IP\Tests\DataProvider\IPv4::getValidIpAddresses()
      */
+    #[PHPUnit\Test]
+    #[PHPUnit\DataProviderExternal(IPv4DataProvider::class, 'getValidIpAddresses')]
     public function testStringCasting($value, $expectedHex, $expectedDot)
     {
         $ip = IP::factory($value);
diff --git a/tests/Version/IPv6Test.php b/tests/Version/IPv6Test.php
index 9fd7a80..480adae 100644
--- a/tests/Version/IPv6Test.php
+++ b/tests/Version/IPv6Test.php
@@ -7,10 +7,13 @@
 use Darsyn\IP\Exception\WrongVersionException;
 use Darsyn\IP\IpInterface;
 use Darsyn\IP\Strategy\Mapped;
+use Darsyn\IP\Tests\DataProvider\IPv4 as IPv4DataProvider;
+use Darsyn\IP\Tests\DataProvider\IPv6 as IPv6DataProvider;
 use Darsyn\IP\Version\IPv4;
 use Darsyn\IP\Version\IPv6 as IP;
 use Darsyn\IP\Version\Multi;
 use Darsyn\IP\Version\Version6Interface;
+use PHPUnit\Framework\Attributes as PHPUnit;
 use PHPUnit\Framework\TestCase;
 
 class IPv6Test extends TestCase
@@ -19,6 +22,8 @@ class IPv6Test extends TestCase
      * @test
      * @dataProvider \Darsyn\IP\Tests\DataProvider\IPv6::getValidIpAddresses()
      */
+    #[PHPUnit\Test]
+    #[PHPUnit\DataProviderExternal(IPv6DataProvider::class, 'getValidIpAddresses')]
     public function testInstantiationWithValidAddresses($value)
     {
         $ip = IP::factory($value);
@@ -30,6 +35,8 @@ public function testInstantiationWithValidAddresses($value)
      * @test
      * @dataProvider \Darsyn\IP\Tests\DataProvider\IPv6::getValidBinarySequences()
      */
+    #[PHPUnit\Test]
+    #[PHPUnit\DataProviderExternal(IPv6DataProvider::class, 'getValidBinarySequences')]
     public function testBinarySequenceIsTheSameOnceInstantiated($value)
     {
         $ip = IP::factory($value);
@@ -40,6 +47,8 @@ public function testBinarySequenceIsTheSameOnceInstantiated($value)
      * @test
      * @dataProvider \Darsyn\IP\Tests\DataProvider\IPv6::getValidProtocolIpAddresses()
      */
+    #[PHPUnit\Test]
+    #[PHPUnit\DataProviderExternal(IPv6DataProvider::class, 'getValidProtocolIpAddresses')]
     public function testProtocolNotationConvertsToCorrectBinarySequence($value, $hex)
     {
         $ip = IP::factory($value);
@@ -50,6 +59,8 @@ public function testProtocolNotationConvertsToCorrectBinarySequence($value, $hex
      * @test
      * @dataProvider \Darsyn\IP\Tests\DataProvider\IPv6::getInvalidIpAddresses()
      */
+    #[PHPUnit\Test]
+    #[PHPUnit\DataProviderExternal(IPv6DataProvider::class, 'getInvalidIpAddresses')]
     public function testExceptionIsThrownOnInstantiationWithInvalidAddresses($value)
     {
         $this->expectException(\Darsyn\IP\Exception\InvalidIpAddressException::class);
@@ -69,6 +80,7 @@ public function testExceptionIsThrownOnInstantiationWithInvalidAddresses($value)
      * @covers \Darsyn\IP\Version\Multi::factory()
      * @covers \Darsyn\IP\Version\Multi::getBinary()
      */
+    #[PHPUnit\Test]
     public function testInstantiationFromEmbeddedIpAddress()
     {
         try {
@@ -94,6 +106,8 @@ public function testInstantiationFromEmbeddedIpAddress()
      * @test
      * @dataProvider \Darsyn\IP\Tests\DataProvider\IPv6::getValidIpAddresses()
      */
+    #[PHPUnit\Test]
+    #[PHPUnit\DataProviderExternal(IPv6DataProvider::class, 'getValidIpAddresses')]
     public function testGetBinaryAlwaysReturnsA16ByteString($value)
     {
         $ip = IP::factory($value);
@@ -104,6 +118,8 @@ public function testGetBinaryAlwaysReturnsA16ByteString($value)
      * @test
      * @dataProvider \Darsyn\IP\Tests\DataProvider\IPv6::getValidIpAddresses()
      */
+    #[PHPUnit\Test]
+    #[PHPUnit\DataProviderExternal(IPv6DataProvider::class, 'getValidIpAddresses')]
     public function testGetCompactedAddressReturnsCorrectString($value, $hex, $expanded, $compacted)
     {
         $ip = IP::factory($value);
@@ -114,6 +130,8 @@ public function testGetCompactedAddressReturnsCorrectString($value, $hex, $expan
      * @test
      * @dataProvider \Darsyn\IP\Tests\DataProvider\IPv6::getValidProtocolIpAddresses()
      */
+    #[PHPUnit\Test]
+    #[PHPUnit\DataProviderExternal(IPv6DataProvider::class, 'getValidProtocolIpAddresses')]
     public function testGetExpandedAddressReturnsCorrectString($value, $hex, $expanded)
     {
         $ip = IP::factory($value);
@@ -124,6 +142,8 @@ public function testGetExpandedAddressReturnsCorrectString($value, $hex, $expand
      * @test
      * @dataProvider \Darsyn\IP\Tests\DataProvider\IPv6::getValidIpAddresses()
      */
+    #[PHPUnit\Test]
+    #[PHPUnit\DataProviderExternal(IPv6DataProvider::class, 'getValidIpAddresses')]
     public function testGetVersionAlwaysReturns6($value)
     {
         $ip = IP::factory($value);
@@ -134,6 +154,8 @@ public function testGetVersionAlwaysReturns6($value)
      * @test
      * @dataProvider \Darsyn\IP\Tests\DataProvider\IPv6::getValidIpAddresses()
      */
+    #[PHPUnit\Test]
+    #[PHPUnit\DataProviderExternal(IPv6DataProvider::class, 'getValidIpAddresses')]
     public function testIsVersionOnlyReturnsTrueFor6($value)
     {
         $ip = IP::factory($value);
@@ -144,6 +166,8 @@ public function testIsVersionOnlyReturnsTrueFor6($value)
      * @test
      * @dataProvider \Darsyn\IP\Tests\DataProvider\IPv6::getValidIpAddresses()
      */
+    #[PHPUnit\Test]
+    #[PHPUnit\DataProviderExternal(IPv6DataProvider::class, 'getValidIpAddresses')]
     public function testIsVersionOnlyReturnsFalseFor4($value)
     {
         $ip = IP::factory($value);
@@ -154,6 +178,8 @@ public function testIsVersionOnlyReturnsFalseFor4($value)
      * @test
      * @dataProvider \Darsyn\IP\Tests\DataProvider\IPv6::getValidIpAddresses()
      */
+    #[PHPUnit\Test]
+    #[PHPUnit\DataProviderExternal(IPv6DataProvider::class, 'getValidIpAddresses')]
     public function testIsVersion6AlwaysReturnsTrue($value)
     {
         $ip = IP::factory($value);
@@ -164,6 +190,8 @@ public function testIsVersion6AlwaysReturnsTrue($value)
      * @test
      * @dataProvider \Darsyn\IP\Tests\DataProvider\IPv6::getValidIpAddresses()
      */
+    #[PHPUnit\Test]
+    #[PHPUnit\DataProviderExternal(IPv6DataProvider::class, 'getValidIpAddresses')]
     public function testIsVersion4AlwaysReturnsFalse($value)
     {
         $ip = IP::factory($value);
@@ -174,6 +202,8 @@ public function testIsVersion4AlwaysReturnsFalse($value)
      * @test
      * @dataProvider \Darsyn\IP\Tests\DataProvider\IPv6::getValidCidrValues()
      */
+    #[PHPUnit\Test]
+    #[PHPUnit\DataProviderExternal(IPv6DataProvider::class, 'getValidCidrValues')]
     public function testCidrMasks($cidr, $expectedMaskHex)
     {
         $ip = IP::factory('::1');
@@ -187,6 +217,8 @@ public function testCidrMasks($cidr, $expectedMaskHex)
      * @test
      * @dataProvider \Darsyn\IP\Tests\DataProvider\IPv6::getInvalidCidrValues()
      */
+    #[PHPUnit\Test]
+    #[PHPUnit\DataProviderExternal(IPv6DataProvider::class, 'getInvalidCidrValues')]
     public function testExceptionIsThrownFromInvalidCidrValues($cidr)
     {
         $this->expectException(\Darsyn\IP\Exception\InvalidCidrException::class);
@@ -208,6 +240,8 @@ public function testExceptionIsThrownFromInvalidCidrValues($cidr)
      * @test
      * @dataProvider \Darsyn\IP\Tests\DataProvider\IPv6::getNetworkIpAddresses()
      */
+    #[PHPUnit\Test]
+    #[PHPUnit\DataProviderExternal(IPv6DataProvider::class, 'getNetworkIpAddresses')]
     public function testNetworkIp($expected, $cidr)
     {
         $ip = IP::factory('2001:db8::a60:8a2e:370:7334');
@@ -218,6 +252,8 @@ public function testNetworkIp($expected, $cidr)
      * @test
      * @dataProvider \Darsyn\IP\Tests\DataProvider\IPv6::getBroadcastIpAddresses()
      */
+    #[PHPUnit\Test]
+    #[PHPUnit\DataProviderExternal(IPv6DataProvider::class, 'getBroadcastIpAddresses')]
     public function testBroadcastIp($expected, $cidr)
     {
         $ip = IP::factory('2001:db8::a60:8a2e:370:7334');
@@ -228,6 +264,8 @@ public function testBroadcastIp($expected, $cidr)
      * @test
      * @dataProvider \Darsyn\IP\Tests\DataProvider\IPv6::getValidInRangeIpAddresses()
      */
+    #[PHPUnit\Test]
+    #[PHPUnit\DataProviderExternal(IPv6DataProvider::class, 'getValidInRangeIpAddresses')]
     public function testInRange($first, $second, $cidr)
     {
         $first = IP::factory($first);
@@ -235,9 +273,8 @@ public function testInRange($first, $second, $cidr)
         $this->assertTrue($first->inRange($second, $cidr));
     }
 
-    /**
-     * @test
-     */
+    /** @test */
+    #[PHPUnit\Test]
     public function testDifferentVersionsAreNotInRange()
     {
         $ip = IP::factory('::12.34.56.78');
@@ -250,6 +287,8 @@ public function testDifferentVersionsAreNotInRange()
      * @test
      * @dataProvider \Darsyn\IP\Tests\DataProvider\IPv6::getCommonCidrValues()
      */
+    #[PHPUnit\Test]
+    #[PHPUnit\DataProviderExternal(IPv6DataProvider::class, 'getCommonCidrValues')]
     public function testCommonCidr($first, $second, $expectedCidr)
     {
         $first = IP::factory($first);
@@ -261,6 +300,8 @@ public function testCommonCidr($first, $second, $expectedCidr)
      * @test
      * @dataProvider \Darsyn\IP\Tests\DataProvider\IPv4::getCommonCidrValues()
      */
+    #[PHPUnit\Test]
+    #[PHPUnit\DataProviderExternal(IPv4DataProvider::class, 'getCommonCidrValues')]
     public function testEmbeddedCommonCidr($first, $second, $expectedCidr)
     {
         $first = IP::fromEmbedded($first);
@@ -269,6 +310,7 @@ public function testEmbeddedCommonCidr($first, $second, $expectedCidr)
     }
 
     /** @test */
+    #[PHPUnit\Test]
     public function testCommonCidrThrowsException()
     {
         $first = IP::factory('2001:db8::a60:8a2e:370:7334');
@@ -281,6 +323,8 @@ public function testCommonCidrThrowsException()
      * @test
      * @dataProvider \Darsyn\IP\Tests\DataProvider\IPv6::getMappedIpAddresses()
      */
+    #[PHPUnit\Test]
+    #[PHPUnit\DataProviderExternal(IPv6DataProvider::class, 'getMappedIpAddresses')]
     public function testIsMapped($value, $isMapped)
     {
         $ip = IP::factory($value);
@@ -291,6 +335,8 @@ public function testIsMapped($value, $isMapped)
      * @test
      * @dataProvider \Darsyn\IP\Tests\DataProvider\IPv6::getDerivedIpAddresses()
      */
+    #[PHPUnit\Test]
+    #[PHPUnit\DataProviderExternal(IPv6DataProvider::class, 'getDerivedIpAddresses')]
     public function testIsDerived($value, $isDerived)
     {
         $ip = IP::factory($value);
@@ -301,6 +347,8 @@ public function testIsDerived($value, $isDerived)
      * @test
      * @dataProvider \Darsyn\IP\Tests\DataProvider\IPv6::getCompatibleIpAddresses()
      */
+    #[PHPUnit\Test]
+    #[PHPUnit\DataProviderExternal(IPv6DataProvider::class, 'getCompatibleIpAddresses')]
     public function testIsCompatible($value, $isCompatible)
     {
         $ip = IP::factory($value);
@@ -311,6 +359,8 @@ public function testIsCompatible($value, $isCompatible)
      * @test
      * @dataProvider \Darsyn\IP\Tests\DataProvider\IPv6::getValidIpAddresses()
      */
+    #[PHPUnit\Test]
+    #[PHPUnit\DataProviderExternal(IPv6DataProvider::class, 'getValidIpAddresses')]
     public function testIsEmbeddedAlwaysReturnsFalse($value)
     {
         $ip = IP::factory($value);
@@ -321,6 +371,8 @@ public function testIsEmbeddedAlwaysReturnsFalse($value)
      * @test
      * @dataProvider \Darsyn\IP\Tests\DataProvider\IPv6::getLinkLocalIpAddresses()
      */
+    #[PHPUnit\Test]
+    #[PHPUnit\DataProviderExternal(IPv6DataProvider::class, 'getLinkLocalIpAddresses')]
     public function testIsLinkLocal($value, $isLinkLocal)
     {
         $ip = IP::factory($value);
@@ -331,6 +383,8 @@ public function testIsLinkLocal($value, $isLinkLocal)
      * @test
      * @dataProvider \Darsyn\IP\Tests\DataProvider\IPv6::getLoopbackIpAddresses()
      */
+    #[PHPUnit\Test]
+    #[PHPUnit\DataProviderExternal(IPv6DataProvider::class, 'getLoopbackIpAddresses')]
     public function testIsLoopback($value, $isLoopback)
     {
         $ip = IP::factory($value);
@@ -341,6 +395,8 @@ public function testIsLoopback($value, $isLoopback)
      * @test
      * @dataProvider \Darsyn\IP\Tests\DataProvider\IPv6::getMulticastIpAddresses()
      */
+    #[PHPUnit\Test]
+    #[PHPUnit\DataProviderExternal(IPv6DataProvider::class, 'getMulticastIpAddresses')]
     public function testIsMulticast($value, $isMulticast)
     {
         $ip = IP::factory($value);
@@ -352,6 +408,8 @@ public function testIsMulticast($value, $isMulticast)
      * @test
      * @dataProvider \Darsyn\IP\Tests\DataProvider\IPv6::getPrivateUseIpAddresses()
      */
+    #[PHPUnit\Test]
+    #[PHPUnit\DataProviderExternal(IPv6DataProvider::class, 'getPrivateUseIpAddresses')]
     public function testIsPrivateUse($value, $isPrivateUse)
     {
         $ip = IP::factory($value);
@@ -362,6 +420,8 @@ public function testIsPrivateUse($value, $isPrivateUse)
      * @test
      * @dataProvider \Darsyn\IP\Tests\DataProvider\IPv6::getUnspecifiedIpAddresses()
      */
+    #[PHPUnit\Test]
+    #[PHPUnit\DataProviderExternal(IPv6DataProvider::class, 'getUnspecifiedIpAddresses')]
     public function testIsUnspecified($value, $isUnspecified)
     {
         $ip = IP::factory($value);
@@ -372,6 +432,8 @@ public function testIsUnspecified($value, $isUnspecified)
      * @test
      * @dataProvider \Darsyn\IP\Tests\DataProvider\IPv6::getBenchmarkingIpAddresses()
      */
+    #[PHPUnit\Test]
+    #[PHPUnit\DataProviderExternal(IPv6DataProvider::class, 'getBenchmarkingIpAddresses')]
     public function testIsBenchmarking($value, $isBenchmarking)
     {
         $ip = IP::factory($value);
@@ -382,6 +444,8 @@ public function testIsBenchmarking($value, $isBenchmarking)
      * @test
      * @dataProvider \Darsyn\IP\Tests\DataProvider\IPv6::getDocumentationIpAddresses()
      */
+    #[PHPUnit\Test]
+    #[PHPUnit\DataProviderExternal(IPv6DataProvider::class, 'getDocumentationIpAddresses')]
     public function testIsDocumentation($value, $isDocumentation)
     {
         $ip = IP::factory($value);
@@ -392,6 +456,8 @@ public function testIsDocumentation($value, $isDocumentation)
      * @test
      * @dataProvider \Darsyn\IP\Tests\DataProvider\IPv6::getPublicUseIpAddresses()
      */
+    #[PHPUnit\Test]
+    #[PHPUnit\DataProviderExternal(IPv6DataProvider::class, 'getPublicUseIpAddresses')]
     public function testIsPublicUse($value, $isPublicUse)
     {
         $ip = IP::factory($value);
@@ -402,6 +468,8 @@ public function testIsPublicUse($value, $isPublicUse)
      * @test
      * @dataProvider \Darsyn\IP\Tests\DataProvider\IPv6::getUniqueLocalIpAddresses()
      */
+    #[PHPUnit\Test]
+    #[PHPUnit\DataProviderExternal(IPv6DataProvider::class, 'getUniqueLocalIpAddresses')]
     public function testIsUniqueLocal($value, $isUniqueLocal)
     {
         $ip = IP::factory($value);
@@ -412,6 +480,8 @@ public function testIsUniqueLocal($value, $isUniqueLocal)
      * @test
      * @dataProvider \Darsyn\IP\Tests\DataProvider\IPv6::getUnicastIpAddresses()
      */
+    #[PHPUnit\Test]
+    #[PHPUnit\DataProviderExternal(IPv6DataProvider::class, 'getUnicastIpAddresses')]
     public function testIsUnicast($value, $isUnicast)
     {
         $ip = IP::factory($value);
@@ -422,6 +492,8 @@ public function testIsUnicast($value, $isUnicast)
      * @test
      * @dataProvider \Darsyn\IP\Tests\DataProvider\IPv6::getUnicastGlobalIpAddresses()
      */
+    #[PHPUnit\Test]
+    #[PHPUnit\DataProviderExternal(IPv6DataProvider::class, 'getUnicastGlobalIpAddresses')]
     public function testIsUnicastGlobal($value, $isUnicastGlobal)
     {
         $ip = IP::factory($value);
@@ -432,6 +504,8 @@ public function testIsUnicastGlobal($value, $isUnicastGlobal)
      * @test
      * @dataProvider \Darsyn\IP\Tests\DataProvider\IPv6::getValidIpAddresses()
      */
+    #[PHPUnit\Test]
+    #[PHPUnit\DataProviderExternal(IPv6DataProvider::class, 'getValidIpAddresses')]
     public function testStringCasting($value, $hex, $expanded, $compacted)
     {
         $ip = IP::factory($value);
diff --git a/tests/Version/MultiTest.php b/tests/Version/MultiTest.php
index c690d36..b6262bf 100644
--- a/tests/Version/MultiTest.php
+++ b/tests/Version/MultiTest.php
@@ -6,17 +6,20 @@
 use Darsyn\IP\Exception\WrongVersionException;
 use Darsyn\IP\IpInterface;
 use Darsyn\IP\Strategy;
+use Darsyn\IP\Tests\DataProvider\Multi as MultiDataProvider;
 use Darsyn\IP\Version\IPv4;
 use Darsyn\IP\Version\IPv6;
 use Darsyn\IP\Version\Multi as IP;
 use Darsyn\IP\Version\MultiVersionInterface;
 use Darsyn\IP\Version\Version4Interface;
 use Darsyn\IP\Version\Version6Interface;
+use PHPUnit\Framework\Attributes as PHPUnit;
 use PHPUnit\Framework\TestCase;
 
 class MultiTest extends TestCase
 {
     /** @before */
+    #[PHPUnit\Before]
     public function resetDefaultEmbeddingStrategy()
     {
         IP::setDefaultEmbeddingStrategy(new Strategy\Mapped);
@@ -26,6 +29,8 @@ public function resetDefaultEmbeddingStrategy()
      * @test
      * @dataProvider \Darsyn\IP\Tests\DataProvider\Multi::getValidIpAddresses()
      */
+    #[PHPUnit\Test]
+    #[PHPUnit\DataProviderExternal(MultiDataProvider::class, 'getValidIpAddresses')]
     public function testInstantiationWithValidAddresses($value)
     {
         $ip = IP::factory($value);
@@ -39,6 +44,8 @@ public function testInstantiationWithValidAddresses($value)
      * @test
      * @dataProvider \Darsyn\IP\Tests\DataProvider\Multi::getEmbeddingStrategyIpAddresses()
      */
+    #[PHPUnit\Test]
+    #[PHPUnit\DataProviderExternal(MultiDataProvider::class, 'getEmbeddingStrategyIpAddresses')]
     public function testEmbeddingStrategy($strategyClass, $expandedAddress, $v4address)
     {
         $ip = IP::factory($v4address, new $strategyClass);
@@ -49,6 +56,8 @@ public function testEmbeddingStrategy($strategyClass, $expandedAddress, $v4addre
      * @test
      * @dataProvider \Darsyn\IP\Tests\DataProvider\Multi::getEmbeddingStrategyIpAddresses()
      */
+    #[PHPUnit\Test]
+    #[PHPUnit\DataProviderExternal(MultiDataProvider::class, 'getEmbeddingStrategyIpAddresses')]
     public function testDefaufltEmbeddingStrategy($strategyClass, $expandedAddress, $v4address)
     {
         IP::setDefaultEmbeddingStrategy(new $strategyClass);
@@ -60,6 +69,8 @@ public function testDefaufltEmbeddingStrategy($strategyClass, $expandedAddress,
      * @test
      * @dataProvider \Darsyn\IP\Tests\DataProvider\Multi::getValidBinarySequences()
      */
+    #[PHPUnit\Test]
+    #[PHPUnit\DataProviderExternal(MultiDataProvider::class, 'getValidBinarySequences')]
     public function testBinarySequenceIsTheSameOnceInstantiated($value)
     {
         $ip = IP::factory($value);
@@ -70,6 +81,8 @@ public function testBinarySequenceIsTheSameOnceInstantiated($value)
      * @test
      * @dataProvider \Darsyn\IP\Tests\DataProvider\Multi::getValidProtocolIpAddresses()
      */
+    #[PHPUnit\Test]
+    #[PHPUnit\DataProviderExternal(MultiDataProvider::class, 'getValidProtocolIpAddresses')]
     public function testProtocolNotationConvertsToCorrectBinarySequence($value, $hex)
     {
         $ip = IP::factory($value);
@@ -80,6 +93,8 @@ public function testProtocolNotationConvertsToCorrectBinarySequence($value, $hex
      * @test
      * @dataProvider \Darsyn\IP\Tests\DataProvider\Multi::getInvalidIpAddresses()
      */
+    #[PHPUnit\Test]
+    #[PHPUnit\DataProviderExternal(MultiDataProvider::class, 'getInvalidIpAddresses')]
     public function testExceptionIsThrownOnInstantiationWithInvalidAddresses($value)
     {
         $this->expectException(InvalidIpAddressException::class);
@@ -96,6 +111,8 @@ public function testExceptionIsThrownOnInstantiationWithInvalidAddresses($value)
      * @test
      * @dataProvider \Darsyn\IP\Tests\DataProvider\Multi::getValidIpAddresses()
      */
+    #[PHPUnit\Test]
+    #[PHPUnit\DataProviderExternal(MultiDataProvider::class, 'getValidIpAddresses')]
     public function testGetBinaryAlwaysReturnsA16ByteString($value)
     {
         $ip = IP::factory($value);
@@ -106,6 +123,8 @@ public function testGetBinaryAlwaysReturnsA16ByteString($value)
      * @test
      * @dataProvider \Darsyn\IP\Tests\DataProvider\Multi::getValidIpAddresses()
      */
+    #[PHPUnit\Test]
+    #[PHPUnit\DataProviderExternal(MultiDataProvider::class, 'getValidIpAddresses')]
     public function testGetCompactedAddressReturnsCorrectString($value, $hex, $expanded, $compacted)
     {
         $ip = IP::factory($value);
@@ -116,6 +135,8 @@ public function testGetCompactedAddressReturnsCorrectString($value, $hex, $expan
      * @test
      * @dataProvider \Darsyn\IP\Tests\DataProvider\Multi::getValidProtocolIpAddresses()
      */
+    #[PHPUnit\Test]
+    #[PHPUnit\DataProviderExternal(MultiDataProvider::class, 'getValidProtocolIpAddresses')]
     public function testGetExpandedAddressReturnsCorrectString($value, $hex, $expanded)
     {
         $ip = IP::factory($value);
@@ -126,6 +147,8 @@ public function testGetExpandedAddressReturnsCorrectString($value, $hex, $expand
      * @test
      * @dataProvider \Darsyn\IP\Tests\DataProvider\Multi::getValidIpVersion4Addresses()
      */
+    #[PHPUnit\Test]
+    #[PHPUnit\DataProviderExternal(MultiDataProvider::class, 'getValidIpVersion4Addresses')]
     public function testDotAddressReturnsCorrectString($value, $hex, $expanded, $compacted, $dot)
     {
         $ip = IP::factory($value);
@@ -136,6 +159,8 @@ public function testDotAddressReturnsCorrectString($value, $hex, $expanded, $com
      * @test
      * @dataProvider \Darsyn\IP\Tests\DataProvider\Multi::getValidIpVersion6Addresses()
      */
+    #[PHPUnit\Test]
+    #[PHPUnit\DataProviderExternal(MultiDataProvider::class, 'getValidIpVersion6Addresses')]
     public function testDotAddressThrowsExceptionForNonVersion4Addresses($value)
     {
         $this->expectException(\Darsyn\IP\Exception\WrongVersionException::class);
@@ -154,6 +179,8 @@ public function testDotAddressThrowsExceptionForNonVersion4Addresses($value)
      * @test
      * @dataProvider \Darsyn\IP\Tests\DataProvider\Multi::getIpAddressVersions()
      */
+    #[PHPUnit\Test]
+    #[PHPUnit\DataProviderExternal(MultiDataProvider::class, 'getIpAddressVersions')]
     public function testVersion($value, $version)
     {
         $ip = IP::factory($value);
@@ -164,6 +191,8 @@ public function testVersion($value, $version)
      * @test
      * @dataProvider \Darsyn\IP\Tests\DataProvider\Multi::getNetworkIpAddresses()
      */
+    #[PHPUnit\Test]
+    #[PHPUnit\DataProviderExternal(MultiDataProvider::class, 'getNetworkIpAddresses')]
     public function testNetworkIp($initial, $expected, $cidr)
     {
         $ip = IP::factory($initial);
@@ -174,6 +203,8 @@ public function testNetworkIp($initial, $expected, $cidr)
      * @test
      * @dataProvider \Darsyn\IP\Tests\DataProvider\Multi::getBroadcastIpAddresses()
      */
+    #[PHPUnit\Test]
+    #[PHPUnit\DataProviderExternal(MultiDataProvider::class, 'getBroadcastIpAddresses')]
     public function testBroadcastIp($initial, $expected, $cidr)
     {
         $ip = IP::factory($initial);
@@ -184,6 +215,8 @@ public function testBroadcastIp($initial, $expected, $cidr)
      * @test
      * @dataProvider \Darsyn\IP\Tests\DataProvider\Multi::getValidInRangeIpAddresses()
      */
+    #[PHPUnit\Test]
+    #[PHPUnit\DataProviderExternal(MultiDataProvider::class, 'getValidInRangeIpAddresses')]
     public function testInRange($first, $second, $cidr)
     {
         $first = IP::factory($first);
@@ -192,6 +225,7 @@ public function testInRange($first, $second, $cidr)
     }
 
     /** @test */
+    #[PHPUnit\Test]
     public function testDifferentVersionsAreInRange()
     {
         $first = IP::factory('127.0.0.1', new Strategy\Mapped);
@@ -200,6 +234,7 @@ public function testDifferentVersionsAreInRange()
     }
 
     /** @test */
+    #[PHPUnit\Test]
     public function testDifferentByteLengthsAreNotInRange()
     {
         $first = IP::factory('127.0.0.1');
@@ -212,6 +247,8 @@ public function testDifferentByteLengthsAreNotInRange()
      * @test
      * @dataProvider \Darsyn\IP\Tests\DataProvider\Multi::getCommonCidrValues()
      */
+    #[PHPUnit\Test]
+    #[PHPUnit\DataProviderExternal(MultiDataProvider::class, 'getCommonCidrValues')]
     public function testCommonCidr($first, $second, $expectedCidr)
     {
         $first = IP::factory($first);
@@ -220,6 +257,7 @@ public function testCommonCidr($first, $second, $expectedCidr)
     }
 
     /** @test */
+    #[PHPUnit\Test]
     public function testCommonCidrThrowsException()
     {
         $first = IP::factory('12.34.56.78');
@@ -232,6 +270,8 @@ public function testCommonCidrThrowsException()
      * @test
      * @dataProvider \Darsyn\IP\Tests\DataProvider\Multi::getLinkLocalIpAddresses()
      */
+    #[PHPUnit\Test]
+    #[PHPUnit\DataProviderExternal(MultiDataProvider::class, 'getLinkLocalIpAddresses')]
     public function testIsLinkLocal($value, $isLinkLocal)
     {
         $ip = IP::factory($value);
@@ -242,6 +282,8 @@ public function testIsLinkLocal($value, $isLinkLocal)
      * @test
      * @dataProvider \Darsyn\IP\Tests\DataProvider\Multi::getMappedLoopbackIpAddresses()
      */
+    #[PHPUnit\Test]
+    #[PHPUnit\DataProviderExternal(MultiDataProvider::class, 'getMappedLoopbackIpAddresses')]
     public function testIsLoopbackMapped($value, $isLoopback)
     {
         $ip = IP::factory($value, new Strategy\Mapped);
@@ -252,6 +294,8 @@ public function testIsLoopbackMapped($value, $isLoopback)
      * @test
      * @dataProvider \Darsyn\IP\Tests\DataProvider\Multi::getCompatibleLoopbackIpAddresses()
      */
+    #[PHPUnit\Test]
+    #[PHPUnit\DataProviderExternal(MultiDataProvider::class, 'getCompatibleLoopbackIpAddresses')]
     public function testIsLoopbackCompatible($value, $isLoopback)
     {
         $ip = IP::factory($value, new Strategy\Compatible);
@@ -269,6 +313,8 @@ public function testIsLoopbackCompatible($value, $isLoopback)
      * @test
      * @dataProvider \Darsyn\IP\Tests\DataProvider\Multi::getDerivedLoopbackIpAddresses()
      */
+    #[PHPUnit\Test]
+    #[PHPUnit\DataProviderExternal(MultiDataProvider::class, 'getDerivedLoopbackIpAddresses')]
     public function testIsLoopbackDerived($value, $isLoopback)
     {
         $ip = IP::factory($value, new Strategy\Derived);
@@ -279,6 +325,8 @@ public function testIsLoopbackDerived($value, $isLoopback)
      * @test
      * @dataProvider \Darsyn\IP\Tests\DataProvider\Multi::getMulticastIpAddresses()
      */
+    #[PHPUnit\Test]
+    #[PHPUnit\DataProviderExternal(MultiDataProvider::class, 'getMulticastIpAddresses')]
     public function testIsMulticast($value, $isMulticast)
     {
         $ip = IP::factory($value);
@@ -290,6 +338,8 @@ public function testIsMulticast($value, $isMulticast)
      * @test
      * @dataProvider \Darsyn\IP\Tests\DataProvider\Multi::getPrivateUseIpAddresses()
      */
+    #[PHPUnit\Test]
+    #[PHPUnit\DataProviderExternal(MultiDataProvider::class, 'getPrivateUseIpAddresses')]
     public function testIsPrivateUse($value, $isPrivateUse)
     {
         $ip = IP::factory($value);
@@ -300,6 +350,8 @@ public function testIsPrivateUse($value, $isPrivateUse)
      * @test
      * @dataProvider \Darsyn\IP\Tests\DataProvider\Multi::getUnspecifiedIpAddresses()
      */
+    #[PHPUnit\Test]
+    #[PHPUnit\DataProviderExternal(MultiDataProvider::class, 'getUnspecifiedIpAddresses')]
     public function testIsUnspecified($value, $isUnspecified)
     {
         $ip = IP::factory($value);
@@ -310,6 +362,8 @@ public function testIsUnspecified($value, $isUnspecified)
      * @test
      * @dataProvider \Darsyn\IP\Tests\DataProvider\Multi::getBenchmarkingIpAddresses()
      */
+    #[PHPUnit\Test]
+    #[PHPUnit\DataProviderExternal(MultiDataProvider::class, 'getBenchmarkingIpAddresses')]
     public function testIsBenchmarking($value, $isBenchmarking)
     {
         $ip = IP::factory($value);
@@ -320,6 +374,8 @@ public function testIsBenchmarking($value, $isBenchmarking)
      * @test
      * @dataProvider \Darsyn\IP\Tests\DataProvider\Multi::getDocumentationIpAddresses()
      */
+    #[PHPUnit\Test]
+    #[PHPUnit\DataProviderExternal(MultiDataProvider::class, 'getDocumentationIpAddresses')]
     public function testIsDocumentation($value, $isDocumentation)
     {
         $ip = IP::factory($value);
@@ -330,6 +386,8 @@ public function testIsDocumentation($value, $isDocumentation)
      * @test
      * @dataProvider \Darsyn\IP\Tests\DataProvider\Multi::getPublicUseIpAddresses()
      */
+    #[PHPUnit\Test]
+    #[PHPUnit\DataProviderExternal(MultiDataProvider::class, 'getPublicUseIpAddresses')]
     public function testIsPublicUse($value, $isPublicUse)
     {
         $ip = IP::factory($value, new Strategy\Mapped);
@@ -340,6 +398,8 @@ public function testIsPublicUse($value, $isPublicUse)
      * @test
      * @dataProvider \Darsyn\IP\Tests\DataProvider\Multi::getUniqueLocalIpAddresses()
      */
+    #[PHPUnit\Test]
+    #[PHPUnit\DataProviderExternal(MultiDataProvider::class, 'getUniqueLocalIpAddresses')]
     public function testIsUniqueLocal($value, $isUniqueLocal, $willThrowException)
     {
         $ip = IP::factory($value, new Strategy\Mapped);
@@ -351,6 +411,8 @@ public function testIsUniqueLocal($value, $isUniqueLocal, $willThrowException)
      * @test
      * @dataProvider \Darsyn\IP\Tests\DataProvider\Multi::getUnicastIpAddresses()
      */
+    #[PHPUnit\Test]
+    #[PHPUnit\DataProviderExternal(MultiDataProvider::class, 'getUnicastIpAddresses')]
     public function testIsUnicast($value, $isUnicast, $willThrowException)
     {
         $ip = IP::factory($value, new Strategy\Mapped);
@@ -362,6 +424,8 @@ public function testIsUnicast($value, $isUnicast, $willThrowException)
      * @test
      * @dataProvider \Darsyn\IP\Tests\DataProvider\Multi::getUnicastGlobalIpAddresses()
      */
+    #[PHPUnit\Test]
+    #[PHPUnit\DataProviderExternal(MultiDataProvider::class, 'getUnicastGlobalIpAddresses')]
     public function testIsUnicastGlobal($value, $isUnicastGlobal, $willThrowException)
     {
         $ip = IP::factory($value, new Strategy\Mapped);
@@ -373,6 +437,8 @@ public function testIsUnicastGlobal($value, $isUnicastGlobal, $willThrowExceptio
      * @test
      * @dataProvider \Darsyn\IP\Tests\DataProvider\Multi::getIsBroadcastIpAddresses()
      */
+    #[PHPUnit\Test]
+    #[PHPUnit\DataProviderExternal(MultiDataProvider::class, 'getIsBroadcastIpAddresses')]
     public function testIsBroadcast($value, $isBroadcast, $willThrowException)
     {
         $ip = IP::factory($value);
@@ -384,6 +450,8 @@ public function testIsBroadcast($value, $isBroadcast, $willThrowException)
      * @test
      * @dataProvider \Darsyn\IP\Tests\DataProvider\Multi::getSharedIpAddresses()
      */
+    #[PHPUnit\Test]
+    #[PHPUnit\DataProviderExternal(MultiDataProvider::class, 'getSharedIpAddresses')]
     public function testIsShared($value, $isShared, $willThrowException)
     {
         $ip = IP::factory($value);
@@ -395,6 +463,8 @@ public function testIsShared($value, $isShared, $willThrowException)
      * @test
      * @dataProvider \Darsyn\IP\Tests\DataProvider\Multi::getFutureReservedIpAddresses()
      */
+    #[PHPUnit\Test]
+    #[PHPUnit\DataProviderExternal(MultiDataProvider::class, 'getFutureReservedIpAddresses')]
     public function testIsFutureReserved($value, $isFutureReserved, $willThrowException)
     {
         $ip = IP::factory($value);
@@ -406,6 +476,8 @@ public function testIsFutureReserved($value, $isFutureReserved, $willThrowExcept
      * @test
      * @dataProvider \Darsyn\IP\Tests\DataProvider\Multi::getValidIpAddresses()
      */
+    #[PHPUnit\Test]
+    #[PHPUnit\DataProviderExternal(MultiDataProvider::class, 'getValidIpAddresses')]
     public function testStringCasting($value, $hex, $expanded, $compacted, $dot)
     {
         $ip = IP::factory($value);