diff --git a/tests/Controller/ApiControllerTest.php b/tests/Controller/ApiControllerTest.php
index 6a61953..2cdbc31 100755
--- a/tests/Controller/ApiControllerTest.php
+++ b/tests/Controller/ApiControllerTest.php
@@ -33,10 +33,10 @@ use phpOMS\Router\WebRouter;
 use phpOMS\Utils\TestUtils;
 
 /**
- * @testdox Modules\Draw\tests\Controller\ApiControllerTest: Draw api controller
- *
  * @internal
  */
+#[\PHPUnit\Framework\Attributes\CoversClass(\Modules\Draw\Controller\ApiController::class)]
+#[\PHPUnit\Framework\Attributes\TestDox('Modules\Draw\tests\Controller\ApiControllerTest: Draw api controller')]
 final class ApiControllerTest extends \PHPUnit\Framework\TestCase
 {
     protected ApplicationAbstract $app;
@@ -91,10 +91,7 @@ final class ApiControllerTest extends \PHPUnit\Framework\TestCase
         TestUtils::setMember($this->module, 'app', $this->app);
     }
 
-    /**
-     * @covers \Modules\Draw\Controller\ApiController
-     * @group module
-     */
+    #[\PHPUnit\Framework\Attributes\Group('module')]
     public function testCreateDraw() : void
     {
         $response = new HttpResponse();
@@ -110,10 +107,7 @@ final class ApiControllerTest extends \PHPUnit\Framework\TestCase
         self::assertGreaterThan(0, $response->getDataArray('')['response']->id);
     }
 
-    /**
-     * @covers \Modules\Draw\Controller\ApiController
-     * @group module
-     */
+    #[\PHPUnit\Framework\Attributes\Group('module')]
     public function testApiDrawCreateInvalidData() : void
     {
         $response = new HttpResponse();
diff --git a/tests/Models/DrawImageTest.php b/tests/Models/DrawImageTest.php
index bd6b2ec..158793f 100755
--- a/tests/Models/DrawImageTest.php
+++ b/tests/Models/DrawImageTest.php
@@ -20,6 +20,7 @@ use Modules\Media\Models\Media;
 /**
  * @internal
  */
+#[\PHPUnit\Framework\Attributes\CoversClass(\Modules\Draw\Models\DrawImage::class)]
 final class DrawImageTest extends \PHPUnit\Framework\TestCase
 {
     private DrawImage $img;
@@ -32,30 +33,21 @@ final class DrawImageTest extends \PHPUnit\Framework\TestCase
         $this->img = new DrawImage();
     }
 
-    /**
-     * @covers \Modules\Draw\Models\DrawImage
-     * @group module
-     */
+    #[\PHPUnit\Framework\Attributes\Group('module')]
     public function testDefault() : void
     {
         self::assertEquals(0, $this->img->id);
         self::assertNull($this->img->media);
     }
 
-    /**
-     * @covers \Modules\Draw\Models\DrawImage
-     * @group module
-     */
+    #[\PHPUnit\Framework\Attributes\Group('module')]
     public function testFromMedia() : void
     {
         $img = DrawImage::fromMedia($temp = new Media());
         self::assertEquals($temp, $img->media);
     }
 
-    /**
-     * @covers \Modules\Draw\Models\DrawImage
-     * @group module
-     */
+    #[\PHPUnit\Framework\Attributes\Group('module')]
     public function testSerialize() : void
     {
         self::assertEquals(
diff --git a/tests/Models/NullDrawImageTest.php b/tests/Models/NullDrawImageTest.php
index 8b6e335..afbb3cb 100755
--- a/tests/Models/NullDrawImageTest.php
+++ b/tests/Models/NullDrawImageTest.php
@@ -19,31 +19,23 @@ use Modules\Draw\Models\NullDrawImage;
 /**
  * @internal
  */
+#[\PHPUnit\Framework\Attributes\CoversClass(\Modules\Draw\Models\NullDrawImage::class)]
 final class NullDrawImageTest extends \PHPUnit\Framework\TestCase
 {
-    /**
-     * @covers \Modules\Draw\Models\NullDrawImage
-     * @group module
-     */
+    #[\PHPUnit\Framework\Attributes\Group('module')]
     public function testNull() : void
     {
         self::assertInstanceOf('\Modules\Draw\Models\DrawImage', new NullDrawImage());
     }
 
-    /**
-     * @covers \Modules\Draw\Models\NullDrawImage
-     * @group module
-     */
+    #[\PHPUnit\Framework\Attributes\Group('module')]
     public function testId() : void
     {
         $null = new NullDrawImage(2);
         self::assertEquals(2, $null->id);
     }
 
-    /**
-     * @covers \Modules\Draw\Models\NullDrawImage
-     * @group module
-     */
+    #[\PHPUnit\Framework\Attributes\Group('module')]
     public function testJsonSerialize() : void
     {
         $null = new NullDrawImage(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>