diff --git a/tests/Models/AttributeHolderTraitTest.php b/tests/Models/AttributeHolderTraitTest.php
index d1179f4..40d77fa 100644
--- a/tests/Models/AttributeHolderTraitTest.php
+++ b/tests/Models/AttributeHolderTraitTest.php
@@ -22,11 +22,10 @@ use Modules\Attribute\Models\AttributeValueType;
 use Modules\Attribute\Models\NullAttribute;
 
 /**
- * @testdox Modules\Admin\tests\Models\AttributeTest: Attribute model
- *
  * @internal
  */
-final class AttributeHolderTraitTestTest extends \PHPUnit\Framework\TestCase
+#[\PHPUnit\Framework\Attributes\TestDox('Modules\Admin\tests\Models\AttributeTest: Attribute model')]
+final class AttributeHolderTraitTest extends \PHPUnit\Framework\TestCase
 {
     private $holder = null;
 
diff --git a/tests/Models/AttributeTest.php b/tests/Models/AttributeTest.php
index bc069d8..e4dac90 100644
--- a/tests/Models/AttributeTest.php
+++ b/tests/Models/AttributeTest.php
@@ -17,10 +17,9 @@ namespace Modules\Admin\tests\Models;
 use Modules\Attribute\Models\Attribute;
 
 /**
- * @testdox Modules\Admin\tests\Models\AttributeTest: Attribute model
- *
  * @internal
  */
+#[\PHPUnit\Framework\Attributes\TestDox('Modules\Admin\tests\Models\AttributeTest: Attribute model')]
 final class AttributeTest extends \PHPUnit\Framework\TestCase
 {
     public function testDeepClone() : void
diff --git a/tests/Models/AttributeTypeTest.php b/tests/Models/AttributeTypeTest.php
index fe6d456..9cfe17e 100644
--- a/tests/Models/AttributeTypeTest.php
+++ b/tests/Models/AttributeTypeTest.php
@@ -19,10 +19,9 @@ use Modules\Attribute\Models\AttributeValue;
 use Modules\Attribute\Models\AttributeValueType;
 
 /**
- * @testdox Modules\Admin\tests\Models\AttributeTypeTest: Attribute model
- *
  * @internal
  */
+#[\PHPUnit\Framework\Attributes\TestDox('Modules\Admin\tests\Models\AttributeTypeTest: Attribute model')]
 final class AttributeTypeTest extends \PHPUnit\Framework\TestCase
 {
     public function testGetDefaultString() : void
diff --git a/tests/Models/AttributeValueTest.php b/tests/Models/AttributeValueTest.php
index dc7fe1b..eaf95ae 100644
--- a/tests/Models/AttributeValueTest.php
+++ b/tests/Models/AttributeValueTest.php
@@ -18,10 +18,9 @@ use Modules\Attribute\Models\AttributeValue;
 use Modules\Attribute\Models\AttributeValueType;
 
 /**
- * @testdox Modules\Admin\tests\Models\AttributeValueTest: Attribute model
- *
  * @internal
  */
+#[\PHPUnit\Framework\Attributes\TestDox('Modules\Admin\tests\Models\AttributeValueTest: Attribute model')]
 final class AttributeValueTest extends \PHPUnit\Framework\TestCase
 {
     public function testGetDefaultString() : void
diff --git a/tests/Models/NullAttributeTest.php b/tests/Models/NullAttributeTest.php
index 131f6d0..9821b49 100644
--- a/tests/Models/NullAttributeTest.php
+++ b/tests/Models/NullAttributeTest.php
@@ -19,31 +19,23 @@ use Modules\Attribute\Models\NullAttribute;
 /**
  * @internal
  */
+#[\PHPUnit\Framework\Attributes\CoversClass(\Modules\Attribute\Models\NullAttribute::class)]
 final class NullAttributeTest extends \PHPUnit\Framework\TestCase
 {
-    /**
-     * @covers \Modules\Attribute\Models\NullAttribute
-     * @group module
-     */
+    #[\PHPUnit\Framework\Attributes\Group('module')]
     public function testNull() : void
     {
         self::assertInstanceOf('\Modules\Attribute\Models\Attribute', new NullAttribute());
     }
 
-    /**
-     * @covers \Modules\Attribute\Models\NullAttribute
-     * @group module
-     */
+    #[\PHPUnit\Framework\Attributes\Group('module')]
     public function testId() : void
     {
         $null = new NullAttribute(2);
         self::assertEquals(2, $null->id);
     }
 
-    /**
-     * @covers \Modules\Attribute\Models\NullAttribute
-     * @group module
-     */
+    #[\PHPUnit\Framework\Attributes\Group('module')]
     public function testJsonSerialize() : void
     {
         $null = new NullAttribute(2);
diff --git a/tests/Models/NullAttributeTypeTest.php b/tests/Models/NullAttributeTypeTest.php
index a312bd6..a0d012f 100644
--- a/tests/Models/NullAttributeTypeTest.php
+++ b/tests/Models/NullAttributeTypeTest.php
@@ -19,31 +19,23 @@ use Modules\Attribute\Models\NullAttributeType;
 /**
  * @internal
  */
+#[\PHPUnit\Framework\Attributes\CoversClass(\Modules\Attribute\Models\NullAttributeType::class)]
 final class NullAttributeTypeTest extends \PHPUnit\Framework\TestCase
 {
-    /**
-     * @covers \Modules\Attribute\Models\NullAttributeType
-     * @group module
-     */
+    #[\PHPUnit\Framework\Attributes\Group('module')]
     public function testNull() : void
     {
         self::assertInstanceOf('\Modules\Attribute\Models\AttributeType', new NullAttributeType());
     }
 
-    /**
-     * @covers \Modules\Attribute\Models\NullAttributeType
-     * @group module
-     */
+    #[\PHPUnit\Framework\Attributes\Group('module')]
     public function testId() : void
     {
         $null = new NullAttributeType(2);
         self::assertEquals(2, $null->id);
     }
 
-    /**
-     * @covers \Modules\Attribute\Models\NullAttributeType
-     * @group module
-     */
+    #[\PHPUnit\Framework\Attributes\Group('module')]
     public function testJsonSerialize() : void
     {
         $null = new NullAttributeType(2);
diff --git a/tests/Models/NullAttributeValueTest.php b/tests/Models/NullAttributeValueTest.php
index c2322b4..6ef3255 100644
--- a/tests/Models/NullAttributeValueTest.php
+++ b/tests/Models/NullAttributeValueTest.php
@@ -19,31 +19,23 @@ use Modules\Attribute\Models\NullAttributeValue;
 /**
  * @internal
  */
+#[\PHPUnit\Framework\Attributes\CoversClass(\Modules\Attribute\Models\NullAttributeValue::class)]
 final class NullAttributeValueTest extends \PHPUnit\Framework\TestCase
 {
-    /**
-     * @covers \Modules\Attribute\Models\NullAttributeValue
-     * @group module
-     */
+    #[\PHPUnit\Framework\Attributes\Group('module')]
     public function testNull() : void
     {
         self::assertInstanceOf('\Modules\Attribute\Models\AttributeValue', new NullAttributeValue());
     }
 
-    /**
-     * @covers \Modules\Attribute\Models\NullAttributeValue
-     * @group module
-     */
+    #[\PHPUnit\Framework\Attributes\Group('module')]
     public function testId() : void
     {
         $null = new NullAttributeValue(2);
         self::assertEquals(2, $null->id);
     }
 
-    /**
-     * @covers \Modules\Attribute\Models\NullAttributeValue
-     * @group module
-     */
+    #[\PHPUnit\Framework\Attributes\Group('module')]
     public function testJsonSerialize() : void
     {
         $null = new NullAttributeValue(2);
diff --git a/tests/phpunit_default.xml b/tests/phpunit_default.xml
index d350430..e4a5639 100755
--- a/tests/phpunit_default.xml
+++ b/tests/phpunit_default.xml
@@ -1,31 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<phpunit xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" bootstrap="Bootstrap.php" colors="true" columns="120" stopOnError="true" stopOnFailure="false" stopOnIncomplete="false" stopOnSkipped="false" beStrictAboutTestsThatDoNotTestAnything="false" xsi:noNamespaceSchemaLocation="https://schema.phpunit.de/9.3/phpunit.xsd">
-  <coverage includeUncoveredFiles="true" processUncoveredFiles="false">
-    <include>
-      <directory suffix=".php">../</directory>
-    </include>
-    <exclude>
-      <directory>../vendor*</directory>
-      <directory>../MainRepository*</directory>
-      <directory>../Karaka*</directory>
-      <directory>../Admin/Install/Application*</directory>
-      <directory>../phpOMS*</directory>
-      <directory>../tests*</directory>
-      <directory>../*/tests*</directory>
-      <directory>../**/tests*</directory>
-      <directory>*/tests*</directory>
-      <directory suffix="tpl.php">../*</directory>
-      <directory suffix="lang.php">../*</directory>
-      <directory suffix="Test.php">../*</directory>
-      <directory suffix="Routes.php">../*</directory>
-      <directory suffix="Hooks.php">../*</directory>
-      <directory>../**/test*</directory>
-      <directory>../**/Theme*</directory>
-      <directory>../**/Admin/Routes*</directory>
-      <directory>../**/Admin/Hooks*</directory>
-      <directory>../**/Admin/Install*</directory>
-      <directory>../Media/Files*</directory>
-    </exclude>
+<phpunit xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" bootstrap="Bootstrap.php" colors="true" columns="120" stopOnError="true" stopOnFailure="false" stopOnIncomplete="false" stopOnSkipped="false" beStrictAboutTestsThatDoNotTestAnything="false" xsi:noNamespaceSchemaLocation="https://schema.phpunit.de/11.0/phpunit.xsd" cacheDirectory=".phpunit.cache">
+  <coverage includeUncoveredFiles="true">
     <report>
       <clover outputFile="coverage.xml"/>
       <html outputDirectory="../tests" lowUpperBound="75" highLowerBound="95"/>
@@ -56,4 +31,31 @@
     <const name="WEB_SERVER_DOCROOT" value="./Karaka"/>
     <const name="RESET" value="1"/>
   </php>
+  <source>
+    <include>
+      <directory suffix=".php">../</directory>
+    </include>
+    <exclude>
+      <directory>../vendor*</directory>
+      <directory>../MainRepository*</directory>
+      <directory>../Karaka*</directory>
+      <directory>../Admin/Install/Application*</directory>
+      <directory>../phpOMS*</directory>
+      <directory>../tests*</directory>
+      <directory>../*/tests*</directory>
+      <directory>../**/tests*</directory>
+      <directory>*/tests*</directory>
+      <directory suffix="tpl.php">../*</directory>
+      <directory suffix="lang.php">../*</directory>
+      <directory suffix="Test.php">../*</directory>
+      <directory suffix="Routes.php">../*</directory>
+      <directory suffix="Hooks.php">../*</directory>
+      <directory>../**/test*</directory>
+      <directory>../**/Theme*</directory>
+      <directory>../**/Admin/Routes*</directory>
+      <directory>../**/Admin/Hooks*</directory>
+      <directory>../**/Admin/Install*</directory>
+      <directory>../Media/Files*</directory>
+    </exclude>
+  </source>
 </phpunit>