diff --git a/tests/WSSecurity/XML/auth/ClaimTypeTest.php b/tests/WSSecurity/XML/auth/ClaimTypeTest.php
index 65f1f80b..c17974bf 100644
--- a/tests/WSSecurity/XML/auth/ClaimTypeTest.php
+++ b/tests/WSSecurity/XML/auth/ClaimTypeTest.php
@@ -4,9 +4,12 @@
 
 namespace SimpleSAML\Test\WSSecurity\XML\auth;
 
+use PHPUnit\Framework\Attributes\CoversClass;
 use PHPUnit\Framework\TestCase;
 use SimpleSAML\Test\WSSecurity\Constants as C;
 use SimpleSAML\WSSecurity\Utils\XPath;
+use SimpleSAML\WSSecurity\XML\auth\AbstractAuthElement;
+use SimpleSAML\WSSecurity\XML\auth\AbstractClaimType;
 use SimpleSAML\WSSecurity\XML\auth\ClaimType;
 use SimpleSAML\WSSecurity\XML\auth\Description;
 use SimpleSAML\WSSecurity\XML\auth\DisplayName;
@@ -23,11 +26,11 @@
 /**
  * Tests for auth:ClaimType.
  *
- * @covers \SimpleSAML\WSSecurity\XML\auth\ClaimType
- * @covers \SimpleSAML\WSSecurity\XML\auth\AbstractClaimType
- * @covers \SimpleSAML\WSSecurity\XML\auth\AbstractAuthElement
  * @package simplesamlphp/ws-security
  */
+#[CoversClass(ClaimType::class)]
+#[CoversClass(AbstractClaimType::class)]
+#[CoversClass(AbstractAuthElement::class)]
 final class ClaimTypeTest extends TestCase
 {
     use SchemaValidationTestTrait;
diff --git a/tests/WSSecurity/XML/auth/ConstrainedManyValueTest.php b/tests/WSSecurity/XML/auth/ConstrainedManyValueTest.php
index 0a865f03..5af7b0ec 100644
--- a/tests/WSSecurity/XML/auth/ConstrainedManyValueTest.php
+++ b/tests/WSSecurity/XML/auth/ConstrainedManyValueTest.php
@@ -4,8 +4,12 @@
 
 namespace SimpleSAML\Test\WSSecurity\XML\auth;
 
+use PHPUnit\Framework\Attributes\CoversClass;
+use PHPUnit\Framework\Attributes\DataProvider;
 use PHPUnit\Framework\TestCase;
 use SimpleSAML\Assert\AssertionFailedException;
+use SimpleSAML\WSSecurity\XML\auth\AbstractAuthElement;
+use SimpleSAML\WSSecurity\XML\auth\AbstractConstrainedManyValueType;
 use SimpleSAML\WSSecurity\XML\auth\StructuredValue;
 use SimpleSAML\WSSecurity\XML\auth\Value;
 use SimpleSAML\WSSecurity\XML\auth\ValueOneOf;
@@ -16,19 +20,20 @@
 /**
  * Tests for auth:ConstrainedManyValueType.
  *
- * @covers \SimpleSAML\WSSecurity\XML\auth\AbstractConstrainedManyValueType
- * @covers \SimpleSAML\WSSecurity\XML\auth\AbstractAuthElement
  * @package simplesamlphp/ws-security
  */
+#[CoversClass(StructuredValue::class)]
+#[CoversClass(ValueOneOf::class)]
+#[CoversClass(AbstractConstrainedManyValueType::class)]
+#[CoversClass(AbstractAuthElement::class)]
 final class ConstrainedManyValueTest extends TestCase
 {
     /**
      * Test creating an object from scratch.
      *
      * @param class-string $class
-     *
-     * @dataProvider classProvider
      */
+    #[DataProvider('classProvider')]
     public function testMarshallingEmpty(string $class): void
     {
         $x = new $class([], []);
@@ -40,9 +45,8 @@ public function testMarshallingEmpty(string $class): void
      * Test creating an object from scratch with both Value and StructuredValue.
      *
      * @param class-string $class
-     *
-     * @dataProvider classProvider
      */
+    #[DataProvider('classProvider')]
     public function testMarshallingIllegalCombination(string $class): void
     {
         $attr1 = new XMLAttribute('urn:x-simplesamlphp:namespace', 'ssp', 'attr1', 'testval1');
diff --git a/tests/WSSecurity/XML/auth/ConstrainedSingleValueTest.php b/tests/WSSecurity/XML/auth/ConstrainedSingleValueTest.php
index ddd638c6..ec8fa7ed 100644
--- a/tests/WSSecurity/XML/auth/ConstrainedSingleValueTest.php
+++ b/tests/WSSecurity/XML/auth/ConstrainedSingleValueTest.php
@@ -4,8 +4,12 @@
 
 namespace SimpleSAML\Test\WSSecurity\XML\auth;
 
+use PHPUnit\Framework\Attributes\CoversClass;
+use PHPUnit\Framework\Attributes\DataProvider;
 use PHPUnit\Framework\TestCase;
 use SimpleSAML\Assert\AssertionFailedException;
+use SimpleSAML\WSSecurity\XML\auth\AbstractAuthElement;
+use SimpleSAML\WSSecurity\XML\auth\AbstractConstrainedSingleValueType;
 use SimpleSAML\WSSecurity\XML\auth\StructuredValue;
 use SimpleSAML\WSSecurity\XML\auth\Value;
 use SimpleSAML\WSSecurity\XML\auth\ValueGreaterThan;
@@ -21,19 +25,24 @@
 /**
  * Tests for auth:ConstrainedSingleValueType.
  *
- * @covers \SimpleSAML\WSSecurity\XML\auth\AbstractConstrainedSingleValueType
- * @covers \SimpleSAML\WSSecurity\XML\auth\AbstractAuthElement
  * @package simplesamlphp/ws-security
  */
+#[CoversClass(ValueGreaterThan::class)]
+#[CoversClass(ValueGreaterThanOrEqual::class)]
+#[CoversClass(ValueLessThan::class)]
+#[CoversClass(ValueLessThanOrEqual::class)]
+#[CoversClass(ValueLowerBound::class)]
+#[CoversClass(ValueUpperBound::class)]
+#[CoversClass(AbstractConstrainedSingleValueType::class)]
+#[CoversClass(AbstractAuthElement::class)]
 final class ConstrainedSingleValueTest extends TestCase
 {
     /**
      * Test creating an object from scratch.
      *
      * @param class-string $class
-     *
-     * @dataProvider classProvider
      */
+    #[DataProvider('classProvider')]
     public function testMarshallingEmpty(string $class): void
     {
         $x = new $class(null, null);
@@ -45,9 +54,8 @@ public function testMarshallingEmpty(string $class): void
      * Test creating an object from scratch with both Value and StructuredValue.
      *
      * @param class-string $class
-     *
-     * @dataProvider classProvider
      */
+    #[DataProvider('classProvider')]
     public function testMarshallingIllegalCombination(string $class): void
     {
         $attr1 = new XMLAttribute('urn:x-simplesamlphp:namespace', 'ssp', 'attr1', 'testval1');
diff --git a/tests/WSSecurity/XML/auth/ConstrainedValueTest.php b/tests/WSSecurity/XML/auth/ConstrainedValueTest.php
index 5d04ed09..e4bcc15d 100644
--- a/tests/WSSecurity/XML/auth/ConstrainedValueTest.php
+++ b/tests/WSSecurity/XML/auth/ConstrainedValueTest.php
@@ -4,7 +4,11 @@
 
 namespace SimpleSAML\Test\WSSecurity\XML\auth;
 
+use PHPUnit\Framework\Attributes\CoversClass;
+use PHPUnit\Framework\Attributes\DataProvider;
 use PHPUnit\Framework\TestCase;
+use SimpleSAML\WSSecurity\XML\auth\AbstractAuthElement;
+use SimpleSAML\WSSecurity\XML\auth\AbstractConstrainedValueType;
 use SimpleSAML\WSSecurity\XML\auth\ConstrainedValue;
 //use SimpleSAML\WSSecurity\XML\auth\StructuredValue;
 use SimpleSAML\WSSecurity\XML\auth\Value;
@@ -22,11 +26,11 @@
 /**
  * Tests for auth:ConstrainedValue.
  *
- * @covers \SimpleSAML\WSSecurity\XML\auth\ConstrainedValue
- * @covers \SimpleSAML\WSSecurity\XML\auth\AbstractConstrainedValueType
- * @covers \SimpleSAML\WSSecurity\XML\auth\AbstractAuthElement
  * @package simplesamlphp/ws-security
  */
+#[CoversClass(ConstrainedValue::class)]
+#[CoversClass(AbstractConstrainedValueType::class)]
+#[CoversClass(AbstractAuthElement::class)]
 final class ConstrainedValueTest extends TestCase
 {
     private static string $resourcePath;
@@ -64,11 +68,10 @@ public static function setUpBeforeClass(): void
     /**
      * Test creating a ConstrainedValue object from scratch.
      *
-     * @dataProvider classProvider
-     *
      * @param class-string $class
      * @param string $xmlRepresentation
      */
+    #[DataProvider('classProvider')]
     public function testMarshalling(string $class, string $xmlRepresentation): void
     {
         $xmlRepresentation = DOMDocumentFactory::fromFile(
@@ -101,11 +104,10 @@ public function testMarshalling(string $class, string $xmlRepresentation): void
     /**
      * Test creating a ConstrainedValue from XML.
      *
-     * @dataProvider classProvider
-     *
      * @param class-string $class
      * @param string $xmlRepresentation
      */
+    #[DataProvider('classProvider')]
     public function testUnmarshalling(string $class, string $xmlRepresentation): void
     {
         $xmlRepresentation = DOMDocumentFactory::fromFile(
diff --git a/tests/WSSecurity/XML/auth/DescriptionTest.php b/tests/WSSecurity/XML/auth/DescriptionTest.php
index e3d37053..28d5f044 100644
--- a/tests/WSSecurity/XML/auth/DescriptionTest.php
+++ b/tests/WSSecurity/XML/auth/DescriptionTest.php
@@ -4,7 +4,10 @@
 
 namespace SimpleSAML\Test\WSSecurity\XML\auth;
 
+use PHPUnit\Framework\Attributes\CoversClass;
 use PHPUnit\Framework\TestCase;
+use SimpleSAML\WSSecurity\XML\auth\AbstractAuthElement;
+use SimpleSAML\WSSecurity\XML\auth\AbstractDescriptionType;
 use SimpleSAML\WSSecurity\XML\auth\Description;
 use SimpleSAML\XML\Attribute;
 use SimpleSAML\XML\DOMDocumentFactory;
@@ -16,11 +19,11 @@
 /**
  * Tests for auth:Description.
  *
- * @covers \SimpleSAML\WSSecurity\XML\auth\Description
- * @covers \SimpleSAML\WSSecurity\XML\auth\AbstractDescriptionType
- * @covers \SimpleSAML\WSSecurity\XML\auth\AbstractAuthElement
  * @package simplesamlphp/ws-security
  */
+#[CoversClass(Description::class)]
+#[CoversClass(AbstractDescriptionType::class)]
+#[CoversClass(AbstractAuthElement::class)]
 final class DescriptionTest extends TestCase
 {
     use SerializableElementTestTrait;
diff --git a/tests/WSSecurity/XML/auth/DisplayNameTest.php b/tests/WSSecurity/XML/auth/DisplayNameTest.php
index 01285ae9..38b34b8e 100644
--- a/tests/WSSecurity/XML/auth/DisplayNameTest.php
+++ b/tests/WSSecurity/XML/auth/DisplayNameTest.php
@@ -4,7 +4,10 @@
 
 namespace SimpleSAML\Test\WSSecurity\XML\auth;
 
+use PHPUnit\Framework\Attributes\CoversClass;
 use PHPUnit\Framework\TestCase;
+use SimpleSAML\WSSecurity\XML\auth\AbstractAuthElement;
+use SimpleSAML\WSSecurity\XML\auth\AbstractDisplayNameType;
 use SimpleSAML\WSSecurity\XML\auth\DisplayName;
 use SimpleSAML\XML\Attribute;
 use SimpleSAML\XML\DOMDocumentFactory;
@@ -16,11 +19,11 @@
 /**
  * Tests for auth:DisplayName.
  *
- * @covers \SimpleSAML\WSSecurity\XML\auth\DisplayName
- * @covers \SimpleSAML\WSSecurity\XML\auth\AbstractDisplayNameType
- * @covers \SimpleSAML\WSSecurity\XML\auth\AbstractAuthElement
  * @package simplesamlphp/ws-security
  */
+#[CoversClass(DisplayName::class)]
+#[CoversClass(AbstractDisplayNameType::class)]
+#[CoversClass(AbstractAuthElement::class)]
 final class DisplayNameTest extends TestCase
 {
     use SerializableElementTestTrait;
diff --git a/tests/WSSecurity/XML/auth/DisplayValueTest.php b/tests/WSSecurity/XML/auth/DisplayValueTest.php
index 69b58300..452bd795 100644
--- a/tests/WSSecurity/XML/auth/DisplayValueTest.php
+++ b/tests/WSSecurity/XML/auth/DisplayValueTest.php
@@ -4,7 +4,10 @@
 
 namespace SimpleSAML\Test\WSSecurity\XML\auth;
 
+use PHPUnit\Framework\Attributes\CoversClass;
 use PHPUnit\Framework\TestCase;
+use SimpleSAML\WSSecurity\XML\auth\AbstractAuthElement;
+use SimpleSAML\WSSecurity\XML\auth\AbstractDisplayValueType;
 use SimpleSAML\WSSecurity\XML\auth\DisplayValue;
 use SimpleSAML\XML\Attribute;
 use SimpleSAML\XML\DOMDocumentFactory;
@@ -16,11 +19,11 @@
 /**
  * Tests for auth:DisplayValue.
  *
- * @covers \SimpleSAML\WSSecurity\XML\auth\DisplayValue
- * @covers \SimpleSAML\WSSecurity\XML\auth\AbstractDisplayValueType
- * @covers \SimpleSAML\WSSecurity\XML\auth\AbstractAuthElement
  * @package simplesamlphp/ws-security
  */
+#[CoversClass(DisplayValue::class)]
+#[CoversClass(AbstractDisplayValueType::class)]
+#[CoversClass(AbstractAuthElement::class)]
 final class DisplayValueTest extends TestCase
 {
     use SerializableElementTestTrait;
diff --git a/tests/WSSecurity/XML/auth/EncryptedValueTest.php b/tests/WSSecurity/XML/auth/EncryptedValueTest.php
index 7399de60..9daf6098 100644
--- a/tests/WSSecurity/XML/auth/EncryptedValueTest.php
+++ b/tests/WSSecurity/XML/auth/EncryptedValueTest.php
@@ -4,7 +4,10 @@
 
 namespace SimpleSAML\Test\WSSecurity\XML\auth;
 
+use PHPUnit\Framework\Attributes\CoversClass;
 use PHPUnit\Framework\TestCase;
+use SimpleSAML\WSSecurity\XML\auth\AbstractAuthElement;
+use SimpleSAML\WSSecurity\XML\auth\AbstractEncryptedValueType;
 use SimpleSAML\WSSecurity\XML\auth\EncryptedValue;
 use SimpleSAML\XML\DOMDocumentFactory;
 use SimpleSAML\XML\TestUtils\SerializableElementTestTrait;
@@ -21,11 +24,11 @@
 /**
  * Tests for auth:EncryptedValue.
  *
- * @covers \SimpleSAML\WSSecurity\XML\auth\EncryptedValue
- * @covers \SimpleSAML\WSSecurity\XML\auth\AbstractEncryptedValueType
- * @covers \SimpleSAML\WSSecurity\XML\auth\AbstractAuthElement
  * @package simplesamlphp/ws-security
  */
+#[CoversClass(EncryptedValue::class)]
+#[CoversClass(AbstractEncryptedValueType::class)]
+#[CoversClass(AbstractAuthElement::class)]
 final class EncryptedValueTest extends TestCase
 {
     use SerializableElementTestTrait;
diff --git a/tests/WSSecurity/XML/auth/StructuredValueTest.php b/tests/WSSecurity/XML/auth/StructuredValueTest.php
index 6755ca71..bea7a821 100644
--- a/tests/WSSecurity/XML/auth/StructuredValueTest.php
+++ b/tests/WSSecurity/XML/auth/StructuredValueTest.php
@@ -4,7 +4,10 @@
 
 namespace SimpleSAML\Test\WSSecurity\XML\auth;
 
+use PHPUnit\Framework\Attributes\CoversClass;
 use PHPUnit\Framework\TestCase;
+use SimpleSAML\WSSecurity\XML\auth\AbstractAuthElement;
+use SimpleSAML\WSSecurity\XML\auth\AbstractStructuredValueType;
 use SimpleSAML\WSSecurity\XML\auth\StructuredValue;
 use SimpleSAML\XML\Attribute as XMLAttribute;
 use SimpleSAML\XML\Chunk;
@@ -17,11 +20,11 @@
 /**
  * Tests for auth:StructuredValue.
  *
- * @covers \SimpleSAML\WSSecurity\XML\auth\StructuredValue
- * @covers \SimpleSAML\WSSecurity\XML\auth\AbstractStructuredValueType
- * @covers \SimpleSAML\WSSecurity\XML\auth\AbstractAuthElement
  * @package simplesamlphp/ws-security
  */
+#[CoversClass(StructuredValue::class)]
+#[CoversClass(AbstractStructuredValueType::class)]
+#[CoversClass(AbstractAuthElement::class)]
 final class StructuredValueTest extends TestCase
 {
     use SerializableElementTestTrait;
diff --git a/tests/WSSecurity/XML/auth/ValueGreaterThanOrEqualTest.php b/tests/WSSecurity/XML/auth/ValueGreaterThanOrEqualTest.php
index 87e1de38..0fd62e33 100644
--- a/tests/WSSecurity/XML/auth/ValueGreaterThanOrEqualTest.php
+++ b/tests/WSSecurity/XML/auth/ValueGreaterThanOrEqualTest.php
@@ -4,7 +4,10 @@
 
 namespace SimpleSAML\Test\WSSecurity\XML\auth;
 
+use PHPUnit\Framework\Attributes\CoversClass;
 use PHPUnit\Framework\TestCase;
+use SimpleSAML\WSSecurity\XML\auth\AbstractAuthElement;
+use SimpleSAML\WSSecurity\XML\auth\AbstractConstrainedSingleValueType;
 use SimpleSAML\WSSecurity\XML\auth\StructuredValue;
 use SimpleSAML\WSSecurity\XML\auth\ValueGreaterThanOrEqual;
 use SimpleSAML\XML\Attribute as XMLAttribute;
@@ -18,11 +21,11 @@
 /**
  * Tests for auth:ValueGreaterThanOrEqual.
  *
- * @covers \SimpleSAML\WSSecurity\XML\auth\ValueGreaterThanOrEqual
- * @covers \SimpleSAML\WSSecurity\XML\auth\AbstractConstrainedSingleValueType
- * @covers \SimpleSAML\WSSecurity\XML\auth\AbstractAuthElement
  * @package simplesamlphp/ws-security
  */
+#[CoversClass(ValueGreaterThanOrEqual::class)]
+#[CoversClass(AbstractConstrainedSingleValueType::class)]
+#[CoversClass(AbstractAuthElement::class)]
 final class ValueGreaterThanOrEqualTest extends TestCase
 {
     use SerializableElementTestTrait;
diff --git a/tests/WSSecurity/XML/auth/ValueGreaterThanTest.php b/tests/WSSecurity/XML/auth/ValueGreaterThanTest.php
index 9b36025a..c9051a85 100644
--- a/tests/WSSecurity/XML/auth/ValueGreaterThanTest.php
+++ b/tests/WSSecurity/XML/auth/ValueGreaterThanTest.php
@@ -4,7 +4,10 @@
 
 namespace SimpleSAML\Test\WSSecurity\XML\auth;
 
+use PHPUnit\Framework\Attributes\CoversClass;
 use PHPUnit\Framework\TestCase;
+use SimpleSAML\WSSecurity\XML\auth\AbstractAuthElement;
+use SimpleSAML\WSSecurity\XML\auth\AbstractConstrainedSingleValueType;
 use SimpleSAML\WSSecurity\XML\auth\StructuredValue;
 use SimpleSAML\WSSecurity\XML\auth\ValueGreaterThan;
 use SimpleSAML\XML\Attribute as XMLAttribute;
@@ -18,11 +21,11 @@
 /**
  * Tests for auth:ValueGreaterThan.
  *
- * @covers \SimpleSAML\WSSecurity\XML\auth\ValueGreaterThan
- * @covers \SimpleSAML\WSSecurity\XML\auth\AbstractConstrainedSingleValueType
- * @covers \SimpleSAML\WSSecurity\XML\auth\AbstractAuthElement
  * @package simplesamlphp/ws-security
  */
+#[CoversClass(ValueGreaterThan::class)]
+#[CoversClass(AbstractConstrainedSingleValueType::class)]
+#[CoversClass(AbstractAuthElement::class)]
 final class ValueGreaterThanTest extends TestCase
 {
     use SerializableElementTestTrait;
diff --git a/tests/WSSecurity/XML/auth/ValueInRangenTest.php b/tests/WSSecurity/XML/auth/ValueInRangenTest.php
index de6a9b46..709fdc9c 100644
--- a/tests/WSSecurity/XML/auth/ValueInRangenTest.php
+++ b/tests/WSSecurity/XML/auth/ValueInRangenTest.php
@@ -4,7 +4,10 @@
 
 namespace SimpleSAML\Test\WSSecurity\XML\auth;
 
+use PHPUnit\Framework\Attributes\CoversClass;
 use PHPUnit\Framework\TestCase;
+use SimpleSAML\WSSecurity\XML\auth\AbstractAuthElement;
+use SimpleSAML\WSSecurity\XML\auth\AbstractValueInRangeType;
 use SimpleSAML\WSSecurity\XML\auth\StructuredValue;
 use SimpleSAML\WSSecurity\XML\auth\Value;
 use SimpleSAML\WSSecurity\XML\auth\ValueInRangen;
@@ -21,11 +24,11 @@
 /**
  * Tests for auth:ValueInRangen.
  *
- * @covers \SimpleSAML\WSSecurity\XML\auth\ValueInRangen
- * @covers \SimpleSAML\WSSecurity\XML\auth\AbstractValueInRangeType
- * @covers \SimpleSAML\WSSecurity\XML\auth\AbstractAuthElement
  * @package simplesamlphp/ws-security
  */
+#[CoversClass(ValueInRangen::class)]
+#[CoversClass(AbstractValueInRangeType::class)]
+#[CoversClass(AbstractAuthElement::class)]
 final class ValueInRangenTest extends TestCase
 {
     use SerializableElementTestTrait;
diff --git a/tests/WSSecurity/XML/auth/ValueLessThanOrEqualTest.php b/tests/WSSecurity/XML/auth/ValueLessThanOrEqualTest.php
index 9ba7e757..4a7a293b 100644
--- a/tests/WSSecurity/XML/auth/ValueLessThanOrEqualTest.php
+++ b/tests/WSSecurity/XML/auth/ValueLessThanOrEqualTest.php
@@ -4,7 +4,10 @@
 
 namespace SimpleSAML\Test\WSSecurity\XML\auth;
 
+use PHPUnit\Framework\Attributes\CoversClass;
 use PHPUnit\Framework\TestCase;
+use SimpleSAML\WSSecurity\XML\auth\AbstractAuthElement;
+use SimpleSAML\WSSecurity\XML\auth\AbstractConstrainedSingleValueType;
 use SimpleSAML\WSSecurity\XML\auth\StructuredValue;
 use SimpleSAML\WSSecurity\XML\auth\ValueLessThanOrEqual;
 use SimpleSAML\XML\Attribute as XMLAttribute;
@@ -18,11 +21,11 @@
 /**
  * Tests for auth:ValueLessThanOrEqual.
  *
- * @covers \SimpleSAML\WSSecurity\XML\auth\ValueLessThanOrEqual
- * @covers \SimpleSAML\WSSecurity\XML\auth\AbstractConstrainedSingleValueType
- * @covers \SimpleSAML\WSSecurity\XML\auth\AbstractAuthElement
  * @package simplesamlphp/ws-security
  */
+#[CoversClass(ValueLessThanOrEqual::class)]
+#[CoversClass(AbstractConstrainedSingleValueType::class)]
+#[CoversClass(AbstractAuthElement::class)]
 final class ValueLessThanOrEqualTest extends TestCase
 {
     use SerializableElementTestTrait;
diff --git a/tests/WSSecurity/XML/auth/ValueLessThanTest.php b/tests/WSSecurity/XML/auth/ValueLessThanTest.php
index f62c2112..e2625161 100644
--- a/tests/WSSecurity/XML/auth/ValueLessThanTest.php
+++ b/tests/WSSecurity/XML/auth/ValueLessThanTest.php
@@ -4,7 +4,10 @@
 
 namespace SimpleSAML\Test\WSSecurity\XML\auth;
 
+use PHPUnit\Framework\Attributes\CoversClass;
 use PHPUnit\Framework\TestCase;
+use SimpleSAML\WSSecurity\XML\auth\AbstractAuthElement;
+use SimpleSAML\WSSecurity\XML\auth\AbstractConstrainedSingleValueType;
 use SimpleSAML\WSSecurity\XML\auth\StructuredValue;
 use SimpleSAML\WSSecurity\XML\auth\ValueLessThan;
 use SimpleSAML\XML\Attribute as XMLAttribute;
@@ -18,11 +21,11 @@
 /**
  * Tests for auth:ValueLessThan.
  *
- * @covers \SimpleSAML\WSSecurity\XML\auth\ValueLessThan
- * @covers \SimpleSAML\WSSecurity\XML\auth\AbstractConstrainedSingleValueType
- * @covers \SimpleSAML\WSSecurity\XML\auth\AbstractAuthElement
  * @package simplesamlphp/ws-security
  */
+#[CoversClass(ValueLessThan::class)]
+#[CoversClass(AbstractConstrainedSingleValueType::class)]
+#[CoversClass(AbstractAuthElement::class)]
 final class ValueLessThanTest extends TestCase
 {
     use SerializableElementTestTrait;
diff --git a/tests/WSSecurity/XML/auth/ValueLowerBoundTest.php b/tests/WSSecurity/XML/auth/ValueLowerBoundTest.php
index fd317ba2..71af7b86 100644
--- a/tests/WSSecurity/XML/auth/ValueLowerBoundTest.php
+++ b/tests/WSSecurity/XML/auth/ValueLowerBoundTest.php
@@ -4,7 +4,10 @@
 
 namespace SimpleSAML\Test\WSSecurity\XML\auth;
 
+use PHPUnit\Framework\Attributes\CoversClass;
 use PHPUnit\Framework\TestCase;
+use SimpleSAML\WSSecurity\XML\auth\AbstractAuthElement;
+use SimpleSAML\WSSecurity\XML\auth\AbstractConstrainedSingleValueType;
 use SimpleSAML\WSSecurity\XML\auth\Value;
 use SimpleSAML\WSSecurity\XML\auth\ValueLowerBound;
 use SimpleSAML\XML\DOMDocumentFactory;
@@ -16,11 +19,11 @@
 /**
  * Tests for auth:ValueLowerBound.
  *
- * @covers \SimpleSAML\WSSecurity\XML\auth\ValueLowerBound
- * @covers \SimpleSAML\WSSecurity\XML\auth\AbstractConstrainedSingleValueType
- * @covers \SimpleSAML\WSSecurity\XML\auth\AbstractAuthElement
  * @package simplesamlphp/ws-security
  */
+#[CoversClass(ValueLowerBound::class)]
+#[CoversClass(AbstractConstrainedSingleValueType::class)]
+#[CoversClass(AbstractAuthElement::class)]
 final class ValueLowerBoundTest extends TestCase
 {
     use SerializableElementTestTrait;
diff --git a/tests/WSSecurity/XML/auth/ValueOneOfWithStructuredValuesTest.php b/tests/WSSecurity/XML/auth/ValueOneOfWithStructuredValuesTest.php
index 0d144bfd..6db05ae2 100644
--- a/tests/WSSecurity/XML/auth/ValueOneOfWithStructuredValuesTest.php
+++ b/tests/WSSecurity/XML/auth/ValueOneOfWithStructuredValuesTest.php
@@ -4,7 +4,10 @@
 
 namespace SimpleSAML\Test\WSSecurity\XML\auth;
 
+use PHPUnit\Framework\Attributes\CoversClass;
 use PHPUnit\Framework\TestCase;
+use SimpleSAML\WSSecurity\XML\auth\AbstractAuthElement;
+use SimpleSAML\WSSecurity\XML\auth\AbstractConstrainedManyValueType;
 use SimpleSAML\WSSecurity\XML\auth\StructuredValue;
 use SimpleSAML\WSSecurity\XML\auth\ValueOneOf;
 use SimpleSAML\XML\Attribute as XMLAttribute;
@@ -18,11 +21,11 @@
 /**
  * Tests for auth:Value.
  *
- * @covers \SimpleSAML\WSSecurity\XML\auth\ValueOneOf
- * @covers \SimpleSAML\WSSecurity\XML\auth\AbstractConstrainedManyValueType
- * @covers \SimpleSAML\WSSecurity\XML\auth\AbstractAuthElement
  * @package simplesamlphp/ws-security
  */
+#[CoversClass(ValueOneOf::class)]
+#[CoversClass(AbstractConstrainedManyValueType::class)]
+#[CoversClass(AbstractAuthElement::class)]
 final class ValueOneOfWithStructuredValuesTest extends TestCase
 {
     use SerializableElementTestTrait;
diff --git a/tests/WSSecurity/XML/auth/ValueOneOfWithValuesTest.php b/tests/WSSecurity/XML/auth/ValueOneOfWithValuesTest.php
index d86cc9f7..73cfd960 100644
--- a/tests/WSSecurity/XML/auth/ValueOneOfWithValuesTest.php
+++ b/tests/WSSecurity/XML/auth/ValueOneOfWithValuesTest.php
@@ -4,7 +4,10 @@
 
 namespace SimpleSAML\Test\WSSecurity\XML\auth;
 
+use PHPUnit\Framework\Attributes\CoversClass;
 use PHPUnit\Framework\TestCase;
+use SimpleSAML\WSSecurity\XML\auth\AbstractAuthElement;
+use SimpleSAML\WSSecurity\XML\auth\AbstractConstrainedManyValueType;
 use SimpleSAML\WSSecurity\XML\auth\Value;
 use SimpleSAML\WSSecurity\XML\auth\ValueOneOf;
 use SimpleSAML\XML\DOMDocumentFactory;
@@ -16,11 +19,11 @@
 /**
  * Tests for auth:Value.
  *
- * @covers \SimpleSAML\WSSecurity\XML\auth\ValueOneOf
- * @covers \SimpleSAML\WSSecurity\XML\auth\AbstractConstrainedManyValueType
- * @covers \SimpleSAML\WSSecurity\XML\auth\AbstractAuthElement
  * @package simplesamlphp/ws-security
  */
+#[CoversClass(ValueOneOf::class)]
+#[CoversClass(AbstractConstrainedManyValueType::class)]
+#[CoversClass(AbstractAuthElement::class)]
 final class ValueOneOfWithValuesTest extends TestCase
 {
     use SerializableElementTestTrait;
diff --git a/tests/WSSecurity/XML/auth/ValueTest.php b/tests/WSSecurity/XML/auth/ValueTest.php
index 46b526ca..9340771f 100644
--- a/tests/WSSecurity/XML/auth/ValueTest.php
+++ b/tests/WSSecurity/XML/auth/ValueTest.php
@@ -4,7 +4,9 @@
 
 namespace SimpleSAML\Test\WSSecurity\XML\auth;
 
+use PHPUnit\Framework\Attributes\CoversClass;
 use PHPUnit\Framework\TestCase;
+use SimpleSAML\WSSecurity\XML\auth\AbstractAuthElement;
 use SimpleSAML\WSSecurity\XML\auth\Value;
 use SimpleSAML\XML\DOMDocumentFactory;
 use SimpleSAML\XML\TestUtils\SerializableElementTestTrait;
@@ -15,10 +17,10 @@
 /**
  * Tests for auth:Value.
  *
- * @covers \SimpleSAML\WSSecurity\XML\auth\Value
- * @covers \SimpleSAML\WSSecurity\XML\auth\AbstractAuthElement
  * @package simplesamlphp/ws-security
  */
+#[CoversClass(Value::class)]
+#[CoversClass(AbstractAuthElement::class)]
 final class ValueTest extends TestCase
 {
     use SerializableElementTestTrait;
diff --git a/tests/WSSecurity/XML/auth/ValueUpperBoundTest.php b/tests/WSSecurity/XML/auth/ValueUpperBoundTest.php
index b539a835..fe433378 100644
--- a/tests/WSSecurity/XML/auth/ValueUpperBoundTest.php
+++ b/tests/WSSecurity/XML/auth/ValueUpperBoundTest.php
@@ -4,7 +4,10 @@
 
 namespace SimpleSAML\Test\WSSecurity\XML\auth;
 
+use PHPUnit\Framework\Attributes\CoversClass;
 use PHPUnit\Framework\TestCase;
+use SimpleSAML\WSSecurity\XML\auth\AbstractAuthElement;
+use SimpleSAML\WSSecurity\XML\auth\AbstractConstrainedSingleValueType;
 use SimpleSAML\WSSecurity\XML\auth\StructuredValue;
 use SimpleSAML\WSSecurity\XML\auth\ValueUpperBound;
 use SimpleSAML\XML\Attribute as XMLAttribute;
@@ -18,11 +21,11 @@
 /**
  * Tests for auth:ValueUpperBound.
  *
- * @covers \SimpleSAML\WSSecurity\XML\auth\ValueUpperBound
- * @covers \SimpleSAML\WSSecurity\XML\auth\AbstractConstrainedSingleValueType
- * @covers \SimpleSAML\WSSecurity\XML\auth\AbstractAuthElement
  * @package simplesamlphp/ws-security
  */
+#[CoversClass(ValueUpperBound::class)]
+#[CoversClass(AbstractConstrainedSingleValueType::class)]
+#[CoversClass(AbstractAuthElement::class)]
 final class ValueUpperBoundTest extends TestCase
 {
     use SerializableElementTestTrait;
diff --git a/tests/WSSecurity/XML/fed/AdditionalContextProcessedTest.php b/tests/WSSecurity/XML/fed/AdditionalContextProcessedTest.php
index 93fb6afb..c852b50a 100644
--- a/tests/WSSecurity/XML/fed/AdditionalContextProcessedTest.php
+++ b/tests/WSSecurity/XML/fed/AdditionalContextProcessedTest.php
@@ -4,8 +4,11 @@
 
 namespace SimpleSAML\Test\WSSecurity\XML\fed;
 
+use PHPUnit\Framework\Attributes\CoversClass;
 use PHPUnit\Framework\TestCase;
 use SimpleSAML\Test\WSSecurity\Constants as C;
+use SimpleSAML\WSSecurity\XML\fed\AbstractAssertionType;
+use SimpleSAML\WSSecurity\XML\fed\AbstractFedElement;
 use SimpleSAML\WSSecurity\XML\fed\AdditionalContextProcessed;
 use SimpleSAML\XML\Attribute as XMLAttribute;
 use SimpleSAML\XML\Chunk;
@@ -18,12 +21,11 @@
 /**
  * Class \SimpleSAML\WSSecurity\XML\fed\AdditionalContextProcessedTest
  *
- * @covers \SimpleSAML\WSSecurity\XML\fed\AdditionalContextProcessed
- * @covers \SimpleSAML\WSSecurity\XML\fed\AbstractAssertionType
- * @covers \SimpleSAML\WSSecurity\XML\fed\AbstractFedElement
- *
  * @package simplesamlphp/ws-security
  */
+#[CoversClass(AdditionalContextProcessed::class)]
+#[CoversClass(AbstractAssertionType::class)]
+#[CoversClass(AbstractFedElement::class)]
 final class AdditionalContextProcessedTest extends TestCase
 {
     use SchemaValidationTestTrait;
diff --git a/tests/WSSecurity/XML/fed/ApplicationServiceEndpointTest.php b/tests/WSSecurity/XML/fed/ApplicationServiceEndpointTest.php
index f90de77d..e229fad9 100644
--- a/tests/WSSecurity/XML/fed/ApplicationServiceEndpointTest.php
+++ b/tests/WSSecurity/XML/fed/ApplicationServiceEndpointTest.php
@@ -5,7 +5,10 @@
 namespace SimpleSAML\Test\WSSecurity\XML\fed;
 
 use DOMElement;
+use PHPUnit\Framework\Attributes\CoversClass;
 use PHPUnit\Framework\TestCase;
+use SimpleSAML\WSSecurity\XML\fed\AbstractEndpointType;
+use SimpleSAML\WSSecurity\XML\fed\AbstractFedElement;
 use SimpleSAML\WSSecurity\XML\fed\ApplicationServiceEndpoint;
 use SimpleSAML\WSSecurity\XML\wsa\Address;
 use SimpleSAML\WSSecurity\XML\wsa\EndpointReference;
@@ -23,11 +26,11 @@
 /**
  * Tests for fed:ApplicationServiceEndpoint.
  *
- * @covers \SimpleSAML\WSSecurity\XML\fed\ApplicationServiceEndpoint
- * @covers \SimpleSAML\WSSecurity\XML\fed\AbstractEndpointType
- * @covers \SimpleSAML\WSSecurity\XML\fed\AbstractFedElement
  * @package simplesamlphp/ws-security
  */
+#[CoversClass(ApplicationServiceEndpoint::class)]
+#[CoversClass(AbstractEndpointType::class)]
+#[CoversClass(AbstractFedElement::class)]
 final class ApplicationServiceEndpointTest extends TestCase
 {
     use SchemaValidationTestTrait;
diff --git a/tests/WSSecurity/XML/fed/AttributeServiceEndpointTest.php b/tests/WSSecurity/XML/fed/AttributeServiceEndpointTest.php
index 8353bb10..c1e8af3a 100644
--- a/tests/WSSecurity/XML/fed/AttributeServiceEndpointTest.php
+++ b/tests/WSSecurity/XML/fed/AttributeServiceEndpointTest.php
@@ -5,7 +5,10 @@
 namespace SimpleSAML\Test\WSSecurity\XML\fed;
 
 use DOMElement;
+use PHPUnit\Framework\Attributes\CoversClass;
 use PHPUnit\Framework\TestCase;
+use SimpleSAML\WSSecurity\XML\fed\AbstractEndpointType;
+use SimpleSAML\WSSecurity\XML\fed\AbstractFedElement;
 use SimpleSAML\WSSecurity\XML\fed\AttributeServiceEndpoint;
 use SimpleSAML\WSSecurity\XML\wsa\Address;
 use SimpleSAML\WSSecurity\XML\wsa\EndpointReference;
@@ -28,6 +31,9 @@
  * @covers \SimpleSAML\WSSecurity\XML\fed\AbstractFedElement
  * @package simplesamlphp/ws-security
  */
+#[CoversClass(AttributeServiceEndpoint::class)]
+#[CoversClass(AbstractEndpointType::class)]
+#[CoversClass(AbstractFedElement::class)]
 final class AttributeServiceEndpointTest extends TestCase
 {
     use SchemaValidationTestTrait;
diff --git a/tests/WSSecurity/XML/fed/AttributeServiceEndpointsTest.php b/tests/WSSecurity/XML/fed/AttributeServiceEndpointsTest.php
index 1f0db3c5..68fdfb60 100644
--- a/tests/WSSecurity/XML/fed/AttributeServiceEndpointsTest.php
+++ b/tests/WSSecurity/XML/fed/AttributeServiceEndpointsTest.php
@@ -5,7 +5,10 @@
 namespace SimpleSAML\Test\WSSecurity\XML\fed;
 
 use DOMElement;
+use PHPUnit\Framework\Attributes\CoversClass;
 use PHPUnit\Framework\TestCase;
+use SimpleSAML\WSSecurity\XML\fed\AbstractEndpointType;
+use SimpleSAML\WSSecurity\XML\fed\AbstractFedElement;
 use SimpleSAML\WSSecurity\XML\fed\AttributeServiceEndpoints;
 use SimpleSAML\WSSecurity\XML\wsa\Address;
 use SimpleSAML\WSSecurity\XML\wsa\EndpointReference;
@@ -23,11 +26,11 @@
 /**
  * Tests for fed:AttributeServiceEndpoints.
  *
- * @covers \SimpleSAML\WSSecurity\XML\fed\AttributeServiceEndpoints
- * @covers \SimpleSAML\WSSecurity\XML\fed\AbstractEndpointType
- * @covers \SimpleSAML\WSSecurity\XML\fed\AbstractFedElement
  * @package simplesamlphp/ws-security
  */
+#[CoversClass(AttributeServiceEndpoints::class)]
+#[CoversClass(AbstractEndpointType::class)]
+#[CoversClass(AbstractFedElement::class)]
 final class AttributeServiceEndpointsTest extends TestCase
 {
     use SchemaValidationTestTrait;
diff --git a/tests/WSSecurity/XML/fed/AuthenticationTokenTest.php b/tests/WSSecurity/XML/fed/AuthenticationTokenTest.php
index e8fb35d2..79dfff6a 100644
--- a/tests/WSSecurity/XML/fed/AuthenticationTokenTest.php
+++ b/tests/WSSecurity/XML/fed/AuthenticationTokenTest.php
@@ -4,10 +4,13 @@
 
 namespace SimpleSAML\Test\WSSecurity\XML\fed;
 
+use PHPUnit\Framework\Attributes\CoversClass;
 use PHPUnit\Framework\TestCase;
 use SimpleSAML\Test\WSSecurity\Constants as C;
 use SimpleSAML\Test\WSSecurity\XML\sp\NestedPolicyTypeTestTrait;
 use SimpleSAML\WSSecurity\XML\fed\AuthenticationToken;
+use SimpleSAML\WSSecurity\XML\sp\AbstractNestedPolicyType;
+use SimpleSAML\WSSecurity\XML\sp\AbstractSpElement;
 use SimpleSAML\XML\Attribute as XMLAttribute;
 use SimpleSAML\XML\Chunk;
 use SimpleSAML\XML\DOMDocumentFactory;
@@ -19,12 +22,11 @@
 /**
  * Class \SimpleSAML\WSSecurity\XML\fed\AuthenticationTokenTest
  *
- * @covers \SimpleSAML\WSSecurity\XML\fed\AuthenticationToken
- * @covers \SimpleSAML\WSSecurity\XML\sp\AbstractNestedPolicyType
- * @covers \SimpleSAML\WSSecurity\XML\sp\AbstractSpElement
- *
  * @package simplesamlphp/ws-security
  */
+#[CoversClass(AuthenticationToken::class)]
+#[CoversClass(AbstractNestedPolicyType::class)]
+#[CoversClass(AbstractSpElement::class)]
 final class AuthenticationTokenTest extends TestCase
 {
     use NestedPolicyTypeTestTrait;
diff --git a/tests/WSSecurity/XML/fed/AutomaticPseudonymsTest.php b/tests/WSSecurity/XML/fed/AutomaticPseudonymsTest.php
index ccd9e3e5..aa4a274e 100644
--- a/tests/WSSecurity/XML/fed/AutomaticPseudonymsTest.php
+++ b/tests/WSSecurity/XML/fed/AutomaticPseudonymsTest.php
@@ -4,7 +4,9 @@
 
 namespace SimpleSAML\Test\WSSecurity\XML\fed;
 
+use PHPUnit\Framework\Attributes\CoversClass;
 use PHPUnit\Framework\TestCase;
+use SimpleSAML\WSSecurity\XML\fed\AbstractFedElement;
 use SimpleSAML\WSSecurity\XML\fed\AutomaticPseudonyms;
 use SimpleSAML\XML\DOMDocumentFactory;
 use SimpleSAML\XML\TestUtils\SchemaValidationTestTrait;
@@ -15,11 +17,10 @@
 /**
  * Class \SimpleSAML\WSSecurity\XML\fed\AutomaticPseudonymsTest
  *
- * @covers \SimpleSAML\WSSecurity\XML\fed\AutomaticPseudonyms
- * @covers \SimpleSAML\WSSecurity\XML\fed\AbstractFedElement
- *
  * @package simplesamlphp/ws-security
  */
+#[CoversClass(AutomaticPseudonyms::class)]
+#[CoversClass(AbstractFedElement::class)]
 final class AutomaticPseudonymsTest extends TestCase
 {
     use SchemaValidationTestTrait;
diff --git a/tests/WSSecurity/XML/fed/ClaimDialectTest.php b/tests/WSSecurity/XML/fed/ClaimDialectTest.php
index 00cb7b45..20010e7b 100644
--- a/tests/WSSecurity/XML/fed/ClaimDialectTest.php
+++ b/tests/WSSecurity/XML/fed/ClaimDialectTest.php
@@ -4,8 +4,11 @@
 
 namespace SimpleSAML\Test\WSSecurity\XML\fed;
 
+use PHPUnit\Framework\Attributes\CoversClass;
 use PHPUnit\Framework\TestCase;
 use SimpleSAML\Assert\AssertionFailedException;
+use SimpleSAML\WSSecurity\XML\fed\AbstractClaimDialectType;
+use SimpleSAML\WSSecurity\XML\fed\AbstractFedElement;
 use SimpleSAML\WSSecurity\XML\fed\ClaimDialect;
 use SimpleSAML\XML\Attribute as XMLAttribute;
 use SimpleSAML\XML\Chunk;
@@ -18,11 +21,11 @@
 /**
  * Tests for fed:ClaimDialect.
  *
- * @covers \SimpleSAML\WSSecurity\XML\fed\ClaimDialect
- * @covers \SimpleSAML\WSSecurity\XML\fed\AbstractClaimDialectType
- * @covers \SimpleSAML\WSSecurity\XML\fed\AbstractFedElement
  * @package simplesamlphp/ws-security
  */
+#[CoversClass(ClaimDialect::class)]
+#[CoversClass(AbstractClaimDialectType::class)]
+#[CoversClass(AbstractFedElement::class)]
 final class ClaimDialectTest extends TestCase
 {
     use SerializableElementTestTrait;
diff --git a/tests/WSSecurity/XML/fed/ClaimDialectsOfferedTest.php b/tests/WSSecurity/XML/fed/ClaimDialectsOfferedTest.php
index d1b0f6b4..348db219 100644
--- a/tests/WSSecurity/XML/fed/ClaimDialectsOfferedTest.php
+++ b/tests/WSSecurity/XML/fed/ClaimDialectsOfferedTest.php
@@ -4,7 +4,10 @@
 
 namespace SimpleSAML\Test\WSSecurity\XML\fed;
 
+use PHPUnit\Framework\Attributes\CoversClass;
 use PHPUnit\Framework\TestCase;
+use SimpleSAML\WSSecurity\XML\fed\AbstractClaimDialectsOfferedType;
+use SimpleSAML\WSSecurity\XML\fed\AbstractFedElement;
 use SimpleSAML\WSSecurity\XML\fed\ClaimDialect;
 use SimpleSAML\WSSecurity\XML\fed\ClaimDialectsOffered;
 use SimpleSAML\XML\Attribute as XMLAttribute;
@@ -19,11 +22,11 @@
 /**
  * Tests for fed:ClaimDialectsOffered.
  *
- * @covers \SimpleSAML\WSSecurity\XML\fed\ClaimDialectsOffered
- * @covers \SimpleSAML\WSSecurity\XML\fed\AbstractClaimDialectsOfferedType
- * @covers \SimpleSAML\WSSecurity\XML\fed\AbstractFedElement
  * @package simplesamlphp/ws-security
  */
+#[CoversClass(ClaimDialectsOffered::class)]
+#[CoversClass(AbstractClaimDialectsOfferedType::class)]
+#[CoversClass(AbstractFedElement::class)]
 final class ClaimDialectsOfferedTest extends TestCase
 {
     use SchemaValidationTestTrait;
diff --git a/tests/WSSecurity/XML/fed/ClaimTypesOfferedTest.php b/tests/WSSecurity/XML/fed/ClaimTypesOfferedTest.php
index f7b35587..f03013d1 100644
--- a/tests/WSSecurity/XML/fed/ClaimTypesOfferedTest.php
+++ b/tests/WSSecurity/XML/fed/ClaimTypesOfferedTest.php
@@ -4,6 +4,7 @@
 
 namespace SimpleSAML\Test\WSSecurity\XML\fed;
 
+use PHPUnit\Framework\Attributes\CoversClass;
 use PHPUnit\Framework\TestCase;
 use SimpleSAML\Test\WSSecurity\Constants as C;
 use SimpleSAML\WSSecurity\XML\auth\ClaimType;
@@ -11,6 +12,8 @@
 use SimpleSAML\WSSecurity\XML\auth\DisplayName;
 use SimpleSAML\WSSecurity\XML\auth\DisplayValue;
 use SimpleSAML\WSSecurity\XML\auth\Value;
+use SimpleSAML\WSSecurity\XML\fed\AbstractClaimTypesOfferedType;
+use SimpleSAML\WSSecurity\XML\fed\AbstractFedElement;
 use SimpleSAML\WSSecurity\XML\fed\ClaimTypesOffered;
 use SimpleSAML\XML\Attribute as XMLAttribute;
 use SimpleSAML\XML\DOMDocumentFactory;
@@ -22,12 +25,11 @@
 /**
  * Class \SimpleSAML\WSSecurity\XML\fed\ClaimTypesOfferedTest
  *
- * @covers \SimpleSAML\WSSecurity\XML\fed\ClaimTypesOffered
- * @covers \SimpleSAML\WSSecurity\XML\fed\AbstractClaimTypesOfferedType
- * @covers \SimpleSAML\WSSecurity\XML\fed\AbstractFedElement
- *
  * @package simplesamlphp/ws-security
  */
+#[CoversClass(ClaimTypesOffered::class)]
+#[CoversClass(AbstractClaimTypesOfferedType::class)]
+#[CoversClass(AbstractFedElement::class)]
 final class ClaimTypesOfferedTest extends TestCase
 {
     use SchemaValidationTestTrait;
diff --git a/tests/WSSecurity/XML/fed/ClaimTypesRequestedTest.php b/tests/WSSecurity/XML/fed/ClaimTypesRequestedTest.php
index a9a019a3..08164cc6 100644
--- a/tests/WSSecurity/XML/fed/ClaimTypesRequestedTest.php
+++ b/tests/WSSecurity/XML/fed/ClaimTypesRequestedTest.php
@@ -4,6 +4,7 @@
 
 namespace SimpleSAML\Test\WSSecurity\XML\fed;
 
+use PHPUnit\Framework\Attributes\CoversClass;
 use PHPUnit\Framework\TestCase;
 use SimpleSAML\Test\WSSecurity\Constants as C;
 use SimpleSAML\WSSecurity\XML\auth\ClaimType;
@@ -11,6 +12,8 @@
 use SimpleSAML\WSSecurity\XML\auth\DisplayName;
 use SimpleSAML\WSSecurity\XML\auth\DisplayValue;
 use SimpleSAML\WSSecurity\XML\auth\Value;
+use SimpleSAML\WSSecurity\XML\fed\AbstractClaimTypesRequestedType;
+use SimpleSAML\WSSecurity\XML\fed\AbstractFedElement;
 use SimpleSAML\WSSecurity\XML\fed\ClaimTypesRequested;
 use SimpleSAML\XML\Attribute as XMLAttribute;
 use SimpleSAML\XML\DOMDocumentFactory;
@@ -22,12 +25,11 @@
 /**
  * Class \SimpleSAML\WSSecurity\XML\fed\ClaimTypesRequestedTest
  *
- * @covers \SimpleSAML\WSSecurity\XML\fed\ClaimTypesRequested
- * @covers \SimpleSAML\WSSecurity\XML\fed\AbstractClaimTypesRequestedType
- * @covers \SimpleSAML\WSSecurity\XML\fed\AbstractFedElement
- *
  * @package simplesamlphp/ws-security
  */
+#[CoversClass(ClaimTypesRequested::class)]
+#[CoversClass(AbstractClaimTypesRequestedType::class)]
+#[CoversClass(AbstractFedElement::class)]
 final class ClaimTypesRequestedTest extends TestCase
 {
     use SchemaValidationTestTrait;
diff --git a/tests/WSSecurity/XML/fed/ClientPseudonymTest.php b/tests/WSSecurity/XML/fed/ClientPseudonymTest.php
index 65ebb2d0..4d0522e6 100644
--- a/tests/WSSecurity/XML/fed/ClientPseudonymTest.php
+++ b/tests/WSSecurity/XML/fed/ClientPseudonymTest.php
@@ -4,7 +4,10 @@
 
 namespace SimpleSAML\Test\WSSecurity\XML\fed;
 
+use PHPUnit\Framework\Attributes\CoversClass;
 use PHPUnit\Framework\TestCase;
+use SimpleSAML\WSSecurity\XML\fed\AbstractClientPseudonymType;
+use SimpleSAML\WSSecurity\XML\fed\AbstractFedElement;
 use SimpleSAML\WSSecurity\XML\fed\ClientPseudonym;
 use SimpleSAML\WSSecurity\XML\fed\DisplayName;
 use SimpleSAML\WSSecurity\XML\fed\EMail;
@@ -22,12 +25,11 @@
 /**
  * Tests for fed:ClientPseudonym.
  *
- * @covers \SimpleSAML\WSSecurity\XML\fed\ClientPseudonym
- * @covers \SimpleSAML\WSSecurity\XML\fed\AbstractClientPseudonymType
- * @covers \SimpleSAML\WSSecurity\XML\fed\AbstractFedElement
- *
  * @package simplesamlphp/ws-security
  */
+#[CoversClass(ClientPseudonym::class)]
+#[CoversClass(AbstractClientPseudonymType::class)]
+#[CoversClass(AbstractFedElement::class)]
 final class ClientPseudonymTest extends TestCase
 {
     use SchemaValidationTestTrait;
diff --git a/tests/WSSecurity/XML/fed/DisplayNameTest.php b/tests/WSSecurity/XML/fed/DisplayNameTest.php
index 1dff32df..2f347100 100644
--- a/tests/WSSecurity/XML/fed/DisplayNameTest.php
+++ b/tests/WSSecurity/XML/fed/DisplayNameTest.php
@@ -4,8 +4,11 @@
 
 namespace SimpleSAML\Test\WSSecurity\XML\fed;
 
+use PHPUnit\Framework\Attributes\CoversClass;
 use PHPUnit\Framework\TestCase;
 use SimpleSAML\Test\WSSecurity\Constants as C;
+use SimpleSAML\WSSecurity\XML\fed\AbstractAttributeExtensibleString;
+use SimpleSAML\WSSecurity\XML\fed\AbstractFedElement;
 use SimpleSAML\WSSecurity\XML\fed\DisplayName;
 use SimpleSAML\XML\Attribute as XMLAttribute;
 use SimpleSAML\XML\DOMDocumentFactory;
@@ -16,12 +19,11 @@
 /**
  * Class \SimpleSAML\WSSecurity\XML\fed\DisplayNameTest
  *
- * @covers \SimpleSAML\WSSecurity\XML\fed\DisplayName
- * @covers \SimpleSAML\WSSecurity\XML\fed\AbstractAttributeExtensibleString
- * @covers \SimpleSAML\WSSecurity\XML\fed\AbstractFedElement
- *
  * @package simplesamlphp/ws-security
  */
+#[CoversClass(DisplayName::class)]
+#[CoversClass(AbstractAttributeExtensibleString::class)]
+#[CoversClass(AbstractFedElement::class)]
 final class DisplayNameTest extends TestCase
 {
     use SerializableElementTestTrait;
diff --git a/tests/WSSecurity/XML/fed/EMailTest.php b/tests/WSSecurity/XML/fed/EMailTest.php
index 1ea209ee..44104a96 100644
--- a/tests/WSSecurity/XML/fed/EMailTest.php
+++ b/tests/WSSecurity/XML/fed/EMailTest.php
@@ -4,8 +4,11 @@
 
 namespace SimpleSAML\Test\WSSecurity\XML\fed;
 
+use PHPUnit\Framework\Attributes\CoversClass;
 use PHPUnit\Framework\TestCase;
 use SimpleSAML\Test\WSSecurity\Constants as C;
+use SimpleSAML\WSSecurity\XML\fed\AbstractAttributeExtensibleString;
+use SimpleSAML\WSSecurity\XML\fed\AbstractFedElement;
 use SimpleSAML\WSSecurity\XML\fed\EMail;
 use SimpleSAML\XML\Attribute as XMLAttribute;
 use SimpleSAML\XML\DOMDocumentFactory;
@@ -16,12 +19,11 @@
 /**
  * Class \SimpleSAML\WSSecurity\XML\fed\EMailTest
  *
- * @covers \SimpleSAML\WSSecurity\XML\fed\EMail
- * @covers \SimpleSAML\WSSecurity\XML\fed\AbstractAttributeExtensibleString
- * @covers \SimpleSAML\WSSecurity\XML\fed\AbstractFedElement
- *
  * @package simplesamlphp/ws-security
  */
+#[CoversClass(EMail::class)]
+#[CoversClass(AbstractAttributeExtensibleString::class)]
+#[CoversClass(AbstractFedElement::class)]
 final class EMailTest extends TestCase
 {
     use SerializableElementTestTrait;
diff --git a/tests/WSSecurity/XML/fed/FederationIDTest.php b/tests/WSSecurity/XML/fed/FederationIDTest.php
index dc83b537..8c1be323 100644
--- a/tests/WSSecurity/XML/fed/FederationIDTest.php
+++ b/tests/WSSecurity/XML/fed/FederationIDTest.php
@@ -4,8 +4,12 @@
 
 namespace SimpleSAML\Test\WSSecurity\XML\fed;
 
+use PHPUnit\Framework\Attributes\CoversClass;
 use PHPUnit\Framework\TestCase;
 use SimpleSAML\Test\WSSecurity\Constants as C;
+use SimpleSAML\WSSecurity\XML\fed\AbstractAttributeExtensibleString;
+use SimpleSAML\WSSecurity\XML\fed\AbstractAttributeExtensibleURI;
+use SimpleSAML\WSSecurity\XML\fed\AbstractFedElement;
 use SimpleSAML\WSSecurity\XML\fed\FederationID;
 use SimpleSAML\XML\Attribute as XMLAttribute;
 use SimpleSAML\XML\DOMDocumentFactory;
@@ -17,13 +21,12 @@
 /**
  * Class \SimpleSAML\WSSecurity\XML\fed\FederationIDTest
  *
- * @covers \SimpleSAML\WSSecurity\XML\fed\FederationID
- * @covers \SimpleSAML\WSSecurity\XML\fed\AbstractAttributeExtensibleURI
- * @covers \SimpleSAML\WSSecurity\XML\fed\AbstractAttributeExtensibleString
- * @covers \SimpleSAML\WSSecurity\XML\fed\AbstractFedElement
- *
  * @package simplesamlphp/ws-security
  */
+#[CoversClass(FederationID::class)]
+#[CoversClass(AbstractAttributeExtensibleURI::class)]
+#[CoversClass(AbstractAttributeExtensibleString::class)]
+#[CoversClass(AbstractFedElement::class)]
 final class FederationIDTest extends TestCase
 {
     use SchemaValidationTestTrait;
diff --git a/tests/WSSecurity/XML/fed/FederationMetadataHandlerTest.php b/tests/WSSecurity/XML/fed/FederationMetadataHandlerTest.php
index 4218eb16..632744dc 100644
--- a/tests/WSSecurity/XML/fed/FederationMetadataHandlerTest.php
+++ b/tests/WSSecurity/XML/fed/FederationMetadataHandlerTest.php
@@ -4,8 +4,11 @@
 
 namespace SimpleSAML\Test\WSSecurity\XML\fed;
 
+use PHPUnit\Framework\Attributes\CoversClass;
 use PHPUnit\Framework\TestCase;
 use SimpleSAML\Test\WSSecurity\Constants as C;
+use SimpleSAML\WSSecurity\XML\fed\AbstractFedElement;
+use SimpleSAML\WSSecurity\XML\fed\AbstractFederationMetadataHandlerType;
 use SimpleSAML\WSSecurity\XML\fed\FederationMetadataHandler;
 use SimpleSAML\XML\Attribute as XMLAttribute;
 use SimpleSAML\XML\DOMDocumentFactory;
@@ -17,12 +20,11 @@
 /**
  * Class \SimpleSAML\WSSecurity\XML\fed\FederationMetadataHandlerTest
  *
- * @covers \SimpleSAML\WSSecurity\XML\fed\FederationMetadataHandler
- * @covers \SimpleSAML\WSSecurity\XML\fed\AbstractFederationMetadataHandlerType
- * @covers \SimpleSAML\WSSecurity\XML\fed\AbstractFedElement
- *
  * @package simplesamlphp/ws-security
  */
+#[CoversClass(FederationMetadataHandler::class)]
+#[CoversClass(AbstractFederationMetadataHandlerType::class)]
+#[CoversClass(AbstractFedElement::class)]
 final class FederationMetadataHandlerTest extends TestCase
 {
     use SchemaValidationTestTrait;
diff --git a/tests/WSSecurity/XML/fed/FederationMetadataTest.php b/tests/WSSecurity/XML/fed/FederationMetadataTest.php
index a7993df7..c67210b9 100644
--- a/tests/WSSecurity/XML/fed/FederationMetadataTest.php
+++ b/tests/WSSecurity/XML/fed/FederationMetadataTest.php
@@ -4,7 +4,10 @@
 
 namespace SimpleSAML\Test\WSSecurity\XML\fed;
 
+use PHPUnit\Framework\Attributes\CoversClass;
 use PHPUnit\Framework\TestCase;
+use SimpleSAML\WSSecurity\XML\fed\AbstractFedElement;
+use SimpleSAML\WSSecurity\XML\fed\AbstractFederationMetadataType;
 use SimpleSAML\WSSecurity\XML\fed\Federation;
 use SimpleSAML\WSSecurity\XML\fed\FederationMetadata;
 use SimpleSAML\XML\Attribute as XMLAttribute;
@@ -19,12 +22,11 @@
 /**
  * Tests for fed:FederationMetadata.
  *
- * @covers \SimpleSAML\WSSecurity\XML\fed\FederationMetadata
- * @covers \SimpleSAML\WSSecurity\XML\fed\AbstractFederationMetadataType
- * @covers \SimpleSAML\WSSecurity\XML\fed\AbstractFedElement
- *
  * @package simplesamlphp/ws-security
  */
+#[CoversClass(FederationMetadata::class)]
+#[CoversClass(AbstractFederationMetadataType::class)]
+#[CoversClass(AbstractFedElement::class)]
 final class FederationMetadataTest extends TestCase
 {
     use SchemaValidationTestTrait;
diff --git a/tests/WSSecurity/XML/fed/FederationTest.php b/tests/WSSecurity/XML/fed/FederationTest.php
index 38ed5ee5..48c87a67 100644
--- a/tests/WSSecurity/XML/fed/FederationTest.php
+++ b/tests/WSSecurity/XML/fed/FederationTest.php
@@ -4,7 +4,10 @@
 
 namespace SimpleSAML\Test\WSSecurity\XML\fed;
 
+use PHPUnit\Framework\Attributes\CoversClass;
 use PHPUnit\Framework\TestCase;
+use SimpleSAML\WSSecurity\XML\fed\AbstractFedElement;
+use SimpleSAML\WSSecurity\XML\fed\AbstractFederationType;
 use SimpleSAML\WSSecurity\XML\fed\Federation;
 use SimpleSAML\XML\Attribute as XMLAttribute;
 use SimpleSAML\XML\Chunk;
@@ -17,12 +20,11 @@
 /**
  * Tests for fed:Federation.
  *
- * @covers \SimpleSAML\WSSecurity\XML\fed\Federation
- * @covers \SimpleSAML\WSSecurity\XML\fed\AbstractFederationType
- * @covers \SimpleSAML\WSSecurity\XML\fed\AbstractFedElement
- *
  * @package simplesamlphp/ws-security
  */
+#[CoversClass(Federation::class)]
+#[CoversClass(AbstractFederationType::class)]
+#[CoversClass(AbstractFedElement::class)]
 final class FederationTest extends TestCase
 {
     use SerializableElementTestTrait;
diff --git a/tests/WSSecurity/XML/fed/FilterPseudonymsTest.php b/tests/WSSecurity/XML/fed/FilterPseudonymsTest.php
index 80cd4f38..d6ec265e 100644
--- a/tests/WSSecurity/XML/fed/FilterPseudonymsTest.php
+++ b/tests/WSSecurity/XML/fed/FilterPseudonymsTest.php
@@ -4,8 +4,11 @@
 
 namespace SimpleSAML\Test\WSSecurity\XML\fed;
 
+use PHPUnit\Framework\Attributes\CoversClass;
 use PHPUnit\Framework\TestCase;
 use SimpleSAML\WSSecurity\Constants as C;
+use SimpleSAML\WSSecurity\XML\fed\AbstractFedElement;
+use SimpleSAML\WSSecurity\XML\fed\AbstractFilterPseudonymsType;
 use SimpleSAML\WSSecurity\XML\fed\FilterPseudonyms;
 use SimpleSAML\WSSecurity\XML\fed\PseudonymBasis;
 use SimpleSAML\WSSecurity\XML\fed\RelativeTo;
@@ -22,12 +25,11 @@
 /**
  * Tests for fed:FilterPseudonyms.
  *
- * @covers \SimpleSAML\WSSecurity\XML\fed\FilterPseudonyms
- * @covers \SimpleSAML\WSSecurity\XML\fed\AbstractFilterPseudonymsType
- * @covers \SimpleSAML\WSSecurity\XML\fed\AbstractFedElement
- *
  * @package simplesamlphp/ws-security
  */
+#[CoversClass(FilterPseudonyms::class)]
+#[CoversClass(AbstractFilterPseudonymsType::class)]
+#[CoversClass(AbstractFedElement::class)]
 final class FilterPseudonymsTest extends TestCase
 {
     use SchemaValidationTestTrait;
diff --git a/tests/WSSecurity/XML/fed/FreshnessTest.php b/tests/WSSecurity/XML/fed/FreshnessTest.php
index ef4e4ea7..84b0a14a 100644
--- a/tests/WSSecurity/XML/fed/FreshnessTest.php
+++ b/tests/WSSecurity/XML/fed/FreshnessTest.php
@@ -4,8 +4,11 @@
 
 namespace SimpleSAML\Test\WSSecurity\XML\fed;
 
+use PHPUnit\Framework\Attributes\CoversClass;
 use PHPUnit\Framework\TestCase;
 use SimpleSAML\Test\WSSecurity\Constants as C;
+use SimpleSAML\WSSecurity\XML\fed\AbstractFedElement;
+use SimpleSAML\WSSecurity\XML\fed\AbstractFreshnessType;
 use SimpleSAML\WSSecurity\XML\fed\Freshness;
 use SimpleSAML\XML\Attribute as XMLAttribute;
 use SimpleSAML\XML\DOMDocumentFactory;
@@ -17,12 +20,11 @@
 /**
  * Class \SimpleSAML\WSSecurity\XML\fed\FreshnessTest
  *
- * @covers \SimpleSAML\WSSecurity\XML\fed\Freshness
- * @covers \SimpleSAML\WSSecurity\XML\fed\AbstractFreshnessType
- * @covers \SimpleSAML\WSSecurity\XML\fed\AbstractFedElement
- *
  * @package simplesamlphp/ws-security
  */
+#[CoversClass(Freshness::class)]
+#[CoversClass(AbstractFreshnessType::class)]
+#[CoversClass(AbstractFedElement::class)]
 final class FreshnessTest extends TestCase
 {
     use SchemaValidationTestTrait;
diff --git a/tests/WSSecurity/XML/fed/IssuerNameTest.php b/tests/WSSecurity/XML/fed/IssuerNameTest.php
index bc212881..62f26a42 100644
--- a/tests/WSSecurity/XML/fed/IssuerNameTest.php
+++ b/tests/WSSecurity/XML/fed/IssuerNameTest.php
@@ -4,7 +4,10 @@
 
 namespace SimpleSAML\Test\WSSecurity\XML\fed;
 
+use PHPUnit\Framework\Attributes\CoversClass;
 use PHPUnit\Framework\TestCase;
+use SimpleSAML\WSSecurity\XML\fed\AbstractFedElement;
+use SimpleSAML\WSSecurity\XML\fed\AbstractIssuerNameType;
 use SimpleSAML\WSSecurity\XML\fed\IssuerName;
 use SimpleSAML\XML\Attribute as XMLAttribute;
 use SimpleSAML\XML\DOMDocumentFactory;
@@ -16,11 +19,11 @@
 /**
  * Tests for fed:IssuerName.
  *
- * @covers \SimpleSAML\WSSecurity\XML\fed\IssuerName
- * @covers \SimpleSAML\WSSecurity\XML\fed\AbstractIssuerNameType
- * @covers \SimpleSAML\WSSecurity\XML\fed\AbstractFedElement
  * @package simplesamlphp/ws-security
  */
+#[CoversClass(IssuerName::class)]
+#[CoversClass(AbstractIssuerNameType::class)]
+#[CoversClass(AbstractFedElement::class)]
 final class IssuerNameTest extends TestCase
 {
     use SerializableElementTestTrait;
diff --git a/tests/WSSecurity/XML/fed/IssuesSpecificPolicyFaultTest.php b/tests/WSSecurity/XML/fed/IssuesSpecificPolicyFaultTest.php
index 44596807..b0a4ddd5 100644
--- a/tests/WSSecurity/XML/fed/IssuesSpecificPolicyFaultTest.php
+++ b/tests/WSSecurity/XML/fed/IssuesSpecificPolicyFaultTest.php
@@ -4,8 +4,11 @@
 
 namespace SimpleSAML\Test\WSSecurity\XML\fed;
 
+use PHPUnit\Framework\Attributes\CoversClass;
 use PHPUnit\Framework\TestCase;
 use SimpleSAML\Test\WSSecurity\Constants as C;
+use SimpleSAML\WSSecurity\XML\fed\AbstractAssertionType;
+use SimpleSAML\WSSecurity\XML\fed\AbstractFedElement;
 use SimpleSAML\WSSecurity\XML\fed\IssuesSpecificPolicyFault;
 use SimpleSAML\XML\Attribute as XMLAttribute;
 use SimpleSAML\XML\Chunk;
@@ -18,12 +21,11 @@
 /**
  * Class \SimpleSAML\WSSecurity\XML\fed\IssuesSpecificPolicyFaultTest
  *
- * @covers \SimpleSAML\WSSecurity\XML\fed\IssuesSpecificPolicyFault
- * @covers \SimpleSAML\WSSecurity\XML\fed\AbstractAssertionType
- * @covers \SimpleSAML\WSSecurity\XML\fed\AbstractFedElement
- *
  * @package simplesamlphp/ws-security
  */
+#[CoversClass(IssuesSpecificPolicyFault::class)]
+#[CoversClass(AbstractAssertionType::class)]
+#[CoversClass(AbstractFedElement::class)]
 final class IssuesSpecificPolicyFaultTest extends TestCase
 {
     use SchemaValidationTestTrait;
diff --git a/tests/WSSecurity/XML/fed/LogicalServiceNamesOfferedTest.php b/tests/WSSecurity/XML/fed/LogicalServiceNamesOfferedTest.php
index dccc8573..59a507ef 100644
--- a/tests/WSSecurity/XML/fed/LogicalServiceNamesOfferedTest.php
+++ b/tests/WSSecurity/XML/fed/LogicalServiceNamesOfferedTest.php
@@ -4,7 +4,10 @@
 
 namespace SimpleSAML\Test\WSSecurity\XML\fed;
 
+use PHPUnit\Framework\Attributes\CoversClass;
 use PHPUnit\Framework\TestCase;
+use SimpleSAML\WSSecurity\XML\fed\AbstractFedElement;
+use SimpleSAML\WSSecurity\XML\fed\AbstractLogicalServiceNamesOfferedType;
 use SimpleSAML\WSSecurity\XML\fed\IssuerName;
 use SimpleSAML\WSSecurity\XML\fed\LogicalServiceNamesOffered;
 use SimpleSAML\XML\Attribute as XMLAttribute;
@@ -18,11 +21,11 @@
 /**
  * Tests for fed:LogicalServiceNamesOffered.
  *
- * @covers \SimpleSAML\WSSecurity\XML\fed\LogicalServiceNamesOffered
- * @covers \SimpleSAML\WSSecurity\XML\fed\AbstractLogicalServiceNamesOfferedType
- * @covers \SimpleSAML\WSSecurity\XML\fed\AbstractFedElement
  * @package simplesamlphp/ws-security
  */
+#[CoversClass(LogicalServiceNamesOffered::class)]
+#[CoversClass(AbstractLogicalServiceNamesOfferedType::class)]
+#[CoversClass(AbstractFedElement::class)]
 final class LogicalServiceNamesOfferedTest extends TestCase
 {
     use SchemaValidationTestTrait;
diff --git a/tests/WSSecurity/XML/fed/PPIDTest.php b/tests/WSSecurity/XML/fed/PPIDTest.php
index 19f56e66..5f3cbad0 100644
--- a/tests/WSSecurity/XML/fed/PPIDTest.php
+++ b/tests/WSSecurity/XML/fed/PPIDTest.php
@@ -4,8 +4,11 @@
 
 namespace SimpleSAML\Test\WSSecurity\XML\fed;
 
+use PHPUnit\Framework\Attributes\CoversClass;
 use PHPUnit\Framework\TestCase;
 use SimpleSAML\Test\WSSecurity\Constants as C;
+use SimpleSAML\WSSecurity\XML\fed\AbstractAttributeExtensibleString;
+use SimpleSAML\WSSecurity\XML\fed\AbstractFedElement;
 use SimpleSAML\WSSecurity\XML\fed\PPID;
 use SimpleSAML\XML\Attribute as XMLAttribute;
 use SimpleSAML\XML\DOMDocumentFactory;
@@ -22,6 +25,9 @@
  *
  * @package simplesamlphp/ws-security
  */
+#[CoversClass(PPID::class)]
+#[CoversClass(AbstractAttributeExtensibleString::class)]
+#[CoversClass(AbstractFedElement::class)]
 final class PPIDTest extends TestCase
 {
     use SerializableElementTestTrait;
diff --git a/tests/WSSecurity/XML/fed/PassiveRequestorEndpointTest.php b/tests/WSSecurity/XML/fed/PassiveRequestorEndpointTest.php
index 5f31eceb..a70c3f27 100644
--- a/tests/WSSecurity/XML/fed/PassiveRequestorEndpointTest.php
+++ b/tests/WSSecurity/XML/fed/PassiveRequestorEndpointTest.php
@@ -5,7 +5,10 @@
 namespace SimpleSAML\Test\WSSecurity\XML\fed;
 
 use DOMElement;
+use PHPUnit\Framework\Attributes\CoversClass;
 use PHPUnit\Framework\TestCase;
+use SimpleSAML\WSSecurity\XML\fed\AbstractEndpointType;
+use SimpleSAML\WSSecurity\XML\fed\AbstractFedElement;
 use SimpleSAML\WSSecurity\XML\fed\PassiveRequestorEndpoint;
 use SimpleSAML\WSSecurity\XML\wsa\Address;
 use SimpleSAML\WSSecurity\XML\wsa\EndpointReference;
@@ -23,11 +26,11 @@
 /**
  * Tests for fed:PassiveRequestorEndpoint.
  *
- * @covers \SimpleSAML\WSSecurity\XML\fed\PassiveRequestorEndpoint
- * @covers \SimpleSAML\WSSecurity\XML\fed\AbstractEndpointType
- * @covers \SimpleSAML\WSSecurity\XML\fed\AbstractFedElement
  * @package simplesamlphp/ws-security
  */
+#[CoversClass(PassiveRequestorEndpoint::class)]
+#[CoversClass(AbstractEndpointType::class)]
+#[CoversClass(AbstractFedElement::class)]
 final class PassiveRequestorEndpointTest extends TestCase
 {
     use SchemaValidationTestTrait;
diff --git a/tests/WSSecurity/XML/fed/PassiveRequestorEndpointsTest.php b/tests/WSSecurity/XML/fed/PassiveRequestorEndpointsTest.php
index d397ccbe..b0d1ffb9 100644
--- a/tests/WSSecurity/XML/fed/PassiveRequestorEndpointsTest.php
+++ b/tests/WSSecurity/XML/fed/PassiveRequestorEndpointsTest.php
@@ -5,7 +5,10 @@
 namespace SimpleSAML\Test\WSSecurity\XML\fed;
 
 use DOMElement;
+use PHPUnit\Framework\Attributes\CoversClass;
 use PHPUnit\Framework\TestCase;
+use SimpleSAML\WSSecurity\XML\fed\AbstractEndpointType;
+use SimpleSAML\WSSecurity\XML\fed\AbstractFedElement;
 use SimpleSAML\WSSecurity\XML\fed\PassiveRequestorEndpoints;
 use SimpleSAML\WSSecurity\XML\wsa\Address;
 use SimpleSAML\WSSecurity\XML\wsa\EndpointReference;
@@ -23,11 +26,11 @@
 /**
  * Tests for fed:PassiveRequestorEndpoints.
  *
- * @covers \SimpleSAML\WSSecurity\XML\fed\PassiveRequestorEndpoints
- * @covers \SimpleSAML\WSSecurity\XML\fed\AbstractEndpointType
- * @covers \SimpleSAML\WSSecurity\XML\fed\AbstractFedElement
  * @package simplesamlphp/ws-security
  */
+#[CoversClass(PassiveRequestorEndpoints::class)]
+#[CoversClass(AbstractEndpointType::class)]
+#[CoversClass(AbstractFedElement::class)]
 final class PassiveRequestorEndpointsTest extends TestCase
 {
     use SchemaValidationTestTrait;
diff --git a/tests/WSSecurity/XML/fed/ProofTokenTest.php b/tests/WSSecurity/XML/fed/ProofTokenTest.php
index 8b56da1f..b973efb7 100644
--- a/tests/WSSecurity/XML/fed/ProofTokenTest.php
+++ b/tests/WSSecurity/XML/fed/ProofTokenTest.php
@@ -4,7 +4,10 @@
 
 namespace SimpleSAML\Test\WSSecurity\XML\fed;
 
+use PHPUnit\Framework\Attributes\CoversClass;
 use PHPUnit\Framework\TestCase;
+use SimpleSAML\WSSecurity\XML\fed\AbstractFedElement;
+use SimpleSAML\WSSecurity\XML\fed\AbstractProofTokenType;
 use SimpleSAML\WSSecurity\XML\fed\ProofToken;
 use SimpleSAML\XML\Attribute as XMLAttribute;
 use SimpleSAML\XML\Chunk;
@@ -18,11 +21,12 @@
 /**
  * Tests for fed:ProofToken.
  *
- * @covers \SimpleSAML\WSSecurity\XML\fed\ProofToken
- * @covers \SimpleSAML\WSSecurity\XML\fed\AbstractProofTokenType
- * @covers \SimpleSAML\WSSecurity\XML\fed\AbstractFedElement
  * @package simplesamlphp/ws-security
  */
+#[CoversClass(ProofToken::class)]
+#[CoversClass(AbstractProofTokenType::class)]
+#[CoversClass(AbstractProofTokenType::class)]
+#[CoversClass(AbstractFedElement::class)]
 final class ProofTokenTest extends TestCase
 {
     use SchemaValidationTestTrait;
diff --git a/tests/WSSecurity/XML/fed/PseudonymBasisTest.php b/tests/WSSecurity/XML/fed/PseudonymBasisTest.php
index 4b891e88..8250d76a 100644
--- a/tests/WSSecurity/XML/fed/PseudonymBasisTest.php
+++ b/tests/WSSecurity/XML/fed/PseudonymBasisTest.php
@@ -4,7 +4,10 @@
 
 namespace SimpleSAML\Test\WSSecurity\XML\fed;
 
+use PHPUnit\Framework\Attributes\CoversClass;
 use PHPUnit\Framework\TestCase;
+use SimpleSAML\WSSecurity\XML\fed\AbstractFedElement;
+use SimpleSAML\WSSecurity\XML\fed\AbstractPseudonymBasisType;
 use SimpleSAML\WSSecurity\XML\fed\PseudonymBasis;
 use SimpleSAML\XML\Attribute as XMLAttribute;
 use SimpleSAML\XML\Chunk;
@@ -18,11 +21,11 @@
 /**
  * Tests for fed:RelativeTo.
  *
- * @covers \SimpleSAML\WSSecurity\XML\fed\PseudonymBasis
- * @covers \SimpleSAML\WSSecurity\XML\fed\AbstractPseudonymBasisType
- * @covers \SimpleSAML\WSSecurity\XML\fed\AbstractFedElement
  * @package simplesamlphp/ws-security
  */
+#[CoversClass(PseudonymBasis::class)]
+#[CoversClass(AbstractPseudonymBasisType::class)]
+#[CoversClass(AbstractFedElement::class)]
 final class PseudonymBasisTest extends TestCase
 {
     use SchemaValidationTestTrait;
diff --git a/tests/WSSecurity/XML/fed/PseudonymServiceEndpointTest.php b/tests/WSSecurity/XML/fed/PseudonymServiceEndpointTest.php
index 80779c7f..4667ca78 100644
--- a/tests/WSSecurity/XML/fed/PseudonymServiceEndpointTest.php
+++ b/tests/WSSecurity/XML/fed/PseudonymServiceEndpointTest.php
@@ -5,7 +5,10 @@
 namespace SimpleSAML\Test\WSSecurity\XML\fed;
 
 use DOMElement;
+use PHPUnit\Framework\Attributes\CoversClass;
 use PHPUnit\Framework\TestCase;
+use SimpleSAML\WSSecurity\XML\fed\AbstractEndpointType;
+use SimpleSAML\WSSecurity\XML\fed\AbstractFedElement;
 use SimpleSAML\WSSecurity\XML\fed\PseudonymServiceEndpoint;
 use SimpleSAML\WSSecurity\XML\wsa\Address;
 use SimpleSAML\WSSecurity\XML\wsa\EndpointReference;
@@ -23,11 +26,11 @@
 /**
  * Tests for fed:PseudonymServiceEndpoint.
  *
- * @covers \SimpleSAML\WSSecurity\XML\fed\PseudonymServiceEndpoint
- * @covers \SimpleSAML\WSSecurity\XML\fed\AbstractEndpointType
- * @covers \SimpleSAML\WSSecurity\XML\fed\AbstractFedElement
  * @package simplesamlphp/ws-security
  */
+#[CoversClass(PseudonymServiceEndpoint::class)]
+#[CoversClass(AbstractEndpointType::class)]
+#[CoversClass(AbstractFedElement::class)]
 final class PseudonymServiceEndpointTest extends TestCase
 {
     use SchemaValidationTestTrait;
diff --git a/tests/WSSecurity/XML/fed/PseudonymTest.php b/tests/WSSecurity/XML/fed/PseudonymTest.php
index f26b1f28..66ace827 100644
--- a/tests/WSSecurity/XML/fed/PseudonymTest.php
+++ b/tests/WSSecurity/XML/fed/PseudonymTest.php
@@ -5,7 +5,10 @@
 namespace SimpleSAML\Test\WSSecurity\XML\fed;
 
 use DateTimeImmutable;
+use PHPUnit\Framework\Attributes\CoversClass;
 use PHPUnit\Framework\TestCase;
+use SimpleSAML\WSSecurity\XML\fed\AbstractFedElement;
+use SimpleSAML\WSSecurity\XML\fed\AbstractPseudonymType;
 use SimpleSAML\WSSecurity\XML\fed\ProofToken;
 use SimpleSAML\WSSecurity\XML\fed\Pseudonym;
 use SimpleSAML\WSSecurity\XML\fed\PseudonymBasis;
@@ -25,12 +28,11 @@
 /**
  * Tests for fed:Pseudonym.
  *
- * @covers \SimpleSAML\WSSecurity\XML\fed\Pseudonym
- * @covers \SimpleSAML\WSSecurity\XML\fed\AbstractPseudonymType
- * @covers \SimpleSAML\WSSecurity\XML\fed\AbstractFedElement
- *
  * @package simplesamlphp/ws-security
  */
+#[CoversClass(Pseudonym::class)]
+#[CoversClass(AbstractPseudonymType::class)]
+#[CoversClass(AbstractFedElement::class)]
 final class PseudonymTest extends TestCase
 {
     use SchemaValidationTestTrait;
diff --git a/tests/WSSecurity/XML/fed/RealmTest.php b/tests/WSSecurity/XML/fed/RealmTest.php
index 512e94d0..dbda27f0 100644
--- a/tests/WSSecurity/XML/fed/RealmTest.php
+++ b/tests/WSSecurity/XML/fed/RealmTest.php
@@ -4,8 +4,10 @@
 
 namespace SimpleSAML\Test\WSSecurity\XML\fed;
 
+use PHPUnit\Framework\Attributes\CoversClass;
 use PHPUnit\Framework\TestCase;
 use SimpleSAML\Test\WSSecurity\Constants as C;
+use SimpleSAML\WSSecurity\XML\fed\AbstractFedElement;
 use SimpleSAML\WSSecurity\XML\fed\Realm;
 use SimpleSAML\XML\DOMDocumentFactory;
 use SimpleSAML\XML\TestUtils\SchemaValidationTestTrait;
@@ -16,11 +18,10 @@
 /**
  * Class \SimpleSAML\WSSecurity\XML\fed\RealmTest
  *
- * @covers \SimpleSAML\WSSecurity\XML\fed\Realm
- * @covers \SimpleSAML\WSSecurity\XML\fed\AbstractFedElement
- *
  * @package simplesamlphp/ws-security
  */
+#[CoversClass(Realm::class)]
+#[CoversClass(AbstractFedElement::class)]
 final class RealmTest extends TestCase
 {
     use SchemaValidationTestTrait;
diff --git a/tests/WSSecurity/XML/fed/ReferenceDigestTest.php b/tests/WSSecurity/XML/fed/ReferenceDigestTest.php
index 1cef7c75..a7f110e2 100644
--- a/tests/WSSecurity/XML/fed/ReferenceDigestTest.php
+++ b/tests/WSSecurity/XML/fed/ReferenceDigestTest.php
@@ -4,8 +4,11 @@
 
 namespace SimpleSAML\Test\WSSecurity\XML\fed;
 
+use PHPUnit\Framework\Attributes\CoversClass;
 use PHPUnit\Framework\TestCase;
 use SimpleSAML\Test\WSSecurity\Constants as C;
+use SimpleSAML\WSSecurity\XML\fed\AbstractFedElement;
+use SimpleSAML\WSSecurity\XML\fed\AbstractReferenceDigestType;
 use SimpleSAML\WSSecurity\XML\fed\ReferenceDigest;
 use SimpleSAML\XML\Attribute as XMLAttribute;
 use SimpleSAML\XML\DOMDocumentFactory;
@@ -16,12 +19,11 @@
 /**
  * Class \SimpleSAML\WSSecurity\XML\fed\ReferenceDigestTest
  *
- * @covers \SimpleSAML\WSSecurity\XML\fed\ReferenceDigest
- * @covers \SimpleSAML\WSSecurity\XML\fed\AbstractReferenceDigestType
- * @covers \SimpleSAML\WSSecurity\XML\fed\AbstractFedElement
- *
  * @package simplesamlphp/ws-security
  */
+#[CoversClass(ReferenceDigest::class)]
+#[CoversClass(AbstractReferenceDigestType::class)]
+#[CoversClass(AbstractFedElement::class)]
 final class ReferenceDigestTest extends TestCase
 {
     use SerializableElementTestTrait;
diff --git a/tests/WSSecurity/XML/fed/ReferenceEPRTest.php b/tests/WSSecurity/XML/fed/ReferenceEPRTest.php
index 89fde8c5..4bf57293 100644
--- a/tests/WSSecurity/XML/fed/ReferenceEPRTest.php
+++ b/tests/WSSecurity/XML/fed/ReferenceEPRTest.php
@@ -5,8 +5,11 @@
 namespace SimpleSAML\Test\WSSecurity\XML\fed;
 
 use DOMElement;
+use PHPUnit\Framework\Attributes\CoversClass;
 use PHPUnit\Framework\TestCase;
 use SimpleSAML\WSSecurity\XML\fed\ReferenceEPR;
+use SimpleSAML\WSSecurity\XML\wsa\AbstractEndpointReferenceType;
+use SimpleSAML\WSSecurity\XML\wsa\AbstractWsaElement;
 use SimpleSAML\WSSecurity\XML\wsa\Address;
 use SimpleSAML\WSSecurity\XML\wsa\Metadata;
 use SimpleSAML\WSSecurity\XML\wsa\ReferenceParameters;
@@ -21,12 +24,11 @@
 /**
  * Tests for fed:ReferenceEPR.
  *
- * @covers \SimpleSAML\WSSecurity\XML\fed\ReferenceEPR
- * @covers \SimpleSAML\WSSecurity\XML\wsa\AbstractEndpointReferenceType
- * @covers \SimpleSAML\WSSecurity\XML\wsa\AbstractWsaElement
- *
  * @package simplesamlphp/ws-security
  */
+#[CoversClass(ReferenceEPR::class)]
+#[CoversClass(AbstractEndpointReferenceType::class)]
+#[CoversClass(AbstractWsaElement::class)]
 final class ReferenceEPRTest extends TestCase
 {
     use SerializableElementTestTrait;
diff --git a/tests/WSSecurity/XML/fed/ReferenceToken11Test.php b/tests/WSSecurity/XML/fed/ReferenceToken11Test.php
index 905fbb78..7884b86e 100644
--- a/tests/WSSecurity/XML/fed/ReferenceToken11Test.php
+++ b/tests/WSSecurity/XML/fed/ReferenceToken11Test.php
@@ -4,8 +4,11 @@
 
 namespace SimpleSAML\Test\WSSecurity\XML\fed;
 
+use PHPUnit\Framework\Attributes\CoversClass;
 use PHPUnit\Framework\TestCase;
 use SimpleSAML\Test\WSSecurity\Constants as C;
+use SimpleSAML\WSSecurity\XML\fed\AbstractAssertionType;
+use SimpleSAML\WSSecurity\XML\fed\AbstractFedElement;
 use SimpleSAML\WSSecurity\XML\fed\ReferenceToken11;
 use SimpleSAML\XML\Attribute as XMLAttribute;
 use SimpleSAML\XML\Chunk;
@@ -18,12 +21,11 @@
 /**
  * Class \SimpleSAML\WSSecurity\XML\fed\ReferenceToken11Test
  *
- * @covers \SimpleSAML\WSSecurity\XML\fed\ReferenceToken11
- * @covers \SimpleSAML\WSSecurity\XML\fed\AbstractAssertionType
- * @covers \SimpleSAML\WSSecurity\XML\fed\AbstractFedElement
- *
  * @package simplesamlphp/ws-security
  */
+#[CoversClass(ReferenceToken11::class)]
+#[CoversClass(AbstractAssertionType::class)]
+#[CoversClass(AbstractFedElement::class)]
 final class ReferenceToken11Test extends TestCase
 {
     use SchemaValidationTestTrait;
diff --git a/tests/WSSecurity/XML/fed/ReferenceTokenTest.php b/tests/WSSecurity/XML/fed/ReferenceTokenTest.php
index f44b8086..7ccdea53 100644
--- a/tests/WSSecurity/XML/fed/ReferenceTokenTest.php
+++ b/tests/WSSecurity/XML/fed/ReferenceTokenTest.php
@@ -5,13 +5,17 @@
 namespace SimpleSAML\Test\WSSecurity\XML\fed;
 
 use DOMElement;
+use PHPUnit\Framework\Attributes\CoversClass;
 use PHPUnit\Framework\TestCase;
 use SimpleSAML\Test\WSSecurity\Constants as C;
+use SimpleSAML\WSSecurity\XML\fed\AbstractReferenceTokenType;
 use SimpleSAML\WSSecurity\XML\fed\ReferenceDigest;
 use SimpleSAML\WSSecurity\XML\fed\ReferenceEPR;
 use SimpleSAML\WSSecurity\XML\fed\ReferenceToken;
 use SimpleSAML\WSSecurity\XML\fed\ReferenceType;
 use SimpleSAML\WSSecurity\XML\fed\SerialNo;
+use SimpleSAML\WSSecurity\XML\wsa\AbstractEndpointReferenceType;
+use SimpleSAML\WSSecurity\XML\wsa\AbstractWsaElement;
 use SimpleSAML\WSSecurity\XML\wsa\Address;
 use SimpleSAML\WSSecurity\XML\wsa\Metadata;
 use SimpleSAML\WSSecurity\XML\wsa\ReferenceParameters;
@@ -27,12 +31,12 @@
 /**
  * Tests for fed:ReferenceToken.
  *
- * @covers \SimpleSAML\WSSecurity\XML\fed\ReferenceToken
- * @covers \SimpleSAML\WSSecurity\XML\fed\AbstractReferenceTokenType
- * @covers \SimpleSAML\WSSecurity\XML\wsa\AbstractEndpointReferenceType
- * @covers \SimpleSAML\WSSecurity\XML\wsa\AbstractWsaElement
  * @package simplesamlphp/ws-security
  */
+#[CoversClass(ReferenceToken::class)]
+#[CoversClass(AbstractReferenceTokenType::class)]
+#[CoversClass(AbstractEndpointReferenceType::class)]
+#[CoversClass(AbstractWsaElement::class)]
 final class ReferenceTokenTest extends TestCase
 {
     use SchemaValidationTestTrait;
diff --git a/tests/WSSecurity/XML/fed/ReferenceTypeTest.php b/tests/WSSecurity/XML/fed/ReferenceTypeTest.php
index 14734177..6a48fb1c 100644
--- a/tests/WSSecurity/XML/fed/ReferenceTypeTest.php
+++ b/tests/WSSecurity/XML/fed/ReferenceTypeTest.php
@@ -4,8 +4,12 @@
 
 namespace SimpleSAML\Test\WSSecurity\XML\fed;
 
+use PHPUnit\Framework\Attributes\CoversClass;
 use PHPUnit\Framework\TestCase;
 use SimpleSAML\Test\WSSecurity\Constants as C;
+use SimpleSAML\WSSecurity\XML\fed\AbstractAttributeExtensibleString;
+use SimpleSAML\WSSecurity\XML\fed\AbstractAttributeExtensibleURI;
+use SimpleSAML\WSSecurity\XML\fed\AbstractFedElement;
 use SimpleSAML\WSSecurity\XML\fed\ReferenceType;
 use SimpleSAML\XML\Attribute as XMLAttribute;
 use SimpleSAML\XML\DOMDocumentFactory;
@@ -16,13 +20,12 @@
 /**
  * Class \SimpleSAML\WSSecurity\XML\fed\ReferenceTypeTest
  *
- * @covers \SimpleSAML\WSSecurity\XML\fed\ReferenceType
- * @covers \SimpleSAML\WSSecurity\XML\fed\AbstractAttributeExtensibleURI
- * @covers \SimpleSAML\WSSecurity\XML\fed\AbstractAttributeExtensibleString
- * @covers \SimpleSAML\WSSecurity\XML\fed\AbstractFedElement
- *
  * @package simplesamlphp/ws-security
  */
+#[CoversClass(ReferenceType::class)]
+#[CoversClass(AbstractAttributeExtensibleURI::class)]
+#[CoversClass(AbstractAttributeExtensibleString::class)]
+#[CoversClass(AbstractFedElement::class)]
 final class ReferenceTypeTest extends TestCase
 {
     use SerializableElementTestTrait;
diff --git a/tests/WSSecurity/XML/fed/RelativeToTest.php b/tests/WSSecurity/XML/fed/RelativeToTest.php
index 549701fe..84c73628 100644
--- a/tests/WSSecurity/XML/fed/RelativeToTest.php
+++ b/tests/WSSecurity/XML/fed/RelativeToTest.php
@@ -4,8 +4,11 @@
 
 namespace SimpleSAML\Test\WSSecurity\XML\fed;
 
+use PHPUnit\Framework\Attributes\CoversClass;
 use PHPUnit\Framework\TestCase;
 use SimpleSAML\WSSecurity\Constants as C;
+use SimpleSAML\WSSecurity\XML\fed\AbstractFedElement;
+use SimpleSAML\WSSecurity\XML\fed\AbstractRelativeToType;
 use SimpleSAML\WSSecurity\XML\fed\RelativeTo;
 use SimpleSAML\XML\Attribute as XMLAttribute;
 use SimpleSAML\XML\Chunk;
@@ -19,11 +22,11 @@
 /**
  * Tests for fed:RelativeTo.
  *
- * @covers \SimpleSAML\WSSecurity\XML\fed\RelativeTo
- * @covers \SimpleSAML\WSSecurity\XML\fed\AbstractRelativeToType
- * @covers \SimpleSAML\WSSecurity\XML\fed\AbstractFedElement
  * @package simplesamlphp/ws-security
  */
+#[CoversClass(RelativeTo::class)]
+#[CoversClass(AbstractRelativeToType::class)]
+#[CoversClass(AbstractFedElement::class)]
 final class RelativeToTest extends TestCase
 {
     use SchemaValidationTestTrait;
diff --git a/tests/WSSecurity/XML/fed/RequestProofTokenTest.php b/tests/WSSecurity/XML/fed/RequestProofTokenTest.php
index e7ab090c..fb3571d0 100644
--- a/tests/WSSecurity/XML/fed/RequestProofTokenTest.php
+++ b/tests/WSSecurity/XML/fed/RequestProofTokenTest.php
@@ -4,8 +4,11 @@
 
 namespace SimpleSAML\Test\WSSecurity\XML\fed;
 
+use PHPUnit\Framework\Attributes\CoversClass;
 use PHPUnit\Framework\TestCase;
 use SimpleSAML\Test\WSSecurity\Constants as C;
+use SimpleSAML\WSSecurity\XML\fed\AbstractFedElement;
+use SimpleSAML\WSSecurity\XML\fed\AbstractRequestProofTokenType;
 use SimpleSAML\WSSecurity\XML\fed\RequestProofToken;
 use SimpleSAML\XML\Attribute as XMLAttribute;
 use SimpleSAML\XML\Chunk;
@@ -18,12 +21,11 @@
 /**
  * Class \SimpleSAML\WSSecurity\XML\fed\RequestProofTokenTest
  *
- * @covers \SimpleSAML\WSSecurity\XML\fed\RequestProofToken
- * @covers \SimpleSAML\WSSecurity\XML\fed\AbstractRequestProofTokenType
- * @covers \SimpleSAML\WSSecurity\XML\fed\AbstractFedElement
- *
  * @package simplesamlphp/ws-security
  */
+#[CoversClass(RequestProofToken::class)]
+#[CoversClass(AbstractRequestProofTokenType::class)]
+#[CoversClass(AbstractFedElement::class)]
 final class RequestProofTokenTest extends TestCase
 {
     use SchemaValidationTestTrait;
diff --git a/tests/WSSecurity/XML/fed/RequestPseudonymTest.php b/tests/WSSecurity/XML/fed/RequestPseudonymTest.php
index a2345cc9..8710da3a 100644
--- a/tests/WSSecurity/XML/fed/RequestPseudonymTest.php
+++ b/tests/WSSecurity/XML/fed/RequestPseudonymTest.php
@@ -4,7 +4,10 @@
 
 namespace SimpleSAML\Test\WSSecurity\XML\fed;
 
+use PHPUnit\Framework\Attributes\CoversClass;
 use PHPUnit\Framework\TestCase;
+use SimpleSAML\WSSecurity\XML\fed\AbstractFedElement;
+use SimpleSAML\WSSecurity\XML\fed\AbstractRequestPseudonymType;
 use SimpleSAML\WSSecurity\XML\fed\RequestPseudonym;
 use SimpleSAML\XML\Attribute as XMLAttribute;
 use SimpleSAML\XML\Chunk;
@@ -18,11 +21,11 @@
 /**
  * Tests for fed:RequestPseudonym.
  *
- * @covers \SimpleSAML\WSSecurity\XML\fed\RequestPseudonym
- * @covers \SimpleSAML\WSSecurity\XML\fed\AbstractRequestPseudonymType
- * @covers \SimpleSAML\WSSecurity\XML\fed\AbstractFedElement
  * @package simplesamlphp/ws-security
  */
+#[CoversClass(RequestPseudonym::class)]
+#[CoversClass(AbstractRequestPseudonymType::class)]
+#[CoversClass(AbstractFedElement::class)]
 final class RequestPseudonymTest extends TestCase
 {
     use SchemaValidationTestTrait;
diff --git a/tests/WSSecurity/XML/fed/RequireBearerTokensTest.php b/tests/WSSecurity/XML/fed/RequireBearerTokensTest.php
index 9af47970..fa3a4b34 100644
--- a/tests/WSSecurity/XML/fed/RequireBearerTokensTest.php
+++ b/tests/WSSecurity/XML/fed/RequireBearerTokensTest.php
@@ -4,8 +4,11 @@
 
 namespace SimpleSAML\Test\WSSecurity\XML\fed;
 
+use PHPUnit\Framework\Attributes\CoversClass;
 use PHPUnit\Framework\TestCase;
 use SimpleSAML\Test\WSSecurity\Constants as C;
+use SimpleSAML\WSSecurity\XML\fed\AbstractAssertionType;
+use SimpleSAML\WSSecurity\XML\fed\AbstractFedElement;
 use SimpleSAML\WSSecurity\XML\fed\RequireBearerTokens;
 use SimpleSAML\XML\Attribute as XMLAttribute;
 use SimpleSAML\XML\Chunk;
@@ -18,12 +21,11 @@
 /**
  * Class \SimpleSAML\WSSecurity\XML\fed\RequireBearerTokensTest
  *
- * @covers \SimpleSAML\WSSecurity\XML\fed\RequireBearerTokens
- * @covers \SimpleSAML\WSSecurity\XML\fed\AbstractAssertionType
- * @covers \SimpleSAML\WSSecurity\XML\fed\AbstractFedElement
- *
  * @package simplesamlphp/ws-security
  */
+#[CoversClass(RequireBearerTokens::class)]
+#[CoversClass(AbstractAssertionType::class)]
+#[CoversClass(AbstractFedElement::class)]
 final class RequireBearerTokensTest extends TestCase
 {
     use SchemaValidationTestTrait;
diff --git a/tests/WSSecurity/XML/fed/RequireReferenceTokenTest.php b/tests/WSSecurity/XML/fed/RequireReferenceTokenTest.php
index cf742703..8583ce2f 100644
--- a/tests/WSSecurity/XML/fed/RequireReferenceTokenTest.php
+++ b/tests/WSSecurity/XML/fed/RequireReferenceTokenTest.php
@@ -4,10 +4,14 @@
 
 namespace SimpleSAML\Test\WSSecurity\XML\fed;
 
+use PHPUnit\Framework\Attributes\CoversClass;
 use PHPUnit\Framework\TestCase;
 use SimpleSAML\Test\WSSecurity\Constants as C;
 use SimpleSAML\WSSecurity\XML\fed\RequireReferenceToken;
+use SimpleSAML\WSSecurity\XML\sp\AbstractSpElement;
+use SimpleSAML\WSSecurity\XML\sp\AbstractTokenAssertionType;
 use SimpleSAML\WSSecurity\XML\sp\IncludeToken;
+use SimpleSAML\WSSecurity\XML\sp\IncludeTokenTypeTrait;
 use SimpleSAML\XML\Attribute as XMLAttribute;
 use SimpleSAML\XML\Chunk;
 use SimpleSAML\XML\DOMDocumentFactory;
@@ -19,13 +23,12 @@
 /**
  * Class \SimpleSAML\WSSecurity\XML\fed\RequireReferenceTokenTest
  *
- * @covers \SimpleSAML\WSSecurity\XML\fed\RequireReferenceToken
- * @covers \SimpleSAML\WSSecurity\XML\sp\IncludeTokenTypeTrait
- * @covers \SimpleSAML\WSSecurity\XML\sp\AbstractTokenAssertionType
- * @covers \SimpleSAML\WSSecurity\XML\sp\AbstractSpElement
- *
  * @package simplesamlphp/ws-security
  */
+#[CoversClass(RequireReferenceToken::class)]
+#[CoversClass(IncludeTokenTypeTrait::class)]
+#[CoversClass(AbstractTokenAssertionType::class)]
+#[CoversClass(AbstractSpElement::class)]
 final class RequireReferenceTokenTest extends TestCase
 {
     use SchemaValidationTestTrait;
diff --git a/tests/WSSecurity/XML/fed/RequireSharedCookiesTest.php b/tests/WSSecurity/XML/fed/RequireSharedCookiesTest.php
index 7e033be8..bb62c19d 100644
--- a/tests/WSSecurity/XML/fed/RequireSharedCookiesTest.php
+++ b/tests/WSSecurity/XML/fed/RequireSharedCookiesTest.php
@@ -4,8 +4,11 @@
 
 namespace SimpleSAML\Test\WSSecurity\XML\fed;
 
+use PHPUnit\Framework\Attributes\CoversClass;
 use PHPUnit\Framework\TestCase;
 use SimpleSAML\Test\WSSecurity\Constants as C;
+use SimpleSAML\WSSecurity\XML\fed\AbstractAssertionType;
+use SimpleSAML\WSSecurity\XML\fed\AbstractFedElement;
 use SimpleSAML\WSSecurity\XML\fed\RequireSharedCookies;
 use SimpleSAML\XML\Attribute as XMLAttribute;
 use SimpleSAML\XML\Chunk;
@@ -18,12 +21,11 @@
 /**
  * Class \SimpleSAML\WSSecurity\XML\fed\RequireSharedCookiesTest
  *
- * @covers \SimpleSAML\WSSecurity\XML\fed\RequireSharedCookies
- * @covers \SimpleSAML\WSSecurity\XML\fed\AbstractAssertionType
- * @covers \SimpleSAML\WSSecurity\XML\fed\AbstractFedElement
- *
  * @package simplesamlphp/ws-security
  */
+#[CoversClass(RequireSharedCookies::class)]
+#[CoversClass(AbstractAssertionType::class)]
+#[CoversClass(AbstractFedElement::class)]
 final class RequireSharedCookiesTest extends TestCase
 {
     use SchemaValidationTestTrait;
diff --git a/tests/WSSecurity/XML/fed/RequireSignedTokensTest.php b/tests/WSSecurity/XML/fed/RequireSignedTokensTest.php
index ee4f21e6..80032e6b 100644
--- a/tests/WSSecurity/XML/fed/RequireSignedTokensTest.php
+++ b/tests/WSSecurity/XML/fed/RequireSignedTokensTest.php
@@ -4,8 +4,11 @@
 
 namespace SimpleSAML\Test\WSSecurity\XML\fed;
 
+use PHPUnit\Framework\Attributes\CoversClass;
 use PHPUnit\Framework\TestCase;
 use SimpleSAML\Test\WSSecurity\Constants as C;
+use SimpleSAML\WSSecurity\XML\fed\AbstractAssertionType;
+use SimpleSAML\WSSecurity\XML\fed\AbstractFedElement;
 use SimpleSAML\WSSecurity\XML\fed\RequireSignedTokens;
 use SimpleSAML\XML\Attribute as XMLAttribute;
 use SimpleSAML\XML\Chunk;
@@ -18,12 +21,11 @@
 /**
  * Class \SimpleSAML\WSSecurity\XML\fed\RequireSignedTokensTest
  *
- * @covers \SimpleSAML\WSSecurity\XML\fed\RequireSignedTokens
- * @covers \SimpleSAML\WSSecurity\XML\fed\AbstractAssertionType
- * @covers \SimpleSAML\WSSecurity\XML\fed\AbstractFedElement
- *
  * @package simplesamlphp/ws-security
  */
+#[CoversClass(RequireSignedTokens::class)]
+#[CoversClass(AbstractAssertionType::class)]
+#[CoversClass(AbstractFedElement::class)]
 final class RequireSignedTokensTest extends TestCase
 {
     use SchemaValidationTestTrait;
diff --git a/tests/WSSecurity/XML/fed/RequiresGenericClaimDialectTest.php b/tests/WSSecurity/XML/fed/RequiresGenericClaimDialectTest.php
index f6126d59..cd8a23aa 100644
--- a/tests/WSSecurity/XML/fed/RequiresGenericClaimDialectTest.php
+++ b/tests/WSSecurity/XML/fed/RequiresGenericClaimDialectTest.php
@@ -4,8 +4,11 @@
 
 namespace SimpleSAML\Test\WSSecurity\XML\fed;
 
+use PHPUnit\Framework\Attributes\CoversClass;
 use PHPUnit\Framework\TestCase;
 use SimpleSAML\Test\WSSecurity\Constants as C;
+use SimpleSAML\WSSecurity\XML\fed\AbstractAssertionType;
+use SimpleSAML\WSSecurity\XML\fed\AbstractFedElement;
 use SimpleSAML\WSSecurity\XML\fed\RequiresGenericClaimDialect;
 use SimpleSAML\XML\Attribute as XMLAttribute;
 use SimpleSAML\XML\Chunk;
@@ -18,12 +21,11 @@
 /**
  * Class \SimpleSAML\WSSecurity\XML\fed\RequiresGenericClaimDialectTest
  *
- * @covers \SimpleSAML\WSSecurity\XML\fed\RequiresGenericClaimDialect
- * @covers \SimpleSAML\WSSecurity\XML\fed\AbstractAssertionType
- * @covers \SimpleSAML\WSSecurity\XML\fed\AbstractFedElement
- *
  * @package simplesamlphp/ws-security
  */
+#[CoversClass(RequiresGenericClaimDialect::class)]
+#[CoversClass(AbstractAssertionType::class)]
+#[CoversClass(AbstractFedElement::class)]
 final class RequiresGenericClaimDialectTest extends TestCase
 {
     use SchemaValidationTestTrait;
diff --git a/tests/WSSecurity/XML/fed/SecurityTokenServiceEndpointTest.php b/tests/WSSecurity/XML/fed/SecurityTokenServiceEndpointTest.php
index 0f4ea41b..9ef33319 100644
--- a/tests/WSSecurity/XML/fed/SecurityTokenServiceEndpointTest.php
+++ b/tests/WSSecurity/XML/fed/SecurityTokenServiceEndpointTest.php
@@ -5,7 +5,10 @@
 namespace SimpleSAML\Test\WSSecurity\XML\fed;
 
 use DOMElement;
+use PHPUnit\Framework\Attributes\CoversClass;
 use PHPUnit\Framework\TestCase;
+use SimpleSAML\WSSecurity\XML\fed\AbstractEndpointType;
+use SimpleSAML\WSSecurity\XML\fed\AbstractFedElement;
 use SimpleSAML\WSSecurity\XML\fed\SecurityTokenServiceEndpoint;
 use SimpleSAML\WSSecurity\XML\wsa\Address;
 use SimpleSAML\WSSecurity\XML\wsa\EndpointReference;
@@ -23,11 +26,11 @@
 /**
  * Tests for fed:SecurityTokenServiceEndpoint.
  *
- * @covers \SimpleSAML\WSSecurity\XML\fed\SecurityTokenServiceEndpoint
- * @covers \SimpleSAML\WSSecurity\XML\fed\AbstractEndpointType
- * @covers \SimpleSAML\WSSecurity\XML\fed\AbstractFedElement
  * @package simplesamlphp/ws-security
  */
+#[CoversClass(SecurityTokenServiceEndpoint::class)]
+#[CoversClass(AbstractEndpointType::class)]
+#[CoversClass(AbstractFedElement::class)]
 final class SecurityTokenServiceEndpointTest extends TestCase
 {
     use SchemaValidationTestTrait;
diff --git a/tests/WSSecurity/XML/fed/SecurityTokenTest.php b/tests/WSSecurity/XML/fed/SecurityTokenTest.php
index 8e065e95..72e42593 100644
--- a/tests/WSSecurity/XML/fed/SecurityTokenTest.php
+++ b/tests/WSSecurity/XML/fed/SecurityTokenTest.php
@@ -4,7 +4,10 @@
 
 namespace SimpleSAML\Test\WSSecurity\XML\fed;
 
+use PHPUnit\Framework\Attributes\CoversClass;
 use PHPUnit\Framework\TestCase;
+use SimpleSAML\WSSecurity\XML\fed\AbstractFedElement;
+use SimpleSAML\WSSecurity\XML\fed\AbstractSecurityTokenType;
 use SimpleSAML\WSSecurity\XML\fed\SecurityToken;
 use SimpleSAML\XML\Attribute as XMLAttribute;
 use SimpleSAML\XML\Chunk;
@@ -18,11 +21,11 @@
 /**
  * Tests for fed:SecurityToken.
  *
- * @covers \SimpleSAML\WSSecurity\XML\fed\SecurityToken
- * @covers \SimpleSAML\WSSecurity\XML\fed\AbstractSecurityTokenType
- * @covers \SimpleSAML\WSSecurity\XML\fed\AbstractFedElement
  * @package simplesamlphp/ws-security
  */
+#[CoversClass(SecurityToken::class)]
+#[CoversClass(AbstractSecurityTokenType::class)]
+#[CoversClass(AbstractFedElement::class)]
 final class SecurityTokenTest extends TestCase
 {
     use SchemaValidationTestTrait;
diff --git a/tests/WSSecurity/XML/fed/SerialNoTest.php b/tests/WSSecurity/XML/fed/SerialNoTest.php
index 26d99f86..3c3f51a4 100644
--- a/tests/WSSecurity/XML/fed/SerialNoTest.php
+++ b/tests/WSSecurity/XML/fed/SerialNoTest.php
@@ -4,8 +4,12 @@
 
 namespace SimpleSAML\Test\WSSecurity\XML\fed;
 
+use PHPUnit\Framework\Attributes\CoversClass;
 use PHPUnit\Framework\TestCase;
 use SimpleSAML\Test\WSSecurity\Constants as C;
+use SimpleSAML\WSSecurity\XML\fed\AbstractAttributeExtensibleString;
+use SimpleSAML\WSSecurity\XML\fed\AbstractAttributeExtensibleURI;
+use SimpleSAML\WSSecurity\XML\fed\AbstractFedElement;
 use SimpleSAML\WSSecurity\XML\fed\SerialNo;
 use SimpleSAML\XML\Attribute as XMLAttribute;
 use SimpleSAML\XML\DOMDocumentFactory;
@@ -16,13 +20,12 @@
 /**
  * Class \SimpleSAML\WSSecurity\XML\fed\SerialNoTest
  *
- * @covers \SimpleSAML\WSSecurity\XML\fed\SerialNo
- * @covers \SimpleSAML\WSSecurity\XML\fed\AbstractAttributeExtensibleURI
- * @covers \SimpleSAML\WSSecurity\XML\fed\AbstractAttributeExtensibleString
- * @covers \SimpleSAML\WSSecurity\XML\fed\AbstractFedElement
- *
  * @package simplesamlphp/ws-security
  */
+#[CoversClass(SerialNo::class)]
+#[CoversClass(AbstractAttributeExtensibleURI::class)]
+#[CoversClass(AbstractAttributeExtensibleString::class)]
+#[CoversClass(AbstractFedElement::class)]
 final class SerialNoTest extends TestCase
 {
     use SerializableElementTestTrait;
diff --git a/tests/WSSecurity/XML/fed/SignOutBasisTest.php b/tests/WSSecurity/XML/fed/SignOutBasisTest.php
index 44b04566..aa49f7fb 100644
--- a/tests/WSSecurity/XML/fed/SignOutBasisTest.php
+++ b/tests/WSSecurity/XML/fed/SignOutBasisTest.php
@@ -4,7 +4,10 @@
 
 namespace SimpleSAML\Test\WSSecurity\XML\fed;
 
+use PHPUnit\Framework\Attributes\CoversClass;
 use PHPUnit\Framework\TestCase;
+use SimpleSAML\WSSecurity\XML\fed\AbstractFedElement;
+use SimpleSAML\WSSecurity\XML\fed\AbstractSignOutBasisType;
 use SimpleSAML\WSSecurity\XML\fed\SignOutBasis;
 use SimpleSAML\XML\Attribute;
 use SimpleSAML\XML\Chunk;
@@ -17,12 +20,11 @@
 /**
  * Tests for fed:SignOutBasis.
  *
- * @covers \SimpleSAML\WSSecurity\XML\fed\SignOutBasis
- * @covers \SimpleSAML\WSSecurity\XML\fed\AbstractSignOutBasisType
- * @covers \SimpleSAML\WSSecurity\XML\fed\AbstractFedElement
- *
  * @package simplesamlphp/ws-security
  */
+#[CoversClass(SignOutBasis::class)]
+#[CoversClass(AbstractSignOutBasisType::class)]
+#[CoversClass(AbstractFedElement::class)]
 final class SignOutBasisTest extends TestCase
 {
     use SerializableElementTestTrait;
diff --git a/tests/WSSecurity/XML/fed/SignOutTest.php b/tests/WSSecurity/XML/fed/SignOutTest.php
index ff018083..4d978bf7 100644
--- a/tests/WSSecurity/XML/fed/SignOutTest.php
+++ b/tests/WSSecurity/XML/fed/SignOutTest.php
@@ -4,7 +4,10 @@
 
 namespace SimpleSAML\Test\WSSecurity\XML\fed;
 
+use PHPUnit\Framework\Attributes\CoversClass;
 use PHPUnit\Framework\TestCase;
+use SimpleSAML\WSSecurity\XML\fed\AbstractFedElement;
+use SimpleSAML\WSSecurity\XML\fed\AbstractSignOutType;
 use SimpleSAML\WSSecurity\XML\fed\Realm;
 use SimpleSAML\WSSecurity\XML\fed\SignOut;
 use SimpleSAML\WSSecurity\XML\fed\SignOutBasis;
@@ -21,12 +24,11 @@
 /**
  * Tests for fed:SignOut.
  *
- * @covers \SimpleSAML\WSSecurity\XML\fed\SignOut
- * @covers \SimpleSAML\WSSecurity\XML\fed\AbstractSignOutType
- * @covers \SimpleSAML\WSSecurity\XML\fed\AbstractFedElement
- *
  * @package simplesamlphp/ws-security
  */
+#[CoversClass(SignOut::class)]
+#[CoversClass(AbstractSignOutType::class)]
+#[CoversClass(AbstractFedElement::class)]
 final class SignOutTest extends TestCase
 {
     use SchemaValidationTestTrait;
diff --git a/tests/WSSecurity/XML/fed/SingleSignOutNotificationEndpointTest.php b/tests/WSSecurity/XML/fed/SingleSignOutNotificationEndpointTest.php
index cfc55147..0c1c7e2f 100644
--- a/tests/WSSecurity/XML/fed/SingleSignOutNotificationEndpointTest.php
+++ b/tests/WSSecurity/XML/fed/SingleSignOutNotificationEndpointTest.php
@@ -5,7 +5,10 @@
 namespace SimpleSAML\Test\WSSecurity\XML\fed;
 
 use DOMElement;
+use PHPUnit\Framework\Attributes\CoversClass;
 use PHPUnit\Framework\TestCase;
+use SimpleSAML\WSSecurity\XML\fed\AbstractEndpointType;
+use SimpleSAML\WSSecurity\XML\fed\AbstractFedElement;
 use SimpleSAML\WSSecurity\XML\fed\SingleSignOutNotificationEndpoint;
 use SimpleSAML\WSSecurity\XML\wsa\Address;
 use SimpleSAML\WSSecurity\XML\wsa\EndpointReference;
@@ -23,11 +26,11 @@
 /**
  * Tests for fed:SingleSignOutNotificationEndpoint.
  *
- * @covers \SimpleSAML\WSSecurity\XML\fed\SingleSignOutNotificationEndpoint
- * @covers \SimpleSAML\WSSecurity\XML\fed\AbstractEndpointType
- * @covers \SimpleSAML\WSSecurity\XML\fed\AbstractFedElement
  * @package simplesamlphp/ws-security
  */
+#[CoversClass(SingleSignOutNotificationEndpoint::class)]
+#[CoversClass(AbstractEndpointType::class)]
+#[CoversClass(AbstractFedElement::class)]
 final class SingleSignOutNotificationEndpointTest extends TestCase
 {
     use SchemaValidationTestTrait;
diff --git a/tests/WSSecurity/XML/fed/SingleSignOutNotificationEndpointsTest.php b/tests/WSSecurity/XML/fed/SingleSignOutNotificationEndpointsTest.php
index d7182fd9..401ec625 100644
--- a/tests/WSSecurity/XML/fed/SingleSignOutNotificationEndpointsTest.php
+++ b/tests/WSSecurity/XML/fed/SingleSignOutNotificationEndpointsTest.php
@@ -5,7 +5,10 @@
 namespace SimpleSAML\Test\WSSecurity\XML\fed;
 
 use DOMElement;
+use PHPUnit\Framework\Attributes\CoversClass;
 use PHPUnit\Framework\TestCase;
+use SimpleSAML\WSSecurity\XML\fed\AbstractEndpointType;
+use SimpleSAML\WSSecurity\XML\fed\AbstractFedElement;
 use SimpleSAML\WSSecurity\XML\fed\SingleSignOutNotificationEndpoints;
 use SimpleSAML\WSSecurity\XML\wsa\Address;
 use SimpleSAML\WSSecurity\XML\wsa\EndpointReference;
@@ -23,11 +26,11 @@
 /**
  * Tests for fed:SingleSignOutNotificationEndpoints.
  *
- * @covers \SimpleSAML\WSSecurity\XML\fed\SingleSignOutNotificationEndpoints
- * @covers \SimpleSAML\WSSecurity\XML\fed\AbstractEndpointType
- * @covers \SimpleSAML\WSSecurity\XML\fed\AbstractFedElement
  * @package simplesamlphp/ws-security
  */
+#[CoversClass(SingleSignOutNotificationEndpoints::class)]
+#[CoversClass(AbstractEndpointType::class)]
+#[CoversClass(AbstractFedElement::class)]
 final class SingleSignOutNotificationEndpointsTest extends TestCase
 {
     use SchemaValidationTestTrait;
diff --git a/tests/WSSecurity/XML/fed/SingleSignOutSubscriptionEndpointTest.php b/tests/WSSecurity/XML/fed/SingleSignOutSubscriptionEndpointTest.php
index d9abcb24..db161742 100644
--- a/tests/WSSecurity/XML/fed/SingleSignOutSubscriptionEndpointTest.php
+++ b/tests/WSSecurity/XML/fed/SingleSignOutSubscriptionEndpointTest.php
@@ -5,7 +5,10 @@
 namespace SimpleSAML\Test\WSSecurity\XML\fed;
 
 use DOMElement;
+use PHPUnit\Framework\Attributes\CoversClass;
 use PHPUnit\Framework\TestCase;
+use SimpleSAML\WSSecurity\XML\fed\AbstractEndpointType;
+use SimpleSAML\WSSecurity\XML\fed\AbstractFedElement;
 use SimpleSAML\WSSecurity\XML\fed\SingleSignOutSubscriptionEndpoint;
 use SimpleSAML\WSSecurity\XML\wsa\Address;
 use SimpleSAML\WSSecurity\XML\wsa\EndpointReference;
@@ -23,11 +26,11 @@
 /**
  * Tests for fed:SingleSignOutSubscriptionEndpoint.
  *
- * @covers \SimpleSAML\WSSecurity\XML\fed\SingleSignOutSubscriptionEndpoint
- * @covers \SimpleSAML\WSSecurity\XML\fed\AbstractEndpointType
- * @covers \SimpleSAML\WSSecurity\XML\fed\AbstractFedElement
  * @package simplesamlphp/ws-security
  */
+#[CoversClass(SingleSignOutSubscriptionEndpoint::class)]
+#[CoversClass(AbstractEndpointType::class)]
+#[CoversClass(AbstractFedElement::class)]
 final class SingleSignOutSubscriptionEndpointTest extends TestCase
 {
     use SchemaValidationTestTrait;
diff --git a/tests/WSSecurity/XML/fed/SingleSignOutSubscriptionEndpointsTest.php b/tests/WSSecurity/XML/fed/SingleSignOutSubscriptionEndpointsTest.php
index 226e19b5..44cd163c 100644
--- a/tests/WSSecurity/XML/fed/SingleSignOutSubscriptionEndpointsTest.php
+++ b/tests/WSSecurity/XML/fed/SingleSignOutSubscriptionEndpointsTest.php
@@ -5,7 +5,10 @@
 namespace SimpleSAML\Test\WSSecurity\XML\fed;
 
 use DOMElement;
+use PHPUnit\Framework\Attributes\CoversClass;
 use PHPUnit\Framework\TestCase;
+use SimpleSAML\WSSecurity\XML\fed\AbstractEndpointType;
+use SimpleSAML\WSSecurity\XML\fed\AbstractFedElement;
 use SimpleSAML\WSSecurity\XML\fed\SingleSignOutSubscriptionEndpoints;
 use SimpleSAML\WSSecurity\XML\wsa\Address;
 use SimpleSAML\WSSecurity\XML\wsa\EndpointReference;
@@ -23,11 +26,11 @@
 /**
  * Tests for fed:SingleSignOutSubscriptionEndpoints.
  *
- * @covers \SimpleSAML\WSSecurity\XML\fed\SingleSignOutSubscriptionEndpoints
- * @covers \SimpleSAML\WSSecurity\XML\fed\AbstractEndpointType
- * @covers \SimpleSAML\WSSecurity\XML\fed\AbstractFedElement
  * @package simplesamlphp/ws-security
  */
+#[CoversClass(SingleSignOutSubscriptionEndpoints::class)]
+#[CoversClass(AbstractEndpointType::class)]
+#[CoversClass(AbstractFedElement::class)]
 final class SingleSignOutSubscriptionEndpointsTest extends TestCase
 {
     use SchemaValidationTestTrait;
diff --git a/tests/WSSecurity/XML/fed/TargetScopesTest.php b/tests/WSSecurity/XML/fed/TargetScopesTest.php
index cd8a934a..9e2696ac 100644
--- a/tests/WSSecurity/XML/fed/TargetScopesTest.php
+++ b/tests/WSSecurity/XML/fed/TargetScopesTest.php
@@ -5,7 +5,10 @@
 namespace SimpleSAML\Test\WSSecurity\XML\fed;
 
 use DOMElement;
+use PHPUnit\Framework\Attributes\CoversClass;
 use PHPUnit\Framework\TestCase;
+use SimpleSAML\WSSecurity\XML\fed\AbstractEndpointType;
+use SimpleSAML\WSSecurity\XML\fed\AbstractFedElement;
 use SimpleSAML\WSSecurity\XML\fed\TargetScopes;
 use SimpleSAML\WSSecurity\XML\wsa\Address;
 use SimpleSAML\WSSecurity\XML\wsa\EndpointReference;
@@ -23,11 +26,11 @@
 /**
  * Tests for fed:TargetScopes.
  *
- * @covers \SimpleSAML\WSSecurity\XML\fed\TargetScopes
- * @covers \SimpleSAML\WSSecurity\XML\fed\AbstractEndpointType
- * @covers \SimpleSAML\WSSecurity\XML\fed\AbstractFedElement
  * @package simplesamlphp/ws-security
  */
+#[CoversClass(TargetScopes::class)]
+#[CoversClass(AbstractEndpointType::class)]
+#[CoversClass(AbstractFedElement::class)]
 final class TargetScopesTest extends TestCase
 {
     use SchemaValidationTestTrait;
diff --git a/tests/WSSecurity/XML/fed/TokenTypeTest.php b/tests/WSSecurity/XML/fed/TokenTypeTest.php
index 97ed3a10..12b5e5c6 100644
--- a/tests/WSSecurity/XML/fed/TokenTypeTest.php
+++ b/tests/WSSecurity/XML/fed/TokenTypeTest.php
@@ -4,7 +4,10 @@
 
 namespace SimpleSAML\Test\WSSecurity\XML\fed;
 
+use PHPUnit\Framework\Attributes\CoversClass;
 use PHPUnit\Framework\TestCase;
+use SimpleSAML\WSSecurity\XML\fed\AbstractFedElement;
+use SimpleSAML\WSSecurity\XML\fed\AbstractTokenType;
 use SimpleSAML\WSSecurity\XML\fed\TokenType;
 use SimpleSAML\XML\Attribute as XMLAttribute;
 use SimpleSAML\XML\Chunk;
@@ -17,11 +20,11 @@
 /**
  * Tests for fed:TokenType.
  *
- * @covers \SimpleSAML\WSSecurity\XML\fed\TokenType
- * @covers \SimpleSAML\WSSecurity\XML\fed\AbstractTokenType
- * @covers \SimpleSAML\WSSecurity\XML\fed\AbstractFedElement
  * @package simplesamlphp/ws-security
  */
+#[CoversClass(TokenType::class)]
+#[CoversClass(AbstractTokenType::class)]
+#[CoversClass(AbstractFedElement::class)]
 final class TokenTypeTest extends TestCase
 {
     use SerializableElementTestTrait;
diff --git a/tests/WSSecurity/XML/fed/TokenTypesOfferedTest.php b/tests/WSSecurity/XML/fed/TokenTypesOfferedTest.php
index ac867783..6dda9593 100644
--- a/tests/WSSecurity/XML/fed/TokenTypesOfferedTest.php
+++ b/tests/WSSecurity/XML/fed/TokenTypesOfferedTest.php
@@ -4,7 +4,10 @@
 
 namespace SimpleSAML\Test\WSSecurity\XML\fed;
 
+use PHPUnit\Framework\Attributes\CoversClass;
 use PHPUnit\Framework\TestCase;
+use SimpleSAML\WSSecurity\XML\fed\AbstractFedElement;
+use SimpleSAML\WSSecurity\XML\fed\AbstractTokenTypesOfferedType;
 use SimpleSAML\WSSecurity\XML\fed\TokenType;
 use SimpleSAML\WSSecurity\XML\fed\TokenTypesOffered;
 use SimpleSAML\XML\Attribute as XMLAttribute;
@@ -19,11 +22,11 @@
 /**
  * Tests for fed:TokenTypesOffered.
  *
- * @covers \SimpleSAML\WSSecurity\XML\fed\TokenTypesOffered
- * @covers \SimpleSAML\WSSecurity\XML\fed\AbstractTokenTypesOfferedType
- * @covers \SimpleSAML\WSSecurity\XML\fed\AbstractFedElement
  * @package simplesamlphp/ws-security
  */
+#[CoversClass(TokenTypesOffered::class)]
+#[CoversClass(AbstractTokenTypesOfferedType::class)]
+#[CoversClass(AbstractFedElement::class)]
 final class TokenTypesOfferedTest extends TestCase
 {
     use SchemaValidationTestTrait;
diff --git a/tests/WSSecurity/XML/fed/WebBindingTest.php b/tests/WSSecurity/XML/fed/WebBindingTest.php
index 36a798b0..ed05863a 100644
--- a/tests/WSSecurity/XML/fed/WebBindingTest.php
+++ b/tests/WSSecurity/XML/fed/WebBindingTest.php
@@ -4,10 +4,13 @@
 
 namespace SimpleSAML\Test\WSSecurity\XML\fed;
 
+use PHPUnit\Framework\Attributes\CoversClass;
 use PHPUnit\Framework\TestCase;
 use SimpleSAML\Test\WSSecurity\Constants as C;
 use SimpleSAML\Test\WSSecurity\XML\sp\NestedPolicyTypeTestTrait;
 use SimpleSAML\WSSecurity\XML\fed\WebBinding;
+use SimpleSAML\WSSecurity\XML\sp\AbstractNestedPolicyType;
+use SimpleSAML\WSSecurity\XML\sp\AbstractSpElement;
 use SimpleSAML\XML\Attribute as XMLAttribute;
 use SimpleSAML\XML\Chunk;
 use SimpleSAML\XML\DOMDocumentFactory;
@@ -19,12 +22,11 @@
 /**
  * Class \SimpleSAML\WSSecurity\XML\fed\WebBindingTest
  *
- * @covers \SimpleSAML\WSSecurity\XML\fed\WebBinding
- * @covers \SimpleSAML\WSSecurity\XML\sp\AbstractNestedPolicyType
- * @covers \SimpleSAML\WSSecurity\XML\sp\AbstractSpElement
- *
  * @package simplesamlphp/ws-security
  */
+#[CoversClass(WebBinding::class)]
+#[CoversClass(AbstractNestedPolicyType::class)]
+#[CoversClass(AbstractSpElement::class)]
 final class WebBindingTest extends TestCase
 {
     use NestedPolicyTypeTestTrait;
diff --git a/tests/WSSecurity/XML/sp/AbsXPathTest.php b/tests/WSSecurity/XML/sp/AbsXPathTest.php
index 1e500857..aef03fe7 100644
--- a/tests/WSSecurity/XML/sp/AbsXPathTest.php
+++ b/tests/WSSecurity/XML/sp/AbsXPathTest.php
@@ -4,7 +4,10 @@
 
 namespace SimpleSAML\Test\WSSecurity\XML\sp;
 
+use PHPUnit\Framework\Attributes\CoversClass;
 use PHPUnit\Framework\TestCase;
+use SimpleSAML\WSSecurity\XML\sp\AbstractQNameAssertionType;
+use SimpleSAML\WSSecurity\XML\sp\AbstractSpElement;
 use SimpleSAML\WSSecurity\XML\sp\AbsXPath;
 use SimpleSAML\XML\DOMDocumentFactory;
 use SimpleSAML\XML\TestUtils\SchemaValidationTestTrait;
@@ -15,12 +18,11 @@
 /**
  * Class \SimpleSAML\WSSecurity\XML\sp\AbsXPathTest
  *
- * @covers \SimpleSAML\WSSecurity\XML\sp\AbsXPath
- * @covers \SimpleSAML\WSSecurity\XML\sp\AbstractQNameAssertionType
- * @covers \SimpleSAML\WSSecurity\XML\sp\AbstractSpElement
- *
  * @package simplesamlphp/ws-security
  */
+#[CoversClass(AbsXPath::class)]
+#[CoversClass(AbstractQNameAssertionType::class)]
+#[CoversClass(AbstractSpElement::class)]
 final class AbsXPathTest extends TestCase
 {
     use QNameAssertionTypeTestTrait;
diff --git a/tests/WSSecurity/XML/sp/AlgorithmSuiteTest.php b/tests/WSSecurity/XML/sp/AlgorithmSuiteTest.php
index 6dc56385..21e25089 100644
--- a/tests/WSSecurity/XML/sp/AlgorithmSuiteTest.php
+++ b/tests/WSSecurity/XML/sp/AlgorithmSuiteTest.php
@@ -4,8 +4,11 @@
 
 namespace SimpleSAML\Test\WSSecurity\XML\sp;
 
+use PHPUnit\Framework\Attributes\CoversClass;
 use PHPUnit\Framework\TestCase;
 use SimpleSAML\Test\WSSecurity\Constants as C;
+use SimpleSAML\WSSecurity\XML\sp\AbstractNestedPolicyType;
+use SimpleSAML\WSSecurity\XML\sp\AbstractSpElement;
 use SimpleSAML\WSSecurity\XML\sp\AlgorithmSuite;
 use SimpleSAML\XML\Attribute as XMLAttribute;
 use SimpleSAML\XML\Chunk;
@@ -18,12 +21,11 @@
 /**
  * Class \SimpleSAML\WSSecurity\XML\sp\AlgorithmSuiteTest
  *
- * @covers \SimpleSAML\WSSecurity\XML\sp\AlgorithmSuite
- * @covers \SimpleSAML\WSSecurity\XML\sp\AbstractNestedPolicyType
- * @covers \SimpleSAML\WSSecurity\XML\sp\AbstractSpElement
- *
  * @package simplesamlphp/ws-security
  */
+#[CoversClass(AlgorithmSuite::class)]
+#[CoversClass(AbstractNestedPolicyType::class)]
+#[CoversClass(AbstractSpElement::class)]
 final class AlgorithmSuiteTest extends TestCase
 {
     use NestedPolicyTypeTestTrait;
diff --git a/tests/WSSecurity/XML/sp/AsymmetricBindingTest.php b/tests/WSSecurity/XML/sp/AsymmetricBindingTest.php
index 803c6187..0c72e69b 100644
--- a/tests/WSSecurity/XML/sp/AsymmetricBindingTest.php
+++ b/tests/WSSecurity/XML/sp/AsymmetricBindingTest.php
@@ -4,8 +4,11 @@
 
 namespace SimpleSAML\Test\WSSecurity\XML\sp;
 
+use PHPUnit\Framework\Attributes\CoversClass;
 use PHPUnit\Framework\TestCase;
 use SimpleSAML\Test\WSSecurity\Constants as C;
+use SimpleSAML\WSSecurity\XML\sp\AbstractNestedPolicyType;
+use SimpleSAML\WSSecurity\XML\sp\AbstractSpElement;
 use SimpleSAML\WSSecurity\XML\sp\AsymmetricBinding;
 use SimpleSAML\XML\Attribute as XMLAttribute;
 use SimpleSAML\XML\Chunk;
@@ -18,12 +21,11 @@
 /**
  * Class \SimpleSAML\WSSecurity\XML\sp\AsymmetricBindingTest
  *
- * @covers \SimpleSAML\WSSecurity\XML\sp\AsymmetricBinding
- * @covers \SimpleSAML\WSSecurity\XML\sp\AbstractNestedPolicyType
- * @covers \SimpleSAML\WSSecurity\XML\sp\AbstractSpElement
- *
  * @package simplesamlphp/ws-security
  */
+#[CoversClass(AsymmetricBinding::class)]
+#[CoversClass(AbstractNestedPolicyType::class)]
+#[CoversClass(AbstractSpElement::class)]
 final class AsymmetricBindingTest extends TestCase
 {
     use NestedPolicyTypeTestTrait;
diff --git a/tests/WSSecurity/XML/sp/AttachmentsTest.php b/tests/WSSecurity/XML/sp/AttachmentsTest.php
index ba526b93..b6e53fae 100644
--- a/tests/WSSecurity/XML/sp/AttachmentsTest.php
+++ b/tests/WSSecurity/XML/sp/AttachmentsTest.php
@@ -4,7 +4,10 @@
 
 namespace SimpleSAML\Test\WSSecurity\XML\sp;
 
+use PHPUnit\Framework\Attributes\CoversClass;
 use PHPUnit\Framework\TestCase;
+use SimpleSAML\WSSecurity\XML\sp\AbstractEmptyType;
+use SimpleSAML\WSSecurity\XML\sp\AbstractSpElement;
 use SimpleSAML\WSSecurity\XML\sp\Attachments;
 use SimpleSAML\XML\DOMDocumentFactory;
 use SimpleSAML\XML\TestUtils\SerializableElementTestTrait;
@@ -14,12 +17,11 @@
 /**
  * Class \SimpleSAML\WSSecurity\XML\sp\AttachmentsTest
  *
- * @covers \SimpleSAML\WSSecurity\XML\sp\Attachments
- * @covers \SimpleSAML\WSSecurity\XML\sp\AbstractEmptyType
- * @covers \SimpleSAML\WSSecurity\XML\sp\AbstractSpElement
- *
  * @package simplesamlphp/ws-security
  */
+#[CoversClass(Attachments::class)]
+#[CoversClass(AbstractEmptyType::class)]
+#[CoversClass(AbstractSpElement::class)]
 final class AttachmentsTest extends TestCase
 {
     use SerializableElementTestTrait;
diff --git a/tests/WSSecurity/XML/sp/Basic128Rsa15Test.php b/tests/WSSecurity/XML/sp/Basic128Rsa15Test.php
index 36ce6800..3328f314 100644
--- a/tests/WSSecurity/XML/sp/Basic128Rsa15Test.php
+++ b/tests/WSSecurity/XML/sp/Basic128Rsa15Test.php
@@ -4,7 +4,10 @@
 
 namespace SimpleSAML\Test\WSSecurity\XML\sp;
 
+use PHPUnit\Framework\Attributes\CoversClass;
 use PHPUnit\Framework\TestCase;
+use SimpleSAML\WSSecurity\XML\sp\AbstractQNameAssertionType;
+use SimpleSAML\WSSecurity\XML\sp\AbstractSpElement;
 use SimpleSAML\WSSecurity\XML\sp\Basic128Rsa15;
 use SimpleSAML\XML\DOMDocumentFactory;
 use SimpleSAML\XML\TestUtils\SchemaValidationTestTrait;
@@ -15,12 +18,11 @@
 /**
  * Class \SimpleSAML\WSSecurity\XML\sp\Basic128Rsa15Test
  *
- * @covers \SimpleSAML\WSSecurity\XML\sp\Basic128Rsa15
- * @covers \SimpleSAML\WSSecurity\XML\sp\AbstractQNameAssertionType
- * @covers \SimpleSAML\WSSecurity\XML\sp\AbstractSpElement
- *
  * @package simplesamlphp/ws-security
  */
+#[CoversClass(Basic128Rsa15::class)]
+#[CoversClass(AbstractQNameAssertionType::class)]
+#[CoversClass(AbstractSpElement::class)]
 final class Basic128Rsa15Test extends TestCase
 {
     use QNameAssertionTypeTestTrait;
diff --git a/tests/WSSecurity/XML/sp/Basic128Sha256Rsa15Test.php b/tests/WSSecurity/XML/sp/Basic128Sha256Rsa15Test.php
index f1f185e7..b48a84d0 100644
--- a/tests/WSSecurity/XML/sp/Basic128Sha256Rsa15Test.php
+++ b/tests/WSSecurity/XML/sp/Basic128Sha256Rsa15Test.php
@@ -4,7 +4,10 @@
 
 namespace SimpleSAML\Test\WSSecurity\XML\sp;
 
+use PHPUnit\Framework\Attributes\CoversClass;
 use PHPUnit\Framework\TestCase;
+use SimpleSAML\WSSecurity\XML\sp\AbstractQNameAssertionType;
+use SimpleSAML\WSSecurity\XML\sp\AbstractSpElement;
 use SimpleSAML\WSSecurity\XML\sp\Basic128Sha256Rsa15;
 use SimpleSAML\XML\DOMDocumentFactory;
 use SimpleSAML\XML\TestUtils\SchemaValidationTestTrait;
@@ -15,12 +18,11 @@
 /**
  * Class \SimpleSAML\WSSecurity\XML\sp\Basic128Sha256Rsa15Test
  *
- * @covers \SimpleSAML\WSSecurity\XML\sp\Basic128Sha256Rsa15
- * @covers \SimpleSAML\WSSecurity\XML\sp\AbstractQNameAssertionType
- * @covers \SimpleSAML\WSSecurity\XML\sp\AbstractSpElement
- *
  * @package simplesamlphp/ws-security
  */
+#[CoversClass(Basic128Sha256Rsa15::class)]
+#[CoversClass(AbstractQNameAssertionType::class)]
+#[CoversClass(AbstractSpElement::class)]
 final class Basic128Sha256Rsa15Test extends TestCase
 {
     use QNameAssertionTypeTestTrait;
diff --git a/tests/WSSecurity/XML/sp/Basic128Sha256Test.php b/tests/WSSecurity/XML/sp/Basic128Sha256Test.php
index 62c55955..cb42b3bd 100644
--- a/tests/WSSecurity/XML/sp/Basic128Sha256Test.php
+++ b/tests/WSSecurity/XML/sp/Basic128Sha256Test.php
@@ -4,7 +4,10 @@
 
 namespace SimpleSAML\Test\WSSecurity\XML\sp;
 
+use PHPUnit\Framework\Attributes\CoversClass;
 use PHPUnit\Framework\TestCase;
+use SimpleSAML\WSSecurity\XML\sp\AbstractQNameAssertionType;
+use SimpleSAML\WSSecurity\XML\sp\AbstractSpElement;
 use SimpleSAML\WSSecurity\XML\sp\Basic128Sha256;
 use SimpleSAML\XML\DOMDocumentFactory;
 use SimpleSAML\XML\TestUtils\SchemaValidationTestTrait;
@@ -15,12 +18,11 @@
 /**
  * Class \SimpleSAML\WSSecurity\XML\sp\Basic128Sha256Test
  *
- * @covers \SimpleSAML\WSSecurity\XML\sp\Basic128Sha256
- * @covers \SimpleSAML\WSSecurity\XML\sp\AbstractQNameAssertionType
- * @covers \SimpleSAML\WSSecurity\XML\sp\AbstractSpElement
- *
  * @package simplesamlphp/ws-security
  */
+#[CoversClass(Basic128Sha256::class)]
+#[CoversClass(AbstractQNameAssertionType::class)]
+#[CoversClass(AbstractSpElement::class)]
 final class Basic128Sha256Test extends TestCase
 {
     use QNameAssertionTypeTestTrait;
diff --git a/tests/WSSecurity/XML/sp/Basic128Test.php b/tests/WSSecurity/XML/sp/Basic128Test.php
index cd5cb143..0fd6aa34 100644
--- a/tests/WSSecurity/XML/sp/Basic128Test.php
+++ b/tests/WSSecurity/XML/sp/Basic128Test.php
@@ -4,7 +4,10 @@
 
 namespace SimpleSAML\Test\WSSecurity\XML\sp;
 
+use PHPUnit\Framework\Attributes\CoversClass;
 use PHPUnit\Framework\TestCase;
+use SimpleSAML\WSSecurity\XML\sp\AbstractQNameAssertionType;
+use SimpleSAML\WSSecurity\XML\sp\AbstractSpElement;
 use SimpleSAML\WSSecurity\XML\sp\Basic128;
 use SimpleSAML\XML\DOMDocumentFactory;
 use SimpleSAML\XML\TestUtils\SchemaValidationTestTrait;
@@ -15,12 +18,11 @@
 /**
  * Class \SimpleSAML\WSSecurity\XML\sp\Basic128Test
  *
- * @covers \SimpleSAML\WSSecurity\XML\sp\Basic128
- * @covers \SimpleSAML\WSSecurity\XML\sp\AbstractQNameAssertionType
- * @covers \SimpleSAML\WSSecurity\XML\sp\AbstractSpElement
- *
  * @package simplesamlphp/ws-security
  */
+#[CoversClass(Basic128::class)]
+#[CoversClass(AbstractQNameAssertionType::class)]
+#[CoversClass(AbstractSpElement::class)]
 final class Basic128Test extends TestCase
 {
     use QNameAssertionTypeTestTrait;
diff --git a/tests/WSSecurity/XML/sp/Basic192Rsa15Test.php b/tests/WSSecurity/XML/sp/Basic192Rsa15Test.php
index 5c3d4468..71cf111d 100644
--- a/tests/WSSecurity/XML/sp/Basic192Rsa15Test.php
+++ b/tests/WSSecurity/XML/sp/Basic192Rsa15Test.php
@@ -4,7 +4,10 @@
 
 namespace SimpleSAML\Test\WSSecurity\XML\sp;
 
+use PHPUnit\Framework\Attributes\CoversClass;
 use PHPUnit\Framework\TestCase;
+use SimpleSAML\WSSecurity\XML\sp\AbstractQNameAssertionType;
+use SimpleSAML\WSSecurity\XML\sp\AbstractSpElement;
 use SimpleSAML\WSSecurity\XML\sp\Basic192Rsa15;
 use SimpleSAML\XML\DOMDocumentFactory;
 use SimpleSAML\XML\TestUtils\SchemaValidationTestTrait;
@@ -15,12 +18,11 @@
 /**
  * Class \SimpleSAML\WSSecurity\XML\sp\Basic192Rsa15Test
  *
- * @covers \SimpleSAML\WSSecurity\XML\sp\Basic192Rsa15
- * @covers \SimpleSAML\WSSecurity\XML\sp\AbstractQNameAssertionType
- * @covers \SimpleSAML\WSSecurity\XML\sp\AbstractSpElement
- *
  * @package simplesamlphp/ws-security
  */
+#[CoversClass(Basic192Rsa15::class)]
+#[CoversClass(AbstractQNameAssertionType::class)]
+#[CoversClass(AbstractSpElement::class)]
 final class Basic192Rsa15Test extends TestCase
 {
     use QNameAssertionTypeTestTrait;
diff --git a/tests/WSSecurity/XML/sp/Basic192Sha256Rsa15Test.php b/tests/WSSecurity/XML/sp/Basic192Sha256Rsa15Test.php
index 42caba09..6cd53cbb 100644
--- a/tests/WSSecurity/XML/sp/Basic192Sha256Rsa15Test.php
+++ b/tests/WSSecurity/XML/sp/Basic192Sha256Rsa15Test.php
@@ -4,7 +4,10 @@
 
 namespace SimpleSAML\Test\WSSecurity\XML\sp;
 
+use PHPUnit\Framework\Attributes\CoversClass;
 use PHPUnit\Framework\TestCase;
+use SimpleSAML\WSSecurity\XML\sp\AbstractQNameAssertionType;
+use SimpleSAML\WSSecurity\XML\sp\AbstractSpElement;
 use SimpleSAML\WSSecurity\XML\sp\Basic192Sha256Rsa15;
 use SimpleSAML\XML\DOMDocumentFactory;
 use SimpleSAML\XML\TestUtils\SchemaValidationTestTrait;
@@ -15,12 +18,11 @@
 /**
  * Class \SimpleSAML\WSSecurity\XML\sp\Basic192Sha256Rsa15Test
  *
- * @covers \SimpleSAML\WSSecurity\XML\sp\Basic192Sha256Rsa15
- * @covers \SimpleSAML\WSSecurity\XML\sp\AbstractQNameAssertionType
- * @covers \SimpleSAML\WSSecurity\XML\sp\AbstractSpElement
- *
  * @package simplesamlphp/ws-security
  */
+#[CoversClass(Basic192Sha256Rsa15::class)]
+#[CoversClass(AbstractQNameAssertionType::class)]
+#[CoversClass(AbstractSpElement::class)]
 final class Basic192Sha256Rsa15Test extends TestCase
 {
     use QNameAssertionTypeTestTrait;
diff --git a/tests/WSSecurity/XML/sp/Basic192Sha256Test.php b/tests/WSSecurity/XML/sp/Basic192Sha256Test.php
index 1af9f819..048c37d3 100644
--- a/tests/WSSecurity/XML/sp/Basic192Sha256Test.php
+++ b/tests/WSSecurity/XML/sp/Basic192Sha256Test.php
@@ -4,7 +4,10 @@
 
 namespace SimpleSAML\Test\WSSecurity\XML\sp;
 
+use PHPUnit\Framework\Attributes\CoversClass;
 use PHPUnit\Framework\TestCase;
+use SimpleSAML\WSSecurity\XML\sp\AbstractQNameAssertionType;
+use SimpleSAML\WSSecurity\XML\sp\AbstractSpElement;
 use SimpleSAML\WSSecurity\XML\sp\Basic192Sha256;
 use SimpleSAML\XML\DOMDocumentFactory;
 use SimpleSAML\XML\TestUtils\SchemaValidationTestTrait;
@@ -15,12 +18,11 @@
 /**
  * Class \SimpleSAML\WSSecurity\XML\sp\Basic192Sha256Test
  *
- * @covers \SimpleSAML\WSSecurity\XML\sp\Basic192Sha256
- * @covers \SimpleSAML\WSSecurity\XML\sp\AbstractQNameAssertionType
- * @covers \SimpleSAML\WSSecurity\XML\sp\AbstractSpElement
- *
  * @package simplesamlphp/ws-security
  */
+#[CoversClass(Basic192Sha256::class)]
+#[CoversClass(AbstractQNameAssertionType::class)]
+#[CoversClass(AbstractSpElement::class)]
 final class Basic192Sha256Test extends TestCase
 {
     use QNameAssertionTypeTestTrait;
diff --git a/tests/WSSecurity/XML/sp/Basic192Test.php b/tests/WSSecurity/XML/sp/Basic192Test.php
index 1055b891..21961470 100644
--- a/tests/WSSecurity/XML/sp/Basic192Test.php
+++ b/tests/WSSecurity/XML/sp/Basic192Test.php
@@ -4,7 +4,10 @@
 
 namespace SimpleSAML\Test\WSSecurity\XML\sp;
 
+use PHPUnit\Framework\Attributes\CoversClass;
 use PHPUnit\Framework\TestCase;
+use SimpleSAML\WSSecurity\XML\sp\AbstractQNameAssertionType;
+use SimpleSAML\WSSecurity\XML\sp\AbstractSpElement;
 use SimpleSAML\WSSecurity\XML\sp\Basic192;
 use SimpleSAML\XML\DOMDocumentFactory;
 use SimpleSAML\XML\TestUtils\SchemaValidationTestTrait;
@@ -15,12 +18,11 @@
 /**
  * Class \SimpleSAML\WSSecurity\XML\sp\Basic192Test
  *
- * @covers \SimpleSAML\WSSecurity\XML\sp\Basic192
- * @covers \SimpleSAML\WSSecurity\XML\sp\AbstractQNameAssertionType
- * @covers \SimpleSAML\WSSecurity\XML\sp\AbstractSpElement
- *
  * @package simplesamlphp/ws-security
  */
+#[CoversClass(Basic192::class)]
+#[CoversClass(AbstractQNameAssertionType::class)]
+#[CoversClass(AbstractSpElement::class)]
 final class Basic192Test extends TestCase
 {
     use QNameAssertionTypeTestTrait;
diff --git a/tests/WSSecurity/XML/sp/Basic256Rsa15Test.php b/tests/WSSecurity/XML/sp/Basic256Rsa15Test.php
index 7c255f45..90bbd9d5 100644
--- a/tests/WSSecurity/XML/sp/Basic256Rsa15Test.php
+++ b/tests/WSSecurity/XML/sp/Basic256Rsa15Test.php
@@ -4,7 +4,10 @@
 
 namespace SimpleSAML\Test\WSSecurity\XML\sp;
 
+use PHPUnit\Framework\Attributes\CoversClass;
 use PHPUnit\Framework\TestCase;
+use SimpleSAML\WSSecurity\XML\sp\AbstractQNameAssertionType;
+use SimpleSAML\WSSecurity\XML\sp\AbstractSpElement;
 use SimpleSAML\WSSecurity\XML\sp\Basic256Rsa15;
 use SimpleSAML\XML\DOMDocumentFactory;
 use SimpleSAML\XML\TestUtils\SchemaValidationTestTrait;
@@ -15,12 +18,11 @@
 /**
  * Class \SimpleSAML\WSSecurity\XML\sp\Basic256Rsa15Test
  *
- * @covers \SimpleSAML\WSSecurity\XML\sp\Basic256Rsa15
- * @covers \SimpleSAML\WSSecurity\XML\sp\AbstractQNameAssertionType
- * @covers \SimpleSAML\WSSecurity\XML\sp\AbstractSpElement
- *
  * @package simplesamlphp/ws-security
  */
+#[CoversClass(Basic256Rsa15::class)]
+#[CoversClass(AbstractQNameAssertionType::class)]
+#[CoversClass(AbstractSpElement::class)]
 final class Basic256Rsa15Test extends TestCase
 {
     use QNameAssertionTypeTestTrait;
diff --git a/tests/WSSecurity/XML/sp/Basic256Sha256Rsa15Test.php b/tests/WSSecurity/XML/sp/Basic256Sha256Rsa15Test.php
index 8103a11e..13499e65 100644
--- a/tests/WSSecurity/XML/sp/Basic256Sha256Rsa15Test.php
+++ b/tests/WSSecurity/XML/sp/Basic256Sha256Rsa15Test.php
@@ -4,7 +4,10 @@
 
 namespace SimpleSAML\Test\WSSecurity\XML\sp;
 
+use PHPUnit\Framework\Attributes\CoversClass;
 use PHPUnit\Framework\TestCase;
+use SimpleSAML\WSSecurity\XML\sp\AbstractQNameAssertionType;
+use SimpleSAML\WSSecurity\XML\sp\AbstractSpElement;
 use SimpleSAML\WSSecurity\XML\sp\Basic256Sha256Rsa15;
 use SimpleSAML\XML\DOMDocumentFactory;
 use SimpleSAML\XML\TestUtils\SchemaValidationTestTrait;
@@ -15,12 +18,11 @@
 /**
  * Class \SimpleSAML\WSSecurity\XML\sp\Basic256Sha256Rsa15Test
  *
- * @covers \SimpleSAML\WSSecurity\XML\sp\Basic256Sha256Rsa15
- * @covers \SimpleSAML\WSSecurity\XML\sp\AbstractQNameAssertionType
- * @covers \SimpleSAML\WSSecurity\XML\sp\AbstractSpElement
- *
  * @package simplesamlphp/ws-security
  */
+#[CoversClass(Basic256Sha256Rsa15::class)]
+#[CoversClass(AbstractQNameAssertionType::class)]
+#[CoversClass(AbstractSpElement::class)]
 final class Basic256Sha256Rsa15Test extends TestCase
 {
     use QNameAssertionTypeTestTrait;
diff --git a/tests/WSSecurity/XML/sp/Basic256Sha256Test.php b/tests/WSSecurity/XML/sp/Basic256Sha256Test.php
index 2f3d3526..7a8d42a5 100644
--- a/tests/WSSecurity/XML/sp/Basic256Sha256Test.php
+++ b/tests/WSSecurity/XML/sp/Basic256Sha256Test.php
@@ -4,7 +4,10 @@
 
 namespace SimpleSAML\Test\WSSecurity\XML\sp;
 
+use PHPUnit\Framework\Attributes\CoversClass;
 use PHPUnit\Framework\TestCase;
+use SimpleSAML\WSSecurity\XML\sp\AbstractQNameAssertionType;
+use SimpleSAML\WSSecurity\XML\sp\AbstractSpElement;
 use SimpleSAML\WSSecurity\XML\sp\Basic256Sha256;
 use SimpleSAML\XML\DOMDocumentFactory;
 use SimpleSAML\XML\TestUtils\SchemaValidationTestTrait;
@@ -15,12 +18,11 @@
 /**
  * Class \SimpleSAML\WSSecurity\XML\sp\Basic256Sha256Test
  *
- * @covers \SimpleSAML\WSSecurity\XML\sp\Basic256Sha256
- * @covers \SimpleSAML\WSSecurity\XML\sp\AbstractQNameAssertionType
- * @covers \SimpleSAML\WSSecurity\XML\sp\AbstractSpElement
- *
  * @package simplesamlphp/ws-security
  */
+#[CoversClass(Basic256Sha256::class)]
+#[CoversClass(AbstractQNameAssertionType::class)]
+#[CoversClass(AbstractSpElement::class)]
 final class Basic256Sha256Test extends TestCase
 {
     use QNameAssertionTypeTestTrait;
diff --git a/tests/WSSecurity/XML/sp/Basic256Test.php b/tests/WSSecurity/XML/sp/Basic256Test.php
index 7b31ee23..b15d13f6 100644
--- a/tests/WSSecurity/XML/sp/Basic256Test.php
+++ b/tests/WSSecurity/XML/sp/Basic256Test.php
@@ -4,7 +4,10 @@
 
 namespace SimpleSAML\Test\WSSecurity\XML\sp;
 
+use PHPUnit\Framework\Attributes\CoversClass;
 use PHPUnit\Framework\TestCase;
+use SimpleSAML\WSSecurity\XML\sp\AbstractQNameAssertionType;
+use SimpleSAML\WSSecurity\XML\sp\AbstractSpElement;
 use SimpleSAML\WSSecurity\XML\sp\Basic256;
 use SimpleSAML\XML\DOMDocumentFactory;
 use SimpleSAML\XML\TestUtils\SchemaValidationTestTrait;
@@ -15,12 +18,11 @@
 /**
  * Class \SimpleSAML\WSSecurity\XML\sp\Basic256Test
  *
- * @covers \SimpleSAML\WSSecurity\XML\sp\Basic256
- * @covers \SimpleSAML\WSSecurity\XML\sp\AbstractQNameAssertionType
- * @covers \SimpleSAML\WSSecurity\XML\sp\AbstractSpElement
- *
  * @package simplesamlphp/ws-security
  */
+#[CoversClass(Basic256::class)]
+#[CoversClass(AbstractQNameAssertionType::class)]
+#[CoversClass(AbstractSpElement::class)]
 final class Basic256Test extends TestCase
 {
     use QNameAssertionTypeTestTrait;
diff --git a/tests/WSSecurity/XML/sp/BodyTest.php b/tests/WSSecurity/XML/sp/BodyTest.php
index 15961f30..aa0d1bf3 100644
--- a/tests/WSSecurity/XML/sp/BodyTest.php
+++ b/tests/WSSecurity/XML/sp/BodyTest.php
@@ -4,7 +4,10 @@
 
 namespace SimpleSAML\Test\WSSecurity\XML\sp;
 
+use PHPUnit\Framework\Attributes\CoversClass;
 use PHPUnit\Framework\TestCase;
+use SimpleSAML\WSSecurity\XML\sp\AbstractEmptyType;
+use SimpleSAML\WSSecurity\XML\sp\AbstractSpElement;
 use SimpleSAML\WSSecurity\XML\sp\Body;
 use SimpleSAML\XML\DOMDocumentFactory;
 use SimpleSAML\XML\TestUtils\SerializableElementTestTrait;
@@ -14,12 +17,11 @@
 /**
  * Class \SimpleSAML\WSSecurity\XML\sp\BodyTest
  *
- * @covers \SimpleSAML\WSSecurity\XML\sp\Body
- * @covers \SimpleSAML\WSSecurity\XML\sp\AbstractEmptyType
- * @covers \SimpleSAML\WSSecurity\XML\sp\AbstractSpElement
- *
  * @package simplesamlphp/ws-security
  */
+#[CoversClass(Body::class)]
+#[CoversClass(AbstractEmptyType::class)]
+#[CoversClass(AbstractSpElement::class)]
 final class BodyTest extends TestCase
 {
     use SerializableElementTestTrait;
diff --git a/tests/WSSecurity/XML/sp/BootstrapPolicyTest.php b/tests/WSSecurity/XML/sp/BootstrapPolicyTest.php
index 8b324bcb..c015bc05 100644
--- a/tests/WSSecurity/XML/sp/BootstrapPolicyTest.php
+++ b/tests/WSSecurity/XML/sp/BootstrapPolicyTest.php
@@ -4,8 +4,11 @@
 
 namespace SimpleSAML\Test\WSSecurity\XML\sp;
 
+use PHPUnit\Framework\Attributes\CoversClass;
 use PHPUnit\Framework\TestCase;
 use SimpleSAML\Test\WSSecurity\Constants as C;
+use SimpleSAML\WSSecurity\XML\sp\AbstractNestedPolicyType;
+use SimpleSAML\WSSecurity\XML\sp\AbstractSpElement;
 use SimpleSAML\WSSecurity\XML\sp\BootstrapPolicy;
 use SimpleSAML\XML\Attribute as XMLAttribute;
 use SimpleSAML\XML\Chunk;
@@ -18,12 +21,11 @@
 /**
  * Class \SimpleSAML\WSSecurity\XML\sp\BootstrapPolicyTest
  *
- * @covers \SimpleSAML\WSSecurity\XML\sp\BootstrapPolicy
- * @covers \SimpleSAML\WSSecurity\XML\sp\AbstractNestedPolicyType
- * @covers \SimpleSAML\WSSecurity\XML\sp\AbstractSpElement
- *
  * @package simplesamlphp/ws-security
  */
+#[CoversClass(BootstrapPolicy::class)]
+#[CoversClass(AbstractNestedPolicyType::class)]
+#[CoversClass(AbstractSpElement::class)]
 final class BootstrapPolicyTest extends TestCase
 {
     use NestedPolicyTypeTestTrait;
diff --git a/tests/WSSecurity/XML/sp/ContentEncryptedElementsTest.php b/tests/WSSecurity/XML/sp/ContentEncryptedElementsTest.php
index c6e0ed15..2f1336d8 100644
--- a/tests/WSSecurity/XML/sp/ContentEncryptedElementsTest.php
+++ b/tests/WSSecurity/XML/sp/ContentEncryptedElementsTest.php
@@ -4,9 +4,12 @@
 
 namespace SimpleSAML\Test\WSSecurity\XML\sp;
 
+use PHPUnit\Framework\Attributes\CoversClass;
 use PHPUnit\Framework\TestCase;
 use SimpleSAML\Test\WSSecurity\Constants as C;
 use SimpleSAML\WSSecurity\Utils\XPath as XMLXPath;
+use SimpleSAML\WSSecurity\XML\sp\AbstractSerElementsType;
+use SimpleSAML\WSSecurity\XML\sp\AbstractSpElement;
 use SimpleSAML\WSSecurity\XML\sp\ContentEncryptedElements;
 use SimpleSAML\WSSecurity\XML\sp\XPath;
 use SimpleSAML\XML\Attribute as XMLAttribute;
@@ -20,12 +23,11 @@
 /**
  * Class \SimpleSAML\WSSecurity\XML\sp\ContentEncryptedElementsTest
  *
- * @covers \SimpleSAML\WSSecurity\XML\sp\ContentEncryptedElements
- * @covers \SimpleSAML\WSSecurity\XML\sp\AbstractSerElementsType
- * @covers \SimpleSAML\WSSecurity\XML\sp\AbstractSpElement
- *
  * @package simplesamlphp/ws-security
  */
+#[CoversClass(ContentEncryptedElements::class)]
+#[CoversClass(AbstractSerElementsType::class)]
+#[CoversClass(AbstractSpElement::class)]
 final class ContentEncryptedElementsTest extends TestCase
 {
     use SchemaValidationTestTrait;
diff --git a/tests/WSSecurity/XML/sp/EncryptBeforeSigningTest.php b/tests/WSSecurity/XML/sp/EncryptBeforeSigningTest.php
index f7bc6bd0..d3a7858b 100644
--- a/tests/WSSecurity/XML/sp/EncryptBeforeSigningTest.php
+++ b/tests/WSSecurity/XML/sp/EncryptBeforeSigningTest.php
@@ -4,7 +4,10 @@
 
 namespace SimpleSAML\Test\WSSecurity\XML\sp;
 
+use PHPUnit\Framework\Attributes\CoversClass;
 use PHPUnit\Framework\TestCase;
+use SimpleSAML\WSSecurity\XML\sp\AbstractQNameAssertionType;
+use SimpleSAML\WSSecurity\XML\sp\AbstractSpElement;
 use SimpleSAML\WSSecurity\XML\sp\EncryptBeforeSigning;
 use SimpleSAML\XML\DOMDocumentFactory;
 use SimpleSAML\XML\TestUtils\SchemaValidationTestTrait;
@@ -15,12 +18,11 @@
 /**
  * Class \SimpleSAML\WSSecurity\XML\sp\EncryptBeforeSigningTest
  *
- * @covers \SimpleSAML\WSSecurity\XML\sp\EncryptBeforeSigning
- * @covers \SimpleSAML\WSSecurity\XML\sp\AbstractQNameAssertionType
- * @covers \SimpleSAML\WSSecurity\XML\sp\AbstractSpElement
- *
  * @package simplesamlphp/ws-security
  */
+#[CoversClass(EncryptBeforeSigning::class)]
+#[CoversClass(AbstractQNameAssertionType::class)]
+#[CoversClass(AbstractSpElement::class)]
 final class EncryptBeforeSigningTest extends TestCase
 {
     use QNameAssertionTypeTestTrait;
diff --git a/tests/WSSecurity/XML/sp/EncryptSignatureTest.php b/tests/WSSecurity/XML/sp/EncryptSignatureTest.php
index 36cd9a79..9114ffc6 100644
--- a/tests/WSSecurity/XML/sp/EncryptSignatureTest.php
+++ b/tests/WSSecurity/XML/sp/EncryptSignatureTest.php
@@ -4,7 +4,10 @@
 
 namespace SimpleSAML\Test\WSSecurity\XML\sp;
 
+use PHPUnit\Framework\Attributes\CoversClass;
 use PHPUnit\Framework\TestCase;
+use SimpleSAML\WSSecurity\XML\sp\AbstractQNameAssertionType;
+use SimpleSAML\WSSecurity\XML\sp\AbstractSpElement;
 use SimpleSAML\WSSecurity\XML\sp\EncryptSignature;
 use SimpleSAML\XML\DOMDocumentFactory;
 use SimpleSAML\XML\TestUtils\SchemaValidationTestTrait;
@@ -15,12 +18,11 @@
 /**
  * Class \SimpleSAML\WSSecurity\XML\sp\EncryptSignatureTest
  *
- * @covers \SimpleSAML\WSSecurity\XML\sp\EncryptSignature
- * @covers \SimpleSAML\WSSecurity\XML\sp\AbstractQNameAssertionType
- * @covers \SimpleSAML\WSSecurity\XML\sp\AbstractSpElement
- *
  * @package simplesamlphp/ws-security
  */
+#[CoversClass(EncryptSignature::class)]
+#[CoversClass(AbstractQNameAssertionType::class)]
+#[CoversClass(AbstractSpElement::class)]
 final class EncryptSignatureTest extends TestCase
 {
     use QNameAssertionTypeTestTrait;
diff --git a/tests/WSSecurity/XML/sp/EncryptedElementsTest.php b/tests/WSSecurity/XML/sp/EncryptedElementsTest.php
index f9db871f..48708a04 100644
--- a/tests/WSSecurity/XML/sp/EncryptedElementsTest.php
+++ b/tests/WSSecurity/XML/sp/EncryptedElementsTest.php
@@ -4,9 +4,12 @@
 
 namespace SimpleSAML\Test\WSSecurity\XML\sp;
 
+use PHPUnit\Framework\Attributes\CoversClass;
 use PHPUnit\Framework\TestCase;
 use SimpleSAML\Test\WSSecurity\Constants as C;
 use SimpleSAML\WSSecurity\Utils\XPath as XMLXPath;
+use SimpleSAML\WSSecurity\XML\sp\AbstractSerElementsType;
+use SimpleSAML\WSSecurity\XML\sp\AbstractSpElement;
 use SimpleSAML\WSSecurity\XML\sp\EncryptedElements;
 use SimpleSAML\WSSecurity\XML\sp\XPath;
 use SimpleSAML\XML\Attribute as XMLAttribute;
@@ -20,12 +23,11 @@
 /**
  * Class \SimpleSAML\WSSecurity\XML\sp\EncryptedElementsTest
  *
- * @covers \SimpleSAML\WSSecurity\XML\sp\EncryptedElements
- * @covers \SimpleSAML\WSSecurity\XML\sp\AbstractSerElementsType
- * @covers \SimpleSAML\WSSecurity\XML\sp\AbstractSpElement
- *
  * @package simplesamlphp/ws-security
  */
+#[CoversClass(EncryptedElements::class)]
+#[CoversClass(AbstractSerElementsType::class)]
+#[CoversClass(AbstractSpElement::class)]
 final class EncryptedElementsTest extends TestCase
 {
     use SchemaValidationTestTrait;
diff --git a/tests/WSSecurity/XML/sp/EncryptedPartsTest.php b/tests/WSSecurity/XML/sp/EncryptedPartsTest.php
index 3c9bd700..95513739 100644
--- a/tests/WSSecurity/XML/sp/EncryptedPartsTest.php
+++ b/tests/WSSecurity/XML/sp/EncryptedPartsTest.php
@@ -4,9 +4,12 @@
 
 namespace SimpleSAML\Test\WSSecurity\XML\sp;
 
+use PHPUnit\Framework\Attributes\CoversClass;
 use PHPUnit\Framework\TestCase;
 use SimpleSAML\Test\WSSecurity\Constants as C;
 use SimpleSAML\WSSecurity\Utils\XPath;
+use SimpleSAML\WSSecurity\XML\sp\AbstractSePartsType;
+use SimpleSAML\WSSecurity\XML\sp\AbstractSpElement;
 use SimpleSAML\WSSecurity\XML\sp\Attachments;
 use SimpleSAML\WSSecurity\XML\sp\Body;
 use SimpleSAML\WSSecurity\XML\sp\EncryptedParts;
@@ -22,12 +25,11 @@
 /**
  * Class \SimpleSAML\WSSecurity\XML\sp\EncryptedPartsTest
  *
- * @covers \SimpleSAML\WSSecurity\XML\sp\EncryptedParts
- * @covers \SimpleSAML\WSSecurity\XML\sp\AbstractSePartsType
- * @covers \SimpleSAML\WSSecurity\XML\sp\AbstractSpElement
- *
  * @package simplesamlphp/ws-security
  */
+#[CoversClass(EncryptedParts::class)]
+#[CoversClass(AbstractSePartsType::class)]
+#[CoversClass(AbstractSpElement::class)]
 final class EncryptedPartsTest extends TestCase
 {
     use SchemaValidationTestTrait;
diff --git a/tests/WSSecurity/XML/sp/EncryptedSupportingTokensTest.php b/tests/WSSecurity/XML/sp/EncryptedSupportingTokensTest.php
index 661fc214..57aa0c92 100644
--- a/tests/WSSecurity/XML/sp/EncryptedSupportingTokensTest.php
+++ b/tests/WSSecurity/XML/sp/EncryptedSupportingTokensTest.php
@@ -4,8 +4,11 @@
 
 namespace SimpleSAML\Test\WSSecurity\XML\sp;
 
+use PHPUnit\Framework\Attributes\CoversClass;
 use PHPUnit\Framework\TestCase;
 use SimpleSAML\Test\WSSecurity\Constants as C;
+use SimpleSAML\WSSecurity\XML\sp\AbstractNestedPolicyType;
+use SimpleSAML\WSSecurity\XML\sp\AbstractSpElement;
 use SimpleSAML\WSSecurity\XML\sp\EncryptedSupportingTokens;
 use SimpleSAML\XML\Attribute as XMLAttribute;
 use SimpleSAML\XML\Chunk;
@@ -18,12 +21,11 @@
 /**
  * Class \SimpleSAML\WSSecurity\XML\sp\EncryptedSupportingTokensTest
  *
- * @covers \SimpleSAML\WSSecurity\XML\sp\EncryptedSupportingTokens
- * @covers \SimpleSAML\WSSecurity\XML\sp\AbstractNestedPolicyType
- * @covers \SimpleSAML\WSSecurity\XML\sp\AbstractSpElement
- *
  * @package simplesamlphp/ws-security
  */
+#[CoversClass(EncryptedSupportingTokens::class)]
+#[CoversClass(AbstractNestedPolicyType::class)]
+#[CoversClass(AbstractSpElement::class)]
 final class EncryptedSupportingTokensTest extends TestCase
 {
     use NestedPolicyTypeTestTrait;
diff --git a/tests/WSSecurity/XML/sp/EncryptionTokenTest.php b/tests/WSSecurity/XML/sp/EncryptionTokenTest.php
index 02fdfedd..bb197c24 100644
--- a/tests/WSSecurity/XML/sp/EncryptionTokenTest.php
+++ b/tests/WSSecurity/XML/sp/EncryptionTokenTest.php
@@ -4,8 +4,11 @@
 
 namespace SimpleSAML\Test\WSSecurity\XML\sp;
 
+use PHPUnit\Framework\Attributes\CoversClass;
 use PHPUnit\Framework\TestCase;
 use SimpleSAML\Test\WSSecurity\Constants as C;
+use SimpleSAML\WSSecurity\XML\sp\AbstractNestedPolicyType;
+use SimpleSAML\WSSecurity\XML\sp\AbstractSpElement;
 use SimpleSAML\WSSecurity\XML\sp\EncryptionToken;
 use SimpleSAML\XML\Attribute as XMLAttribute;
 use SimpleSAML\XML\Chunk;
@@ -18,12 +21,11 @@
 /**
  * Class \SimpleSAML\WSSecurity\XML\sp\EncryptionTokenTest
  *
- * @covers \SimpleSAML\WSSecurity\XML\sp\EncryptionToken
- * @covers \SimpleSAML\WSSecurity\XML\sp\AbstractNestedPolicyType
- * @covers \SimpleSAML\WSSecurity\XML\sp\AbstractSpElement
- *
  * @package simplesamlphp/ws-security
  */
+#[CoversClass(EncryptionToken::class)]
+#[CoversClass(AbstractNestedPolicyType::class)]
+#[CoversClass(AbstractSpElement::class)]
 final class EncryptionTokenTest extends TestCase
 {
     use NestedPolicyTypeTestTrait;
diff --git a/tests/WSSecurity/XML/sp/EndorsingEncryptedSupportingTokensTest.php b/tests/WSSecurity/XML/sp/EndorsingEncryptedSupportingTokensTest.php
index 163f05ec..e8c3d31d 100644
--- a/tests/WSSecurity/XML/sp/EndorsingEncryptedSupportingTokensTest.php
+++ b/tests/WSSecurity/XML/sp/EndorsingEncryptedSupportingTokensTest.php
@@ -4,8 +4,11 @@
 
 namespace SimpleSAML\Test\WSSecurity\XML\sp;
 
+use PHPUnit\Framework\Attributes\CoversClass;
 use PHPUnit\Framework\TestCase;
 use SimpleSAML\Test\WSSecurity\Constants as C;
+use SimpleSAML\WSSecurity\XML\sp\AbstractNestedPolicyType;
+use SimpleSAML\WSSecurity\XML\sp\AbstractSpElement;
 use SimpleSAML\WSSecurity\XML\sp\EndorsingEncryptedSupportingTokens;
 use SimpleSAML\XML\Attribute as XMLAttribute;
 use SimpleSAML\XML\Chunk;
@@ -18,12 +21,11 @@
 /**
  * Class \SimpleSAML\WSSecurity\XML\sp\EndorsingEncryptedSupportingTokensTest
  *
- * @covers \SimpleSAML\WSSecurity\XML\sp\EndorsingEncryptedSupportingTokens
- * @covers \SimpleSAML\WSSecurity\XML\sp\AbstractNestedPolicyType
- * @covers \SimpleSAML\WSSecurity\XML\sp\AbstractSpElement
- *
  * @package simplesamlphp/ws-security
  */
+#[CoversClass(EndorsingEncryptedSupportingTokens::class)]
+#[CoversClass(AbstractNestedPolicyType::class)]
+#[CoversClass(AbstractSpElement::class)]
 final class EndorsingEncryptedSupportingTokensTest extends TestCase
 {
     use NestedPolicyTypeTestTrait;
diff --git a/tests/WSSecurity/XML/sp/EndorsingSupportingTokensTest.php b/tests/WSSecurity/XML/sp/EndorsingSupportingTokensTest.php
index 9b45f838..f9fdc6b3 100644
--- a/tests/WSSecurity/XML/sp/EndorsingSupportingTokensTest.php
+++ b/tests/WSSecurity/XML/sp/EndorsingSupportingTokensTest.php
@@ -4,8 +4,11 @@
 
 namespace SimpleSAML\Test\WSSecurity\XML\sp;
 
+use PHPUnit\Framework\Attributes\CoversClass;
 use PHPUnit\Framework\TestCase;
 use SimpleSAML\Test\WSSecurity\Constants as C;
+use SimpleSAML\WSSecurity\XML\sp\AbstractNestedPolicyType;
+use SimpleSAML\WSSecurity\XML\sp\AbstractSpElement;
 use SimpleSAML\WSSecurity\XML\sp\EndorsingSupportingTokens;
 use SimpleSAML\XML\Attribute as XMLAttribute;
 use SimpleSAML\XML\Chunk;
@@ -18,12 +21,11 @@
 /**
  * Class \SimpleSAML\WSSecurity\XML\sp\EndorsingSupportingTokensTest
  *
- * @covers \SimpleSAML\WSSecurity\XML\sp\EndorsingSupportingTokens
- * @covers \SimpleSAML\WSSecurity\XML\sp\AbstractNestedPolicyType
- * @covers \SimpleSAML\WSSecurity\XML\sp\AbstractSpElement
- *
  * @package simplesamlphp/ws-security
  */
+#[CoversClass(EndorsingSupportingTokens::class)]
+#[CoversClass(AbstractNestedPolicyType::class)]
+#[CoversClass(AbstractSpElement::class)]
 final class EndorsingSupportingTokensTest extends TestCase
 {
     use NestedPolicyTypeTestTrait;
diff --git a/tests/WSSecurity/XML/sp/HashPasswordTest.php b/tests/WSSecurity/XML/sp/HashPasswordTest.php
index 2bb095b8..27ec387f 100644
--- a/tests/WSSecurity/XML/sp/HashPasswordTest.php
+++ b/tests/WSSecurity/XML/sp/HashPasswordTest.php
@@ -4,7 +4,10 @@
 
 namespace SimpleSAML\Test\WSSecurity\XML\sp;
 
+use PHPUnit\Framework\Attributes\CoversClass;
 use PHPUnit\Framework\TestCase;
+use SimpleSAML\WSSecurity\XML\sp\AbstractQNameAssertionType;
+use SimpleSAML\WSSecurity\XML\sp\AbstractSpElement;
 use SimpleSAML\WSSecurity\XML\sp\HashPassword;
 use SimpleSAML\XML\DOMDocumentFactory;
 use SimpleSAML\XML\TestUtils\SchemaValidationTestTrait;
@@ -15,12 +18,11 @@
 /**
  * Class \SimpleSAML\WSSecurity\XML\sp\HashPasswordTest
  *
- * @covers \SimpleSAML\WSSecurity\XML\sp\HashPassword
- * @covers \SimpleSAML\WSSecurity\XML\sp\AbstractQNameAssertionType
- * @covers \SimpleSAML\WSSecurity\XML\sp\AbstractSpElement
- *
  * @package simplesamlphp/ws-security
  */
+#[CoversClass(HashPassword::class)]
+#[CoversClass(AbstractQNameAssertionType::class)]
+#[CoversClass(AbstractSpElement::class)]
 final class HashPasswordTest extends TestCase
 {
     use QNameAssertionTypeTestTrait;
diff --git a/tests/WSSecurity/XML/sp/HeaderTest.php b/tests/WSSecurity/XML/sp/HeaderTest.php
index 14452e01..0858ecac 100644
--- a/tests/WSSecurity/XML/sp/HeaderTest.php
+++ b/tests/WSSecurity/XML/sp/HeaderTest.php
@@ -4,8 +4,11 @@
 
 namespace SimpleSAML\Test\WSSecurity\XML\sp;
 
+use PHPUnit\Framework\Attributes\CoversClass;
 use PHPUnit\Framework\TestCase;
 use SimpleSAML\Test\WSSecurity\Constants as C;
+use SimpleSAML\WSSecurity\XML\sp\AbstractHeaderType;
+use SimpleSAML\WSSecurity\XML\sp\AbstractSpElement;
 use SimpleSAML\WSSecurity\XML\sp\Header;
 use SimpleSAML\XML\Attribute as XMLAttribute;
 use SimpleSAML\XML\DOMDocumentFactory;
@@ -16,12 +19,11 @@
 /**
  * Class \SimpleSAML\WSSecurity\XML\sp\HeaderTest
  *
- * @covers \SimpleSAML\WSSecurity\XML\sp\Header
- * @covers \SimpleSAML\WSSecurity\XML\sp\AbstractHeaderType
- * @covers \SimpleSAML\WSSecurity\XML\sp\AbstractSpElement
- *
  * @package simplesamlphp/ws-security
  */
+#[CoversClass(Header::class)]
+#[CoversClass(AbstractHeaderType::class)]
+#[CoversClass(AbstractSpElement::class)]
 final class HeaderTest extends TestCase
 {
     use SerializableElementTestTrait;
diff --git a/tests/WSSecurity/XML/sp/HttpBasicAuthenticationTest.php b/tests/WSSecurity/XML/sp/HttpBasicAuthenticationTest.php
index c6b0f198..64f8d6f8 100644
--- a/tests/WSSecurity/XML/sp/HttpBasicAuthenticationTest.php
+++ b/tests/WSSecurity/XML/sp/HttpBasicAuthenticationTest.php
@@ -4,7 +4,10 @@
 
 namespace SimpleSAML\Test\WSSecurity\XML\sp;
 
+use PHPUnit\Framework\Attributes\CoversClass;
 use PHPUnit\Framework\TestCase;
+use SimpleSAML\WSSecurity\XML\sp\AbstractQNameAssertionType;
+use SimpleSAML\WSSecurity\XML\sp\AbstractSpElement;
 use SimpleSAML\WSSecurity\XML\sp\HttpBasicAuthentication;
 use SimpleSAML\XML\DOMDocumentFactory;
 use SimpleSAML\XML\TestUtils\SchemaValidationTestTrait;
@@ -15,12 +18,11 @@
 /**
  * Class \SimpleSAML\WSSecurity\XML\sp\HttpBasicAuthenticationTestTest
  *
- * @covers \SimpleSAML\WSSecurity\XML\sp\HttpBasicAuthentication
- * @covers \SimpleSAML\WSSecurity\XML\sp\AbstractQNameAssertionType
- * @covers \SimpleSAML\WSSecurity\XML\sp\AbstractSpElement
- *
  * @package simplesamlphp/ws-security
  */
+#[CoversClass(HttpBasicAuthentication::class)]
+#[CoversClass(AbstractQNameAssertionType::class)]
+#[CoversClass(AbstractSpElement::class)]
 final class HttpBasicAuthenticationTest extends TestCase
 {
     use QNameAssertionTypeTestTrait;
diff --git a/tests/WSSecurity/XML/sp/HttpDigestAuthenticationTest.php b/tests/WSSecurity/XML/sp/HttpDigestAuthenticationTest.php
index ff8e0b33..4d960972 100644
--- a/tests/WSSecurity/XML/sp/HttpDigestAuthenticationTest.php
+++ b/tests/WSSecurity/XML/sp/HttpDigestAuthenticationTest.php
@@ -4,7 +4,10 @@
 
 namespace SimpleSAML\Test\WSSecurity\XML\sp;
 
+use PHPUnit\Framework\Attributes\CoversClass;
 use PHPUnit\Framework\TestCase;
+use SimpleSAML\WSSecurity\XML\sp\AbstractQNameAssertionType;
+use SimpleSAML\WSSecurity\XML\sp\AbstractSpElement;
 use SimpleSAML\WSSecurity\XML\sp\HttpDigestAuthentication;
 use SimpleSAML\XML\DOMDocumentFactory;
 use SimpleSAML\XML\TestUtils\SchemaValidationTestTrait;
@@ -15,12 +18,11 @@
 /**
  * Class \SimpleSAML\WSSecurity\XML\sp\HttpDigestAuthenticationTest
  *
- * @covers \SimpleSAML\WSSecurity\XML\sp\HttpDigestAuthentication
- * @covers \SimpleSAML\WSSecurity\XML\sp\AbstractQNameAssertionType
- * @covers \SimpleSAML\WSSecurity\XML\sp\AbstractSpElement
- *
  * @package simplesamlphp/ws-security
  */
+#[CoversClass(HttpDigestAuthentication::class)]
+#[CoversClass(AbstractQNameAssertionType::class)]
+#[CoversClass(AbstractSpElement::class)]
 final class HttpDigestAuthenticationTest extends TestCase
 {
     use QNameAssertionTypeTestTrait;
diff --git a/tests/WSSecurity/XML/sp/HttpsTokenTest.php b/tests/WSSecurity/XML/sp/HttpsTokenTest.php
index 9e6127ae..501d7ef0 100644
--- a/tests/WSSecurity/XML/sp/HttpsTokenTest.php
+++ b/tests/WSSecurity/XML/sp/HttpsTokenTest.php
@@ -4,10 +4,14 @@
 
 namespace SimpleSAML\Test\WSSecurity\XML\sp;
 
+use PHPUnit\Framework\Attributes\CoversClass;
 use PHPUnit\Framework\TestCase;
 use SimpleSAML\Test\WSSecurity\Constants as C;
+use SimpleSAML\WSSecurity\XML\sp\AbstractSpElement;
+use SimpleSAML\WSSecurity\XML\sp\AbstractTokenAssertionType;
 use SimpleSAML\WSSecurity\XML\sp\HttpsToken;
 use SimpleSAML\WSSecurity\XML\sp\IncludeToken;
+use SimpleSAML\WSSecurity\XML\sp\IncludeTokenTypeTrait;
 use SimpleSAML\XML\Attribute as XMLAttribute;
 use SimpleSAML\XML\Chunk;
 use SimpleSAML\XML\DOMDocumentFactory;
@@ -19,13 +23,12 @@
 /**
  * Class \SimpleSAML\WSSecurity\XML\sp\HttpsTokenTest
  *
- * @covers \SimpleSAML\WSSecurity\XML\sp\HttpsToken
- * @covers \SimpleSAML\WSSecurity\XML\sp\IncludeTokenTypeTrait
- * @covers \SimpleSAML\WSSecurity\XML\sp\AbstractTokenAssertionType
- * @covers \SimpleSAML\WSSecurity\XML\sp\AbstractSpElement
- *
  * @package simplesamlphp/ws-security
  */
+#[CoversClass(HttpsToken::class)]
+#[CoversClass(IncludeTokenTypeTrait::class)]
+#[CoversClass(AbstractTokenAssertionType::class)]
+#[CoversClass(AbstractSpElement::class)]
 final class HttpsTokenTest extends TestCase
 {
     use SchemaValidationTestTrait;
diff --git a/tests/WSSecurity/XML/sp/IncludeTimestampTest.php b/tests/WSSecurity/XML/sp/IncludeTimestampTest.php
index e96ddc80..efd78f42 100644
--- a/tests/WSSecurity/XML/sp/IncludeTimestampTest.php
+++ b/tests/WSSecurity/XML/sp/IncludeTimestampTest.php
@@ -4,7 +4,10 @@
 
 namespace SimpleSAML\Test\WSSecurity\XML\sp;
 
+use PHPUnit\Framework\Attributes\CoversClass;
 use PHPUnit\Framework\TestCase;
+use SimpleSAML\WSSecurity\XML\sp\AbstractQNameAssertionType;
+use SimpleSAML\WSSecurity\XML\sp\AbstractSpElement;
 use SimpleSAML\WSSecurity\XML\sp\IncludeTimestamp;
 use SimpleSAML\XML\DOMDocumentFactory;
 use SimpleSAML\XML\TestUtils\SchemaValidationTestTrait;
@@ -15,12 +18,11 @@
 /**
  * Class \SimpleSAML\WSSecurity\XML\sp\IncludeTimestampTest
  *
- * @covers \SimpleSAML\WSSecurity\XML\sp\IncludeTimestamp
- * @covers \SimpleSAML\WSSecurity\XML\sp\AbstractQNameAssertionType
- * @covers \SimpleSAML\WSSecurity\XML\sp\AbstractSpElement
- *
  * @package simplesamlphp/ws-security
  */
+#[CoversClass(IncludeTimestamp::class)]
+#[CoversClass(AbstractQNameAssertionType::class)]
+#[CoversClass(AbstractSpElement::class)]
 final class IncludeTimestampTest extends TestCase
 {
     use QNameAssertionTypeTestTrait;
diff --git a/tests/WSSecurity/XML/sp/InclusiveC14NTest.php b/tests/WSSecurity/XML/sp/InclusiveC14NTest.php
index 984ce369..027fffe7 100644
--- a/tests/WSSecurity/XML/sp/InclusiveC14NTest.php
+++ b/tests/WSSecurity/XML/sp/InclusiveC14NTest.php
@@ -4,7 +4,10 @@
 
 namespace SimpleSAML\Test\WSSecurity\XML\sp;
 
+use PHPUnit\Framework\Attributes\CoversClass;
 use PHPUnit\Framework\TestCase;
+use SimpleSAML\WSSecurity\XML\sp\AbstractQNameAssertionType;
+use SimpleSAML\WSSecurity\XML\sp\AbstractSpElement;
 use SimpleSAML\WSSecurity\XML\sp\InclusiveC14N;
 use SimpleSAML\XML\DOMDocumentFactory;
 use SimpleSAML\XML\TestUtils\SchemaValidationTestTrait;
@@ -15,12 +18,11 @@
 /**
  * Class \SimpleSAML\WSSecurity\XML\sp\InclusiveC14NTest
  *
- * @covers \SimpleSAML\WSSecurity\XML\sp\InclusiveC14N
- * @covers \SimpleSAML\WSSecurity\XML\sp\AbstractQNameAssertionType
- * @covers \SimpleSAML\WSSecurity\XML\sp\AbstractSpElement
- *
  * @package simplesamlphp/ws-security
  */
+#[CoversClass(InclusiveC14N::class)]
+#[CoversClass(AbstractQNameAssertionType::class)]
+#[CoversClass(AbstractSpElement::class)]
 final class InclusiveC14NTest extends TestCase
 {
     use QNameAssertionTypeTestTrait;
diff --git a/tests/WSSecurity/XML/sp/InitiatorEncryptionTokenTest.php b/tests/WSSecurity/XML/sp/InitiatorEncryptionTokenTest.php
index a9d34db4..3862ebea 100644
--- a/tests/WSSecurity/XML/sp/InitiatorEncryptionTokenTest.php
+++ b/tests/WSSecurity/XML/sp/InitiatorEncryptionTokenTest.php
@@ -4,8 +4,11 @@
 
 namespace SimpleSAML\Test\WSSecurity\XML\sp;
 
+use PHPUnit\Framework\Attributes\CoversClass;
 use PHPUnit\Framework\TestCase;
 use SimpleSAML\Test\WSSecurity\Constants as C;
+use SimpleSAML\WSSecurity\XML\sp\AbstractNestedPolicyType;
+use SimpleSAML\WSSecurity\XML\sp\AbstractSpElement;
 use SimpleSAML\WSSecurity\XML\sp\InitiatorEncryptionToken;
 use SimpleSAML\XML\Attribute as XMLAttribute;
 use SimpleSAML\XML\Chunk;
@@ -18,12 +21,11 @@
 /**
  * Class \SimpleSAML\WSSecurity\XML\sp\InitiatorEncryptionTokenTest
  *
- * @covers \SimpleSAML\WSSecurity\XML\sp\InitiatorEncryptionToken
- * @covers \SimpleSAML\WSSecurity\XML\sp\AbstractNestedPolicyType
- * @covers \SimpleSAML\WSSecurity\XML\sp\AbstractSpElement
- *
  * @package simplesamlphp/ws-security
  */
+#[CoversClass(InitiatorEncryptionToken::class)]
+#[CoversClass(AbstractNestedPolicyType::class)]
+#[CoversClass(AbstractSpElement::class)]
 final class InitiatorEncryptionTokenTest extends TestCase
 {
     use NestedPolicyTypeTestTrait;
diff --git a/tests/WSSecurity/XML/sp/InitiatorSignatureTokenTest.php b/tests/WSSecurity/XML/sp/InitiatorSignatureTokenTest.php
index 68b6b149..9349cfb9 100644
--- a/tests/WSSecurity/XML/sp/InitiatorSignatureTokenTest.php
+++ b/tests/WSSecurity/XML/sp/InitiatorSignatureTokenTest.php
@@ -4,8 +4,11 @@
 
 namespace SimpleSAML\Test\WSSecurity\XML\sp;
 
+use PHPUnit\Framework\Attributes\CoversClass;
 use PHPUnit\Framework\TestCase;
 use SimpleSAML\Test\WSSecurity\Constants as C;
+use SimpleSAML\WSSecurity\XML\sp\AbstractNestedPolicyType;
+use SimpleSAML\WSSecurity\XML\sp\AbstractSpElement;
 use SimpleSAML\WSSecurity\XML\sp\InitiatorSignatureToken;
 use SimpleSAML\XML\Attribute as XMLAttribute;
 use SimpleSAML\XML\Chunk;
@@ -18,12 +21,11 @@
 /**
  * Class \SimpleSAML\WSSecurity\XML\sp\InitiatorSignatureTokenTest
  *
- * @covers \SimpleSAML\WSSecurity\XML\sp\InitiatorSignatureToken
- * @covers \SimpleSAML\WSSecurity\XML\sp\AbstractNestedPolicyType
- * @covers \SimpleSAML\WSSecurity\XML\sp\AbstractSpElement
- *
  * @package simplesamlphp/ws-security
  */
+#[CoversClass(InitiatorSignatureToken::class)]
+#[CoversClass(AbstractNestedPolicyType::class)]
+#[CoversClass(AbstractSpElement::class)]
 final class InitiatorSignatureTokenTest extends TestCase
 {
     use NestedPolicyTypeTestTrait;
diff --git a/tests/WSSecurity/XML/sp/InitiatorTokenTest.php b/tests/WSSecurity/XML/sp/InitiatorTokenTest.php
index 8fe78f60..e87f40f6 100644
--- a/tests/WSSecurity/XML/sp/InitiatorTokenTest.php
+++ b/tests/WSSecurity/XML/sp/InitiatorTokenTest.php
@@ -4,8 +4,11 @@
 
 namespace SimpleSAML\Test\WSSecurity\XML\sp;
 
+use PHPUnit\Framework\Attributes\CoversClass;
 use PHPUnit\Framework\TestCase;
 use SimpleSAML\Test\WSSecurity\Constants as C;
+use SimpleSAML\WSSecurity\XML\sp\AbstractNestedPolicyType;
+use SimpleSAML\WSSecurity\XML\sp\AbstractSpElement;
 use SimpleSAML\WSSecurity\XML\sp\InitiatorToken;
 use SimpleSAML\XML\Attribute as XMLAttribute;
 use SimpleSAML\XML\Chunk;
@@ -18,12 +21,11 @@
 /**
  * Class \SimpleSAML\WSSecurity\XML\sp\InitiatorTokenTest
  *
- * @covers \SimpleSAML\WSSecurity\XML\sp\InitiatorToken
- * @covers \SimpleSAML\WSSecurity\XML\sp\AbstractNestedPolicyType
- * @covers \SimpleSAML\WSSecurity\XML\sp\AbstractSpElement
- *
  * @package simplesamlphp/ws-security
  */
+#[CoversClass(InitiatorToken::class)]
+#[CoversClass(AbstractNestedPolicyType::class)]
+#[CoversClass(AbstractSpElement::class)]
 final class InitiatorTokenTest extends TestCase
 {
     use NestedPolicyTypeTestTrait;
diff --git a/tests/WSSecurity/XML/sp/IssuedTokenTest.php b/tests/WSSecurity/XML/sp/IssuedTokenTest.php
index 28ee5e94..44d7700e 100644
--- a/tests/WSSecurity/XML/sp/IssuedTokenTest.php
+++ b/tests/WSSecurity/XML/sp/IssuedTokenTest.php
@@ -4,10 +4,14 @@
 
 namespace SimpleSAML\Test\WSSecurity\XML\sp;
 
+use PHPUnit\Framework\Attributes\CoversClass;
 use PHPUnit\Framework\TestCase;
 use SimpleSAML\Test\WSSecurity\Constants as C;
 use SimpleSAML\WSSecurity\Utils\XPath;
+use SimpleSAML\WSSecurity\XML\sp\AbstractIssuedTokenType;
+use SimpleSAML\WSSecurity\XML\sp\AbstractSpElement;
 use SimpleSAML\WSSecurity\XML\sp\IncludeToken;
+use SimpleSAML\WSSecurity\XML\sp\IncludeTokenTypeTrait;
 use SimpleSAML\WSSecurity\XML\sp\IssuedToken;
 use SimpleSAML\WSSecurity\XML\sp\IssuerName;
 use SimpleSAML\WSSecurity\XML\sp\RequestSecurityTokenTemplate;
@@ -22,13 +26,12 @@
 /**
  * Class \SimpleSAML\WSSecurity\XML\sp\IssuedTokenTest
  *
- * @covers \SimpleSAML\WSSecurity\XML\sp\IssuedToken
- * @covers \SimpleSAML\WSSecurity\XML\sp\IncludeTokenTypeTrait
- * @covers \SimpleSAML\WSSecurity\XML\sp\AbstractIssuedTokenType
- * @covers \SimpleSAML\WSSecurity\XML\sp\AbstractSpElement
- *
  * @package simplesamlphp/ws-security
  */
+#[CoversClass(IssuedToken::class)]
+#[CoversClass(IncludeTokenTypeTrait::class)]
+#[CoversClass(AbstractIssuedTokenType::class)]
+#[CoversClass(AbstractSpElement::class)]
 final class IssuedTokenTest extends TestCase
 {
     use SchemaValidationTestTrait;
diff --git a/tests/WSSecurity/XML/sp/IssuerNameTest.php b/tests/WSSecurity/XML/sp/IssuerNameTest.php
index c4414c36..a7bc8c86 100644
--- a/tests/WSSecurity/XML/sp/IssuerNameTest.php
+++ b/tests/WSSecurity/XML/sp/IssuerNameTest.php
@@ -4,7 +4,9 @@
 
 namespace SimpleSAML\Test\WSSecurity\XML\sp;
 
+use PHPUnit\Framework\Attributes\CoversClass;
 use PHPUnit\Framework\TestCase;
+use SimpleSAML\WSSecurity\XML\sp\AbstractSpElement;
 use SimpleSAML\WSSecurity\XML\sp\IssuerName;
 use SimpleSAML\XML\DOMDocumentFactory;
 use SimpleSAML\XML\TestUtils\SerializableElementTestTrait;
@@ -15,11 +17,10 @@
 /**
  * Tests for IssuerName.
  *
- * @covers \SimpleSAML\WSSecurity\XML\sp\IssuerName
- * @covers \SimpleSAML\WSSecurity\XML\sp\AbstractSpElement
- *
  * @package simplesamlphp/ws-security
  */
+#[CoversClass(IssuerName::class)]
+#[CoversClass(AbstractSpElement::class)]
 final class IssuerNameTest extends TestCase
 {
     use SerializableElementTestTrait;
diff --git a/tests/WSSecurity/XML/sp/IssuerTest.php b/tests/WSSecurity/XML/sp/IssuerTest.php
index 21b1e9a4..29e7b119 100644
--- a/tests/WSSecurity/XML/sp/IssuerTest.php
+++ b/tests/WSSecurity/XML/sp/IssuerTest.php
@@ -5,8 +5,11 @@
 namespace SimpleSAML\Test\WSSecurity\XML\wsa;
 
 use DOMElement;
+use PHPUnit\Framework\Attributes\CoversClass;
 use PHPUnit\Framework\TestCase;
 use SimpleSAML\WSSecurity\XML\sp\Issuer;
+use SimpleSAML\WSSecurity\XML\wsa\AbstractEndpointReferenceType;
+use SimpleSAML\WSSecurity\XML\wsa\AbstractWsaElement;
 use SimpleSAML\WSSecurity\XML\wsa\Address;
 use SimpleSAML\WSSecurity\XML\wsa\Metadata;
 use SimpleSAML\WSSecurity\XML\wsa\ReferenceParameters;
@@ -21,11 +24,11 @@
 /**
  * Tests for sp:Issuer.
  *
- * @covers \SimpleSAML\WSSecurity\XML\sp\Issuer
- * @covers \SimpleSAML\WSSecurity\XML\wsa\AbstractEndpointReferenceType
- * @covers \SimpleSAML\WSSecurity\XML\wsa\AbstractWsaElement
  * @package simplesamlphp/ws-security
  */
+#[CoversClass(Issuer::class)]
+#[CoversClass(AbstractEndpointReferenceType::class)]
+#[CoversClass(AbstractWsaElement::class)]
 final class IssuerTest extends TestCase
 {
     use SerializableElementTestTrait;
diff --git a/tests/WSSecurity/XML/sp/KerberosTokenTest.php b/tests/WSSecurity/XML/sp/KerberosTokenTest.php
index 81f8224b..7fbc4dfa 100644
--- a/tests/WSSecurity/XML/sp/KerberosTokenTest.php
+++ b/tests/WSSecurity/XML/sp/KerberosTokenTest.php
@@ -4,9 +4,13 @@
 
 namespace SimpleSAML\Test\WSSecurity\XML\sp;
 
+use PHPUnit\Framework\Attributes\CoversClass;
 use PHPUnit\Framework\TestCase;
 use SimpleSAML\Test\WSSecurity\Constants as C;
+use SimpleSAML\WSSecurity\XML\sp\AbstractSpElement;
+use SimpleSAML\WSSecurity\XML\sp\AbstractTokenAssertionType;
 use SimpleSAML\WSSecurity\XML\sp\IncludeToken;
+use SimpleSAML\WSSecurity\XML\sp\IncludeTokenTypeTrait;
 use SimpleSAML\WSSecurity\XML\sp\KerberosToken;
 use SimpleSAML\XML\Attribute as XMLAttribute;
 use SimpleSAML\XML\Chunk;
@@ -19,13 +23,12 @@
 /**
  * Class \SimpleSAML\WSSecurity\XML\sp\KerberosTokenTest
  *
- * @covers \SimpleSAML\WSSecurity\XML\sp\KerberosToken
- * @covers \SimpleSAML\WSSecurity\XML\sp\IncludeTokenTypeTrait
- * @covers \SimpleSAML\WSSecurity\XML\sp\AbstractTokenAssertionType
- * @covers \SimpleSAML\WSSecurity\XML\sp\AbstractSpElement
- *
  * @package simplesamlphp/ws-security
  */
+#[CoversClass(KerberosToken::class)]
+#[CoversClass(IncludeTokenTypeTrait::class)]
+#[CoversClass(AbstractTokenAssertionType::class)]
+#[CoversClass(AbstractSpElement::class)]
 final class KerberosTokenTest extends TestCase
 {
     use SchemaValidationTestTrait;
diff --git a/tests/WSSecurity/XML/sp/KeyValueTokenTest.php b/tests/WSSecurity/XML/sp/KeyValueTokenTest.php
index d3e6097a..06a24557 100644
--- a/tests/WSSecurity/XML/sp/KeyValueTokenTest.php
+++ b/tests/WSSecurity/XML/sp/KeyValueTokenTest.php
@@ -4,9 +4,13 @@
 
 namespace SimpleSAML\Test\WSSecurity\XML\sp;
 
+use PHPUnit\Framework\Attributes\CoversClass;
 use PHPUnit\Framework\TestCase;
 use SimpleSAML\Test\WSSecurity\Constants as C;
+use SimpleSAML\WSSecurity\XML\sp\AbstractKeyValueTokenType;
+use SimpleSAML\WSSecurity\XML\sp\AbstractSpElement;
 use SimpleSAML\WSSecurity\XML\sp\IncludeToken;
+use SimpleSAML\WSSecurity\XML\sp\IncludeTokenTypeTrait;
 use SimpleSAML\WSSecurity\XML\sp\KeyValueToken;
 use SimpleSAML\XML\Attribute as XMLAttribute;
 use SimpleSAML\XML\Chunk;
@@ -19,13 +23,12 @@
 /**
  * Class \SimpleSAML\WSSecurity\XML\sp\KeyValueTokenTest
  *
- * @covers \SimpleSAML\WSSecurity\XML\sp\KeyValueToken
- * @covers \SimpleSAML\WSSecurity\XML\sp\IncludeTokenTypeTrait
- * @covers \SimpleSAML\WSSecurity\XML\sp\AbstractKeyValueTokenType
- * @covers \SimpleSAML\WSSecurity\XML\sp\AbstractSpElement
- *
  * @package simplesamlphp/ws-security
  */
+#[CoversClass(KeyValueToken::class)]
+#[CoversClass(IncludeTokenTypeTrait::class)]
+#[CoversClass(AbstractKeyValueTokenType::class)]
+#[CoversClass(AbstractSpElement::class)]
 final class KeyValueTokenTest extends TestCase
 {
     use SchemaValidationTestTrait;
diff --git a/tests/WSSecurity/XML/sp/LaxTest.php b/tests/WSSecurity/XML/sp/LaxTest.php
index 40a19413..bbb75ba7 100644
--- a/tests/WSSecurity/XML/sp/LaxTest.php
+++ b/tests/WSSecurity/XML/sp/LaxTest.php
@@ -4,7 +4,10 @@
 
 namespace SimpleSAML\Test\WSSecurity\XML\sp;
 
+use PHPUnit\Framework\Attributes\CoversClass;
 use PHPUnit\Framework\TestCase;
+use SimpleSAML\WSSecurity\XML\sp\AbstractQNameAssertionType;
+use SimpleSAML\WSSecurity\XML\sp\AbstractSpElement;
 use SimpleSAML\WSSecurity\XML\sp\Lax;
 use SimpleSAML\XML\DOMDocumentFactory;
 use SimpleSAML\XML\TestUtils\SchemaValidationTestTrait;
@@ -15,12 +18,11 @@
 /**
  * Class \SimpleSAML\WSSecurity\XML\sp\LaxTest
  *
- * @covers \SimpleSAML\WSSecurity\XML\sp\Lax
- * @covers \SimpleSAML\WSSecurity\XML\sp\AbstractQNameAssertionType
- * @covers \SimpleSAML\WSSecurity\XML\sp\AbstractSpElement
- *
  * @package simplesamlphp/ws-security
  */
+#[CoversClass(Lax::class)]
+#[CoversClass(AbstractQNameAssertionType::class)]
+#[CoversClass(AbstractSpElement::class)]
 final class LaxTest extends TestCase
 {
     use QNameAssertionTypeTestTrait;
diff --git a/tests/WSSecurity/XML/sp/LaxTsFirstTest.php b/tests/WSSecurity/XML/sp/LaxTsFirstTest.php
index bccfe6e0..9ccd8329 100644
--- a/tests/WSSecurity/XML/sp/LaxTsFirstTest.php
+++ b/tests/WSSecurity/XML/sp/LaxTsFirstTest.php
@@ -4,7 +4,10 @@
 
 namespace SimpleSAML\Test\WSSecurity\XML\sp;
 
+use PHPUnit\Framework\Attributes\CoversClass;
 use PHPUnit\Framework\TestCase;
+use SimpleSAML\WSSecurity\XML\sp\AbstractQNameAssertionType;
+use SimpleSAML\WSSecurity\XML\sp\AbstractSpElement;
 use SimpleSAML\WSSecurity\XML\sp\LaxTsFirst;
 use SimpleSAML\XML\DOMDocumentFactory;
 use SimpleSAML\XML\TestUtils\SchemaValidationTestTrait;
@@ -15,12 +18,11 @@
 /**
  * Class \SimpleSAML\WSSecurity\XML\sp\LaxTsFirstTest
  *
- * @covers \SimpleSAML\WSSecurity\XML\sp\LaxTsFirst
- * @covers \SimpleSAML\WSSecurity\XML\sp\AbstractQNameAssertionType
- * @covers \SimpleSAML\WSSecurity\XML\sp\AbstractSpElement
- *
  * @package simplesamlphp/ws-security
  */
+#[CoversClass(LaxTsFirst::class)]
+#[CoversClass(AbstractQNameAssertionType::class)]
+#[CoversClass(AbstractSpElement::class)]
 final class LaxTsFirstTest extends TestCase
 {
     use QNameAssertionTypeTestTrait;
diff --git a/tests/WSSecurity/XML/sp/LaxTsLastTest.php b/tests/WSSecurity/XML/sp/LaxTsLastTest.php
index a06f6d62..b824f118 100644
--- a/tests/WSSecurity/XML/sp/LaxTsLastTest.php
+++ b/tests/WSSecurity/XML/sp/LaxTsLastTest.php
@@ -4,7 +4,10 @@
 
 namespace SimpleSAML\Test\WSSecurity\XML\sp;
 
+use PHPUnit\Framework\Attributes\CoversClass;
 use PHPUnit\Framework\TestCase;
+use SimpleSAML\WSSecurity\XML\sp\AbstractQNameAssertionType;
+use SimpleSAML\WSSecurity\XML\sp\AbstractSpElement;
 use SimpleSAML\WSSecurity\XML\sp\LaxTsLast;
 use SimpleSAML\XML\DOMDocumentFactory;
 use SimpleSAML\XML\TestUtils\SchemaValidationTestTrait;
@@ -15,12 +18,11 @@
 /**
  * Class \SimpleSAML\WSSecurity\XML\sp\LaxTsLastTest
  *
- * @covers \SimpleSAML\WSSecurity\XML\sp\LaxTsLast
- * @covers \SimpleSAML\WSSecurity\XML\sp\AbstractQNameAssertionType
- * @covers \SimpleSAML\WSSecurity\XML\sp\AbstractSpElement
- *
  * @package simplesamlphp/ws-security
  */
+#[CoversClass(LaxTsLast::class)]
+#[CoversClass(AbstractQNameAssertionType::class)]
+#[CoversClass(AbstractSpElement::class)]
 final class LaxTsLastTest extends TestCase
 {
     use QNameAssertionTypeTestTrait;
diff --git a/tests/WSSecurity/XML/sp/LayoutTest.php b/tests/WSSecurity/XML/sp/LayoutTest.php
index 03a665f1..8be2bbb6 100644
--- a/tests/WSSecurity/XML/sp/LayoutTest.php
+++ b/tests/WSSecurity/XML/sp/LayoutTest.php
@@ -4,8 +4,11 @@
 
 namespace SimpleSAML\Test\WSSecurity\XML\sp;
 
+use PHPUnit\Framework\Attributes\CoversClass;
 use PHPUnit\Framework\TestCase;
 use SimpleSAML\Test\WSSecurity\Constants as C;
+use SimpleSAML\WSSecurity\XML\sp\AbstractNestedPolicyType;
+use SimpleSAML\WSSecurity\XML\sp\AbstractSpElement;
 use SimpleSAML\WSSecurity\XML\sp\Layout;
 use SimpleSAML\XML\Attribute as XMLAttribute;
 use SimpleSAML\XML\Chunk;
@@ -18,12 +21,11 @@
 /**
  * Class \SimpleSAML\WSSecurity\XML\sp\LayoutTest
  *
- * @covers \SimpleSAML\WSSecurity\XML\sp\Layout
- * @covers \SimpleSAML\WSSecurity\XML\sp\AbstractNestedPolicyType
- * @covers \SimpleSAML\WSSecurity\XML\sp\AbstractSpElement
- *
  * @package simplesamlphp/ws-security
  */
+#[CoversClass(Layout::class)]
+#[CoversClass(AbstractNestedPolicyType::class)]
+#[CoversClass(AbstractSpElement::class)]
 final class LayoutTest extends TestCase
 {
     use NestedPolicyTypeTestTrait;
diff --git a/tests/WSSecurity/XML/sp/MustNotSendAmendTest.php b/tests/WSSecurity/XML/sp/MustNotSendAmendTest.php
index f5eaacd3..864b46b3 100644
--- a/tests/WSSecurity/XML/sp/MustNotSendAmendTest.php
+++ b/tests/WSSecurity/XML/sp/MustNotSendAmendTest.php
@@ -4,7 +4,10 @@
 
 namespace SimpleSAML\Test\WSSecurity\XML\sp;
 
+use PHPUnit\Framework\Attributes\CoversClass;
 use PHPUnit\Framework\TestCase;
+use SimpleSAML\WSSecurity\XML\sp\AbstractQNameAssertionType;
+use SimpleSAML\WSSecurity\XML\sp\AbstractSpElement;
 use SimpleSAML\WSSecurity\XML\sp\MustNotSendAmend;
 use SimpleSAML\XML\DOMDocumentFactory;
 use SimpleSAML\XML\TestUtils\SchemaValidationTestTrait;
@@ -15,12 +18,11 @@
 /**
  * Class \SimpleSAML\WSSecurity\XML\sp\MustNotSendAmendTest
  *
- * @covers \SimpleSAML\WSSecurity\XML\sp\MustNotSendAmend
- * @covers \SimpleSAML\WSSecurity\XML\sp\AbstractQNameAssertionType
- * @covers \SimpleSAML\WSSecurity\XML\sp\AbstractSpElement
- *
  * @package simplesamlphp/ws-security
  */
+#[CoversClass(MustNotSendAmend::class)]
+#[CoversClass(AbstractQNameAssertionType::class)]
+#[CoversClass(AbstractSpElement::class)]
 final class MustNotSendAmendTest extends TestCase
 {
     use QNameAssertionTypeTestTrait;
diff --git a/tests/WSSecurity/XML/sp/MustNotSendCancelTest.php b/tests/WSSecurity/XML/sp/MustNotSendCancelTest.php
index 3859eee8..ccae61c8 100644
--- a/tests/WSSecurity/XML/sp/MustNotSendCancelTest.php
+++ b/tests/WSSecurity/XML/sp/MustNotSendCancelTest.php
@@ -4,7 +4,10 @@
 
 namespace SimpleSAML\Test\WSSecurity\XML\sp;
 
+use PHPUnit\Framework\Attributes\CoversClass;
 use PHPUnit\Framework\TestCase;
+use SimpleSAML\WSSecurity\XML\sp\AbstractQNameAssertionType;
+use SimpleSAML\WSSecurity\XML\sp\AbstractSpElement;
 use SimpleSAML\WSSecurity\XML\sp\MustNotSendCancel;
 use SimpleSAML\XML\DOMDocumentFactory;
 use SimpleSAML\XML\TestUtils\SchemaValidationTestTrait;
@@ -15,12 +18,11 @@
 /**
  * Class \SimpleSAML\WSSecurity\XML\sp\MustNotSendCancelTest
  *
- * @covers \SimpleSAML\WSSecurity\XML\sp\MustNotSendCancel
- * @covers \SimpleSAML\WSSecurity\XML\sp\AbstractQNameAssertionType
- * @covers \SimpleSAML\WSSecurity\XML\sp\AbstractSpElement
- *
  * @package simplesamlphp/ws-security
  */
+#[CoversClass(MustNotSendCancel::class)]
+#[CoversClass(AbstractQNameAssertionType::class)]
+#[CoversClass(AbstractSpElement::class)]
 final class MustNotSendCancelTest extends TestCase
 {
     use QNameAssertionTypeTestTrait;
diff --git a/tests/WSSecurity/XML/sp/MustNotSendRenewTest.php b/tests/WSSecurity/XML/sp/MustNotSendRenewTest.php
index ae5e975a..18faf646 100644
--- a/tests/WSSecurity/XML/sp/MustNotSendRenewTest.php
+++ b/tests/WSSecurity/XML/sp/MustNotSendRenewTest.php
@@ -4,7 +4,10 @@
 
 namespace SimpleSAML\Test\WSSecurity\XML\sp;
 
+use PHPUnit\Framework\Attributes\CoversClass;
 use PHPUnit\Framework\TestCase;
+use SimpleSAML\WSSecurity\XML\sp\AbstractQNameAssertionType;
+use SimpleSAML\WSSecurity\XML\sp\AbstractSpElement;
 use SimpleSAML\WSSecurity\XML\sp\MustNotSendRenew;
 use SimpleSAML\XML\DOMDocumentFactory;
 use SimpleSAML\XML\TestUtils\SchemaValidationTestTrait;
@@ -15,12 +18,11 @@
 /**
  * Class \SimpleSAML\WSSecurity\XML\sp\MustNotSendRenewTest
  *
- * @covers \SimpleSAML\WSSecurity\XML\sp\MustNotSendRenew
- * @covers \SimpleSAML\WSSecurity\XML\sp\AbstractQNameAssertionType
- * @covers \SimpleSAML\WSSecurity\XML\sp\AbstractSpElement
- *
  * @package simplesamlphp/ws-security
  */
+#[CoversClass(MustNotSendRenew::class)]
+#[CoversClass(AbstractQNameAssertionType::class)]
+#[CoversClass(AbstractSpElement::class)]
 final class MustNotSendRenewTest extends TestCase
 {
     use QNameAssertionTypeTestTrait;
diff --git a/tests/WSSecurity/XML/sp/MustSupportClientChallengeTest.php b/tests/WSSecurity/XML/sp/MustSupportClientChallengeTest.php
index 038fa6f5..5d959db9 100644
--- a/tests/WSSecurity/XML/sp/MustSupportClientChallengeTest.php
+++ b/tests/WSSecurity/XML/sp/MustSupportClientChallengeTest.php
@@ -4,7 +4,10 @@
 
 namespace SimpleSAML\Test\WSSecurity\XML\sp;
 
+use PHPUnit\Framework\Attributes\CoversClass;
 use PHPUnit\Framework\TestCase;
+use SimpleSAML\WSSecurity\XML\sp\AbstractQNameAssertionType;
+use SimpleSAML\WSSecurity\XML\sp\AbstractSpElement;
 use SimpleSAML\WSSecurity\XML\sp\MustSupportClientChallenge;
 use SimpleSAML\XML\DOMDocumentFactory;
 use SimpleSAML\XML\TestUtils\SchemaValidationTestTrait;
@@ -15,12 +18,11 @@
 /**
  * Class \SimpleSAML\WSSecurity\XML\sp\MustSupportClientChallengeTest
  *
- * @covers \SimpleSAML\WSSecurity\XML\sp\MustSupportClientChallenge
- * @covers \SimpleSAML\WSSecurity\XML\sp\AbstractQNameAssertionType
- * @covers \SimpleSAML\WSSecurity\XML\sp\AbstractSpElement
- *
  * @package simplesamlphp/ws-security
  */
+#[CoversClass(MustSupportClientChallenge::class)]
+#[CoversClass(AbstractQNameAssertionType::class)]
+#[CoversClass(AbstractSpElement::class)]
 final class MustSupportClientChallengeTest extends TestCase
 {
     use QNameAssertionTypeTestTrait;
diff --git a/tests/WSSecurity/XML/sp/MustSupportIssuedTokensTest.php b/tests/WSSecurity/XML/sp/MustSupportIssuedTokensTest.php
index 7a9c6a67..e7029e53 100644
--- a/tests/WSSecurity/XML/sp/MustSupportIssuedTokensTest.php
+++ b/tests/WSSecurity/XML/sp/MustSupportIssuedTokensTest.php
@@ -4,7 +4,10 @@
 
 namespace SimpleSAML\Test\WSSecurity\XML\sp;
 
+use PHPUnit\Framework\Attributes\CoversClass;
 use PHPUnit\Framework\TestCase;
+use SimpleSAML\WSSecurity\XML\sp\AbstractQNameAssertionType;
+use SimpleSAML\WSSecurity\XML\sp\AbstractSpElement;
 use SimpleSAML\WSSecurity\XML\sp\MustSupportIssuedTokens;
 use SimpleSAML\XML\DOMDocumentFactory;
 use SimpleSAML\XML\TestUtils\SchemaValidationTestTrait;
@@ -15,12 +18,11 @@
 /**
  * Class \SimpleSAML\WSSecurity\XML\sp\MustSupportIssuedTokensTest
  *
- * @covers \SimpleSAML\WSSecurity\XML\sp\MustSupportIssuedTokens
- * @covers \SimpleSAML\WSSecurity\XML\sp\AbstractQNameAssertionType
- * @covers \SimpleSAML\WSSecurity\XML\sp\AbstractSpElement
- *
  * @package simplesamlphp/ws-security
  */
+#[CoversClass(MustSupportIssuedTokens::class)]
+#[CoversClass(AbstractQNameAssertionType::class)]
+#[CoversClass(AbstractSpElement::class)]
 final class MustSupportIssuedTokensTest extends TestCase
 {
     use QNameAssertionTypeTestTrait;
diff --git a/tests/WSSecurity/XML/sp/MustSupportRefEmbeddedTokenTest.php b/tests/WSSecurity/XML/sp/MustSupportRefEmbeddedTokenTest.php
index 91831ed4..f5f5a5f9 100644
--- a/tests/WSSecurity/XML/sp/MustSupportRefEmbeddedTokenTest.php
+++ b/tests/WSSecurity/XML/sp/MustSupportRefEmbeddedTokenTest.php
@@ -4,7 +4,10 @@
 
 namespace SimpleSAML\Test\WSSecurity\XML\sp;
 
+use PHPUnit\Framework\Attributes\CoversClass;
 use PHPUnit\Framework\TestCase;
+use SimpleSAML\WSSecurity\XML\sp\AbstractQNameAssertionType;
+use SimpleSAML\WSSecurity\XML\sp\AbstractSpElement;
 use SimpleSAML\WSSecurity\XML\sp\MustSupportRefEmbeddedToken;
 use SimpleSAML\XML\DOMDocumentFactory;
 use SimpleSAML\XML\TestUtils\SchemaValidationTestTrait;
@@ -15,12 +18,11 @@
 /**
  * Class \SimpleSAML\WSSecurity\XML\sp\MustSupportRefEmbeddedTokenTest
  *
- * @covers \SimpleSAML\WSSecurity\XML\sp\MustSupportRefEmbeddedToken
- * @covers \SimpleSAML\WSSecurity\XML\sp\AbstractQNameAssertionType
- * @covers \SimpleSAML\WSSecurity\XML\sp\AbstractSpElement
- *
  * @package simplesamlphp/ws-security
  */
+#[CoversClass(MustSupportRefEmbeddedToken::class)]
+#[CoversClass(AbstractQNameAssertionType::class)]
+#[CoversClass(AbstractSpElement::class)]
 final class MustSupportRefEmbeddedTokenTest extends TestCase
 {
     use QNameAssertionTypeTestTrait;
diff --git a/tests/WSSecurity/XML/sp/MustSupportRefEncryptedKeyTest.php b/tests/WSSecurity/XML/sp/MustSupportRefEncryptedKeyTest.php
index 2346c37a..b2ced539 100644
--- a/tests/WSSecurity/XML/sp/MustSupportRefEncryptedKeyTest.php
+++ b/tests/WSSecurity/XML/sp/MustSupportRefEncryptedKeyTest.php
@@ -4,7 +4,10 @@
 
 namespace SimpleSAML\Test\WSSecurity\XML\sp;
 
+use PHPUnit\Framework\Attributes\CoversClass;
 use PHPUnit\Framework\TestCase;
+use SimpleSAML\WSSecurity\XML\sp\AbstractQNameAssertionType;
+use SimpleSAML\WSSecurity\XML\sp\AbstractSpElement;
 use SimpleSAML\WSSecurity\XML\sp\MustSupportRefEncryptedKey;
 use SimpleSAML\XML\DOMDocumentFactory;
 use SimpleSAML\XML\TestUtils\SchemaValidationTestTrait;
@@ -15,12 +18,11 @@
 /**
  * Class \SimpleSAML\WSSecurity\XML\sp\MustSupportRefEncryptedKeyTest
  *
- * @covers \SimpleSAML\WSSecurity\XML\sp\MustSupportRefEncryptedKey
- * @covers \SimpleSAML\WSSecurity\XML\sp\AbstractQNameAssertionType
- * @covers \SimpleSAML\WSSecurity\XML\sp\AbstractSpElement
- *
  * @package simplesamlphp/ws-security
  */
+#[CoversClass(MustSupportRefEncryptedKey::class)]
+#[CoversClass(AbstractQNameAssertionType::class)]
+#[CoversClass(AbstractSpElement::class)]
 final class MustSupportRefEncryptedKeyTest extends TestCase
 {
     use QNameAssertionTypeTestTrait;
diff --git a/tests/WSSecurity/XML/sp/MustSupportRefExternalURITest.php b/tests/WSSecurity/XML/sp/MustSupportRefExternalURITest.php
index 3074d90b..4e8d6c07 100644
--- a/tests/WSSecurity/XML/sp/MustSupportRefExternalURITest.php
+++ b/tests/WSSecurity/XML/sp/MustSupportRefExternalURITest.php
@@ -4,7 +4,10 @@
 
 namespace SimpleSAML\Test\WSSecurity\XML\sp;
 
+use PHPUnit\Framework\Attributes\CoversClass;
 use PHPUnit\Framework\TestCase;
+use SimpleSAML\WSSecurity\XML\sp\AbstractQNameAssertionType;
+use SimpleSAML\WSSecurity\XML\sp\AbstractSpElement;
 use SimpleSAML\WSSecurity\XML\sp\MustSupportRefExternalURI;
 use SimpleSAML\XML\DOMDocumentFactory;
 use SimpleSAML\XML\TestUtils\SchemaValidationTestTrait;
@@ -15,12 +18,11 @@
 /**
  * Class \SimpleSAML\WSSecurity\XML\sp\MustSupportRefExternalURITest
  *
- * @covers \SimpleSAML\WSSecurity\XML\sp\MustSupportRefExternalURI
- * @covers \SimpleSAML\WSSecurity\XML\sp\AbstractQNameAssertionType
- * @covers \SimpleSAML\WSSecurity\XML\sp\AbstractSpElement
- *
  * @package simplesamlphp/ws-security
  */
+#[CoversClass(MustSupportRefExternalURI::class)]
+#[CoversClass(AbstractQNameAssertionType::class)]
+#[CoversClass(AbstractSpElement::class)]
 final class MustSupportRefExternalURITest extends TestCase
 {
     use QNameAssertionTypeTestTrait;
diff --git a/tests/WSSecurity/XML/sp/MustSupportRefIssuerSerialTest.php b/tests/WSSecurity/XML/sp/MustSupportRefIssuerSerialTest.php
index 6f8a71c8..f44025ae 100644
--- a/tests/WSSecurity/XML/sp/MustSupportRefIssuerSerialTest.php
+++ b/tests/WSSecurity/XML/sp/MustSupportRefIssuerSerialTest.php
@@ -4,7 +4,10 @@
 
 namespace SimpleSAML\Test\WSSecurity\XML\sp;
 
+use PHPUnit\Framework\Attributes\CoversClass;
 use PHPUnit\Framework\TestCase;
+use SimpleSAML\WSSecurity\XML\sp\AbstractQNameAssertionType;
+use SimpleSAML\WSSecurity\XML\sp\AbstractSpElement;
 use SimpleSAML\WSSecurity\XML\sp\MustSupportRefIssuerSerial;
 use SimpleSAML\XML\DOMDocumentFactory;
 use SimpleSAML\XML\TestUtils\SchemaValidationTestTrait;
@@ -15,12 +18,11 @@
 /**
  * Class \SimpleSAML\WSSecurity\XML\sp\MustSupportRefIssuerSerialTest
  *
- * @covers \SimpleSAML\WSSecurity\XML\sp\MustSupportRefIssuerSerial
- * @covers \SimpleSAML\WSSecurity\XML\sp\AbstractQNameAssertionType
- * @covers \SimpleSAML\WSSecurity\XML\sp\AbstractSpElement
- *
  * @package simplesamlphp/ws-security
  */
+#[CoversClass(MustSupportRefIssuerSerial::class)]
+#[CoversClass(AbstractQNameAssertionType::class)]
+#[CoversClass(AbstractSpElement::class)]
 final class MustSupportRefIssuerSerialTest extends TestCase
 {
     use QNameAssertionTypeTestTrait;
diff --git a/tests/WSSecurity/XML/sp/MustSupportRefKeyIdentifierTest.php b/tests/WSSecurity/XML/sp/MustSupportRefKeyIdentifierTest.php
index 8942a9a2..7974bc5d 100644
--- a/tests/WSSecurity/XML/sp/MustSupportRefKeyIdentifierTest.php
+++ b/tests/WSSecurity/XML/sp/MustSupportRefKeyIdentifierTest.php
@@ -4,7 +4,10 @@
 
 namespace SimpleSAML\Test\WSSecurity\XML\sp;
 
+use PHPUnit\Framework\Attributes\CoversClass;
 use PHPUnit\Framework\TestCase;
+use SimpleSAML\WSSecurity\XML\sp\AbstractQNameAssertionType;
+use SimpleSAML\WSSecurity\XML\sp\AbstractSpElement;
 use SimpleSAML\WSSecurity\XML\sp\MustSupportRefKeyIdentifier;
 use SimpleSAML\XML\DOMDocumentFactory;
 use SimpleSAML\XML\TestUtils\SchemaValidationTestTrait;
@@ -15,12 +18,11 @@
 /**
  * Class \SimpleSAML\WSSecurity\XML\sp\MustSupportRefKeyIdentifierTest
  *
- * @covers \SimpleSAML\WSSecurity\XML\sp\MustSupportRefKeyIdentifier
- * @covers \SimpleSAML\WSSecurity\XML\sp\AbstractQNameAssertionType
- * @covers \SimpleSAML\WSSecurity\XML\sp\AbstractSpElement
- *
  * @package simplesamlphp/ws-security
  */
+#[CoversClass(MustSupportRefKeyIdentifier::class)]
+#[CoversClass(AbstractQNameAssertionType::class)]
+#[CoversClass(AbstractSpElement::class)]
 final class MustSupportRefKeyIdentifierTest extends TestCase
 {
     use QNameAssertionTypeTestTrait;
diff --git a/tests/WSSecurity/XML/sp/MustSupportRefThumbprintTest.php b/tests/WSSecurity/XML/sp/MustSupportRefThumbprintTest.php
index 47d8e41a..02c46b7f 100644
--- a/tests/WSSecurity/XML/sp/MustSupportRefThumbprintTest.php
+++ b/tests/WSSecurity/XML/sp/MustSupportRefThumbprintTest.php
@@ -4,7 +4,10 @@
 
 namespace SimpleSAML\Test\WSSecurity\XML\sp;
 
+use PHPUnit\Framework\Attributes\CoversClass;
 use PHPUnit\Framework\TestCase;
+use SimpleSAML\WSSecurity\XML\sp\AbstractQNameAssertionType;
+use SimpleSAML\WSSecurity\XML\sp\AbstractSpElement;
 use SimpleSAML\WSSecurity\XML\sp\MustSupportRefThumbprint;
 use SimpleSAML\XML\DOMDocumentFactory;
 use SimpleSAML\XML\TestUtils\SchemaValidationTestTrait;
@@ -15,12 +18,11 @@
 /**
  * Class \SimpleSAML\WSSecurity\XML\sp\MustSupportRefThumbprintTest
  *
- * @covers \SimpleSAML\WSSecurity\XML\sp\MustSupportRefThumbprint
- * @covers \SimpleSAML\WSSecurity\XML\sp\AbstractQNameAssertionType
- * @covers \SimpleSAML\WSSecurity\XML\sp\AbstractSpElement
- *
  * @package simplesamlphp/ws-security
  */
+#[CoversClass(MustSupportRefThumbprint::class)]
+#[CoversClass(AbstractQNameAssertionType::class)]
+#[CoversClass(AbstractSpElement::class)]
 final class MustSupportRefThumbprintTest extends TestCase
 {
     use QNameAssertionTypeTestTrait;
diff --git a/tests/WSSecurity/XML/sp/MustSupportServerChallengeTest.php b/tests/WSSecurity/XML/sp/MustSupportServerChallengeTest.php
index 187a0963..1f606d0a 100644
--- a/tests/WSSecurity/XML/sp/MustSupportServerChallengeTest.php
+++ b/tests/WSSecurity/XML/sp/MustSupportServerChallengeTest.php
@@ -4,7 +4,10 @@
 
 namespace SimpleSAML\Test\WSSecurity\XML\sp;
 
+use PHPUnit\Framework\Attributes\CoversClass;
 use PHPUnit\Framework\TestCase;
+use SimpleSAML\WSSecurity\XML\sp\AbstractQNameAssertionType;
+use SimpleSAML\WSSecurity\XML\sp\AbstractSpElement;
 use SimpleSAML\WSSecurity\XML\sp\MustSupportServerChallenge;
 use SimpleSAML\XML\DOMDocumentFactory;
 use SimpleSAML\XML\TestUtils\SchemaValidationTestTrait;
@@ -15,12 +18,11 @@
 /**
  * Class \SimpleSAML\WSSecurity\XML\sp\MustSupportServerChallengeTest
  *
- * @covers \SimpleSAML\WSSecurity\XML\sp\MustSupportServerChallenge
- * @covers \SimpleSAML\WSSecurity\XML\sp\AbstractQNameAssertionType
- * @covers \SimpleSAML\WSSecurity\XML\sp\AbstractSpElement
- *
  * @package simplesamlphp/ws-security
  */
+#[CoversClass(MustSupportServerChallenge::class)]
+#[CoversClass(AbstractQNameAssertionType::class)]
+#[CoversClass(AbstractSpElement::class)]
 final class MustSupportServerChallengeTest extends TestCase
 {
     use QNameAssertionTypeTestTrait;
diff --git a/tests/WSSecurity/XML/sp/NoPasswordTest.php b/tests/WSSecurity/XML/sp/NoPasswordTest.php
index cbe2d236..e2327799 100644
--- a/tests/WSSecurity/XML/sp/NoPasswordTest.php
+++ b/tests/WSSecurity/XML/sp/NoPasswordTest.php
@@ -4,7 +4,10 @@
 
 namespace SimpleSAML\Test\WSSecurity\XML\sp;
 
+use PHPUnit\Framework\Attributes\CoversClass;
 use PHPUnit\Framework\TestCase;
+use SimpleSAML\WSSecurity\XML\sp\AbstractQNameAssertionType;
+use SimpleSAML\WSSecurity\XML\sp\AbstractSpElement;
 use SimpleSAML\WSSecurity\XML\sp\NoPassword;
 use SimpleSAML\XML\DOMDocumentFactory;
 use SimpleSAML\XML\TestUtils\SchemaValidationTestTrait;
@@ -15,12 +18,11 @@
 /**
  * Class \SimpleSAML\WSSecurity\XML\sp\NoPasswordTest
  *
- * @covers \SimpleSAML\WSSecurity\XML\sp\NoPassword
- * @covers \SimpleSAML\WSSecurity\XML\sp\AbstractQNameAssertionType
- * @covers \SimpleSAML\WSSecurity\XML\sp\AbstractSpElement
- *
  * @package simplesamlphp/ws-security
  */
+#[CoversClass(NoPassword::class)]
+#[CoversClass(AbstractQNameAssertionType::class)]
+#[CoversClass(AbstractSpElement::class)]
 final class NoPasswordTest extends TestCase
 {
     use QNameAssertionTypeTestTrait;
diff --git a/tests/WSSecurity/XML/sp/OnlySignEntireHeadersAndBodyTest.php b/tests/WSSecurity/XML/sp/OnlySignEntireHeadersAndBodyTest.php
index 37523f5d..3ab3c6c1 100644
--- a/tests/WSSecurity/XML/sp/OnlySignEntireHeadersAndBodyTest.php
+++ b/tests/WSSecurity/XML/sp/OnlySignEntireHeadersAndBodyTest.php
@@ -4,7 +4,10 @@
 
 namespace SimpleSAML\Test\WSSecurity\XML\sp;
 
+use PHPUnit\Framework\Attributes\CoversClass;
 use PHPUnit\Framework\TestCase;
+use SimpleSAML\WSSecurity\XML\sp\AbstractQNameAssertionType;
+use SimpleSAML\WSSecurity\XML\sp\AbstractSpElement;
 use SimpleSAML\WSSecurity\XML\sp\OnlySignEntireHeadersAndBody;
 use SimpleSAML\XML\DOMDocumentFactory;
 use SimpleSAML\XML\TestUtils\SchemaValidationTestTrait;
@@ -15,12 +18,11 @@
 /**
  * Class \SimpleSAML\WSSecurity\XML\sp\OnlySignEntireHeadersAndBodyTest
  *
- * @covers \SimpleSAML\WSSecurity\XML\sp\OnlySignEntireHeadersAndBody
- * @covers \SimpleSAML\WSSecurity\XML\sp\AbstractQNameAssertionType
- * @covers \SimpleSAML\WSSecurity\XML\sp\AbstractSpElement
- *
  * @package simplesamlphp/ws-security
  */
+#[CoversClass(OnlySignEntireHeadersAndBody::class)]
+#[CoversClass(AbstractQNameAssertionType::class)]
+#[CoversClass(AbstractSpElement::class)]
 final class OnlySignEntireHeadersAndBodyTest extends TestCase
 {
     use QNameAssertionTypeTestTrait;
diff --git a/tests/WSSecurity/XML/sp/ProtectTokensTest.php b/tests/WSSecurity/XML/sp/ProtectTokensTest.php
index de9798aa..0ce430df 100644
--- a/tests/WSSecurity/XML/sp/ProtectTokensTest.php
+++ b/tests/WSSecurity/XML/sp/ProtectTokensTest.php
@@ -4,7 +4,10 @@
 
 namespace SimpleSAML\Test\WSSecurity\XML\sp;
 
+use PHPUnit\Framework\Attributes\CoversClass;
 use PHPUnit\Framework\TestCase;
+use SimpleSAML\WSSecurity\XML\sp\AbstractQNameAssertionType;
+use SimpleSAML\WSSecurity\XML\sp\AbstractSpElement;
 use SimpleSAML\WSSecurity\XML\sp\ProtectTokens;
 use SimpleSAML\XML\DOMDocumentFactory;
 use SimpleSAML\XML\TestUtils\SchemaValidationTestTrait;
@@ -15,12 +18,11 @@
 /**
  * Class \SimpleSAML\WSSecurity\XML\sp\ProtectTokensTest
  *
- * @covers \SimpleSAML\WSSecurity\XML\sp\ProtectTokens
- * @covers \SimpleSAML\WSSecurity\XML\sp\AbstractQNameAssertionType
- * @covers \SimpleSAML\WSSecurity\XML\sp\AbstractSpElement
- *
  * @package simplesamlphp/ws-security
  */
+#[CoversClass(ProtectTokens::class)]
+#[CoversClass(AbstractQNameAssertionType::class)]
+#[CoversClass(AbstractSpElement::class)]
 final class ProtectTokensTest extends TestCase
 {
     use QNameAssertionTypeTestTrait;
diff --git a/tests/WSSecurity/XML/sp/ProtectionTokenTest.php b/tests/WSSecurity/XML/sp/ProtectionTokenTest.php
index 9524bb25..c1e69d2c 100644
--- a/tests/WSSecurity/XML/sp/ProtectionTokenTest.php
+++ b/tests/WSSecurity/XML/sp/ProtectionTokenTest.php
@@ -4,8 +4,11 @@
 
 namespace SimpleSAML\Test\WSSecurity\XML\sp;
 
+use PHPUnit\Framework\Attributes\CoversClass;
 use PHPUnit\Framework\TestCase;
 use SimpleSAML\Test\WSSecurity\Constants as C;
+use SimpleSAML\WSSecurity\XML\sp\AbstractNestedPolicyType;
+use SimpleSAML\WSSecurity\XML\sp\AbstractSpElement;
 use SimpleSAML\WSSecurity\XML\sp\ProtectionToken;
 use SimpleSAML\XML\Attribute as XMLAttribute;
 use SimpleSAML\XML\Chunk;
@@ -18,12 +21,11 @@
 /**
  * Class \SimpleSAML\WSSecurity\XML\sp\ProtectionTokenTest
  *
- * @covers \SimpleSAML\WSSecurity\XML\sp\ProtectionToken
- * @covers \SimpleSAML\WSSecurity\XML\sp\AbstractNestedPolicyType
- * @covers \SimpleSAML\WSSecurity\XML\sp\AbstractSpElement
- *
  * @package simplesamlphp/ws-security
  */
+#[CoversClass(ProtectionToken::class)]
+#[CoversClass(AbstractNestedPolicyType::class)]
+#[CoversClass(AbstractSpElement::class)]
 final class ProtectionTokenTest extends TestCase
 {
     use NestedPolicyTypeTestTrait;
diff --git a/tests/WSSecurity/XML/sp/RecipientEncryptionTokenTest.php b/tests/WSSecurity/XML/sp/RecipientEncryptionTokenTest.php
index b96fa022..06366be7 100644
--- a/tests/WSSecurity/XML/sp/RecipientEncryptionTokenTest.php
+++ b/tests/WSSecurity/XML/sp/RecipientEncryptionTokenTest.php
@@ -4,8 +4,11 @@
 
 namespace SimpleSAML\Test\WSSecurity\XML\sp;
 
+use PHPUnit\Framework\Attributes\CoversClass;
 use PHPUnit\Framework\TestCase;
 use SimpleSAML\Test\WSSecurity\Constants as C;
+use SimpleSAML\WSSecurity\XML\sp\AbstractNestedPolicyType;
+use SimpleSAML\WSSecurity\XML\sp\AbstractSpElement;
 use SimpleSAML\WSSecurity\XML\sp\RecipientEncryptionToken;
 use SimpleSAML\XML\Attribute as XMLAttribute;
 use SimpleSAML\XML\Chunk;
@@ -18,12 +21,11 @@
 /**
  * Class \SimpleSAML\WSSecurity\XML\sp\RecipientEncryptionTokenTest
  *
- * @covers \SimpleSAML\WSSecurity\XML\sp\RecipientEncryptionToken
- * @covers \SimpleSAML\WSSecurity\XML\sp\AbstractNestedPolicyType
- * @covers \SimpleSAML\WSSecurity\XML\sp\AbstractSpElement
- *
  * @package simplesamlphp/ws-security
  */
+#[CoversClass(RecipientEncryptionToken::class)]
+#[CoversClass(AbstractNestedPolicyType::class)]
+#[CoversClass(AbstractSpElement::class)]
 final class RecipientEncryptionTokenTest extends TestCase
 {
     use NestedPolicyTypeTestTrait;
diff --git a/tests/WSSecurity/XML/sp/RecipientSignatureTokenTest.php b/tests/WSSecurity/XML/sp/RecipientSignatureTokenTest.php
index 3ac199c1..dc898e29 100644
--- a/tests/WSSecurity/XML/sp/RecipientSignatureTokenTest.php
+++ b/tests/WSSecurity/XML/sp/RecipientSignatureTokenTest.php
@@ -4,8 +4,11 @@
 
 namespace SimpleSAML\Test\WSSecurity\XML\sp;
 
+use PHPUnit\Framework\Attributes\CoversClass;
 use PHPUnit\Framework\TestCase;
 use SimpleSAML\Test\WSSecurity\Constants as C;
+use SimpleSAML\WSSecurity\XML\sp\AbstractNestedPolicyType;
+use SimpleSAML\WSSecurity\XML\sp\AbstractSpElement;
 use SimpleSAML\WSSecurity\XML\sp\RecipientSignatureToken;
 use SimpleSAML\XML\Attribute as XMLAttribute;
 use SimpleSAML\XML\Chunk;
@@ -18,12 +21,11 @@
 /**
  * Class \SimpleSAML\WSSecurity\XML\sp\RecipientSignatureTokenTest
  *
- * @covers \SimpleSAML\WSSecurity\XML\sp\RecipientSignatureToken
- * @covers \SimpleSAML\WSSecurity\XML\sp\AbstractNestedPolicyType
- * @covers \SimpleSAML\WSSecurity\XML\sp\AbstractSpElement
- *
  * @package simplesamlphp/ws-security
  */
+#[CoversClass(RecipientSignatureToken::class)]
+#[CoversClass(AbstractNestedPolicyType::class)]
+#[CoversClass(AbstractSpElement::class)]
 final class RecipientSignatureTokenTest extends TestCase
 {
     use NestedPolicyTypeTestTrait;
diff --git a/tests/WSSecurity/XML/sp/RecipientTokenTest.php b/tests/WSSecurity/XML/sp/RecipientTokenTest.php
index fcfc4748..77e94d1c 100644
--- a/tests/WSSecurity/XML/sp/RecipientTokenTest.php
+++ b/tests/WSSecurity/XML/sp/RecipientTokenTest.php
@@ -4,8 +4,11 @@
 
 namespace SimpleSAML\Test\WSSecurity\XML\sp;
 
+use PHPUnit\Framework\Attributes\CoversClass;
 use PHPUnit\Framework\TestCase;
 use SimpleSAML\Test\WSSecurity\Constants as C;
+use SimpleSAML\WSSecurity\XML\sp\AbstractNestedPolicyType;
+use SimpleSAML\WSSecurity\XML\sp\AbstractSpElement;
 use SimpleSAML\WSSecurity\XML\sp\RecipientToken;
 use SimpleSAML\XML\Attribute as XMLAttribute;
 use SimpleSAML\XML\Chunk;
@@ -18,12 +21,11 @@
 /**
  * Class \SimpleSAML\WSSecurity\XML\sp\RecipientTokenTest
  *
- * @covers \SimpleSAML\WSSecurity\XML\sp\RecipientToken
- * @covers \SimpleSAML\WSSecurity\XML\sp\AbstractNestedPolicyType
- * @covers \SimpleSAML\WSSecurity\XML\sp\AbstractSpElement
- *
  * @package simplesamlphp/ws-security
  */
+#[CoversClass(RecipientToken::class)]
+#[CoversClass(AbstractNestedPolicyType::class)]
+#[CoversClass(AbstractSpElement::class)]
 final class RecipientTokenTest extends TestCase
 {
     use NestedPolicyTypeTestTrait;
diff --git a/tests/WSSecurity/XML/sp/RelTokenTest.php b/tests/WSSecurity/XML/sp/RelTokenTest.php
index c88b1377..2192239a 100644
--- a/tests/WSSecurity/XML/sp/RelTokenTest.php
+++ b/tests/WSSecurity/XML/sp/RelTokenTest.php
@@ -4,9 +4,13 @@
 
 namespace SimpleSAML\Test\WSSecurity\XML\sp;
 
+use PHPUnit\Framework\Attributes\CoversClass;
 use PHPUnit\Framework\TestCase;
 use SimpleSAML\Test\WSSecurity\Constants as C;
+use SimpleSAML\WSSecurity\XML\sp\AbstractSpElement;
+use SimpleSAML\WSSecurity\XML\sp\AbstractTokenAssertionType;
 use SimpleSAML\WSSecurity\XML\sp\IncludeToken;
+use SimpleSAML\WSSecurity\XML\sp\IncludeTokenTypeTrait;
 use SimpleSAML\WSSecurity\XML\sp\RelToken;
 use SimpleSAML\XML\Attribute as XMLAttribute;
 use SimpleSAML\XML\Chunk;
@@ -19,13 +23,12 @@
 /**
  * Class \SimpleSAML\WSSecurity\XML\sp\RelTokenTest
  *
- * @covers \SimpleSAML\WSSecurity\XML\sp\RelToken
- * @covers \SimpleSAML\WSSecurity\XML\sp\IncludeTokenTypeTrait
- * @covers \SimpleSAML\WSSecurity\XML\sp\AbstractTokenAssertionType
- * @covers \SimpleSAML\WSSecurity\XML\sp\AbstractSpElement
- *
  * @package simplesamlphp/ws-security
  */
+#[CoversClass(RelToken::class)]
+#[CoversClass(IncludeTokenTypeTrait::class)]
+#[CoversClass(AbstractTokenAssertionType::class)]
+#[CoversClass(AbstractSpElement::class)]
 final class RelTokenTest extends TestCase
 {
     use SchemaValidationTestTrait;
diff --git a/tests/WSSecurity/XML/sp/RequestSecurityTokenTemplateTest.php b/tests/WSSecurity/XML/sp/RequestSecurityTokenTemplateTest.php
index 0df18b20..bac84638 100644
--- a/tests/WSSecurity/XML/sp/RequestSecurityTokenTemplateTest.php
+++ b/tests/WSSecurity/XML/sp/RequestSecurityTokenTemplateTest.php
@@ -4,8 +4,11 @@
 
 namespace SimpleSAML\Test\WSSecurity\XML\sp;
 
+use PHPUnit\Framework\Attributes\CoversClass;
 use PHPUnit\Framework\TestCase;
 use SimpleSAML\Test\WSSecurity\Constants as C;
+use SimpleSAML\WSSecurity\XML\sp\AbstractRequestSecurityTokenTemplateType;
+use SimpleSAML\WSSecurity\XML\sp\AbstractSpElement;
 use SimpleSAML\WSSecurity\XML\sp\RequestSecurityTokenTemplate;
 use SimpleSAML\XML\Attribute as XMLAttribute;
 use SimpleSAML\XML\Chunk;
@@ -17,12 +20,11 @@
 /**
  * Class \SimpleSAML\WSSecurity\XML\sp\RequestSecurityTokenTemplateTest
  *
- * @covers \SimpleSAML\WSSecurity\XML\sp\RequestSecurityTokenTemplate
- * @covers \SimpleSAML\WSSecurity\XML\sp\AbstractRequestSecurityTokenTemplateType
- * @covers \SimpleSAML\WSSecurity\XML\sp\AbstractSpElement
- *
  * @package simplesamlphp/ws-security
  */
+#[CoversClass(RequestSecurityTokenTemplate::class)]
+#[CoversClass(AbstractRequestSecurityTokenTemplateType::class)]
+#[CoversClass(AbstractSpElement::class)]
 final class RequestSecurityTokenTemplateTest extends TestCase
 {
     use SerializableElementTestTrait;
diff --git a/tests/WSSecurity/XML/sp/RequireAppliesToTest.php b/tests/WSSecurity/XML/sp/RequireAppliesToTest.php
index 57dbdd90..323cf257 100644
--- a/tests/WSSecurity/XML/sp/RequireAppliesToTest.php
+++ b/tests/WSSecurity/XML/sp/RequireAppliesToTest.php
@@ -4,7 +4,10 @@
 
 namespace SimpleSAML\Test\WSSecurity\XML\sp;
 
+use PHPUnit\Framework\Attributes\CoversClass;
 use PHPUnit\Framework\TestCase;
+use SimpleSAML\WSSecurity\XML\sp\AbstractQNameAssertionType;
+use SimpleSAML\WSSecurity\XML\sp\AbstractSpElement;
 use SimpleSAML\WSSecurity\XML\sp\RequireAppliesTo;
 use SimpleSAML\XML\DOMDocumentFactory;
 use SimpleSAML\XML\TestUtils\SchemaValidationTestTrait;
@@ -15,12 +18,11 @@
 /**
  * Class \SimpleSAML\WSSecurity\XML\sp\RequireAppliesToTest
  *
- * @covers \SimpleSAML\WSSecurity\XML\sp\RequireAppliesTo
- * @covers \SimpleSAML\WSSecurity\XML\sp\AbstractQNameAssertionType
- * @covers \SimpleSAML\WSSecurity\XML\sp\AbstractSpElement
- *
  * @package simplesamlphp/ws-security
  */
+#[CoversClass(RequireAppliesTo::class)]
+#[CoversClass(AbstractQNameAssertionType::class)]
+#[CoversClass(AbstractSpElement::class)]
 final class RequireAppliesToTest extends TestCase
 {
     use QNameAssertionTypeTestTrait;
diff --git a/tests/WSSecurity/XML/sp/RequireClientCertificateTest.php b/tests/WSSecurity/XML/sp/RequireClientCertificateTest.php
index 45b2b5ed..abf41cd6 100644
--- a/tests/WSSecurity/XML/sp/RequireClientCertificateTest.php
+++ b/tests/WSSecurity/XML/sp/RequireClientCertificateTest.php
@@ -4,7 +4,10 @@
 
 namespace SimpleSAML\Test\WSSecurity\XML\sp;
 
+use PHPUnit\Framework\Attributes\CoversClass;
 use PHPUnit\Framework\TestCase;
+use SimpleSAML\WSSecurity\XML\sp\AbstractQNameAssertionType;
+use SimpleSAML\WSSecurity\XML\sp\AbstractSpElement;
 use SimpleSAML\WSSecurity\XML\sp\RequireClientCertificate;
 use SimpleSAML\XML\DOMDocumentFactory;
 use SimpleSAML\XML\TestUtils\SchemaValidationTestTrait;
@@ -15,12 +18,11 @@
 /**
  * Class \SimpleSAML\WSSecurity\XML\sp\RequireClientCertificateTest
  *
- * @covers \SimpleSAML\WSSecurity\XML\sp\RequireClientCertificate
- * @covers \SimpleSAML\WSSecurity\XML\sp\AbstractQNameAssertionType
- * @covers \SimpleSAML\WSSecurity\XML\sp\AbstractSpElement
- *
  * @package simplesamlphp/ws-security
  */
+#[CoversClass(RequireClientCertificate::class)]
+#[CoversClass(AbstractQNameAssertionType::class)]
+#[CoversClass(AbstractSpElement::class)]
 final class RequireClientCertificateTest extends TestCase
 {
     use QNameAssertionTypeTestTrait;
diff --git a/tests/WSSecurity/XML/sp/RequireClientEntropyTest.php b/tests/WSSecurity/XML/sp/RequireClientEntropyTest.php
index 1d402b9a..db78cf9c 100644
--- a/tests/WSSecurity/XML/sp/RequireClientEntropyTest.php
+++ b/tests/WSSecurity/XML/sp/RequireClientEntropyTest.php
@@ -4,7 +4,10 @@
 
 namespace SimpleSAML\Test\WSSecurity\XML\sp;
 
+use PHPUnit\Framework\Attributes\CoversClass;
 use PHPUnit\Framework\TestCase;
+use SimpleSAML\WSSecurity\XML\sp\AbstractQNameAssertionType;
+use SimpleSAML\WSSecurity\XML\sp\AbstractSpElement;
 use SimpleSAML\WSSecurity\XML\sp\RequireClientEntropy;
 use SimpleSAML\XML\DOMDocumentFactory;
 use SimpleSAML\XML\TestUtils\SchemaValidationTestTrait;
@@ -15,12 +18,11 @@
 /**
  * Class \SimpleSAML\WSSecurity\XML\sp\RequireClientEntropyTest
  *
- * @covers \SimpleSAML\WSSecurity\XML\sp\RequireClientEntropy
- * @covers \SimpleSAML\WSSecurity\XML\sp\AbstractQNameAssertionType
- * @covers \SimpleSAML\WSSecurity\XML\sp\AbstractSpElement
- *
  * @package simplesamlphp/ws-security
  */
+#[CoversClass(RequireClientEntropy::class)]
+#[CoversClass(AbstractQNameAssertionType::class)]
+#[CoversClass(AbstractSpElement::class)]
 final class RequireClientEntropyTest extends TestCase
 {
     use QNameAssertionTypeTestTrait;
diff --git a/tests/WSSecurity/XML/sp/RequireDerivedKeysTest.php b/tests/WSSecurity/XML/sp/RequireDerivedKeysTest.php
index 167cd4a5..41c4167f 100644
--- a/tests/WSSecurity/XML/sp/RequireDerivedKeysTest.php
+++ b/tests/WSSecurity/XML/sp/RequireDerivedKeysTest.php
@@ -4,7 +4,10 @@
 
 namespace SimpleSAML\Test\WSSecurity\XML\sp;
 
+use PHPUnit\Framework\Attributes\CoversClass;
 use PHPUnit\Framework\TestCase;
+use SimpleSAML\WSSecurity\XML\sp\AbstractQNameAssertionType;
+use SimpleSAML\WSSecurity\XML\sp\AbstractSpElement;
 use SimpleSAML\WSSecurity\XML\sp\RequireDerivedKeys;
 use SimpleSAML\XML\DOMDocumentFactory;
 use SimpleSAML\XML\TestUtils\SchemaValidationTestTrait;
@@ -15,12 +18,11 @@
 /**
  * Class \SimpleSAML\WSSecurity\XML\sp\RequireDerivedKeysTest
  *
- * @covers \SimpleSAML\WSSecurity\XML\sp\RequireDerivedKeys
- * @covers \SimpleSAML\WSSecurity\XML\sp\AbstractQNameAssertionType
- * @covers \SimpleSAML\WSSecurity\XML\sp\AbstractSpElement
- *
  * @package simplesamlphp/ws-security
  */
+#[CoversClass(RequireDerivedKeys::class)]
+#[CoversClass(AbstractQNameAssertionType::class)]
+#[CoversClass(AbstractSpElement::class)]
 final class RequireDerivedKeysTest extends TestCase
 {
     use QNameAssertionTypeTestTrait;
diff --git a/tests/WSSecurity/XML/sp/RequireEmbeddedTokenReferenceTest.php b/tests/WSSecurity/XML/sp/RequireEmbeddedTokenReferenceTest.php
index deffc5df..4f2dd02c 100644
--- a/tests/WSSecurity/XML/sp/RequireEmbeddedTokenReferenceTest.php
+++ b/tests/WSSecurity/XML/sp/RequireEmbeddedTokenReferenceTest.php
@@ -4,7 +4,10 @@
 
 namespace SimpleSAML\Test\WSSecurity\XML\sp;
 
+use PHPUnit\Framework\Attributes\CoversClass;
 use PHPUnit\Framework\TestCase;
+use SimpleSAML\WSSecurity\XML\sp\AbstractQNameAssertionType;
+use SimpleSAML\WSSecurity\XML\sp\AbstractSpElement;
 use SimpleSAML\WSSecurity\XML\sp\RequireEmbeddedTokenReference;
 use SimpleSAML\XML\DOMDocumentFactory;
 use SimpleSAML\XML\TestUtils\SchemaValidationTestTrait;
@@ -15,12 +18,11 @@
 /**
  * Class \SimpleSAML\WSSecurity\XML\sp\RequireEmbeddedTokenReferenceTest
  *
- * @covers \SimpleSAML\WSSecurity\XML\sp\RequireEmbeddedTokenReference
- * @covers \SimpleSAML\WSSecurity\XML\sp\AbstractQNameAssertionType
- * @covers \SimpleSAML\WSSecurity\XML\sp\AbstractSpElement
- *
  * @package simplesamlphp/ws-security
  */
+#[CoversClass(RequireEmbeddedTokenReference::class)]
+#[CoversClass(AbstractQNameAssertionType::class)]
+#[CoversClass(AbstractSpElement::class)]
 final class RequireEmbeddedTokenReferenceTest extends TestCase
 {
     use QNameAssertionTypeTestTrait;
diff --git a/tests/WSSecurity/XML/sp/RequireExplicitDerivedKeysTest.php b/tests/WSSecurity/XML/sp/RequireExplicitDerivedKeysTest.php
index e9d18cd9..596fcd4b 100644
--- a/tests/WSSecurity/XML/sp/RequireExplicitDerivedKeysTest.php
+++ b/tests/WSSecurity/XML/sp/RequireExplicitDerivedKeysTest.php
@@ -4,7 +4,10 @@
 
 namespace SimpleSAML\Test\WSSecurity\XML\sp;
 
+use PHPUnit\Framework\Attributes\CoversClass;
 use PHPUnit\Framework\TestCase;
+use SimpleSAML\WSSecurity\XML\sp\AbstractQNameAssertionType;
+use SimpleSAML\WSSecurity\XML\sp\AbstractSpElement;
 use SimpleSAML\WSSecurity\XML\sp\RequireExplicitDerivedKeys;
 use SimpleSAML\XML\DOMDocumentFactory;
 use SimpleSAML\XML\TestUtils\SchemaValidationTestTrait;
@@ -15,12 +18,11 @@
 /**
  * Class \SimpleSAML\WSSecurity\XML\sp\RequireExplicitDerivedKeysTest
  *
- * @covers \SimpleSAML\WSSecurity\XML\sp\RequireExplicitDerivedKeys
- * @covers \SimpleSAML\WSSecurity\XML\sp\AbstractQNameAssertionType
- * @covers \SimpleSAML\WSSecurity\XML\sp\AbstractSpElement
- *
  * @package simplesamlphp/ws-security
  */
+#[CoversClass(RequireExplicitDerivedKeys::class)]
+#[CoversClass(AbstractQNameAssertionType::class)]
+#[CoversClass(AbstractSpElement::class)]
 final class RequireExplicitDerivedKeysTest extends TestCase
 {
     use QNameAssertionTypeTestTrait;
diff --git a/tests/WSSecurity/XML/sp/RequireExternalUriReferenceTest.php b/tests/WSSecurity/XML/sp/RequireExternalUriReferenceTest.php
index 9b4ef9b4..446d0522 100644
--- a/tests/WSSecurity/XML/sp/RequireExternalUriReferenceTest.php
+++ b/tests/WSSecurity/XML/sp/RequireExternalUriReferenceTest.php
@@ -4,7 +4,10 @@
 
 namespace SimpleSAML\Test\WSSecurity\XML\sp;
 
+use PHPUnit\Framework\Attributes\CoversClass;
 use PHPUnit\Framework\TestCase;
+use SimpleSAML\WSSecurity\XML\sp\AbstractQNameAssertionType;
+use SimpleSAML\WSSecurity\XML\sp\AbstractSpElement;
 use SimpleSAML\WSSecurity\XML\sp\RequireExternalUriReference;
 use SimpleSAML\XML\DOMDocumentFactory;
 use SimpleSAML\XML\TestUtils\SchemaValidationTestTrait;
@@ -15,12 +18,11 @@
 /**
  * Class \SimpleSAML\WSSecurity\XML\sp\RequireExternalUriReferenceTest
  *
- * @covers \SimpleSAML\WSSecurity\XML\sp\RequireExternalUriReference
- * @covers \SimpleSAML\WSSecurity\XML\sp\AbstractQNameAssertionType
- * @covers \SimpleSAML\WSSecurity\XML\sp\AbstractSpElement
- *
  * @package simplesamlphp/ws-security
  */
+#[CoversClass(RequireExternalUriReference::class)]
+#[CoversClass(AbstractQNameAssertionType::class)]
+#[CoversClass(AbstractSpElement::class)]
 final class RequireExternalUriReferenceTest extends TestCase
 {
     use QNameAssertionTypeTestTrait;
diff --git a/tests/WSSecurity/XML/sp/RequireImpliedDerivedKeysTest.php b/tests/WSSecurity/XML/sp/RequireImpliedDerivedKeysTest.php
index 1b1a5e13..ba3e743e 100644
--- a/tests/WSSecurity/XML/sp/RequireImpliedDerivedKeysTest.php
+++ b/tests/WSSecurity/XML/sp/RequireImpliedDerivedKeysTest.php
@@ -4,7 +4,10 @@
 
 namespace SimpleSAML\Test\WSSecurity\XML\sp;
 
+use PHPUnit\Framework\Attributes\CoversClass;
 use PHPUnit\Framework\TestCase;
+use SimpleSAML\WSSecurity\XML\sp\AbstractQNameAssertionType;
+use SimpleSAML\WSSecurity\XML\sp\AbstractSpElement;
 use SimpleSAML\WSSecurity\XML\sp\RequireImpliedDerivedKeys;
 use SimpleSAML\XML\DOMDocumentFactory;
 use SimpleSAML\XML\TestUtils\SchemaValidationTestTrait;
@@ -15,12 +18,11 @@
 /**
  * Class \SimpleSAML\WSSecurity\XML\sp\RequireImpliedDerivedKeysTest
  *
- * @covers \SimpleSAML\WSSecurity\XML\sp\RequireImpliedDerivedKeys
- * @covers \SimpleSAML\WSSecurity\XML\sp\AbstractQNameAssertionType
- * @covers \SimpleSAML\WSSecurity\XML\sp\AbstractSpElement
- *
  * @package simplesamlphp/ws-security
  */
+#[CoversClass(RequireImpliedDerivedKeys::class)]
+#[CoversClass(AbstractQNameAssertionType::class)]
+#[CoversClass(AbstractSpElement::class)]
 final class RequireImpliedDerivedKeysTest extends TestCase
 {
     use QNameAssertionTypeTestTrait;
diff --git a/tests/WSSecurity/XML/sp/RequireInternalReferenceTest.php b/tests/WSSecurity/XML/sp/RequireInternalReferenceTest.php
index b8729d1e..c8a6f3d2 100644
--- a/tests/WSSecurity/XML/sp/RequireInternalReferenceTest.php
+++ b/tests/WSSecurity/XML/sp/RequireInternalReferenceTest.php
@@ -4,7 +4,10 @@
 
 namespace SimpleSAML\Test\WSSecurity\XML\sp;
 
+use PHPUnit\Framework\Attributes\CoversClass;
 use PHPUnit\Framework\TestCase;
+use SimpleSAML\WSSecurity\XML\sp\AbstractQNameAssertionType;
+use SimpleSAML\WSSecurity\XML\sp\AbstractSpElement;
 use SimpleSAML\WSSecurity\XML\sp\RequireInternalReference;
 use SimpleSAML\XML\DOMDocumentFactory;
 use SimpleSAML\XML\TestUtils\SchemaValidationTestTrait;
@@ -15,12 +18,11 @@
 /**
  * Class \SimpleSAML\WSSecurity\XML\sp\RequireInternalReferenceTest
  *
- * @covers \SimpleSAML\WSSecurity\XML\sp\RequireInternalReference
- * @covers \SimpleSAML\WSSecurity\XML\sp\AbstractQNameAssertionType
- * @covers \SimpleSAML\WSSecurity\XML\sp\AbstractSpElement
- *
  * @package simplesamlphp/ws-security
  */
+#[CoversClass(RequireInternalReference::class)]
+#[CoversClass(AbstractQNameAssertionType::class)]
+#[CoversClass(AbstractSpElement::class)]
 final class RequireInternalReferenceTest extends TestCase
 {
     use QNameAssertionTypeTestTrait;
diff --git a/tests/WSSecurity/XML/sp/RequireIssuerSerialReferenceTest.php b/tests/WSSecurity/XML/sp/RequireIssuerSerialReferenceTest.php
index a82911c4..231af10b 100644
--- a/tests/WSSecurity/XML/sp/RequireIssuerSerialReferenceTest.php
+++ b/tests/WSSecurity/XML/sp/RequireIssuerSerialReferenceTest.php
@@ -4,7 +4,10 @@
 
 namespace SimpleSAML\Test\WSSecurity\XML\sp;
 
+use PHPUnit\Framework\Attributes\CoversClass;
 use PHPUnit\Framework\TestCase;
+use SimpleSAML\WSSecurity\XML\sp\AbstractQNameAssertionType;
+use SimpleSAML\WSSecurity\XML\sp\AbstractSpElement;
 use SimpleSAML\WSSecurity\XML\sp\RequireIssuerSerialReference;
 use SimpleSAML\XML\DOMDocumentFactory;
 use SimpleSAML\XML\TestUtils\SchemaValidationTestTrait;
@@ -15,12 +18,11 @@
 /**
  * Class \SimpleSAML\WSSecurity\XML\sp\RequireIssuerSerialReferenceTest
  *
- * @covers \SimpleSAML\WSSecurity\XML\sp\RequireIssuerSerialReference
- * @covers \SimpleSAML\WSSecurity\XML\sp\AbstractQNameAssertionType
- * @covers \SimpleSAML\WSSecurity\XML\sp\AbstractSpElement
- *
  * @package simplesamlphp/ws-security
  */
+#[CoversClass(RequireIssuerSerialReference::class)]
+#[CoversClass(AbstractQNameAssertionType::class)]
+#[CoversClass(AbstractSpElement::class)]
 final class RequireIssuerSerialReferenceTest extends TestCase
 {
     use QNameAssertionTypeTestTrait;
diff --git a/tests/WSSecurity/XML/sp/RequireKeyIdentifierReferenceTest.php b/tests/WSSecurity/XML/sp/RequireKeyIdentifierReferenceTest.php
index 0ccb8adc..d8d98e08 100644
--- a/tests/WSSecurity/XML/sp/RequireKeyIdentifierReferenceTest.php
+++ b/tests/WSSecurity/XML/sp/RequireKeyIdentifierReferenceTest.php
@@ -4,7 +4,10 @@
 
 namespace SimpleSAML\Test\WSSecurity\XML\sp;
 
+use PHPUnit\Framework\Attributes\CoversClass;
 use PHPUnit\Framework\TestCase;
+use SimpleSAML\WSSecurity\XML\sp\AbstractQNameAssertionType;
+use SimpleSAML\WSSecurity\XML\sp\AbstractSpElement;
 use SimpleSAML\WSSecurity\XML\sp\RequireKeyIdentifierReference;
 use SimpleSAML\XML\DOMDocumentFactory;
 use SimpleSAML\XML\TestUtils\SchemaValidationTestTrait;
@@ -15,12 +18,11 @@
 /**
  * Class \SimpleSAML\WSSecurity\XML\sp\RequireKeyIdentifierReferenceTest
  *
- * @covers \SimpleSAML\WSSecurity\XML\sp\RequireKeyIdentifierReference
- * @covers \SimpleSAML\WSSecurity\XML\sp\AbstractQNameAssertionType
- * @covers \SimpleSAML\WSSecurity\XML\sp\AbstractSpElement
- *
  * @package simplesamlphp/ws-security
  */
+#[CoversClass(RequireKeyIdentifierReference::class)]
+#[CoversClass(AbstractQNameAssertionType::class)]
+#[CoversClass(AbstractSpElement::class)]
 final class RequireKeyIdentifierReferenceTest extends TestCase
 {
     use QNameAssertionTypeTestTrait;
diff --git a/tests/WSSecurity/XML/sp/RequireRequestSecurityTokenCollectionTest.php b/tests/WSSecurity/XML/sp/RequireRequestSecurityTokenCollectionTest.php
index bb2b5cc2..ab98c259 100644
--- a/tests/WSSecurity/XML/sp/RequireRequestSecurityTokenCollectionTest.php
+++ b/tests/WSSecurity/XML/sp/RequireRequestSecurityTokenCollectionTest.php
@@ -4,7 +4,10 @@
 
 namespace SimpleSAML\Test\WSSecurity\XML\sp;
 
+use PHPUnit\Framework\Attributes\CoversClass;
 use PHPUnit\Framework\TestCase;
+use SimpleSAML\WSSecurity\XML\sp\AbstractQNameAssertionType;
+use SimpleSAML\WSSecurity\XML\sp\AbstractSpElement;
 use SimpleSAML\WSSecurity\XML\sp\RequireRequestSecurityTokenCollection;
 use SimpleSAML\XML\DOMDocumentFactory;
 use SimpleSAML\XML\TestUtils\SchemaValidationTestTrait;
@@ -15,12 +18,11 @@
 /**
  * Class \SimpleSAML\WSSecurity\XML\sp\RequireRequestSecurityTokenCollectionTest
  *
- * @covers \SimpleSAML\WSSecurity\XML\sp\RequireRequestSecurityTokenCollection
- * @covers \SimpleSAML\WSSecurity\XML\sp\AbstractQNameAssertionType
- * @covers \SimpleSAML\WSSecurity\XML\sp\AbstractSpElement
- *
  * @package simplesamlphp/ws-security
  */
+#[CoversClass(RequireRequestSecurityTokenCollection::class)]
+#[CoversClass(AbstractQNameAssertionType::class)]
+#[CoversClass(AbstractSpElement::class)]
 final class RequireRequestSecurityTokenCollectionTest extends TestCase
 {
     use QNameAssertionTypeTestTrait;
diff --git a/tests/WSSecurity/XML/sp/RequireServerEntropyTest.php b/tests/WSSecurity/XML/sp/RequireServerEntropyTest.php
index 778b87ee..b8fa30af 100644
--- a/tests/WSSecurity/XML/sp/RequireServerEntropyTest.php
+++ b/tests/WSSecurity/XML/sp/RequireServerEntropyTest.php
@@ -4,7 +4,10 @@
 
 namespace SimpleSAML\Test\WSSecurity\XML\sp;
 
+use PHPUnit\Framework\Attributes\CoversClass;
 use PHPUnit\Framework\TestCase;
+use SimpleSAML\WSSecurity\XML\sp\AbstractQNameAssertionType;
+use SimpleSAML\WSSecurity\XML\sp\AbstractSpElement;
 use SimpleSAML\WSSecurity\XML\sp\RequireServerEntropy;
 use SimpleSAML\XML\DOMDocumentFactory;
 use SimpleSAML\XML\TestUtils\SchemaValidationTestTrait;
@@ -15,12 +18,11 @@
 /**
  * Class \SimpleSAML\WSSecurity\XML\sp\RequireServerEntropyTest
  *
- * @covers \SimpleSAML\WSSecurity\XML\sp\RequireServerEntropy
- * @covers \SimpleSAML\WSSecurity\XML\sp\AbstractQNameAssertionType
- * @covers \SimpleSAML\WSSecurity\XML\sp\AbstractSpElement
- *
  * @package simplesamlphp/ws-security
  */
+#[CoversClass(RequireServerEntropy::class)]
+#[CoversClass(AbstractQNameAssertionType::class)]
+#[CoversClass(AbstractSpElement::class)]
 final class RequireServerEntropyTest extends TestCase
 {
     use QNameAssertionTypeTestTrait;
diff --git a/tests/WSSecurity/XML/sp/RequireSignatureConfirmationTest.php b/tests/WSSecurity/XML/sp/RequireSignatureConfirmationTest.php
index 13340441..e30a865a 100644
--- a/tests/WSSecurity/XML/sp/RequireSignatureConfirmationTest.php
+++ b/tests/WSSecurity/XML/sp/RequireSignatureConfirmationTest.php
@@ -4,7 +4,10 @@
 
 namespace SimpleSAML\Test\WSSecurity\XML\sp;
 
+use PHPUnit\Framework\Attributes\CoversClass;
 use PHPUnit\Framework\TestCase;
+use SimpleSAML\WSSecurity\XML\sp\AbstractQNameAssertionType;
+use SimpleSAML\WSSecurity\XML\sp\AbstractSpElement;
 use SimpleSAML\WSSecurity\XML\sp\RequireSignatureConfirmation;
 use SimpleSAML\XML\DOMDocumentFactory;
 use SimpleSAML\XML\TestUtils\SchemaValidationTestTrait;
@@ -15,12 +18,11 @@
 /**
  * Class \SimpleSAML\WSSecurity\XML\sp\RequireSignatureConfirmationTest
  *
- * @covers \SimpleSAML\WSSecurity\XML\sp\RequireSignatureConfirmation
- * @covers \SimpleSAML\WSSecurity\XML\sp\AbstractQNameAssertionType
- * @covers \SimpleSAML\WSSecurity\XML\sp\AbstractSpElement
- *
  * @package simplesamlphp/ws-security
  */
+#[CoversClass(RequireSignatureConfirmation::class)]
+#[CoversClass(AbstractQNameAssertionType::class)]
+#[CoversClass(AbstractSpElement::class)]
 final class RequireSignatureConfirmationTest extends TestCase
 {
     use QNameAssertionTypeTestTrait;
diff --git a/tests/WSSecurity/XML/sp/RequireThumbprintReferenceTest.php b/tests/WSSecurity/XML/sp/RequireThumbprintReferenceTest.php
index 9241ff55..ad98a9d3 100644
--- a/tests/WSSecurity/XML/sp/RequireThumbprintReferenceTest.php
+++ b/tests/WSSecurity/XML/sp/RequireThumbprintReferenceTest.php
@@ -4,7 +4,10 @@
 
 namespace SimpleSAML\Test\WSSecurity\XML\sp;
 
+use PHPUnit\Framework\Attributes\CoversClass;
 use PHPUnit\Framework\TestCase;
+use SimpleSAML\WSSecurity\XML\sp\AbstractQNameAssertionType;
+use SimpleSAML\WSSecurity\XML\sp\AbstractSpElement;
 use SimpleSAML\WSSecurity\XML\sp\RequireThumbprintReference;
 use SimpleSAML\XML\DOMDocumentFactory;
 use SimpleSAML\XML\TestUtils\SchemaValidationTestTrait;
@@ -15,12 +18,11 @@
 /**
  * Class \SimpleSAML\WSSecurity\XML\sp\RequireThumbprintReferenceTest
  *
- * @covers \SimpleSAML\WSSecurity\XML\sp\RequireThumbprintReference
- * @covers \SimpleSAML\WSSecurity\XML\sp\AbstractQNameAssertionType
- * @covers \SimpleSAML\WSSecurity\XML\sp\AbstractSpElement
- *
  * @package simplesamlphp/ws-security
  */
+#[CoversClass(RequireThumbprintReference::class)]
+#[CoversClass(AbstractQNameAssertionType::class)]
+#[CoversClass(AbstractSpElement::class)]
 final class RequireThumbprintReferenceTest extends TestCase
 {
     use QNameAssertionTypeTestTrait;
diff --git a/tests/WSSecurity/XML/sp/RequiredElementsTest.php b/tests/WSSecurity/XML/sp/RequiredElementsTest.php
index 4bed7311..ab37a1dc 100644
--- a/tests/WSSecurity/XML/sp/RequiredElementsTest.php
+++ b/tests/WSSecurity/XML/sp/RequiredElementsTest.php
@@ -4,9 +4,12 @@
 
 namespace SimpleSAML\Test\WSSecurity\XML\sp;
 
+use PHPUnit\Framework\Attributes\CoversClass;
 use PHPUnit\Framework\TestCase;
 use SimpleSAML\Test\WSSecurity\Constants as C;
 use SimpleSAML\WSSecurity\Utils\XPath as XMLXPath;
+use SimpleSAML\WSSecurity\XML\sp\AbstractSerElementsType;
+use SimpleSAML\WSSecurity\XML\sp\AbstractSpElement;
 use SimpleSAML\WSSecurity\XML\sp\RequiredElements;
 use SimpleSAML\WSSecurity\XML\sp\XPath;
 use SimpleSAML\XML\Attribute as XMLAttribute;
@@ -20,12 +23,11 @@
 /**
  * Class \SimpleSAML\WSSecurity\XML\sp\RequiredElementsTest
  *
- * @covers \SimpleSAML\WSSecurity\XML\sp\RequiredElements
- * @covers \SimpleSAML\WSSecurity\XML\sp\AbstractSerElementsType
- * @covers \SimpleSAML\WSSecurity\XML\sp\AbstractSpElement
- *
  * @package simplesamlphp/ws-security
  */
+#[CoversClass(RequiredElements::class)]
+#[CoversClass(AbstractSerElementsType::class)]
+#[CoversClass(AbstractSpElement::class)]
 final class RequiredElementsTest extends TestCase
 {
     use SchemaValidationTestTrait;
diff --git a/tests/WSSecurity/XML/sp/RequiredPartsTest.php b/tests/WSSecurity/XML/sp/RequiredPartsTest.php
index 297e7db1..40aa7781 100644
--- a/tests/WSSecurity/XML/sp/RequiredPartsTest.php
+++ b/tests/WSSecurity/XML/sp/RequiredPartsTest.php
@@ -4,9 +4,12 @@
 
 namespace SimpleSAML\Test\WSSecurity\XML\sp;
 
+use PHPUnit\Framework\Attributes\CoversClass;
 use PHPUnit\Framework\TestCase;
 use SimpleSAML\Test\WSSecurity\Constants as C;
 use SimpleSAML\WSSecurity\Utils\XPath;
+use SimpleSAML\WSSecurity\XML\sp\AbstractReqPartsType;
+use SimpleSAML\WSSecurity\XML\sp\AbstractSpElement;
 use SimpleSAML\WSSecurity\XML\sp\Header;
 use SimpleSAML\WSSecurity\XML\sp\RequiredParts;
 use SimpleSAML\XML\Attribute as XMLAttribute;
@@ -20,12 +23,11 @@
 /**
  * Class \SimpleSAML\WSSecurity\XML\sp\RequiredPartsTest
  *
- * @covers \SimpleSAML\WSSecurity\XML\sp\RequiredParts
- * @covers \SimpleSAML\WSSecurity\XML\sp\AbstractReqPartsType
- * @covers \SimpleSAML\WSSecurity\XML\sp\AbstractSpElement
- *
  * @package simplesamlphp/ws-security
  */
+#[CoversClass(RequiredParts::class)]
+#[CoversClass(AbstractReqPartsType::class)]
+#[CoversClass(AbstractSpElement::class)]
 final class RequiredPartsTest extends TestCase
 {
     use SchemaValidationTestTrait;
diff --git a/tests/WSSecurity/XML/sp/RsaKeyValueTest.php b/tests/WSSecurity/XML/sp/RsaKeyValueTest.php
index def49ace..17a68b7a 100644
--- a/tests/WSSecurity/XML/sp/RsaKeyValueTest.php
+++ b/tests/WSSecurity/XML/sp/RsaKeyValueTest.php
@@ -4,7 +4,10 @@
 
 namespace SimpleSAML\Test\WSSecurity\XML\sp;
 
+use PHPUnit\Framework\Attributes\CoversClass;
 use PHPUnit\Framework\TestCase;
+use SimpleSAML\WSSecurity\XML\sp\AbstractQNameAssertionType;
+use SimpleSAML\WSSecurity\XML\sp\AbstractSpElement;
 use SimpleSAML\WSSecurity\XML\sp\RsaKeyValue;
 use SimpleSAML\XML\DOMDocumentFactory;
 use SimpleSAML\XML\TestUtils\SchemaValidationTestTrait;
@@ -15,12 +18,11 @@
 /**
  * Class \SimpleSAML\WSSecurity\XML\sp\RsaKeyValueTest
  *
- * @covers \SimpleSAML\WSSecurity\XML\sp\RsaKeyValue
- * @covers \SimpleSAML\WSSecurity\XML\sp\AbstractQNameAssertionType
- * @covers \SimpleSAML\WSSecurity\XML\sp\AbstractSpElement
- *
  * @package simplesamlphp/ws-security
  */
+#[CoversClass(RsaKeyValue::class)]
+#[CoversClass(AbstractQNameAssertionType::class)]
+#[CoversClass(AbstractSpElement::class)]
 final class RsaKeyValueTest extends TestCase
 {
     use QNameAssertionTypeTestTrait;
diff --git a/tests/WSSecurity/XML/sp/SC13SecurityContextTokenTest.php b/tests/WSSecurity/XML/sp/SC13SecurityContextTokenTest.php
index aefe42f1..edc13179 100644
--- a/tests/WSSecurity/XML/sp/SC13SecurityContextTokenTest.php
+++ b/tests/WSSecurity/XML/sp/SC13SecurityContextTokenTest.php
@@ -4,7 +4,10 @@
 
 namespace SimpleSAML\Test\WSSecurity\XML\sp;
 
+use PHPUnit\Framework\Attributes\CoversClass;
 use PHPUnit\Framework\TestCase;
+use SimpleSAML\WSSecurity\XML\sp\AbstractQNameAssertionType;
+use SimpleSAML\WSSecurity\XML\sp\AbstractSpElement;
 use SimpleSAML\WSSecurity\XML\sp\SC13SecurityContextToken;
 use SimpleSAML\XML\DOMDocumentFactory;
 use SimpleSAML\XML\TestUtils\SchemaValidationTestTrait;
@@ -15,12 +18,11 @@
 /**
  * Class \SimpleSAML\WSSecurity\XML\sp\SC13SecurityContextTokenTest
  *
- * @covers \SimpleSAML\WSSecurity\XML\sp\SC13SecurityContextToken
- * @covers \SimpleSAML\WSSecurity\XML\sp\AbstractQNameAssertionType
- * @covers \SimpleSAML\WSSecurity\XML\sp\AbstractSpElement
- *
  * @package simplesamlphp/ws-security
  */
+#[CoversClass(SC13SecurityContextToken::class)]
+#[CoversClass(AbstractQNameAssertionType::class)]
+#[CoversClass(AbstractSpElement::class)]
 final class SC13SecurityContextTokenTest extends TestCase
 {
     use QNameAssertionTypeTestTrait;
diff --git a/tests/WSSecurity/XML/sp/SOAPNormalization10Test.php b/tests/WSSecurity/XML/sp/SOAPNormalization10Test.php
index 8799c78d..f0fef21c 100644
--- a/tests/WSSecurity/XML/sp/SOAPNormalization10Test.php
+++ b/tests/WSSecurity/XML/sp/SOAPNormalization10Test.php
@@ -4,7 +4,10 @@
 
 namespace SimpleSAML\Test\WSSecurity\XML\sp;
 
+use PHPUnit\Framework\Attributes\CoversClass;
 use PHPUnit\Framework\TestCase;
+use SimpleSAML\WSSecurity\XML\sp\AbstractQNameAssertionType;
+use SimpleSAML\WSSecurity\XML\sp\AbstractSpElement;
 use SimpleSAML\WSSecurity\XML\sp\SOAPNormalization10;
 use SimpleSAML\XML\DOMDocumentFactory;
 use SimpleSAML\XML\TestUtils\SchemaValidationTestTrait;
@@ -15,12 +18,11 @@
 /**
  * Class \SimpleSAML\WSSecurity\XML\sp\SOAPNormalization10Test
  *
- * @covers \SimpleSAML\WSSecurity\XML\sp\SOAPNormalization10
- * @covers \SimpleSAML\WSSecurity\XML\sp\AbstractQNameAssertionType
- * @covers \SimpleSAML\WSSecurity\XML\sp\AbstractSpElement
- *
  * @package simplesamlphp/ws-security
  */
+#[CoversClass(SOAPNormalization10::class)]
+#[CoversClass(AbstractQNameAssertionType::class)]
+#[CoversClass(AbstractSpElement::class)]
 final class SOAPNormalization10Test extends TestCase
 {
     use QNameAssertionTypeTestTrait;
diff --git a/tests/WSSecurity/XML/sp/STRTransform10Test.php b/tests/WSSecurity/XML/sp/STRTransform10Test.php
index 6e07a211..76ad807d 100644
--- a/tests/WSSecurity/XML/sp/STRTransform10Test.php
+++ b/tests/WSSecurity/XML/sp/STRTransform10Test.php
@@ -4,7 +4,10 @@
 
 namespace SimpleSAML\Test\WSSecurity\XML\sp;
 
+use PHPUnit\Framework\Attributes\CoversClass;
 use PHPUnit\Framework\TestCase;
+use SimpleSAML\WSSecurity\XML\sp\AbstractQNameAssertionType;
+use SimpleSAML\WSSecurity\XML\sp\AbstractSpElement;
 use SimpleSAML\WSSecurity\XML\sp\STRTransform10;
 use SimpleSAML\XML\DOMDocumentFactory;
 use SimpleSAML\XML\TestUtils\SchemaValidationTestTrait;
@@ -15,12 +18,11 @@
 /**
  * Class \SimpleSAML\WSSecurity\XML\sp\STRTransform10Test
  *
- * @covers \SimpleSAML\WSSecurity\XML\sp\STRTransform10
- * @covers \SimpleSAML\WSSecurity\XML\sp\AbstractQNameAssertionType
- * @covers \SimpleSAML\WSSecurity\XML\sp\AbstractSpElement
- *
  * @package simplesamlphp/ws-security
  */
+#[CoversClass(STRTransform10::class)]
+#[CoversClass(AbstractQNameAssertionType::class)]
+#[CoversClass(AbstractSpElement::class)]
 final class STRTransform10Test extends TestCase
 {
     use QNameAssertionTypeTestTrait;
diff --git a/tests/WSSecurity/XML/sp/SamlTokenTest.php b/tests/WSSecurity/XML/sp/SamlTokenTest.php
index f7edc4fd..d3e8796c 100644
--- a/tests/WSSecurity/XML/sp/SamlTokenTest.php
+++ b/tests/WSSecurity/XML/sp/SamlTokenTest.php
@@ -4,9 +4,13 @@
 
 namespace SimpleSAML\Test\WSSecurity\XML\sp;
 
+use PHPUnit\Framework\Attributes\CoversClass;
 use PHPUnit\Framework\TestCase;
 use SimpleSAML\Test\WSSecurity\Constants as C;
+use SimpleSAML\WSSecurity\XML\sp\AbstractSpElement;
+use SimpleSAML\WSSecurity\XML\sp\AbstractTokenAssertionType;
 use SimpleSAML\WSSecurity\XML\sp\IncludeToken;
+use SimpleSAML\WSSecurity\XML\sp\IncludeTokenTypeTrait;
 use SimpleSAML\WSSecurity\XML\sp\SamlToken;
 use SimpleSAML\XML\Attribute as XMLAttribute;
 use SimpleSAML\XML\Chunk;
@@ -19,13 +23,12 @@
 /**
  * Class \SimpleSAML\WSSecurity\XML\sp\SamlTokenTest
  *
- * @covers \SimpleSAML\WSSecurity\XML\sp\SamlToken
- * @covers \SimpleSAML\WSSecurity\XML\sp\IncludeTokenTypeTrait
- * @covers \SimpleSAML\WSSecurity\XML\sp\AbstractTokenAssertionType
- * @covers \SimpleSAML\WSSecurity\XML\sp\AbstractSpElement
- *
  * @package simplesamlphp/ws-security
  */
+#[CoversClass(SamlToken::class)]
+#[CoversClass(IncludeTokenTypeTrait::class)]
+#[CoversClass(AbstractTokenAssertionType::class)]
+#[CoversClass(AbstractSpElement::class)]
 final class SamlTokenTest extends TestCase
 {
     use SchemaValidationTestTrait;
diff --git a/tests/WSSecurity/XML/sp/SecureConversationTokenTest.php b/tests/WSSecurity/XML/sp/SecureConversationTokenTest.php
index 08bac834..5ec8dc94 100644
--- a/tests/WSSecurity/XML/sp/SecureConversationTokenTest.php
+++ b/tests/WSSecurity/XML/sp/SecureConversationTokenTest.php
@@ -4,10 +4,14 @@
 
 namespace SimpleSAML\Test\WSSecurity\XML\sp;
 
+use PHPUnit\Framework\Attributes\CoversClass;
 use PHPUnit\Framework\TestCase;
 use SimpleSAML\Test\WSSecurity\Constants as C;
 use SimpleSAML\WSSecurity\Utils\XPath;
+use SimpleSAML\WSSecurity\XML\sp\AbstractSecureConversationTokenType;
+use SimpleSAML\WSSecurity\XML\sp\AbstractSpElement;
 use SimpleSAML\WSSecurity\XML\sp\IncludeToken;
+use SimpleSAML\WSSecurity\XML\sp\IncludeTokenTypeTrait;
 use SimpleSAML\WSSecurity\XML\sp\IssuerName;
 use SimpleSAML\WSSecurity\XML\sp\SecureConversationToken;
 use SimpleSAML\XML\Attribute as XMLAttribute;
@@ -21,13 +25,12 @@
 /**
  * Class \SimpleSAML\WSSecurity\XML\sp\SecureConversationTokenTest
  *
- * @covers \SimpleSAML\WSSecurity\XML\sp\SecureConversationToken
- * @covers \SimpleSAML\WSSecurity\XML\sp\IncludeTokenTypeTrait
- * @covers \SimpleSAML\WSSecurity\XML\sp\AbstractSecureConversationTokenType
- * @covers \SimpleSAML\WSSecurity\XML\sp\AbstractSpElement
- *
  * @package simplesamlphp/ws-security
  */
+#[CoversClass(SecureConversationToken::class)]
+#[CoversClass(IncludeTokenTypeTrait::class)]
+#[CoversClass(AbstractSecureConversationTokenType::class)]
+#[CoversClass(AbstractSpElement::class)]
 final class SecureConversationTokenTest extends TestCase
 {
     use SchemaValidationTestTrait;
diff --git a/tests/WSSecurity/XML/sp/SecurityContextTokenTest.php b/tests/WSSecurity/XML/sp/SecurityContextTokenTest.php
index be13200a..326e83fc 100644
--- a/tests/WSSecurity/XML/sp/SecurityContextTokenTest.php
+++ b/tests/WSSecurity/XML/sp/SecurityContextTokenTest.php
@@ -4,9 +4,13 @@
 
 namespace SimpleSAML\Test\WSSecurity\XML\sp;
 
+use PHPUnit\Framework\Attributes\CoversClass;
 use PHPUnit\Framework\TestCase;
 use SimpleSAML\Test\WSSecurity\Constants as C;
+use SimpleSAML\WSSecurity\XML\sp\AbstractSpElement;
+use SimpleSAML\WSSecurity\XML\sp\AbstractTokenAssertionType;
 use SimpleSAML\WSSecurity\XML\sp\IncludeToken;
+use SimpleSAML\WSSecurity\XML\sp\IncludeTokenTypeTrait;
 use SimpleSAML\WSSecurity\XML\sp\SecurityContextToken;
 use SimpleSAML\XML\Attribute as XMLAttribute;
 use SimpleSAML\XML\Chunk;
@@ -19,13 +23,12 @@
 /**
  * Class \SimpleSAML\WSSecurity\XML\sp\SecurityContextTokenTest
  *
- * @covers \SimpleSAML\WSSecurity\XML\sp\SecurityContextToken
- * @covers \SimpleSAML\WSSecurity\XML\sp\IncludeTokenTypeTrait
- * @covers \SimpleSAML\WSSecurity\XML\sp\AbstractTokenAssertionType
- * @covers \SimpleSAML\WSSecurity\XML\sp\AbstractSpElement
- *
  * @package simplesamlphp/ws-security
  */
+#[CoversClass(SecurityContextToken::class)]
+#[CoversClass(IncludeTokenTypeTrait::class)]
+#[CoversClass(AbstractTokenAssertionType::class)]
+#[CoversClass(AbstractSpElement::class)]
 final class SecurityContextTokenTest extends TestCase
 {
     use SchemaValidationTestTrait;
diff --git a/tests/WSSecurity/XML/sp/SignatureTokenTest.php b/tests/WSSecurity/XML/sp/SignatureTokenTest.php
index 92d220f0..f4fce23d 100644
--- a/tests/WSSecurity/XML/sp/SignatureTokenTest.php
+++ b/tests/WSSecurity/XML/sp/SignatureTokenTest.php
@@ -4,8 +4,11 @@
 
 namespace SimpleSAML\Test\WSSecurity\XML\sp;
 
+use PHPUnit\Framework\Attributes\CoversClass;
 use PHPUnit\Framework\TestCase;
 use SimpleSAML\Test\WSSecurity\Constants as C;
+use SimpleSAML\WSSecurity\XML\sp\AbstractNestedPolicyType;
+use SimpleSAML\WSSecurity\XML\sp\AbstractSpElement;
 use SimpleSAML\WSSecurity\XML\sp\SignatureToken;
 use SimpleSAML\XML\Attribute as XMLAttribute;
 use SimpleSAML\XML\Chunk;
@@ -18,12 +21,11 @@
 /**
  * Class \SimpleSAML\WSSecurity\XML\sp\SignatureTokenTest
  *
- * @covers \SimpleSAML\WSSecurity\XML\sp\SignatureToken
- * @covers \SimpleSAML\WSSecurity\XML\sp\AbstractNestedPolicyType
- * @covers \SimpleSAML\WSSecurity\XML\sp\AbstractSpElement
- *
  * @package simplesamlphp/ws-security
  */
+#[CoversClass(SignatureToken::class)]
+#[CoversClass(AbstractNestedPolicyType::class)]
+#[CoversClass(AbstractSpElement::class)]
 final class SignatureTokenTest extends TestCase
 {
     use NestedPolicyTypeTestTrait;
diff --git a/tests/WSSecurity/XML/sp/SignedElementsTest.php b/tests/WSSecurity/XML/sp/SignedElementsTest.php
index 4099fdfc..a6c81ddd 100644
--- a/tests/WSSecurity/XML/sp/SignedElementsTest.php
+++ b/tests/WSSecurity/XML/sp/SignedElementsTest.php
@@ -4,9 +4,12 @@
 
 namespace SimpleSAML\Test\WSSecurity\XML\sp;
 
+use PHPUnit\Framework\Attributes\CoversClass;
 use PHPUnit\Framework\TestCase;
 use SimpleSAML\Test\WSSecurity\Constants as C;
 use SimpleSAML\WSSecurity\Utils\XPath as XMLXPath;
+use SimpleSAML\WSSecurity\XML\sp\AbstractSerElementsType;
+use SimpleSAML\WSSecurity\XML\sp\AbstractSpElement;
 use SimpleSAML\WSSecurity\XML\sp\SignedElements;
 use SimpleSAML\WSSecurity\XML\sp\XPath;
 use SimpleSAML\XML\Attribute as XMLAttribute;
@@ -20,12 +23,11 @@
 /**
  * Class \SimpleSAML\WSSecurity\XML\sp\SignedElementsTest
  *
- * @covers \SimpleSAML\WSSecurity\XML\sp\SignedElements
- * @covers \SimpleSAML\WSSecurity\XML\sp\AbstractSerElementsType
- * @covers \SimpleSAML\WSSecurity\XML\sp\AbstractSpElement
- *
  * @package simplesamlphp/ws-security
  */
+#[CoversClass(SignedElements::class)]
+#[CoversClass(AbstractSerElementsType::class)]
+#[CoversClass(AbstractSpElement::class)]
 final class SignedElementsTest extends TestCase
 {
     use SchemaValidationTestTrait;
diff --git a/tests/WSSecurity/XML/sp/SignedEncryptedSupportingTokensTest.php b/tests/WSSecurity/XML/sp/SignedEncryptedSupportingTokensTest.php
index 61c38a72..e06de246 100644
--- a/tests/WSSecurity/XML/sp/SignedEncryptedSupportingTokensTest.php
+++ b/tests/WSSecurity/XML/sp/SignedEncryptedSupportingTokensTest.php
@@ -4,8 +4,11 @@
 
 namespace SimpleSAML\Test\WSSecurity\XML\sp;
 
+use PHPUnit\Framework\Attributes\CoversClass;
 use PHPUnit\Framework\TestCase;
 use SimpleSAML\Test\WSSecurity\Constants as C;
+use SimpleSAML\WSSecurity\XML\sp\AbstractNestedPolicyType;
+use SimpleSAML\WSSecurity\XML\sp\AbstractSpElement;
 use SimpleSAML\WSSecurity\XML\sp\SignedEncryptedSupportingTokens;
 use SimpleSAML\XML\Attribute as XMLAttribute;
 use SimpleSAML\XML\Chunk;
@@ -18,12 +21,11 @@
 /**
  * Class \SimpleSAML\WSSecurity\XML\sp\SignedEncryptedSupportingTokensTest
  *
- * @covers \SimpleSAML\WSSecurity\XML\sp\SignedEncryptedSupportingTokens
- * @covers \SimpleSAML\WSSecurity\XML\sp\AbstractNestedPolicyType
- * @covers \SimpleSAML\WSSecurity\XML\sp\AbstractSpElement
- *
  * @package simplesamlphp/ws-security
  */
+#[CoversClass(SignedEncryptedSupportingTokens::class)]
+#[CoversClass(AbstractNestedPolicyType::class)]
+#[CoversClass(AbstractSpElement::class)]
 final class SignedEncryptedSupportingTokensTest extends TestCase
 {
     use NestedPolicyTypeTestTrait;
diff --git a/tests/WSSecurity/XML/sp/SignedEndorsingEncryptedSupportingTokensTest.php b/tests/WSSecurity/XML/sp/SignedEndorsingEncryptedSupportingTokensTest.php
index ce8ddd1d..0385bd14 100644
--- a/tests/WSSecurity/XML/sp/SignedEndorsingEncryptedSupportingTokensTest.php
+++ b/tests/WSSecurity/XML/sp/SignedEndorsingEncryptedSupportingTokensTest.php
@@ -4,8 +4,11 @@
 
 namespace SimpleSAML\Test\WSSecurity\XML\sp;
 
+use PHPUnit\Framework\Attributes\CoversClass;
 use PHPUnit\Framework\TestCase;
 use SimpleSAML\Test\WSSecurity\Constants as C;
+use SimpleSAML\WSSecurity\XML\sp\AbstractNestedPolicyType;
+use SimpleSAML\WSSecurity\XML\sp\AbstractSpElement;
 use SimpleSAML\WSSecurity\XML\sp\SignedEndorsingEncryptedSupportingTokens;
 use SimpleSAML\XML\Attribute as XMLAttribute;
 use SimpleSAML\XML\Chunk;
@@ -18,12 +21,11 @@
 /**
  * Class \SimpleSAML\WSSecurity\XML\sp\SignedEndorsingEncryptedSupportingTokensTest
  *
- * @covers \SimpleSAML\WSSecurity\XML\sp\EncryptedSupportingTokens
- * @covers \SimpleSAML\WSSecurity\XML\sp\AbstractNestedPolicyType
- * @covers \SimpleSAML\WSSecurity\XML\sp\AbstractSpElement
- *
  * @package simplesamlphp/ws-security
  */
+#[CoversClass(SignedEndorsingEncryptedSupportingTokens::class)]
+#[CoversClass(AbstractNestedPolicyType::class)]
+#[CoversClass(AbstractSpElement::class)]
 final class SignedEndorsingEncryptedSupportingTokensTest extends TestCase
 {
     use NestedPolicyTypeTestTrait;
diff --git a/tests/WSSecurity/XML/sp/SignedEndorsingSupportingTokensTest.php b/tests/WSSecurity/XML/sp/SignedEndorsingSupportingTokensTest.php
index fa75d8d5..8c9af89d 100644
--- a/tests/WSSecurity/XML/sp/SignedEndorsingSupportingTokensTest.php
+++ b/tests/WSSecurity/XML/sp/SignedEndorsingSupportingTokensTest.php
@@ -4,8 +4,11 @@
 
 namespace SimpleSAML\Test\WSSecurity\XML\sp;
 
+use PHPUnit\Framework\Attributes\CoversClass;
 use PHPUnit\Framework\TestCase;
 use SimpleSAML\Test\WSSecurity\Constants as C;
+use SimpleSAML\WSSecurity\XML\sp\AbstractNestedPolicyType;
+use SimpleSAML\WSSecurity\XML\sp\AbstractSpElement;
 use SimpleSAML\WSSecurity\XML\sp\SignedEndorsingSupportingTokens;
 use SimpleSAML\XML\Attribute as XMLAttribute;
 use SimpleSAML\XML\Chunk;
@@ -18,12 +21,11 @@
 /**
  * Class \SimpleSAML\WSSecurity\XML\sp\SignedEndorsingSupportingTokensTest
  *
- * @covers \SimpleSAML\WSSecurity\XML\sp\SignedEndorsingSupportingTokens
- * @covers \SimpleSAML\WSSecurity\XML\sp\AbstractNestedPolicyType
- * @covers \SimpleSAML\WSSecurity\XML\sp\AbstractSpElement
- *
  * @package simplesamlphp/ws-security
  */
+#[CoversClass(SignedEndorsingSupportingTokens::class)]
+#[CoversClass(AbstractNestedPolicyType::class)]
+#[CoversClass(AbstractSpElement::class)]
 final class SignedEndorsingSupportingTokensTest extends TestCase
 {
     use NestedPolicyTypeTestTrait;
diff --git a/tests/WSSecurity/XML/sp/SignedPartsTest.php b/tests/WSSecurity/XML/sp/SignedPartsTest.php
index 4d9664fb..6a0990b6 100644
--- a/tests/WSSecurity/XML/sp/SignedPartsTest.php
+++ b/tests/WSSecurity/XML/sp/SignedPartsTest.php
@@ -4,9 +4,12 @@
 
 namespace SimpleSAML\Test\WSSecurity\XML\sp;
 
+use PHPUnit\Framework\Attributes\CoversClass;
 use PHPUnit\Framework\TestCase;
 use SimpleSAML\Test\WSSecurity\Constants as C;
 use SimpleSAML\WSSecurity\Utils\XPath;
+use SimpleSAML\WSSecurity\XML\sp\AbstractSePartsType;
+use SimpleSAML\WSSecurity\XML\sp\AbstractSpElement;
 use SimpleSAML\WSSecurity\XML\sp\Attachments;
 use SimpleSAML\WSSecurity\XML\sp\Body;
 use SimpleSAML\WSSecurity\XML\sp\Header;
@@ -22,12 +25,11 @@
 /**
  * Class \SimpleSAML\WSSecurity\XML\sp\SignedPartsTest
  *
- * @covers \SimpleSAML\WSSecurity\XML\sp\SignedParts
- * @covers \SimpleSAML\WSSecurity\XML\sp\AbstractSePartsType
- * @covers \SimpleSAML\WSSecurity\XML\sp\AbstractSpElement
- *
  * @package simplesamlphp/ws-security
  */
+#[CoversClass(SignedParts::class)]
+#[CoversClass(AbstractSePartsType::class)]
+#[CoversClass(AbstractSpElement::class)]
 final class SignedPartsTest extends TestCase
 {
     use SchemaValidationTestTrait;
diff --git a/tests/WSSecurity/XML/sp/SignedSupportingTokensTest.php b/tests/WSSecurity/XML/sp/SignedSupportingTokensTest.php
index 663d6b68..343ae5ed 100644
--- a/tests/WSSecurity/XML/sp/SignedSupportingTokensTest.php
+++ b/tests/WSSecurity/XML/sp/SignedSupportingTokensTest.php
@@ -4,8 +4,11 @@
 
 namespace SimpleSAML\Test\WSSecurity\XML\sp;
 
+use PHPUnit\Framework\Attributes\CoversClass;
 use PHPUnit\Framework\TestCase;
 use SimpleSAML\Test\WSSecurity\Constants as C;
+use SimpleSAML\WSSecurity\XML\sp\AbstractNestedPolicyType;
+use SimpleSAML\WSSecurity\XML\sp\AbstractSpElement;
 use SimpleSAML\WSSecurity\XML\sp\SignedSupportingTokens;
 use SimpleSAML\XML\Attribute as XMLAttribute;
 use SimpleSAML\XML\Chunk;
@@ -18,12 +21,11 @@
 /**
  * Class \SimpleSAML\WSSecurity\XML\sp\SignedSupportingTokensTest
  *
- * @covers \SimpleSAML\WSSecurity\XML\sp\SignedSupportingTokens
- * @covers \SimpleSAML\WSSecurity\XML\sp\AbstractNestedPolicyType
- * @covers \SimpleSAML\WSSecurity\XML\sp\AbstractSpElement
- *
  * @package simplesamlphp/ws-security
  */
+#[CoversClass(SignedSupportingTokens::class)]
+#[CoversClass(AbstractNestedPolicyType::class)]
+#[CoversClass(AbstractSpElement::class)]
 final class SignedSupportingTokensTest extends TestCase
 {
     use NestedPolicyTypeTestTrait;
diff --git a/tests/WSSecurity/XML/sp/SpnegoContextTokenTest.php b/tests/WSSecurity/XML/sp/SpnegoContextTokenTest.php
index f34188f9..acb6f433 100644
--- a/tests/WSSecurity/XML/sp/SpnegoContextTokenTest.php
+++ b/tests/WSSecurity/XML/sp/SpnegoContextTokenTest.php
@@ -4,10 +4,14 @@
 
 namespace SimpleSAML\Test\WSSecurity\XML\sp;
 
+use PHPUnit\Framework\Attributes\CoversClass;
 use PHPUnit\Framework\TestCase;
 use SimpleSAML\Test\WSSecurity\Constants as C;
 use SimpleSAML\WSSecurity\Utils\XPath;
+use SimpleSAML\WSSecurity\XML\sp\AbstractSpElement;
+use SimpleSAML\WSSecurity\XML\sp\AbstractSpnegoContextTokenType;
 use SimpleSAML\WSSecurity\XML\sp\IncludeToken;
+use SimpleSAML\WSSecurity\XML\sp\IncludeTokenTypeTrait;
 use SimpleSAML\WSSecurity\XML\sp\IssuerName;
 use SimpleSAML\WSSecurity\XML\sp\SpnegoContextToken;
 use SimpleSAML\XML\Attribute as XMLAttribute;
@@ -21,13 +25,12 @@
 /**
  * Class \SimpleSAML\WSSecurity\XML\sp\SpnegoContextTokenTest
  *
- * @covers \SimpleSAML\WSSecurity\XML\sp\SpnegoContextToken
- * @covers \SimpleSAML\WSSecurity\XML\sp\IncludeTokenTypeTrait
- * @covers \SimpleSAML\WSSecurity\XML\sp\AbstractSpnegoContextTokenType
- * @covers \SimpleSAML\WSSecurity\XML\sp\AbstractSpElement
- *
  * @package simplesamlphp/ws-security
  */
+#[CoversClass(SpnegoContextToken::class)]
+#[CoversClass(IncludeTokenTypeTrait::class)]
+#[CoversClass(AbstractSpnegoContextTokenType::class)]
+#[CoversClass(AbstractSpElement::class)]
 final class SpnegoContextTokenTest extends TestCase
 {
     use SchemaValidationTestTrait;
diff --git a/tests/WSSecurity/XML/sp/StrictTest.php b/tests/WSSecurity/XML/sp/StrictTest.php
index 540fc13d..8f0d181e 100644
--- a/tests/WSSecurity/XML/sp/StrictTest.php
+++ b/tests/WSSecurity/XML/sp/StrictTest.php
@@ -4,7 +4,10 @@
 
 namespace SimpleSAML\Test\WSSecurity\XML\sp;
 
+use PHPUnit\Framework\Attributes\CoversClass;
 use PHPUnit\Framework\TestCase;
+use SimpleSAML\WSSecurity\XML\sp\AbstractQNameAssertionType;
+use SimpleSAML\WSSecurity\XML\sp\AbstractSpElement;
 use SimpleSAML\WSSecurity\XML\sp\Strict;
 use SimpleSAML\XML\DOMDocumentFactory;
 use SimpleSAML\XML\TestUtils\SchemaValidationTestTrait;
@@ -15,12 +18,11 @@
 /**
  * Class \SimpleSAML\WSSecurity\XML\sp\StrictTest
  *
- * @covers \SimpleSAML\WSSecurity\XML\sp\Strict
- * @covers \SimpleSAML\WSSecurity\XML\sp\AbstractQNameAssertionType
- * @covers \SimpleSAML\WSSecurity\XML\sp\AbstractSpElement
- *
  * @package simplesamlphp/ws-security
  */
+#[CoversClass(Strict::class)]
+#[CoversClass(AbstractQNameAssertionType::class)]
+#[CoversClass(AbstractSpElement::class)]
 final class StrictTest extends TestCase
 {
     use QNameAssertionTypeTestTrait;
diff --git a/tests/WSSecurity/XML/sp/SupportingTokensTest.php b/tests/WSSecurity/XML/sp/SupportingTokensTest.php
index c50f8bdc..decd36fb 100644
--- a/tests/WSSecurity/XML/sp/SupportingTokensTest.php
+++ b/tests/WSSecurity/XML/sp/SupportingTokensTest.php
@@ -4,8 +4,11 @@
 
 namespace SimpleSAML\Test\WSSecurity\XML\sp;
 
+use PHPUnit\Framework\Attributes\CoversClass;
 use PHPUnit\Framework\TestCase;
 use SimpleSAML\Test\WSSecurity\Constants as C;
+use SimpleSAML\WSSecurity\XML\sp\AbstractNestedPolicyType;
+use SimpleSAML\WSSecurity\XML\sp\AbstractSpElement;
 use SimpleSAML\WSSecurity\XML\sp\SupportingTokens;
 use SimpleSAML\XML\Attribute as XMLAttribute;
 use SimpleSAML\XML\Chunk;
@@ -18,12 +21,11 @@
 /**
  * Class \SimpleSAML\WSSecurity\XML\sp\SupportingTokensTest
  *
- * @covers \SimpleSAML\WSSecurity\XML\sp\SupportingTokens
- * @covers \SimpleSAML\WSSecurity\XML\sp\AbstractNestedPolicyType
- * @covers \SimpleSAML\WSSecurity\XML\sp\AbstractSpElement
- *
  * @package simplesamlphp/ws-security
  */
+#[CoversClass(SupportingTokens::class)]
+#[CoversClass(AbstractNestedPolicyType::class)]
+#[CoversClass(AbstractSpElement::class)]
 final class SupportingTokensTest extends TestCase
 {
     use NestedPolicyTypeTestTrait;
diff --git a/tests/WSSecurity/XML/sp/SymmetricBindingTest.php b/tests/WSSecurity/XML/sp/SymmetricBindingTest.php
index 77caa1b2..d058ceec 100644
--- a/tests/WSSecurity/XML/sp/SymmetricBindingTest.php
+++ b/tests/WSSecurity/XML/sp/SymmetricBindingTest.php
@@ -4,8 +4,11 @@
 
 namespace SimpleSAML\Test\WSSecurity\XML\sp;
 
+use PHPUnit\Framework\Attributes\CoversClass;
 use PHPUnit\Framework\TestCase;
 use SimpleSAML\Test\WSSecurity\Constants as C;
+use SimpleSAML\WSSecurity\XML\sp\AbstractNestedPolicyType;
+use SimpleSAML\WSSecurity\XML\sp\AbstractSpElement;
 use SimpleSAML\WSSecurity\XML\sp\SymmetricBinding;
 use SimpleSAML\XML\Attribute as XMLAttribute;
 use SimpleSAML\XML\Chunk;
@@ -18,12 +21,11 @@
 /**
  * Class \SimpleSAML\WSSecurity\XML\sp\SymmetricBindingTest
  *
- * @covers \SimpleSAML\WSSecurity\XML\sp\SymmetricBinding
- * @covers \SimpleSAML\WSSecurity\XML\sp\AbstractNestedPolicyType
- * @covers \SimpleSAML\WSSecurity\XML\sp\AbstractSpElement
- *
  * @package simplesamlphp/ws-security
  */
+#[CoversClass(SymmetricBinding::class)]
+#[CoversClass(AbstractNestedPolicyType::class)]
+#[CoversClass(AbstractSpElement::class)]
 final class SymmetricBindingTest extends TestCase
 {
     use NestedPolicyTypeTestTrait;
diff --git a/tests/WSSecurity/XML/sp/TransportBindingTest.php b/tests/WSSecurity/XML/sp/TransportBindingTest.php
index 454a13ca..49956b0f 100644
--- a/tests/WSSecurity/XML/sp/TransportBindingTest.php
+++ b/tests/WSSecurity/XML/sp/TransportBindingTest.php
@@ -4,8 +4,11 @@
 
 namespace SimpleSAML\Test\WSSecurity\XML\sp;
 
+use PHPUnit\Framework\Attributes\CoversClass;
 use PHPUnit\Framework\TestCase;
 use SimpleSAML\Test\WSSecurity\Constants as C;
+use SimpleSAML\WSSecurity\XML\sp\AbstractNestedPolicyType;
+use SimpleSAML\WSSecurity\XML\sp\AbstractSpElement;
 use SimpleSAML\WSSecurity\XML\sp\TransportBinding;
 use SimpleSAML\XML\Attribute as XMLAttribute;
 use SimpleSAML\XML\Chunk;
@@ -18,12 +21,11 @@
 /**
  * Class \SimpleSAML\WSSecurity\XML\sp\TransportBindingTest
  *
- * @covers \SimpleSAML\WSSecurity\XML\sp\TransportBinding
- * @covers \SimpleSAML\WSSecurity\XML\sp\AbstractNestedPolicyType
- * @covers \SimpleSAML\WSSecurity\XML\sp\AbstractSpElement
- *
  * @package simplesamlphp/ws-security
  */
+#[CoversClass(TransportBinding::class)]
+#[CoversClass(AbstractNestedPolicyType::class)]
+#[CoversClass(AbstractSpElement::class)]
 final class TransportBindingTest extends TestCase
 {
     use NestedPolicyTypeTestTrait;
diff --git a/tests/WSSecurity/XML/sp/TransportTokenTest.php b/tests/WSSecurity/XML/sp/TransportTokenTest.php
index 92565dfa..1c939817 100644
--- a/tests/WSSecurity/XML/sp/TransportTokenTest.php
+++ b/tests/WSSecurity/XML/sp/TransportTokenTest.php
@@ -4,8 +4,11 @@
 
 namespace SimpleSAML\Test\WSSecurity\XML\sp;
 
+use PHPUnit\Framework\Attributes\CoversClass;
 use PHPUnit\Framework\TestCase;
 use SimpleSAML\Test\WSSecurity\Constants as C;
+use SimpleSAML\WSSecurity\XML\sp\AbstractNestedPolicyType;
+use SimpleSAML\WSSecurity\XML\sp\AbstractSpElement;
 use SimpleSAML\WSSecurity\XML\sp\TransportToken;
 use SimpleSAML\XML\Attribute as XMLAttribute;
 use SimpleSAML\XML\Chunk;
@@ -18,12 +21,11 @@
 /**
  * Class \SimpleSAML\WSSecurity\XML\sp\TransportTokenTest
  *
- * @covers \SimpleSAML\WSSecurity\XML\sp\TransportToken
- * @covers \SimpleSAML\WSSecurity\XML\sp\AbstractNestedPolicyType
- * @covers \SimpleSAML\WSSecurity\XML\sp\AbstractSpElement
- *
  * @package simplesamlphp/ws-security
  */
+#[CoversClass(TransportToken::class)]
+#[CoversClass(AbstractNestedPolicyType::class)]
+#[CoversClass(AbstractSpElement::class)]
 final class TransportTokenTest extends TestCase
 {
     use NestedPolicyTypeTestTrait;
diff --git a/tests/WSSecurity/XML/sp/TripleDesRsa15Test.php b/tests/WSSecurity/XML/sp/TripleDesRsa15Test.php
index 11d52a49..c497ce00 100644
--- a/tests/WSSecurity/XML/sp/TripleDesRsa15Test.php
+++ b/tests/WSSecurity/XML/sp/TripleDesRsa15Test.php
@@ -4,7 +4,10 @@
 
 namespace SimpleSAML\Test\WSSecurity\XML\sp;
 
+use PHPUnit\Framework\Attributes\CoversClass;
 use PHPUnit\Framework\TestCase;
+use SimpleSAML\WSSecurity\XML\sp\AbstractQNameAssertionType;
+use SimpleSAML\WSSecurity\XML\sp\AbstractSpElement;
 use SimpleSAML\WSSecurity\XML\sp\TripleDesRsa15;
 use SimpleSAML\XML\DOMDocumentFactory;
 use SimpleSAML\XML\TestUtils\SchemaValidationTestTrait;
@@ -15,12 +18,11 @@
 /**
  * Class \SimpleSAML\WSSecurity\XML\sp\TripleDesRsa15Test
  *
- * @covers \SimpleSAML\WSSecurity\XML\sp\TripleDesRsa15
- * @covers \SimpleSAML\WSSecurity\XML\sp\AbstractQNameAssertionType
- * @covers \SimpleSAML\WSSecurity\XML\sp\AbstractSpElement
- *
  * @package simplesamlphp/ws-security
  */
+#[CoversClass(TripleDesRsa15::class)]
+#[CoversClass(AbstractQNameAssertionType::class)]
+#[CoversClass(AbstractSpElement::class)]
 final class TripleDesRsa15Test extends TestCase
 {
     use QNameAssertionTypeTestTrait;
diff --git a/tests/WSSecurity/XML/sp/TripleDesSha256Rsa15Test.php b/tests/WSSecurity/XML/sp/TripleDesSha256Rsa15Test.php
index 4d8cda35..4600cf1d 100644
--- a/tests/WSSecurity/XML/sp/TripleDesSha256Rsa15Test.php
+++ b/tests/WSSecurity/XML/sp/TripleDesSha256Rsa15Test.php
@@ -4,7 +4,10 @@
 
 namespace SimpleSAML\Test\WSSecurity\XML\sp;
 
+use PHPUnit\Framework\Attributes\CoversClass;
 use PHPUnit\Framework\TestCase;
+use SimpleSAML\WSSecurity\XML\sp\AbstractQNameAssertionType;
+use SimpleSAML\WSSecurity\XML\sp\AbstractSpElement;
 use SimpleSAML\WSSecurity\XML\sp\TripleDesSha256Rsa15;
 use SimpleSAML\XML\DOMDocumentFactory;
 use SimpleSAML\XML\TestUtils\SchemaValidationTestTrait;
@@ -15,12 +18,11 @@
 /**
  * Class \SimpleSAML\WSSecurity\XML\sp\TripleDesSha256Rsa15Test
  *
- * @covers \SimpleSAML\WSSecurity\XML\sp\TripleDesSha256Rsa15
- * @covers \SimpleSAML\WSSecurity\XML\sp\AbstractQNameAssertionType
- * @covers \SimpleSAML\WSSecurity\XML\sp\AbstractSpElement
- *
  * @package simplesamlphp/ws-security
  */
+#[CoversClass(TripleDesSha256Rsa15::class)]
+#[CoversClass(AbstractQNameAssertionType::class)]
+#[CoversClass(AbstractSpElement::class)]
 final class TripleDesSha256Rsa15Test extends TestCase
 {
     use QNameAssertionTypeTestTrait;
diff --git a/tests/WSSecurity/XML/sp/TripleDesSha256Test.php b/tests/WSSecurity/XML/sp/TripleDesSha256Test.php
index b36fae02..12721cad 100644
--- a/tests/WSSecurity/XML/sp/TripleDesSha256Test.php
+++ b/tests/WSSecurity/XML/sp/TripleDesSha256Test.php
@@ -4,7 +4,10 @@
 
 namespace SimpleSAML\Test\WSSecurity\XML\sp;
 
+use PHPUnit\Framework\Attributes\CoversClass;
 use PHPUnit\Framework\TestCase;
+use SimpleSAML\WSSecurity\XML\sp\AbstractQNameAssertionType;
+use SimpleSAML\WSSecurity\XML\sp\AbstractSpElement;
 use SimpleSAML\WSSecurity\XML\sp\TripleDesSha256;
 use SimpleSAML\XML\DOMDocumentFactory;
 use SimpleSAML\XML\TestUtils\SchemaValidationTestTrait;
@@ -15,12 +18,11 @@
 /**
  * Class \SimpleSAML\WSSecurity\XML\sp\TripleDesSha256Test
  *
- * @covers \SimpleSAML\WSSecurity\XML\sp\TripleDesSha256
- * @covers \SimpleSAML\WSSecurity\XML\sp\AbstractQNameAssertionType
- * @covers \SimpleSAML\WSSecurity\XML\sp\AbstractSpElement
- *
  * @package simplesamlphp/ws-security
  */
+#[CoversClass(TripleDesSha256::class)]
+#[CoversClass(AbstractQNameAssertionType::class)]
+#[CoversClass(AbstractSpElement::class)]
 final class TripleDesSha256Test extends TestCase
 {
     use QNameAssertionTypeTestTrait;
diff --git a/tests/WSSecurity/XML/sp/TripleDesTest.php b/tests/WSSecurity/XML/sp/TripleDesTest.php
index 4bdbf51a..ff943f37 100644
--- a/tests/WSSecurity/XML/sp/TripleDesTest.php
+++ b/tests/WSSecurity/XML/sp/TripleDesTest.php
@@ -4,7 +4,10 @@
 
 namespace SimpleSAML\Test\WSSecurity\XML\sp;
 
+use PHPUnit\Framework\Attributes\CoversClass;
 use PHPUnit\Framework\TestCase;
+use SimpleSAML\WSSecurity\XML\sp\AbstractQNameAssertionType;
+use SimpleSAML\WSSecurity\XML\sp\AbstractSpElement;
 use SimpleSAML\WSSecurity\XML\sp\TripleDes;
 use SimpleSAML\XML\DOMDocumentFactory;
 use SimpleSAML\XML\TestUtils\SchemaValidationTestTrait;
@@ -15,12 +18,11 @@
 /**
  * Class \SimpleSAML\WSSecurity\XML\sp\TripleDesTest
  *
- * @covers \SimpleSAML\WSSecurity\XML\sp\TripleDes
- * @covers \SimpleSAML\WSSecurity\XML\sp\AbstractQNameAssertionType
- * @covers \SimpleSAML\WSSecurity\XML\sp\AbstractSpElement
- *
  * @package simplesamlphp/ws-security
  */
+#[CoversClass(TripleDes::class)]
+#[CoversClass(AbstractQNameAssertionType::class)]
+#[CoversClass(AbstractSpElement::class)]
 final class TripleDesTest extends TestCase
 {
     use QNameAssertionTypeTestTrait;
diff --git a/tests/WSSecurity/XML/sp/Trust13Test.php b/tests/WSSecurity/XML/sp/Trust13Test.php
index 433e764e..2da94c5c 100644
--- a/tests/WSSecurity/XML/sp/Trust13Test.php
+++ b/tests/WSSecurity/XML/sp/Trust13Test.php
@@ -4,8 +4,11 @@
 
 namespace SimpleSAML\Test\WSSecurity\XML\sp;
 
+use PHPUnit\Framework\Attributes\CoversClass;
 use PHPUnit\Framework\TestCase;
 use SimpleSAML\Test\WSSecurity\Constants as C;
+use SimpleSAML\WSSecurity\XML\sp\AbstractNestedPolicyType;
+use SimpleSAML\WSSecurity\XML\sp\AbstractSpElement;
 use SimpleSAML\WSSecurity\XML\sp\Trust13;
 use SimpleSAML\XML\Attribute as XMLAttribute;
 use SimpleSAML\XML\Chunk;
@@ -18,12 +21,11 @@
 /**
  * Class \SimpleSAML\WSSecurity\XML\sp\Trust13Test
  *
- * @covers \SimpleSAML\WSSecurity\XML\sp\Trust13
- * @covers \SimpleSAML\WSSecurity\XML\sp\AbstractNestedPolicyType
- * @covers \SimpleSAML\WSSecurity\XML\sp\AbstractSpElement
- *
  * @package simplesamlphp/ws-security
  */
+#[CoversClass(Trust13::class)]
+#[CoversClass(AbstractNestedPolicyType::class)]
+#[CoversClass(AbstractSpElement::class)]
 final class Trust13Test extends TestCase
 {
     use NestedPolicyTypeTestTrait;
diff --git a/tests/WSSecurity/XML/sp/UsernameTokenTest.php b/tests/WSSecurity/XML/sp/UsernameTokenTest.php
index f0c45453..9925459d 100644
--- a/tests/WSSecurity/XML/sp/UsernameTokenTest.php
+++ b/tests/WSSecurity/XML/sp/UsernameTokenTest.php
@@ -4,9 +4,13 @@
 
 namespace SimpleSAML\Test\WSSecurity\XML\sp;
 
+use PHPUnit\Framework\Attributes\CoversClass;
 use PHPUnit\Framework\TestCase;
 use SimpleSAML\Test\WSSecurity\Constants as C;
+use SimpleSAML\WSSecurity\XML\sp\AbstractSpElement;
+use SimpleSAML\WSSecurity\XML\sp\AbstractTokenAssertionType;
 use SimpleSAML\WSSecurity\XML\sp\IncludeToken;
+use SimpleSAML\WSSecurity\XML\sp\IncludeTokenTypeTrait;
 use SimpleSAML\WSSecurity\XML\sp\UsernameToken;
 use SimpleSAML\XML\Attribute as XMLAttribute;
 use SimpleSAML\XML\Chunk;
@@ -19,13 +23,12 @@
 /**
  * Class \SimpleSAML\WSSecurity\XML\sp\UsernameTokenTest
  *
- * @covers \SimpleSAML\WSSecurity\XML\sp\UsernameToken
- * @covers \SimpleSAML\WSSecurity\XML\sp\IncludeTokenTypeTrait
- * @covers \SimpleSAML\WSSecurity\XML\sp\AbstractTokenAssertionType
- * @covers \SimpleSAML\WSSecurity\XML\sp\AbstractSpElement
- *
  * @package simplesamlphp/ws-security
  */
+#[CoversClass(UsernameToken::class)]
+#[CoversClass(IncludeTokenTypeTrait::class)]
+#[CoversClass(AbstractTokenAssertionType::class)]
+#[CoversClass(AbstractSpElement::class)]
 final class UsernameTokenTest extends TestCase
 {
     use SchemaValidationTestTrait;
diff --git a/tests/WSSecurity/XML/sp/Wss10Test.php b/tests/WSSecurity/XML/sp/Wss10Test.php
index 61044059..b14576e1 100644
--- a/tests/WSSecurity/XML/sp/Wss10Test.php
+++ b/tests/WSSecurity/XML/sp/Wss10Test.php
@@ -4,8 +4,11 @@
 
 namespace SimpleSAML\Test\WSSecurity\XML\sp;
 
+use PHPUnit\Framework\Attributes\CoversClass;
 use PHPUnit\Framework\TestCase;
 use SimpleSAML\Test\WSSecurity\Constants as C;
+use SimpleSAML\WSSecurity\XML\sp\AbstractNestedPolicyType;
+use SimpleSAML\WSSecurity\XML\sp\AbstractSpElement;
 use SimpleSAML\WSSecurity\XML\sp\Wss10;
 use SimpleSAML\XML\Attribute as XMLAttribute;
 use SimpleSAML\XML\Chunk;
@@ -18,12 +21,11 @@
 /**
  * Class \SimpleSAML\WSSecurity\XML\sp\Wss10Test
  *
- * @covers \SimpleSAML\WSSecurity\XML\sp\Wss10
- * @covers \SimpleSAML\WSSecurity\XML\sp\AbstractNestedPolicyType
- * @covers \SimpleSAML\WSSecurity\XML\sp\AbstractSpElement
- *
  * @package simplesamlphp/ws-security
  */
+#[CoversClass(Wss10::class)]
+#[CoversClass(AbstractNestedPolicyType::class)]
+#[CoversClass(AbstractSpElement::class)]
 final class Wss10Test extends TestCase
 {
     use NestedPolicyTypeTestTrait;
diff --git a/tests/WSSecurity/XML/sp/Wss11Test.php b/tests/WSSecurity/XML/sp/Wss11Test.php
index 96d48458..8d5cdad2 100644
--- a/tests/WSSecurity/XML/sp/Wss11Test.php
+++ b/tests/WSSecurity/XML/sp/Wss11Test.php
@@ -4,8 +4,11 @@
 
 namespace SimpleSAML\Test\WSSecurity\XML\sp;
 
+use PHPUnit\Framework\Attributes\CoversClass;
 use PHPUnit\Framework\TestCase;
 use SimpleSAML\Test\WSSecurity\Constants as C;
+use SimpleSAML\WSSecurity\XML\sp\AbstractNestedPolicyType;
+use SimpleSAML\WSSecurity\XML\sp\AbstractSpElement;
 use SimpleSAML\WSSecurity\XML\sp\Wss11;
 use SimpleSAML\XML\Attribute as XMLAttribute;
 use SimpleSAML\XML\Chunk;
@@ -18,12 +21,11 @@
 /**
  * Class \SimpleSAML\WSSecurity\XML\sp\Wss11Test
  *
- * @covers \SimpleSAML\WSSecurity\XML\sp\Wss11
- * @covers \SimpleSAML\WSSecurity\XML\sp\AbstractNestedPolicyType
- * @covers \SimpleSAML\WSSecurity\XML\sp\AbstractSpElement
- *
  * @package simplesamlphp/ws-security
  */
+#[CoversClass(Wss11::class)]
+#[CoversClass(AbstractNestedPolicyType::class)]
+#[CoversClass(AbstractSpElement::class)]
 final class Wss11Test extends TestCase
 {
     use NestedPolicyTypeTestTrait;
diff --git a/tests/WSSecurity/XML/sp/WssGssKerberosV5ApReqToken11Test.php b/tests/WSSecurity/XML/sp/WssGssKerberosV5ApReqToken11Test.php
index 70a68405..3533b173 100644
--- a/tests/WSSecurity/XML/sp/WssGssKerberosV5ApReqToken11Test.php
+++ b/tests/WSSecurity/XML/sp/WssGssKerberosV5ApReqToken11Test.php
@@ -4,7 +4,10 @@
 
 namespace SimpleSAML\Test\WSSecurity\XML\sp;
 
+use PHPUnit\Framework\Attributes\CoversClass;
 use PHPUnit\Framework\TestCase;
+use SimpleSAML\WSSecurity\XML\sp\AbstractQNameAssertionType;
+use SimpleSAML\WSSecurity\XML\sp\AbstractSpElement;
 use SimpleSAML\WSSecurity\XML\sp\WssGssKerberosV5ApReqToken11;
 use SimpleSAML\XML\DOMDocumentFactory;
 use SimpleSAML\XML\TestUtils\SchemaValidationTestTrait;
@@ -15,12 +18,11 @@
 /**
  * Class \SimpleSAML\WSSecurity\XML\sp\WssGssKerberosV5ApReqToken11Test
  *
- * @covers \SimpleSAML\WSSecurity\XML\sp\WssGssKerberosV5ApReqToken11
- * @covers \SimpleSAML\WSSecurity\XML\sp\AbstractQNameAssertionType
- * @covers \SimpleSAML\WSSecurity\XML\sp\AbstractSpElement
- *
  * @package simplesamlphp/ws-security
  */
+#[CoversClass(WssGssKerberosV5ApReqToken11::class)]
+#[CoversClass(AbstractQNameAssertionType::class)]
+#[CoversClass(AbstractSpElement::class)]
 final class WssGssKerberosV5ApReqToken11Test extends TestCase
 {
     use QNameAssertionTypeTestTrait;
diff --git a/tests/WSSecurity/XML/sp/WssKerberosV5ApReqToken11Test.php b/tests/WSSecurity/XML/sp/WssKerberosV5ApReqToken11Test.php
index d2ceb9bd..31ff0072 100644
--- a/tests/WSSecurity/XML/sp/WssKerberosV5ApReqToken11Test.php
+++ b/tests/WSSecurity/XML/sp/WssKerberosV5ApReqToken11Test.php
@@ -4,7 +4,10 @@
 
 namespace SimpleSAML\Test\WSSecurity\XML\sp;
 
+use PHPUnit\Framework\Attributes\CoversClass;
 use PHPUnit\Framework\TestCase;
+use SimpleSAML\WSSecurity\XML\sp\AbstractQNameAssertionType;
+use SimpleSAML\WSSecurity\XML\sp\AbstractSpElement;
 use SimpleSAML\WSSecurity\XML\sp\WssKerberosV5ApReqToken11;
 use SimpleSAML\XML\DOMDocumentFactory;
 use SimpleSAML\XML\TestUtils\SchemaValidationTestTrait;
@@ -15,12 +18,11 @@
 /**
  * Class \SimpleSAML\WSSecurity\XML\sp\WssKerberosV5ApReqToken11Test
  *
- * @covers \SimpleSAML\WSSecurity\XML\sp\WssKerberosV5ApReqToken11
- * @covers \SimpleSAML\WSSecurity\XML\sp\AbstractQNameAssertionType
- * @covers \SimpleSAML\WSSecurity\XML\sp\AbstractSpElement
- *
  * @package simplesamlphp/ws-security
  */
+#[CoversClass(WssKerberosV5ApReqToken11::class)]
+#[CoversClass(AbstractQNameAssertionType::class)]
+#[CoversClass(AbstractSpElement::class)]
 final class WssKerberosV5ApReqToken11Test extends TestCase
 {
     use QNameAssertionTypeTestTrait;
diff --git a/tests/WSSecurity/XML/sp/WssRelV10Token10Test.php b/tests/WSSecurity/XML/sp/WssRelV10Token10Test.php
index c3f3da94..113b42e4 100644
--- a/tests/WSSecurity/XML/sp/WssRelV10Token10Test.php
+++ b/tests/WSSecurity/XML/sp/WssRelV10Token10Test.php
@@ -4,7 +4,10 @@
 
 namespace SimpleSAML\Test\WSSecurity\XML\sp;
 
+use PHPUnit\Framework\Attributes\CoversClass;
 use PHPUnit\Framework\TestCase;
+use SimpleSAML\WSSecurity\XML\sp\AbstractQNameAssertionType;
+use SimpleSAML\WSSecurity\XML\sp\AbstractSpElement;
 use SimpleSAML\WSSecurity\XML\sp\WssRelV10Token10;
 use SimpleSAML\XML\DOMDocumentFactory;
 use SimpleSAML\XML\TestUtils\SchemaValidationTestTrait;
@@ -15,12 +18,11 @@
 /**
  * Class \SimpleSAML\WSSecurity\XML\sp\WssRelV10Token10Test
  *
- * @covers \SimpleSAML\WSSecurity\XML\sp\WssRelV10Token10
- * @covers \SimpleSAML\WSSecurity\XML\sp\AbstractQNameAssertionType
- * @covers \SimpleSAML\WSSecurity\XML\sp\AbstractSpElement
- *
  * @package simplesamlphp/ws-security
  */
+#[CoversClass(WssRelV10Token10::class)]
+#[CoversClass(AbstractQNameAssertionType::class)]
+#[CoversClass(AbstractSpElement::class)]
 final class WssRelV10Token10Test extends TestCase
 {
     use QNameAssertionTypeTestTrait;
diff --git a/tests/WSSecurity/XML/sp/WssRelV10Token11Test.php b/tests/WSSecurity/XML/sp/WssRelV10Token11Test.php
index fe9a5eb9..975bc483 100644
--- a/tests/WSSecurity/XML/sp/WssRelV10Token11Test.php
+++ b/tests/WSSecurity/XML/sp/WssRelV10Token11Test.php
@@ -4,7 +4,10 @@
 
 namespace SimpleSAML\Test\WSSecurity\XML\sp;
 
+use PHPUnit\Framework\Attributes\CoversClass;
 use PHPUnit\Framework\TestCase;
+use SimpleSAML\WSSecurity\XML\sp\AbstractQNameAssertionType;
+use SimpleSAML\WSSecurity\XML\sp\AbstractSpElement;
 use SimpleSAML\WSSecurity\XML\sp\WssRelV10Token11;
 use SimpleSAML\XML\DOMDocumentFactory;
 use SimpleSAML\XML\TestUtils\SchemaValidationTestTrait;
@@ -15,12 +18,11 @@
 /**
  * Class \SimpleSAML\WSSecurity\XML\sp\WssRelV10Token11Test
  *
- * @covers \SimpleSAML\WSSecurity\XML\sp\WssRelV10Token11
- * @covers \SimpleSAML\WSSecurity\XML\sp\AbstractQNameAssertionType
- * @covers \SimpleSAML\WSSecurity\XML\sp\AbstractSpElement
- *
  * @package simplesamlphp/ws-security
  */
+#[CoversClass(WssRelV10Token11::class)]
+#[CoversClass(AbstractQNameAssertionType::class)]
+#[CoversClass(AbstractSpElement::class)]
 final class WssRelV10Token11Test extends TestCase
 {
     use QNameAssertionTypeTestTrait;
diff --git a/tests/WSSecurity/XML/sp/WssRelV20Token10Test.php b/tests/WSSecurity/XML/sp/WssRelV20Token10Test.php
index 55bdb026..75acdbd5 100644
--- a/tests/WSSecurity/XML/sp/WssRelV20Token10Test.php
+++ b/tests/WSSecurity/XML/sp/WssRelV20Token10Test.php
@@ -4,7 +4,10 @@
 
 namespace SimpleSAML\Test\WSSecurity\XML\sp;
 
+use PHPUnit\Framework\Attributes\CoversClass;
 use PHPUnit\Framework\TestCase;
+use SimpleSAML\WSSecurity\XML\sp\AbstractQNameAssertionType;
+use SimpleSAML\WSSecurity\XML\sp\AbstractSpElement;
 use SimpleSAML\WSSecurity\XML\sp\WssRelV20Token10;
 use SimpleSAML\XML\DOMDocumentFactory;
 use SimpleSAML\XML\TestUtils\SchemaValidationTestTrait;
@@ -15,12 +18,11 @@
 /**
  * Class \SimpleSAML\WSSecurity\XML\sp\WssRelV20Token10Test
  *
- * @covers \SimpleSAML\WSSecurity\XML\sp\WssRelV20Token10
- * @covers \SimpleSAML\WSSecurity\XML\sp\AbstractQNameAssertionType
- * @covers \SimpleSAML\WSSecurity\XML\sp\AbstractSpElement
- *
  * @package simplesamlphp/ws-security
  */
+#[CoversClass(WssRelV20Token10::class)]
+#[CoversClass(AbstractQNameAssertionType::class)]
+#[CoversClass(AbstractSpElement::class)]
 final class WssRelV20Token10Test extends TestCase
 {
     use QNameAssertionTypeTestTrait;
diff --git a/tests/WSSecurity/XML/sp/WssRelV20Token11Test.php b/tests/WSSecurity/XML/sp/WssRelV20Token11Test.php
index 2d9cfe03..6a2b739f 100644
--- a/tests/WSSecurity/XML/sp/WssRelV20Token11Test.php
+++ b/tests/WSSecurity/XML/sp/WssRelV20Token11Test.php
@@ -4,7 +4,10 @@
 
 namespace SimpleSAML\Test\WSSecurity\XML\sp;
 
+use PHPUnit\Framework\Attributes\CoversClass;
 use PHPUnit\Framework\TestCase;
+use SimpleSAML\WSSecurity\XML\sp\AbstractQNameAssertionType;
+use SimpleSAML\WSSecurity\XML\sp\AbstractSpElement;
 use SimpleSAML\WSSecurity\XML\sp\WssRelV20Token11;
 use SimpleSAML\XML\DOMDocumentFactory;
 use SimpleSAML\XML\TestUtils\SchemaValidationTestTrait;
@@ -15,12 +18,11 @@
 /**
  * Class \SimpleSAML\WSSecurity\XML\sp\WssRelV20Token11Test
  *
- * @covers \SimpleSAML\WSSecurity\XML\sp\WssRelV20Token11
- * @covers \SimpleSAML\WSSecurity\XML\sp\AbstractQNameAssertionType
- * @covers \SimpleSAML\WSSecurity\XML\sp\AbstractSpElement
- *
  * @package simplesamlphp/ws-security
  */
+#[CoversClass(WssRelV20Token11::class)]
+#[CoversClass(AbstractQNameAssertionType::class)]
+#[CoversClass(AbstractSpElement::class)]
 final class WssRelV20Token11Test extends TestCase
 {
     use QNameAssertionTypeTestTrait;
diff --git a/tests/WSSecurity/XML/sp/WssSamlV11Token10Test.php b/tests/WSSecurity/XML/sp/WssSamlV11Token10Test.php
index e618f560..e7221da1 100644
--- a/tests/WSSecurity/XML/sp/WssSamlV11Token10Test.php
+++ b/tests/WSSecurity/XML/sp/WssSamlV11Token10Test.php
@@ -4,7 +4,10 @@
 
 namespace SimpleSAML\Test\WSSecurity\XML\sp;
 
+use PHPUnit\Framework\Attributes\CoversClass;
 use PHPUnit\Framework\TestCase;
+use SimpleSAML\WSSecurity\XML\sp\AbstractQNameAssertionType;
+use SimpleSAML\WSSecurity\XML\sp\AbstractSpElement;
 use SimpleSAML\WSSecurity\XML\sp\WssSamlV11Token10;
 use SimpleSAML\XML\DOMDocumentFactory;
 use SimpleSAML\XML\TestUtils\SchemaValidationTestTrait;
@@ -15,12 +18,11 @@
 /**
  * Class \SimpleSAML\WSSecurity\XML\sp\WssSamlV11Token10Test
  *
- * @covers \SimpleSAML\WSSecurity\XML\sp\WssSamlV11Token10
- * @covers \SimpleSAML\WSSecurity\XML\sp\AbstractQNameAssertionType
- * @covers \SimpleSAML\WSSecurity\XML\sp\AbstractSpElement
- *
  * @package simplesamlphp/ws-security
  */
+#[CoversClass(WssSamlV11Token10::class)]
+#[CoversClass(AbstractQNameAssertionType::class)]
+#[CoversClass(AbstractSpElement::class)]
 final class WssSamlV11Token10Test extends TestCase
 {
     use QNameAssertionTypeTestTrait;
diff --git a/tests/WSSecurity/XML/sp/WssSamlV11Token11Test.php b/tests/WSSecurity/XML/sp/WssSamlV11Token11Test.php
index 9bb2f832..865bf863 100644
--- a/tests/WSSecurity/XML/sp/WssSamlV11Token11Test.php
+++ b/tests/WSSecurity/XML/sp/WssSamlV11Token11Test.php
@@ -4,7 +4,10 @@
 
 namespace SimpleSAML\Test\WSSecurity\XML\sp;
 
+use PHPUnit\Framework\Attributes\CoversClass;
 use PHPUnit\Framework\TestCase;
+use SimpleSAML\WSSecurity\XML\sp\AbstractQNameAssertionType;
+use SimpleSAML\WSSecurity\XML\sp\AbstractSpElement;
 use SimpleSAML\WSSecurity\XML\sp\WssSamlV11Token11;
 use SimpleSAML\XML\DOMDocumentFactory;
 use SimpleSAML\XML\TestUtils\SchemaValidationTestTrait;
@@ -15,12 +18,11 @@
 /**
  * Class \SimpleSAML\WSSecurity\XML\sp\WssSamlV11Token11Test
  *
- * @covers \SimpleSAML\WSSecurity\XML\sp\WssSamlV11Token11
- * @covers \SimpleSAML\WSSecurity\XML\sp\AbstractQNameAssertionType
- * @covers \SimpleSAML\WSSecurity\XML\sp\AbstractSpElement
- *
  * @package simplesamlphp/ws-security
  */
+#[CoversClass(WssSamlV11Token11::class)]
+#[CoversClass(AbstractQNameAssertionType::class)]
+#[CoversClass(AbstractSpElement::class)]
 final class WssSamlV11Token11Test extends TestCase
 {
     use QNameAssertionTypeTestTrait;
diff --git a/tests/WSSecurity/XML/sp/WssSamlV20Token11Test.php b/tests/WSSecurity/XML/sp/WssSamlV20Token11Test.php
index 1ffb3ae1..0df0ba39 100644
--- a/tests/WSSecurity/XML/sp/WssSamlV20Token11Test.php
+++ b/tests/WSSecurity/XML/sp/WssSamlV20Token11Test.php
@@ -4,7 +4,10 @@
 
 namespace SimpleSAML\Test\WSSecurity\XML\sp;
 
+use PHPUnit\Framework\Attributes\CoversClass;
 use PHPUnit\Framework\TestCase;
+use SimpleSAML\WSSecurity\XML\sp\AbstractQNameAssertionType;
+use SimpleSAML\WSSecurity\XML\sp\AbstractSpElement;
 use SimpleSAML\WSSecurity\XML\sp\WssSamlV20Token11;
 use SimpleSAML\XML\DOMDocumentFactory;
 use SimpleSAML\XML\TestUtils\SchemaValidationTestTrait;
@@ -15,12 +18,11 @@
 /**
  * Class \SimpleSAML\WSSecurity\XML\sp\WssSamlV20Token11Test
  *
- * @covers \SimpleSAML\WSSecurity\XML\sp\WssSamlV20Token11
- * @covers \SimpleSAML\WSSecurity\XML\sp\AbstractQNameAssertionType
- * @covers \SimpleSAML\WSSecurity\XML\sp\AbstractSpElement
- *
  * @package simplesamlphp/ws-security
  */
+#[CoversClass(WssSamlV20Token11::class)]
+#[CoversClass(AbstractQNameAssertionType::class)]
+#[CoversClass(AbstractSpElement::class)]
 final class WssSamlV20Token11Test extends TestCase
 {
     use QNameAssertionTypeTestTrait;
diff --git a/tests/WSSecurity/XML/sp/WssUsernameToken10Test.php b/tests/WSSecurity/XML/sp/WssUsernameToken10Test.php
index 7067f13c..ca84f3f1 100644
--- a/tests/WSSecurity/XML/sp/WssUsernameToken10Test.php
+++ b/tests/WSSecurity/XML/sp/WssUsernameToken10Test.php
@@ -4,7 +4,10 @@
 
 namespace SimpleSAML\Test\WSSecurity\XML\sp;
 
+use PHPUnit\Framework\Attributes\CoversClass;
 use PHPUnit\Framework\TestCase;
+use SimpleSAML\WSSecurity\XML\sp\AbstractQNameAssertionType;
+use SimpleSAML\WSSecurity\XML\sp\AbstractSpElement;
 use SimpleSAML\WSSecurity\XML\sp\WssUsernameToken10;
 use SimpleSAML\XML\DOMDocumentFactory;
 use SimpleSAML\XML\TestUtils\SchemaValidationTestTrait;
@@ -15,12 +18,11 @@
 /**
  * Class \SimpleSAML\WSSecurity\XML\sp\WssUsernameToken10Test
  *
- * @covers \SimpleSAML\WSSecurity\XML\sp\WssUsernameToken10
- * @covers \SimpleSAML\WSSecurity\XML\sp\AbstractQNameAssertionType
- * @covers \SimpleSAML\WSSecurity\XML\sp\AbstractSpElement
- *
  * @package simplesamlphp/ws-security
  */
+#[CoversClass(WssUsernameToken10::class)]
+#[CoversClass(AbstractQNameAssertionType::class)]
+#[CoversClass(AbstractSpElement::class)]
 final class WssUsernameToken10Test extends TestCase
 {
     use QNameAssertionTypeTestTrait;
diff --git a/tests/WSSecurity/XML/sp/WssUsernameToken11Test.php b/tests/WSSecurity/XML/sp/WssUsernameToken11Test.php
index ae99d262..0432b551 100644
--- a/tests/WSSecurity/XML/sp/WssUsernameToken11Test.php
+++ b/tests/WSSecurity/XML/sp/WssUsernameToken11Test.php
@@ -4,7 +4,10 @@
 
 namespace SimpleSAML\Test\WSSecurity\XML\sp;
 
+use PHPUnit\Framework\Attributes\CoversClass;
 use PHPUnit\Framework\TestCase;
+use SimpleSAML\WSSecurity\XML\sp\AbstractQNameAssertionType;
+use SimpleSAML\WSSecurity\XML\sp\AbstractSpElement;
 use SimpleSAML\WSSecurity\XML\sp\WssUsernameToken11;
 use SimpleSAML\XML\DOMDocumentFactory;
 use SimpleSAML\XML\TestUtils\SchemaValidationTestTrait;
@@ -15,12 +18,11 @@
 /**
  * Class \SimpleSAML\WSSecurity\XML\sp\WssUsernameToken11Test
  *
- * @covers \SimpleSAML\WSSecurity\XML\sp\WssUsernameToken11
- * @covers \SimpleSAML\WSSecurity\XML\sp\AbstractQNameAssertionType
- * @covers \SimpleSAML\WSSecurity\XML\sp\AbstractSpElement
- *
  * @package simplesamlphp/ws-security
  */
+#[CoversClass(WssUsernameToken11::class)]
+#[CoversClass(AbstractQNameAssertionType::class)]
+#[CoversClass(AbstractSpElement::class)]
 final class WssUsernameToken11Test extends TestCase
 {
     use QNameAssertionTypeTestTrait;
diff --git a/tests/WSSecurity/XML/sp/WssX509Pkcs7Token10Test.php b/tests/WSSecurity/XML/sp/WssX509Pkcs7Token10Test.php
index f91d198d..01871b4c 100644
--- a/tests/WSSecurity/XML/sp/WssX509Pkcs7Token10Test.php
+++ b/tests/WSSecurity/XML/sp/WssX509Pkcs7Token10Test.php
@@ -4,7 +4,10 @@
 
 namespace SimpleSAML\Test\WSSecurity\XML\sp;
 
+use PHPUnit\Framework\Attributes\CoversClass;
 use PHPUnit\Framework\TestCase;
+use SimpleSAML\WSSecurity\XML\sp\AbstractQNameAssertionType;
+use SimpleSAML\WSSecurity\XML\sp\AbstractSpElement;
 use SimpleSAML\WSSecurity\XML\sp\WssX509Pkcs7Token10;
 use SimpleSAML\XML\DOMDocumentFactory;
 use SimpleSAML\XML\TestUtils\SchemaValidationTestTrait;
@@ -15,12 +18,11 @@
 /**
  * Class \SimpleSAML\WSSecurity\XML\sp\WssX509Pkcs7Token10Test
  *
- * @covers \SimpleSAML\WSSecurity\XML\sp\WssX509Pkcs7Token10
- * @covers \SimpleSAML\WSSecurity\XML\sp\AbstractQNameAssertionType
- * @covers \SimpleSAML\WSSecurity\XML\sp\AbstractSpElement
- *
  * @package simplesamlphp/ws-security
  */
+#[CoversClass(WssX509Pkcs7Token10Test::class)]
+#[CoversClass(AbstractQNameAssertionType::class)]
+#[CoversClass(AbstractSpElement::class)]
 final class WssX509Pkcs7Token10Test extends TestCase
 {
     use QNameAssertionTypeTestTrait;
diff --git a/tests/WSSecurity/XML/sp/WssX509Pkcs7Token11Test.php b/tests/WSSecurity/XML/sp/WssX509Pkcs7Token11Test.php
index 03f4b5ae..463342c4 100644
--- a/tests/WSSecurity/XML/sp/WssX509Pkcs7Token11Test.php
+++ b/tests/WSSecurity/XML/sp/WssX509Pkcs7Token11Test.php
@@ -4,7 +4,10 @@
 
 namespace SimpleSAML\Test\WSSecurity\XML\sp;
 
+use PHPUnit\Framework\Attributes\CoversClass;
 use PHPUnit\Framework\TestCase;
+use SimpleSAML\WSSecurity\XML\sp\AbstractQNameAssertionType;
+use SimpleSAML\WSSecurity\XML\sp\AbstractSpElement;
 use SimpleSAML\WSSecurity\XML\sp\WssX509Pkcs7Token11;
 use SimpleSAML\XML\DOMDocumentFactory;
 use SimpleSAML\XML\TestUtils\SchemaValidationTestTrait;
@@ -15,12 +18,11 @@
 /**
  * Class \SimpleSAML\WSSecurity\XML\sp\WssX509Pkcs7Token11Test
  *
- * @covers \SimpleSAML\WSSecurity\XML\sp\WssX509Pkcs7Token11
- * @covers \SimpleSAML\WSSecurity\XML\sp\AbstractQNameAssertionType
- * @covers \SimpleSAML\WSSecurity\XML\sp\AbstractSpElement
- *
  * @package simplesamlphp/ws-security
  */
+#[CoversClass(WssX509Pkcs7Token11::class)]
+#[CoversClass(AbstractQNameAssertionType::class)]
+#[CoversClass(AbstractSpElement::class)]
 final class WssX509Pkcs7Token11Test extends TestCase
 {
     use QNameAssertionTypeTestTrait;
diff --git a/tests/WSSecurity/XML/sp/WssX509PkiPathV1Token10Test.php b/tests/WSSecurity/XML/sp/WssX509PkiPathV1Token10Test.php
index ee93f4ba..80855592 100644
--- a/tests/WSSecurity/XML/sp/WssX509PkiPathV1Token10Test.php
+++ b/tests/WSSecurity/XML/sp/WssX509PkiPathV1Token10Test.php
@@ -4,7 +4,10 @@
 
 namespace SimpleSAML\Test\WSSecurity\XML\sp;
 
+use PHPUnit\Framework\Attributes\CoversClass;
 use PHPUnit\Framework\TestCase;
+use SimpleSAML\WSSecurity\XML\sp\AbstractQNameAssertionType;
+use SimpleSAML\WSSecurity\XML\sp\AbstractSpElement;
 use SimpleSAML\WSSecurity\XML\sp\WssX509PkiPathV1Token10;
 use SimpleSAML\XML\DOMDocumentFactory;
 use SimpleSAML\XML\TestUtils\SchemaValidationTestTrait;
@@ -15,12 +18,11 @@
 /**
  * Class \SimpleSAML\WSSecurity\XML\sp\WssX509PkiPathV1Token10Test
  *
- * @covers \SimpleSAML\WSSecurity\XML\sp\WssX509PkiPathV1Token10
- * @covers \SimpleSAML\WSSecurity\XML\sp\AbstractQNameAssertionType
- * @covers \SimpleSAML\WSSecurity\XML\sp\AbstractSpElement
- *
  * @package simplesamlphp/ws-security
  */
+#[CoversClass(WssX509PkiPathV1Token10::class)]
+#[CoversClass(AbstractQNameAssertionType::class)]
+#[CoversClass(AbstractSpElement::class)]
 final class WssX509PkiPathV1Token10Test extends TestCase
 {
     use QNameAssertionTypeTestTrait;
diff --git a/tests/WSSecurity/XML/sp/WssX509PkiPathV1Token11Test.php b/tests/WSSecurity/XML/sp/WssX509PkiPathV1Token11Test.php
index 2aaa0cd1..d4cd4d60 100644
--- a/tests/WSSecurity/XML/sp/WssX509PkiPathV1Token11Test.php
+++ b/tests/WSSecurity/XML/sp/WssX509PkiPathV1Token11Test.php
@@ -4,7 +4,10 @@
 
 namespace SimpleSAML\Test\WSSecurity\XML\sp;
 
+use PHPUnit\Framework\Attributes\CoversClass;
 use PHPUnit\Framework\TestCase;
+use SimpleSAML\WSSecurity\XML\sp\AbstractQNameAssertionType;
+use SimpleSAML\WSSecurity\XML\sp\AbstractSpElement;
 use SimpleSAML\WSSecurity\XML\sp\WssX509PkiPathV1Token11;
 use SimpleSAML\XML\DOMDocumentFactory;
 use SimpleSAML\XML\TestUtils\SchemaValidationTestTrait;
@@ -15,12 +18,11 @@
 /**
  * Class \SimpleSAML\WSSecurity\XML\sp\WssX509PkiPathV1Token11Test
  *
- * @covers \SimpleSAML\WSSecurity\XML\sp\WssX509PkiPathV1Token11
- * @covers \SimpleSAML\WSSecurity\XML\sp\AbstractQNameAssertionType
- * @covers \SimpleSAML\WSSecurity\XML\sp\AbstractSpElement
- *
  * @package simplesamlphp/ws-security
  */
+#[CoversClass(WssX509PkiPathV1Token11::class)]
+#[CoversClass(AbstractQNameAssertionType::class)]
+#[CoversClass(AbstractSpElement::class)]
 final class WssX509PkiPathV1Token11Test extends TestCase
 {
     use QNameAssertionTypeTestTrait;
diff --git a/tests/WSSecurity/XML/sp/WssX509V1Token11Test.php b/tests/WSSecurity/XML/sp/WssX509V1Token11Test.php
index e6586d40..3bcaf9b9 100644
--- a/tests/WSSecurity/XML/sp/WssX509V1Token11Test.php
+++ b/tests/WSSecurity/XML/sp/WssX509V1Token11Test.php
@@ -4,7 +4,10 @@
 
 namespace SimpleSAML\Test\WSSecurity\XML\sp;
 
+use PHPUnit\Framework\Attributes\CoversClass;
 use PHPUnit\Framework\TestCase;
+use SimpleSAML\WSSecurity\XML\sp\AbstractQNameAssertionType;
+use SimpleSAML\WSSecurity\XML\sp\AbstractSpElement;
 use SimpleSAML\WSSecurity\XML\sp\WssX509V1Token11;
 use SimpleSAML\XML\DOMDocumentFactory;
 use SimpleSAML\XML\TestUtils\SchemaValidationTestTrait;
@@ -15,12 +18,11 @@
 /**
  * Class \SimpleSAML\WSSecurity\XML\sp\WssX509V1Token11Test
  *
- * @covers \SimpleSAML\WSSecurity\XML\sp\WssX509V1Token11
- * @covers \SimpleSAML\WSSecurity\XML\sp\AbstractQNameAssertionType
- * @covers \SimpleSAML\WSSecurity\XML\sp\AbstractSpElement
- *
  * @package simplesamlphp/ws-security
  */
+#[CoversClass(WssX509V1Token11::class)]
+#[CoversClass(AbstractQNameAssertionType::class)]
+#[CoversClass(AbstractSpElement::class)]
 final class WssX509V1Token11Test extends TestCase
 {
     use QNameAssertionTypeTestTrait;
diff --git a/tests/WSSecurity/XML/sp/WssX509V3Token10Test.php b/tests/WSSecurity/XML/sp/WssX509V3Token10Test.php
index c5ff0454..fb93b02c 100644
--- a/tests/WSSecurity/XML/sp/WssX509V3Token10Test.php
+++ b/tests/WSSecurity/XML/sp/WssX509V3Token10Test.php
@@ -4,7 +4,10 @@
 
 namespace SimpleSAML\Test\WSSecurity\XML\sp;
 
+use PHPUnit\Framework\Attributes\CoversClass;
 use PHPUnit\Framework\TestCase;
+use SimpleSAML\WSSecurity\XML\sp\AbstractQNameAssertionType;
+use SimpleSAML\WSSecurity\XML\sp\AbstractSpElement;
 use SimpleSAML\WSSecurity\XML\sp\WssX509V3Token10;
 use SimpleSAML\XML\DOMDocumentFactory;
 use SimpleSAML\XML\TestUtils\SchemaValidationTestTrait;
@@ -15,12 +18,11 @@
 /**
  * Class \SimpleSAML\WSSecurity\XML\sp\WssX509V3Token10Test
  *
- * @covers \SimpleSAML\WSSecurity\XML\sp\WssX509V3Token10
- * @covers \SimpleSAML\WSSecurity\XML\sp\AbstractQNameAssertionType
- * @covers \SimpleSAML\WSSecurity\XML\sp\AbstractSpElement
- *
  * @package simplesamlphp/ws-security
  */
+#[CoversClass(WssX509V3Token10::class)]
+#[CoversClass(AbstractQNameAssertionType::class)]
+#[CoversClass(AbstractSpElement::class)]
 final class WssX509V3Token10Test extends TestCase
 {
     use QNameAssertionTypeTestTrait;
diff --git a/tests/WSSecurity/XML/sp/WssX509V3Token11Test.php b/tests/WSSecurity/XML/sp/WssX509V3Token11Test.php
index e1615080..fa72a716 100644
--- a/tests/WSSecurity/XML/sp/WssX509V3Token11Test.php
+++ b/tests/WSSecurity/XML/sp/WssX509V3Token11Test.php
@@ -4,7 +4,10 @@
 
 namespace SimpleSAML\Test\WSSecurity\XML\sp;
 
+use PHPUnit\Framework\Attributes\CoversClass;
 use PHPUnit\Framework\TestCase;
+use SimpleSAML\WSSecurity\XML\sp\AbstractQNameAssertionType;
+use SimpleSAML\WSSecurity\XML\sp\AbstractSpElement;
 use SimpleSAML\WSSecurity\XML\sp\WssX509V3Token11;
 use SimpleSAML\XML\DOMDocumentFactory;
 use SimpleSAML\XML\TestUtils\SchemaValidationTestTrait;
@@ -15,12 +18,11 @@
 /**
  * Class \SimpleSAML\WSSecurity\XML\sp\WssX509V3Token11Test
  *
- * @covers \SimpleSAML\WSSecurity\XML\sp\WssX509V3Token11
- * @covers \SimpleSAML\WSSecurity\XML\sp\AbstractQNameAssertionType
- * @covers \SimpleSAML\WSSecurity\XML\sp\AbstractSpElement
- *
  * @package simplesamlphp/ws-security
  */
+#[CoversClass(WssX509V3Token11::class)]
+#[CoversClass(AbstractQNameAssertionType::class)]
+#[CoversClass(AbstractSpElement::class)]
 final class WssX509V3Token11Test extends TestCase
 {
     use QNameAssertionTypeTestTrait;
diff --git a/tests/WSSecurity/XML/sp/X509TokenTest.php b/tests/WSSecurity/XML/sp/X509TokenTest.php
index 778bb8b8..ba192df0 100644
--- a/tests/WSSecurity/XML/sp/X509TokenTest.php
+++ b/tests/WSSecurity/XML/sp/X509TokenTest.php
@@ -4,9 +4,13 @@
 
 namespace SimpleSAML\Test\WSSecurity\XML\sp;
 
+use PHPUnit\Framework\Attributes\CoversClass;
 use PHPUnit\Framework\TestCase;
 use SimpleSAML\Test\WSSecurity\Constants as C;
+use SimpleSAML\WSSecurity\XML\sp\AbstractSpElement;
+use SimpleSAML\WSSecurity\XML\sp\AbstractTokenAssertionType;
 use SimpleSAML\WSSecurity\XML\sp\IncludeToken;
+use SimpleSAML\WSSecurity\XML\sp\IncludeTokenTypeTrait;
 use SimpleSAML\WSSecurity\XML\sp\X509Token;
 use SimpleSAML\XML\Attribute as XMLAttribute;
 use SimpleSAML\XML\Chunk;
@@ -19,13 +23,12 @@
 /**
  * Class \SimpleSAML\WSSecurity\XML\sp\X509TokenTest
  *
- * @covers \SimpleSAML\WSSecurity\XML\sp\X509Token
- * @covers \SimpleSAML\WSSecurity\XML\sp\IncludeTokenTypeTrait
- * @covers \SimpleSAML\WSSecurity\XML\sp\AbstractTokenAssertionType
- * @covers \SimpleSAML\WSSecurity\XML\sp\AbstractSpElement
- *
  * @package simplesamlphp/ws-security
  */
+#[CoversClass(X509Token::class)]
+#[CoversClass(IncludeTokenTypeTrait::class)]
+#[CoversClass(AbstractTokenAssertionType::class)]
+#[CoversClass(AbstractSpElement::class)]
 final class X509TokenTest extends TestCase
 {
     use SchemaValidationTestTrait;
diff --git a/tests/WSSecurity/XML/sp/XPath10Test.php b/tests/WSSecurity/XML/sp/XPath10Test.php
index e304ed50..50b82946 100644
--- a/tests/WSSecurity/XML/sp/XPath10Test.php
+++ b/tests/WSSecurity/XML/sp/XPath10Test.php
@@ -4,7 +4,10 @@
 
 namespace SimpleSAML\Test\WSSecurity\XML\sp;
 
+use PHPUnit\Framework\Attributes\CoversClass;
 use PHPUnit\Framework\TestCase;
+use SimpleSAML\WSSecurity\XML\sp\AbstractQNameAssertionType;
+use SimpleSAML\WSSecurity\XML\sp\AbstractSpElement;
 use SimpleSAML\WSSecurity\XML\sp\XPath10;
 use SimpleSAML\XML\DOMDocumentFactory;
 use SimpleSAML\XML\TestUtils\SchemaValidationTestTrait;
@@ -15,12 +18,11 @@
 /**
  * Class \SimpleSAML\WSSecurity\XML\sp\XPath10Test
  *
- * @covers \SimpleSAML\WSSecurity\XML\sp\XPath10
- * @covers \SimpleSAML\WSSecurity\XML\sp\AbstractQNameAssertionType
- * @covers \SimpleSAML\WSSecurity\XML\sp\AbstractSpElement
- *
  * @package simplesamlphp/ws-security
  */
+#[CoversClass(XPath10::class)]
+#[CoversClass(AbstractQNameAssertionType::class)]
+#[CoversClass(AbstractSpElement::class)]
 final class XPath10Test extends TestCase
 {
     use QNameAssertionTypeTestTrait;
diff --git a/tests/WSSecurity/XML/sp/XPathFilter20Test.php b/tests/WSSecurity/XML/sp/XPathFilter20Test.php
index ea9167a0..29d52ade 100644
--- a/tests/WSSecurity/XML/sp/XPathFilter20Test.php
+++ b/tests/WSSecurity/XML/sp/XPathFilter20Test.php
@@ -4,7 +4,10 @@
 
 namespace SimpleSAML\Test\WSSecurity\XML\sp;
 
+use PHPUnit\Framework\Attributes\CoversClass;
 use PHPUnit\Framework\TestCase;
+use SimpleSAML\WSSecurity\XML\sp\AbstractQNameAssertionType;
+use SimpleSAML\WSSecurity\XML\sp\AbstractSpElement;
 use SimpleSAML\WSSecurity\XML\sp\XPathFilter20;
 use SimpleSAML\XML\DOMDocumentFactory;
 use SimpleSAML\XML\TestUtils\SchemaValidationTestTrait;
@@ -15,12 +18,11 @@
 /**
  * Class \SimpleSAML\WSSecurity\XML\sp\XPathFilter20Test
  *
- * @covers \SimpleSAML\WSSecurity\XML\sp\XPathFilter20
- * @covers \SimpleSAML\WSSecurity\XML\sp\AbstractQNameAssertionType
- * @covers \SimpleSAML\WSSecurity\XML\sp\AbstractSpElement
- *
  * @package simplesamlphp/ws-security
  */
+#[CoversClass(XPathFilter20::class)]
+#[CoversClass(AbstractQNameAssertionType::class)]
+#[CoversClass(AbstractSpElement::class)]
 final class XPathFilter20Test extends TestCase
 {
     use QNameAssertionTypeTestTrait;
diff --git a/tests/WSSecurity/XML/sp/XPathTest.php b/tests/WSSecurity/XML/sp/XPathTest.php
index 19ad4a70..20314de5 100644
--- a/tests/WSSecurity/XML/sp/XPathTest.php
+++ b/tests/WSSecurity/XML/sp/XPathTest.php
@@ -4,7 +4,9 @@
 
 namespace SimpleSAML\Test\WSSecurity\XML\sp;
 
+use PHPUnit\Framework\Attributes\CoversClass;
 use PHPUnit\Framework\TestCase;
+use SimpleSAML\WSSecurity\XML\sp\AbstractSpElement;
 use SimpleSAML\WSSecurity\XML\sp\XPath;
 use SimpleSAML\XML\DOMDocumentFactory;
 use SimpleSAML\XML\TestUtils\SerializableElementTestTrait;
@@ -15,11 +17,10 @@
 /**
  * Tests for XPath.
  *
- * @covers \SimpleSAML\WSSecurity\XML\sp\XPath
- * @covers \SimpleSAML\WSSecurity\XML\sp\AbstractSpElement
- *
  * @package simplesamlphp/ws-security
  */
+#[CoversClass(XPath::class)]
+#[CoversClass(AbstractSpElement::class)]
 final class XPathTest extends TestCase
 {
     use SerializableElementTestTrait;
diff --git a/tests/WSSecurity/XML/wsa/ActionTest.php b/tests/WSSecurity/XML/wsa/ActionTest.php
index f1ebadf8..dde5807b 100644
--- a/tests/WSSecurity/XML/wsa/ActionTest.php
+++ b/tests/WSSecurity/XML/wsa/ActionTest.php
@@ -4,7 +4,10 @@
 
 namespace SimpleSAML\Test\WSSecurity\XML\wsa;
 
+use PHPUnit\Framework\Attributes\CoversClass;
 use PHPUnit\Framework\TestCase;
+use SimpleSAML\WSSecurity\XML\wsa\AbstractAttributedURIType;
+use SimpleSAML\WSSecurity\XML\wsa\AbstractWsaElement;
 use SimpleSAML\WSSecurity\XML\wsa\Action;
 use SimpleSAML\XML\Attribute;
 use SimpleSAML\XML\DOMDocumentFactory;
@@ -17,11 +20,11 @@
 /**
  * Tests for wsa:Action.
  *
- * @covers \SimpleSAML\WSSecurity\XML\wsa\Action
- * @covers \SimpleSAML\WSSecurity\XML\wsa\AbstractAttributedURIType
- * @covers \SimpleSAML\WSSecurity\XML\wsa\AbstractWsaElement
  * @package simplesamlphp/ws-security
  */
+#[CoversClass(Action::class)]
+#[CoversClass(AbstractAttributedURIType::class)]
+#[CoversClass(AbstractWsaElement::class)]
 final class ActionTest extends TestCase
 {
     use SchemaValidationTestTrait;
diff --git a/tests/WSSecurity/XML/wsa/AddressTest.php b/tests/WSSecurity/XML/wsa/AddressTest.php
index 146d7f9b..c451cc77 100644
--- a/tests/WSSecurity/XML/wsa/AddressTest.php
+++ b/tests/WSSecurity/XML/wsa/AddressTest.php
@@ -4,7 +4,10 @@
 
 namespace SimpleSAML\Test\WSSecurity\XML\wsa;
 
+use PHPUnit\Framework\Attributes\CoversClass;
 use PHPUnit\Framework\TestCase;
+use SimpleSAML\WSSecurity\XML\wsa\AbstractAttributedURIType;
+use SimpleSAML\WSSecurity\XML\wsa\AbstractWsaElement;
 use SimpleSAML\WSSecurity\XML\wsa\Address;
 use SimpleSAML\XML\Attribute;
 use SimpleSAML\XML\DOMDocumentFactory;
@@ -16,11 +19,11 @@
 /**
  * Tests for wsa:Address.
  *
- * @covers \SimpleSAML\WSSecurity\XML\wsa\Address
- * @covers \SimpleSAML\WSSecurity\XML\wsa\AbstractAttributedURIType
- * @covers \SimpleSAML\WSSecurity\XML\wsa\AbstractWsaElement
  * @package simplesamlphp/ws-security
  */
+#[CoversClass(Address::class)]
+#[CoversClass(AbstractAttributedURIType::class)]
+#[CoversClass(AbstractWsaElement::class)]
 final class AddressTest extends TestCase
 {
     use SerializableElementTestTrait;
diff --git a/tests/WSSecurity/XML/wsa/EndpointReferenceTest.php b/tests/WSSecurity/XML/wsa/EndpointReferenceTest.php
index 1ee3507f..3be89c20 100644
--- a/tests/WSSecurity/XML/wsa/EndpointReferenceTest.php
+++ b/tests/WSSecurity/XML/wsa/EndpointReferenceTest.php
@@ -5,7 +5,9 @@
 namespace SimpleSAML\Test\WSSecurity\XML\wsa;
 
 use DOMElement;
+use PHPUnit\Framework\Attributes\CoversClass;
 use PHPUnit\Framework\TestCase;
+use SimpleSAML\WSSecurity\XML\wsa\AbstractWsaElement;
 use SimpleSAML\WSSecurity\XML\wsa\Address;
 use SimpleSAML\WSSecurity\XML\wsa\EndpointReference;
 use SimpleSAML\WSSecurity\XML\wsa\Metadata;
@@ -22,11 +24,11 @@
 /**
  * Tests for wsa:EndpointReference.
  *
- * @covers \SimpleSAML\WSSecurity\XML\wsa\EndpointReference
- * @covers \SimpleSAML\WSSecurity\XML\wsa\AbstractEndpointReferenceType
- * @covers \SimpleSAML\WSSecurity\XML\wsa\AbstractWsaElement
  * @package simplesamlphp/ws-security
  */
+#[CoversClass(EndpointReference::class)]
+#[CoversClass(AbstractEndpointReferenceType::class)]
+#[CoversClass(AbstractWsaElement::class)]
 final class EndpointReferenceTest extends TestCase
 {
     use SchemaValidationTestTrait;
diff --git a/tests/WSSecurity/XML/wsa/FaultToTest.php b/tests/WSSecurity/XML/wsa/FaultToTest.php
index 3c6535c4..43cad18d 100644
--- a/tests/WSSecurity/XML/wsa/FaultToTest.php
+++ b/tests/WSSecurity/XML/wsa/FaultToTest.php
@@ -5,7 +5,10 @@
 namespace SimpleSAML\Test\WSSecurity\XML\wsa;
 
 use DOMElement;
+use PHPUnit\Framework\Attributes\CoversClass;
 use PHPUnit\Framework\TestCase;
+use SimpleSAML\WSSecurity\XML\wsa\AbstractEndpointReferenceType;
+use SimpleSAML\WSSecurity\XML\wsa\AbstractWsaElement;
 use SimpleSAML\WSSecurity\XML\wsa\Address;
 use SimpleSAML\WSSecurity\XML\wsa\FaultTo;
 use SimpleSAML\WSSecurity\XML\wsa\Metadata;
@@ -22,11 +25,11 @@
 /**
  * Tests for wsa:FaultTo.
  *
- * @covers \SimpleSAML\WSSecurity\XML\wsa\FaultTo
- * @covers \SimpleSAML\WSSecurity\XML\wsa\AbstractEndpointReferenceType
- * @covers \SimpleSAML\WSSecurity\XML\wsa\AbstractWsaElement
  * @package simplesamlphp/ws-security
  */
+#[CoversClass(FaultTo::class)]
+#[CoversClass(AbstractEndpointReferenceType::class)]
+#[CoversClass(AbstractWsaElement::class)]
 final class FaultToTest extends TestCase
 {
     use SchemaValidationTestTrait;
diff --git a/tests/WSSecurity/XML/wsa/FromTest.php b/tests/WSSecurity/XML/wsa/FromTest.php
index 6b9d62a7..e8ee068d 100644
--- a/tests/WSSecurity/XML/wsa/FromTest.php
+++ b/tests/WSSecurity/XML/wsa/FromTest.php
@@ -5,7 +5,10 @@
 namespace SimpleSAML\Test\WSSecurity\XML\wsa;
 
 use DOMElement;
+use PHPUnit\Framework\Attributes\CoversClass;
 use PHPUnit\Framework\TestCase;
+use SimpleSAML\WSSecurity\XML\wsa\AbstractEndpointReferenceType;
+use SimpleSAML\WSSecurity\XML\wsa\AbstractWsaElement;
 use SimpleSAML\WSSecurity\XML\wsa\Address;
 use SimpleSAML\WSSecurity\XML\wsa\From;
 use SimpleSAML\WSSecurity\XML\wsa\Metadata;
@@ -22,11 +25,11 @@
 /**
  * Tests for wsa:From.
  *
- * @covers \SimpleSAML\WSSecurity\XML\wsa\From
- * @covers \SimpleSAML\WSSecurity\XML\wsa\AbstractEndpointReferenceType
- * @covers \SimpleSAML\WSSecurity\XML\wsa\AbstractWsaElement
  * @package simplesamlphp/ws-security
  */
+#[CoversClass(From::class)]
+#[CoversClass(AbstractEndpointReferenceType::class)]
+#[CoversClass(AbstractWsaElement::class)]
 final class FromTest extends TestCase
 {
     use SchemaValidationTestTrait;
diff --git a/tests/WSSecurity/XML/wsa/MessageIDTest.php b/tests/WSSecurity/XML/wsa/MessageIDTest.php
index 0fc067a5..48806133 100644
--- a/tests/WSSecurity/XML/wsa/MessageIDTest.php
+++ b/tests/WSSecurity/XML/wsa/MessageIDTest.php
@@ -4,8 +4,11 @@
 
 namespace SimpleSAML\Test\WSSecurity\XML\wsa;
 
+use PHPUnit\Framework\Attributes\CoversClass;
 use PHPUnit\Framework\TestCase;
 use SimpleSAML\SOAP\Constants as C;
+use SimpleSAML\WSSecurity\XML\wsa\AbstractAttributedURIType;
+use SimpleSAML\WSSecurity\XML\wsa\AbstractWsaElement;
 use SimpleSAML\WSSecurity\XML\wsa\MessageID;
 use SimpleSAML\XML\Attribute;
 use SimpleSAML\XML\DOMDocumentFactory;
@@ -18,11 +21,11 @@
 /**
  * Tests for wsa:MessageID.
  *
- * @covers \SimpleSAML\WSSecurity\XML\wsa\MessageID
- * @covers \SimpleSAML\WSSecurity\XML\wsa\AbstractAttributedURIType
- * @covers \SimpleSAML\WSSecurity\XML\wsa\AbstractWsaElement
  * @package simplesamlphp/ws-security
  */
+#[CoversClass(MessageID::class)]
+#[CoversClass(AbstractAttributedURIType::class)]
+#[CoversClass(AbstractWsaElement::class)]
 final class MessageIDTest extends TestCase
 {
     use SchemaValidationTestTrait;
diff --git a/tests/WSSecurity/XML/wsa/MetadataTest.php b/tests/WSSecurity/XML/wsa/MetadataTest.php
index 8015e019..748fe3ca 100644
--- a/tests/WSSecurity/XML/wsa/MetadataTest.php
+++ b/tests/WSSecurity/XML/wsa/MetadataTest.php
@@ -5,7 +5,9 @@
 namespace SimpleSAML\Test\WSSecurity\XML\wsa;
 
 use DOMElement;
+use PHPUnit\Framework\Attributes\CoversClass;
 use PHPUnit\Framework\TestCase;
+use SimpleSAML\WSSecurity\XML\wsa\AbstractWsaElement;
 use SimpleSAML\WSSecurity\XML\wsa\Metadata;
 use SimpleSAML\XML\Attribute;
 use SimpleSAML\XML\Chunk;
@@ -19,11 +21,10 @@
 /**
  * Class \SimpleSAML\WSSecurity\XML\wsa\MetadataTest
  *
- * @covers \SimpleSAML\WSSecurity\XML\wsa\Metadata
- * @covers \SimpleSAML\WSSecurity\XML\wsa\AbstractWsaElement
- *
  * @package simplesamlphp/ws-security
  */
+#[CoversClass(Metadata::class)]
+#[CoversClass(AbstractWsaElement::class)]
 final class MetadataTest extends TestCase
 {
     use SchemaValidationTestTrait;
diff --git a/tests/WSSecurity/XML/wsa/ProblemActionTest.php b/tests/WSSecurity/XML/wsa/ProblemActionTest.php
index 1e12bd93..079395bf 100644
--- a/tests/WSSecurity/XML/wsa/ProblemActionTest.php
+++ b/tests/WSSecurity/XML/wsa/ProblemActionTest.php
@@ -4,8 +4,11 @@
 
 namespace SimpleSAML\Test\WSSecurity\XML\wsa;
 
+use PHPUnit\Framework\Attributes\CoversClass;
 use PHPUnit\Framework\TestCase;
 use SimpleSAML\WSSecurity\Constants as C;
+use SimpleSAML\WSSecurity\XML\wsa\AbstractProblemActionType;
+use SimpleSAML\WSSecurity\XML\wsa\AbstractWsaElement;
 use SimpleSAML\WSSecurity\XML\wsa\Action;
 use SimpleSAML\WSSecurity\XML\wsa\ProblemAction;
 use SimpleSAML\WSSecurity\XML\wsa\SoapAction;
@@ -20,11 +23,11 @@
 /**
  * Tests for wsa:ProblemIRI.
  *
- * @covers \SimpleSAML\WSSecurity\XML\wsa\ProblemAction
- * @covers \SimpleSAML\WSSecurity\XML\wsa\AbstractProblemActionType
- * @covers \SimpleSAML\WSSecurity\XML\wsa\AbstractWsaElement
  * @package simplesamlphp/ws-security
  */
+#[CoversClass(ProblemAction::class)]
+#[CoversClass(AbstractProblemActionType::class)]
+#[CoversClass(AbstractWsaElement::class)]
 final class ProblemActionTest extends TestCase
 {
     use SchemaValidationTestTrait;
diff --git a/tests/WSSecurity/XML/wsa/ProblemHeaderQNameTest.php b/tests/WSSecurity/XML/wsa/ProblemHeaderQNameTest.php
index 046d4ce1..8f8c1e2d 100644
--- a/tests/WSSecurity/XML/wsa/ProblemHeaderQNameTest.php
+++ b/tests/WSSecurity/XML/wsa/ProblemHeaderQNameTest.php
@@ -4,7 +4,10 @@
 
 namespace SimpleSAML\Test\WSSecurity\XML\wsa;
 
+use PHPUnit\Framework\Attributes\CoversClass;
 use PHPUnit\Framework\TestCase;
+use SimpleSAML\WSSecurity\XML\wsa\AbstractAttributedQNameType;
+use SimpleSAML\WSSecurity\XML\wsa\AbstractWsaElement;
 use SimpleSAML\WSSecurity\XML\wsa\ProblemHeaderQName;
 use SimpleSAML\XML\Attribute;
 use SimpleSAML\XML\DOMDocumentFactory;
@@ -17,11 +20,11 @@
 /**
  * Tests for wsa:ProblemIRI.
  *
- * @covers \SimpleSAML\WSSecurity\XML\wsa\ProblemHeaderQName
- * @covers \SimpleSAML\WSSecurity\XML\wsa\AbstractAttributedQNameType
- * @covers \SimpleSAML\WSSecurity\XML\wsa\AbstractWsaElement
  * @package simplesamlphp/ws-security
  */
+#[CoversClass(ProblemHeaderQName::class)]
+#[CoversClass(AbstractAttributedQNameType::class)]
+#[CoversClass(AbstractWsaElement::class)]
 final class ProblemHeaderQNameTest extends TestCase
 {
     use SchemaValidationTestTrait;
diff --git a/tests/WSSecurity/XML/wsa/ProblemIRITest.php b/tests/WSSecurity/XML/wsa/ProblemIRITest.php
index f60b3f6e..130e5fb8 100644
--- a/tests/WSSecurity/XML/wsa/ProblemIRITest.php
+++ b/tests/WSSecurity/XML/wsa/ProblemIRITest.php
@@ -4,7 +4,10 @@
 
 namespace SimpleSAML\Test\WSSecurity\XML\wsa;
 
+use PHPUnit\Framework\Attributes\CoversClass;
 use PHPUnit\Framework\TestCase;
+use SimpleSAML\WSSecurity\XML\wsa\AbstractAttributedURIType;
+use SimpleSAML\WSSecurity\XML\wsa\AbstractWsaElement;
 use SimpleSAML\WSSecurity\XML\wsa\ProblemIRI;
 use SimpleSAML\XML\Attribute;
 use SimpleSAML\XML\DOMDocumentFactory;
@@ -17,11 +20,11 @@
 /**
  * Tests for wsa:ProblemIRI.
  *
- * @covers \SimpleSAML\WSSecurity\XML\wsa\ProblemIRI
- * @covers \SimpleSAML\WSSecurity\XML\wsa\AbstractAttributedURIType
- * @covers \SimpleSAML\WSSecurity\XML\wsa\AbstractWsaElement
  * @package simplesamlphp/ws-security
  */
+#[CoversClass(ProblemIRI::class)]
+#[CoversClass(AbstractAttributedURIType::class)]
+#[CoversClass(AbstractWsaElement::class)]
 final class ProblemIRITest extends TestCase
 {
     use SchemaValidationTestTrait;
diff --git a/tests/WSSecurity/XML/wsa/ReferenceParametersTest.php b/tests/WSSecurity/XML/wsa/ReferenceParametersTest.php
index 58dd3c1f..337a47c8 100644
--- a/tests/WSSecurity/XML/wsa/ReferenceParametersTest.php
+++ b/tests/WSSecurity/XML/wsa/ReferenceParametersTest.php
@@ -5,7 +5,9 @@
 namespace SimpleSAML\Test\WSSecurity\XML\wsa;
 
 use DOMElement;
+use PHPUnit\Framework\Attributes\CoversClass;
 use PHPUnit\Framework\TestCase;
+use SimpleSAML\WSSecurity\XML\wsa\AbstractWsaElement;
 use SimpleSAML\WSSecurity\XML\wsa\ReferenceParameters;
 use SimpleSAML\XML\Attribute;
 use SimpleSAML\XML\Chunk;
@@ -19,11 +21,10 @@
 /**
  * Class \SimpleSAML\WSSecurity\XML\wsa\ReferenceParametersTest
  *
- * @covers \SimpleSAML\WSSecurity\XML\wsa\ReferenceParameters
- * @covers \SimpleSAML\WSSecurity\XML\wsa\AbstractWsaElement
- *
  * @package simplesamlphp/ws-security
  */
+#[CoversClass(ReferenceParameters::class)]
+#[CoversClass(AbstractWsaElement::class)]
 final class ReferenceParametersTest extends TestCase
 {
     use SchemaValidationTestTrait;
diff --git a/tests/WSSecurity/XML/wsa/RelatesToTest.php b/tests/WSSecurity/XML/wsa/RelatesToTest.php
index 6b79fe03..acbac9d5 100644
--- a/tests/WSSecurity/XML/wsa/RelatesToTest.php
+++ b/tests/WSSecurity/XML/wsa/RelatesToTest.php
@@ -4,7 +4,9 @@
 
 namespace SimpleSAML\Test\WSSecurity\XML\wsa;
 
+use PHPUnit\Framework\Attributes\CoversClass;
 use PHPUnit\Framework\TestCase;
+use SimpleSAML\WSSecurity\XML\wsa\AbstractWsaElement;
 use SimpleSAML\WSSecurity\XML\wsa\RelatesTo;
 use SimpleSAML\XML\Attribute;
 use SimpleSAML\XML\DOMDocumentFactory;
@@ -17,11 +19,10 @@
 /**
  * Class \SimpleSAML\WSSecurity\XML\wsa\RelatesToTest
  *
- * @covers \SimpleSAML\WSSecurity\XML\wsa\RelatesTo
- * @covers \SimpleSAML\WSSecurity\XML\wsa\AbstractWsaElement
- *
  * @package simplesamlphp/ws-security
  */
+#[CoversClass(RelatesTo::class)]
+#[CoversClass(AbstractWsaElement::class)]
 final class RelatesToTest extends TestCase
 {
     use SchemaValidationTestTrait;
diff --git a/tests/WSSecurity/XML/wsa/ReplyToTest.php b/tests/WSSecurity/XML/wsa/ReplyToTest.php
index 7891544e..1fc580fa 100644
--- a/tests/WSSecurity/XML/wsa/ReplyToTest.php
+++ b/tests/WSSecurity/XML/wsa/ReplyToTest.php
@@ -5,7 +5,10 @@
 namespace SimpleSAML\Test\WSSecurity\XML\wsa;
 
 use DOMElement;
+use PHPUnit\Framework\Attributes\CoversClass;
 use PHPUnit\Framework\TestCase;
+use SimpleSAML\WSSecurity\XML\wsa\AbstractEndpointReferenceType;
+use SimpleSAML\WSSecurity\XML\wsa\AbstractWsaElement;
 use SimpleSAML\WSSecurity\XML\wsa\Address;
 use SimpleSAML\WSSecurity\XML\wsa\Metadata;
 use SimpleSAML\WSSecurity\XML\wsa\ReferenceParameters;
@@ -22,11 +25,11 @@
 /**
  * Tests for wsa:ReplyTo.
  *
- * @covers \SimpleSAML\WSSecurity\XML\wsa\ReplyTo
- * @covers \SimpleSAML\WSSecurity\XML\wsa\AbstractEndpointReferenceType
- * @covers \SimpleSAML\WSSecurity\XML\wsa\AbstractWsaElement
  * @package simplesamlphp/ws-security
  */
+#[CoversClass(ReplyTo::class)]
+#[CoversClass(AbstractEndpointReferenceType::class)]
+#[CoversClass(AbstractWsaElement::class)]
 final class ReplyToTest extends TestCase
 {
     use SchemaValidationTestTrait;
diff --git a/tests/WSSecurity/XML/wsa/RetryAfterTest.php b/tests/WSSecurity/XML/wsa/RetryAfterTest.php
index 7160fcc3..321c3639 100644
--- a/tests/WSSecurity/XML/wsa/RetryAfterTest.php
+++ b/tests/WSSecurity/XML/wsa/RetryAfterTest.php
@@ -4,7 +4,10 @@
 
 namespace SimpleSAML\Test\WSSecurity\XML\wsa;
 
+use PHPUnit\Framework\Attributes\CoversClass;
 use PHPUnit\Framework\TestCase;
+use SimpleSAML\WSSecurity\XML\wsa\AbstractAttributedLongType;
+use SimpleSAML\WSSecurity\XML\wsa\AbstractWsaElement;
 use SimpleSAML\WSSecurity\XML\wsa\RetryAfter;
 use SimpleSAML\XML\Attribute;
 use SimpleSAML\XML\DOMDocumentFactory;
@@ -17,11 +20,11 @@
 /**
  * Tests for wsa:RetryAfter.
  *
- * @covers \SimpleSAML\WSSecurity\XML\wsa\RetryAfter
- * @covers \SimpleSAML\WSSecurity\XML\wsa\AbstractAttributedLongType
- * @covers \SimpleSAML\WSSecurity\XML\wsa\AbstractWsaElement
  * @package simplesamlphp/ws-security
  */
+#[CoversClass(RetryAfter::class)]
+#[CoversClass(AbstractAttributedLongType::class)]
+#[CoversClass(AbstractWsaElement::class)]
 final class RetryAfterTest extends TestCase
 {
     use SchemaValidationTestTrait;
diff --git a/tests/WSSecurity/XML/wsa/SoapActionTest.php b/tests/WSSecurity/XML/wsa/SoapActionTest.php
index 3080ab0d..980fa71e 100644
--- a/tests/WSSecurity/XML/wsa/SoapActionTest.php
+++ b/tests/WSSecurity/XML/wsa/SoapActionTest.php
@@ -4,7 +4,9 @@
 
 namespace SimpleSAML\Test\WSSecurity\XML\wsa;
 
+use PHPUnit\Framework\Attributes\CoversClass;
 use PHPUnit\Framework\TestCase;
+use SimpleSAML\WSSecurity\XML\wsa\AbstractWsaElement;
 use SimpleSAML\WSSecurity\XML\wsa\SoapAction;
 use SimpleSAML\XML\DOMDocumentFactory;
 use SimpleSAML\XML\TestUtils\SerializableElementTestTrait;
@@ -15,10 +17,10 @@
 /**
  * Tests for wsa:ProblemIRI.
  *
- * @covers \SimpleSAML\WSSecurity\XML\wsa\SoapAction
- * @covers \SimpleSAML\WSSecurity\XML\wsa\AbstractWsaElement
  * @package simplesamlphp/ws-security
  */
+#[CoversClass(SoapAction::class)]
+#[CoversClass(AbstractWsaElement::class)]
 final class SoapActionTest extends TestCase
 {
     use SerializableElementTestTrait;
diff --git a/tests/WSSecurity/XML/wsa/ToTest.php b/tests/WSSecurity/XML/wsa/ToTest.php
index 1cd40364..4816752a 100644
--- a/tests/WSSecurity/XML/wsa/ToTest.php
+++ b/tests/WSSecurity/XML/wsa/ToTest.php
@@ -4,7 +4,10 @@
 
 namespace SimpleSAML\Test\WSSecurity\XML\wsa;
 
+use PHPUnit\Framework\Attributes\CoversClass;
 use PHPUnit\Framework\TestCase;
+use SimpleSAML\WSSecurity\XML\wsa\AbstractAttributedURIType;
+use SimpleSAML\WSSecurity\XML\wsa\AbstractWsaElement;
 use SimpleSAML\WSSecurity\XML\wsa\To;
 use SimpleSAML\XML\Attribute;
 use SimpleSAML\XML\DOMDocumentFactory;
@@ -17,11 +20,11 @@
 /**
  * Tests for wsa:To.
  *
- * @covers \SimpleSAML\WSSecurity\XML\wsa\To
- * @covers \SimpleSAML\WSSecurity\XML\wsa\AbstractAttributedURIType
- * @covers \SimpleSAML\WSSecurity\XML\wsa\AbstractWsaElement
  * @package simplesamlphp/ws-security
  */
+#[CoversClass(To::class)]
+#[CoversClass(AbstractAttributedURIType::class)]
+#[CoversClass(AbstractWsaElement::class)]
 final class ToTest extends TestCase
 {
     use SchemaValidationTestTrait;
diff --git a/tests/WSSecurity/XML/wsp/AllTest.php b/tests/WSSecurity/XML/wsp/AllTest.php
index 040e0286..2ce2d86c 100644
--- a/tests/WSSecurity/XML/wsp/AllTest.php
+++ b/tests/WSSecurity/XML/wsp/AllTest.php
@@ -4,7 +4,10 @@
 
 namespace SimpleSAML\Test\WSSecurity\XML\wsp;
 
+use PHPUnit\Framework\Attributes\CoversClass;
 use PHPUnit\Framework\TestCase;
+use SimpleSAML\WSSecurity\XML\wsp\AbstractOperatorContentType;
+use SimpleSAML\WSSecurity\XML\wsp\AbstractWspElement;
 use SimpleSAML\WSSecurity\XML\wsp\All;
 use SimpleSAML\WSSecurity\XML\wsp\ExactlyOne;
 use SimpleSAML\XML\Chunk;
@@ -18,11 +21,11 @@
 /**
  * Class \SimpleSAML\WSSecurity\XML\wsp\AllTest
  *
- * @covers \SimpleSAML\WSSecurity\XML\wsp\All
- * @covers \SimpleSAML\WSSecurity\XML\wsp\AbstractOperatorContentType
- * @covers \SimpleSAML\WSSecurity\XML\wsp\AbstractWspElement
  * @package simplesamlphp/ws-security
  */
+#[CoversClass(All::class)]
+#[CoversClass(AbstractOperatorContentType::class)]
+#[CoversClass(AbstractWspElement::class)]
 final class AllTest extends TestCase
 {
     use SchemaValidationTestTrait;
diff --git a/tests/WSSecurity/XML/wsp/AppliesToTest.php b/tests/WSSecurity/XML/wsp/AppliesToTest.php
index 5fed8044..a9cd4d14 100644
--- a/tests/WSSecurity/XML/wsp/AppliesToTest.php
+++ b/tests/WSSecurity/XML/wsp/AppliesToTest.php
@@ -4,9 +4,11 @@
 
 namespace SimpleSAML\Test\WSSecurity\XML\wsp;
 
+use PHPUnit\Framework\Attributes\CoversClass;
 use PHPUnit\Framework\TestCase;
 use SimpleSAML\WSSecurity\XML\wsa\Address;
 use SimpleSAML\WSSecurity\XML\wsa\EndpointReference;
+use SimpleSAML\WSSecurity\XML\wsp\AbstractWspElement;
 use SimpleSAML\WSSecurity\XML\wsp\AppliesTo;
 use SimpleSAML\XML\Attribute;
 use SimpleSAML\XML\DOMDocumentFactory;
@@ -19,11 +21,10 @@
 /**
  * Class \SimpleSAML\WSSecurity\XML\wsp\AppliesToTest
  *
- * @covers \SimpleSAML\WSSecurity\XML\wsp\AppliesTo
- * @covers \SimpleSAML\WSSecurity\XML\wsp\AbstractwspElement
- *
  * @package simplesamlphp/ws-security
  */
+#[CoversClass(AppliesTo::class)]
+#[CoversClass(AbstractWspElement::class)]
 final class AppliesToTest extends TestCase
 {
     use SchemaValidationTestTrait;
diff --git a/tests/WSSecurity/XML/wsp/ExactlyOneTest.php b/tests/WSSecurity/XML/wsp/ExactlyOneTest.php
index 427eabff..c9940598 100644
--- a/tests/WSSecurity/XML/wsp/ExactlyOneTest.php
+++ b/tests/WSSecurity/XML/wsp/ExactlyOneTest.php
@@ -4,7 +4,10 @@
 
 namespace SimpleSAML\Test\WSSecurity\XML\wsp;
 
+use PHPUnit\Framework\Attributes\CoversClass;
 use PHPUnit\Framework\TestCase;
+use SimpleSAML\WSSecurity\XML\wsp\AbstractOperatorContentType;
+use SimpleSAML\WSSecurity\XML\wsp\AbstractWspElement;
 use SimpleSAML\WSSecurity\XML\wsp\All;
 use SimpleSAML\WSSecurity\XML\wsp\ExactlyOne;
 use SimpleSAML\XML\Chunk;
@@ -18,11 +21,11 @@
 /**
  * Class \SimpleSAML\WSSecurity\XML\wsp\ExactlyOneTest
  *
- * @covers \SimpleSAML\WSSecurity\XML\wsp\ExactlyOne
- * @covers \SimpleSAML\WSSecurity\XML\wsp\AbstractOperatorContentType
- * @covers \SimpleSAML\WSSecurity\XML\wsp\AbstractWspElement
  * @package simplesamlphp/ws-security
  */
+#[CoversClass(ExactlyOne::class)]
+#[CoversClass(AbstractOperatorContentType::class)]
+#[CoversClass(AbstractWspElement::class)]
 final class ExactlyOneTest extends TestCase
 {
     use SchemaValidationTestTrait;
diff --git a/tests/WSSecurity/XML/wsp/PolicyAttachmentTest.php b/tests/WSSecurity/XML/wsp/PolicyAttachmentTest.php
index a5c53000..469b12d8 100644
--- a/tests/WSSecurity/XML/wsp/PolicyAttachmentTest.php
+++ b/tests/WSSecurity/XML/wsp/PolicyAttachmentTest.php
@@ -4,10 +4,12 @@
 
 namespace SimpleSAML\Test\WSSecurity\XML\wsp;
 
+use PHPUnit\Framework\Attributes\CoversClass;
 use PHPUnit\Framework\TestCase;
 use SimpleSAML\Test\WSSecurity\Constants as C;
 use SimpleSAML\WSSecurity\XML\wsa\Address;
 use SimpleSAML\WSSecurity\XML\wsa\EndpointReference;
+use SimpleSAML\WSSecurity\XML\wsp\AbstractWspElement;
 use SimpleSAML\WSSecurity\XML\wsp\AppliesTo;
 use SimpleSAML\WSSecurity\XML\wsp\ExactlyOne;
 use SimpleSAML\WSSecurity\XML\wsp\Policy;
@@ -26,10 +28,10 @@
 /**
  * Class \SimpleSAML\WSSecurity\XML\wsp\PolicyAttachmentTest
  *
- * @covers \SimpleSAML\WSSecurity\XML\wsp\PolicyAttachment
- * @covers \SimpleSAML\WSSecurity\XML\wsp\AbstractWspElement
  * @package simplesamlphp/ws-security
  */
+#[CoversClass(PolicyAttachment::class)]
+#[CoversClass(AbstractWspElement::class)]
 final class PolicyAttachmentTest extends TestCase
 {
     use SchemaValidationTestTrait;
diff --git a/tests/WSSecurity/XML/wsp/PolicyReferenceTest.php b/tests/WSSecurity/XML/wsp/PolicyReferenceTest.php
index 82636ba0..22939603 100644
--- a/tests/WSSecurity/XML/wsp/PolicyReferenceTest.php
+++ b/tests/WSSecurity/XML/wsp/PolicyReferenceTest.php
@@ -4,8 +4,10 @@
 
 namespace SimpleSAML\Test\WSSecurity\XML\wsp;
 
+use PHPUnit\Framework\Attributes\CoversClass;
 use PHPUnit\Framework\TestCase;
 use SimpleSAML\Test\WSSecurity\Constants as C;
+use SimpleSAML\WSSecurity\XML\wsp\AbstractWspElement;
 use SimpleSAML\WSSecurity\XML\wsp\PolicyReference;
 use SimpleSAML\XML\Attribute as XMLAttribute;
 use SimpleSAML\XML\DOMDocumentFactory;
@@ -18,10 +20,10 @@
 /**
  * Class \SimpleSAML\WSSecurity\XML\wsp\PolicyReferenceTest
  *
- * @covers \SimpleSAML\WSSecurity\XML\wsp\PolicyReference
- * @covers \SimpleSAML\WSSecurity\XML\wsp\AbstractWspElement
  * @package simplesamlphp/ws-security
  */
+#[CoversClass(PolicyReference::class)]
+#[CoversClass(AbstractWspElement::class)]
 final class PolicyReferenceTest extends TestCase
 {
     use SchemaValidationTestTrait;
diff --git a/tests/WSSecurity/XML/wsp/PolicyTest.php b/tests/WSSecurity/XML/wsp/PolicyTest.php
index 2761accd..b799bf88 100644
--- a/tests/WSSecurity/XML/wsp/PolicyTest.php
+++ b/tests/WSSecurity/XML/wsp/PolicyTest.php
@@ -4,8 +4,11 @@
 
 namespace SimpleSAML\Test\WSSecurity\XML\wsp;
 
+use PHPUnit\Framework\Attributes\CoversClass;
 use PHPUnit\Framework\TestCase;
 use SimpleSAML\Test\WSSecurity\Constants as C;
+use SimpleSAML\WSSecurity\XML\wsp\AbstractOperatorContentType;
+use SimpleSAML\WSSecurity\XML\wsp\AbstractWspElement;
 use SimpleSAML\WSSecurity\XML\wsp\ExactlyOne;
 use SimpleSAML\WSSecurity\XML\wsp\Policy;
 use SimpleSAML\XML\Attribute as XMLAttribute;
@@ -20,11 +23,11 @@
 /**
  * Class \SimpleSAML\WSSecurity\XML\wsp\PolicyTest
  *
- * @covers \SimpleSAML\WSSecurity\XML\wsp\Policy
- * @covers \SimpleSAML\WSSecurity\XML\wsp\AbstractOperatorContentType
- * @covers \SimpleSAML\WSSecurity\XML\wsp\AbstractWspElement
  * @package simplesamlphp/ws-security
  */
+#[CoversClass(Policy::class)]
+#[CoversClass(AbstractOperatorContentType::class)]
+#[CoversClass(AbstractWspElement::class)]
 final class PolicyTest extends TestCase
 {
     use SchemaValidationTestTrait;
diff --git a/tests/WSSecurity/XML/wsse/BinarySecurityTokenTest.php b/tests/WSSecurity/XML/wsse/BinarySecurityTokenTest.php
index 1d51b9ca..953ab254 100644
--- a/tests/WSSecurity/XML/wsse/BinarySecurityTokenTest.php
+++ b/tests/WSSecurity/XML/wsse/BinarySecurityTokenTest.php
@@ -4,7 +4,12 @@
 
 namespace SimpleSAML\Test\WSSecurity\XML\wsse;
 
+use PHPUnit\Framework\Attributes\CoversClass;
 use PHPUnit\Framework\TestCase;
+use SimpleSAML\WSSecurity\XML\wsse\AbstractAttributedString;
+use SimpleSAML\WSSecurity\XML\wsse\AbstractBinarySecurityTokenType;
+use SimpleSAML\WSSecurity\XML\wsse\AbstractEncodedString;
+use SimpleSAML\WSSecurity\XML\wsse\AbstractWsseElement;
 use SimpleSAML\WSSecurity\XML\wsse\BinarySecurityToken;
 use SimpleSAML\XML\Attribute as XMLAttribute;
 use SimpleSAML\XML\DOMDocumentFactory;
@@ -17,13 +22,13 @@
 /**
  * Tests for wsse:BinarySecurityToken.
  *
- * @covers \SimpleSAML\WSSecurity\XML\wsse\BinarySecurityToken
- * @covers \SimpleSAML\WSSecurity\XML\wsse\AbstractBinarySecurityTokenType
- * @covers \SimpleSAML\WSSecurity\XML\wsse\AbstractEncodedString
- * @covers \SimpleSAML\WSSecurity\XML\wsse\AbstractAttributedString
- * @covers \SimpleSAML\WSSecurity\XML\wsse\AbstractWsseElement
  * @package simplesamlphp/ws-security
  */
+#[CoversClass(BinarySecurityToken::class)]
+#[CoversClass(AbstractBinarySecurityTokenType::class)]
+#[CoversClass(AbstractEncodedString::class)]
+#[CoversClass(AbstractAttributedString::class)]
+#[CoversClass(AbstractWsseElement::class)]
 final class BinarySecurityTokenTest extends TestCase
 {
     use SchemaValidationTestTrait;
diff --git a/tests/WSSecurity/XML/wsse/EmbeddedTest.php b/tests/WSSecurity/XML/wsse/EmbeddedTest.php
index 65c38558..34a2df20 100644
--- a/tests/WSSecurity/XML/wsse/EmbeddedTest.php
+++ b/tests/WSSecurity/XML/wsse/EmbeddedTest.php
@@ -4,7 +4,10 @@
 
 namespace SimpleSAML\Test\WSSecurity\XML\wsse;
 
+use PHPUnit\Framework\Attributes\CoversClass;
 use PHPUnit\Framework\TestCase;
+use SimpleSAML\WSSecurity\XML\wsse\AbstractEmbeddedType;
+use SimpleSAML\WSSecurity\XML\wsse\AbstractWsseElement;
 use SimpleSAML\WSSecurity\XML\wsse\Embedded;
 use SimpleSAML\XML\Attribute as XMLAttribute;
 use SimpleSAML\XML\Chunk;
@@ -18,11 +21,11 @@
 /**
  * Tests for wsse:Embedded.
  *
- * @covers \SimpleSAML\WSSecurity\XML\wsse\Embedded
- * @covers \SimpleSAML\WSSecurity\XML\wsse\AbstractEmbeddedType
- * @covers \SimpleSAML\WSSecurity\XML\wsse\AbstractWsseElement
  * @package simplesamlphp/ws-security
  */
+#[CoversClass(Embedded::class)]
+#[CoversClass(AbstractEmbeddedType::class)]
+#[CoversClass(AbstractWsseElement::class)]
 final class EmbeddedTest extends TestCase
 {
     use SchemaValidationTestTrait;
diff --git a/tests/WSSecurity/XML/wsse/KeyIdentifierTest.php b/tests/WSSecurity/XML/wsse/KeyIdentifierTest.php
index 2c335271..d525015e 100644
--- a/tests/WSSecurity/XML/wsse/KeyIdentifierTest.php
+++ b/tests/WSSecurity/XML/wsse/KeyIdentifierTest.php
@@ -4,7 +4,12 @@
 
 namespace SimpleSAML\Test\WSSecurity\XML\wsse;
 
+use PHPUnit\Framework\Attributes\CoversClass;
 use PHPUnit\Framework\TestCase;
+use SimpleSAML\WSSecurity\XML\wsse\AbstractAttributedString;
+use SimpleSAML\WSSecurity\XML\wsse\AbstractEncodedString;
+use SimpleSAML\WSSecurity\XML\wsse\AbstractKeyIdentifierType;
+use SimpleSAML\WSSecurity\XML\wsse\AbstractWsseElement;
 use SimpleSAML\WSSecurity\XML\wsse\KeyIdentifier;
 use SimpleSAML\XML\Attribute as XMLAttribute;
 use SimpleSAML\XML\DOMDocumentFactory;
@@ -17,13 +22,13 @@
 /**
  * Tests for wsse:KeyIdentifier.
  *
- * @covers \SimpleSAML\WSSecurity\XML\wsse\KeyIdentifier
- * @covers \SimpleSAML\WSSecurity\XML\wsse\AbstractKeyIdentifierType
- * @covers \SimpleSAML\WSSecurity\XML\wsse\AbstractEncodedString
- * @covers \SimpleSAML\WSSecurity\XML\wsse\AbstractAttributedString
- * @covers \SimpleSAML\WSSecurity\XML\wsse\AbstractWsseElement
  * @package simplesamlphp/ws-security
  */
+#[CoversClass(KeyIdentifier::class)]
+#[CoversClass(AbstractKeyIdentifierType::class)]
+#[CoversClass(AbstractEncodedString::class)]
+#[CoversClass(AbstractAttributedString::class)]
+#[CoversClass(AbstractWsseElement::class)]
 final class KeyIdentifierTest extends TestCase
 {
     use SchemaValidationTestTrait;
diff --git a/tests/WSSecurity/XML/wsse/NonceTest.php b/tests/WSSecurity/XML/wsse/NonceTest.php
index 01236ecf..a4747570 100644
--- a/tests/WSSecurity/XML/wsse/NonceTest.php
+++ b/tests/WSSecurity/XML/wsse/NonceTest.php
@@ -4,7 +4,11 @@
 
 namespace SimpleSAML\Test\WSSecurity\XML\wsse;
 
+use PHPUnit\Framework\Attributes\CoversClass;
 use PHPUnit\Framework\TestCase;
+use SimpleSAML\WSSecurity\XML\wsse\AbstractAttributedString;
+use SimpleSAML\WSSecurity\XML\wsse\AbstractEncodedString;
+use SimpleSAML\WSSecurity\XML\wsse\AbstractWsseElement;
 use SimpleSAML\WSSecurity\XML\wsse\Nonce;
 use SimpleSAML\XML\Attribute as XMLAttribute;
 use SimpleSAML\XML\DOMDocumentFactory;
@@ -17,12 +21,12 @@
 /**
  * Tests for wsse:Nonce.
  *
- * @covers \SimpleSAML\WSSecurity\XML\wsse\Nonce
- * @covers \SimpleSAML\WSSecurity\XML\wsse\AbstractEncodedString
- * @covers \SimpleSAML\WSSecurity\XML\wsse\AbstractAttributedString
- * @covers \SimpleSAML\WSSecurity\XML\wsse\AbstractWsseElement
  * @package simplesamlphp/ws-security
  */
+#[CoversClass(Nonce::class)]
+#[CoversClass(AbstractEncodedString::class)]
+#[CoversClass(AbstractAttributedString::class)]
+#[CoversClass(AbstractWsseElement::class)]
 final class NonceTest extends TestCase
 {
     use SchemaValidationTestTrait;
diff --git a/tests/WSSecurity/XML/wsse/PasswordTest.php b/tests/WSSecurity/XML/wsse/PasswordTest.php
index f6a6eb97..8dd90465 100644
--- a/tests/WSSecurity/XML/wsse/PasswordTest.php
+++ b/tests/WSSecurity/XML/wsse/PasswordTest.php
@@ -4,7 +4,11 @@
 
 namespace SimpleSAML\Test\WSSecurity\XML\wsse;
 
+use PHPUnit\Framework\Attributes\CoversClass;
 use PHPUnit\Framework\TestCase;
+use SimpleSAML\WSSecurity\XML\wsse\AbstractAttributedString;
+use SimpleSAML\WSSecurity\XML\wsse\AbstractPasswordString;
+use SimpleSAML\WSSecurity\XML\wsse\AbstractWsseElement;
 use SimpleSAML\WSSecurity\XML\wsse\Password;
 use SimpleSAML\XML\Attribute as XMLAttribute;
 use SimpleSAML\XML\DOMDocumentFactory;
@@ -16,12 +20,12 @@
 /**
  * Tests for wsse:Password.
  *
- * @covers \SimpleSAML\WSSecurity\XML\wsse\Password
- * @covers \SimpleSAML\WSSecurity\XML\wsse\AbstractPasswordString
- * @covers \SimpleSAML\WSSecurity\XML\wsse\AbstractAttributedString
- * @covers \SimpleSAML\WSSecurity\XML\wsse\AbstractWsseElement
  * @package simplesamlphp/ws-security
  */
+#[CoversClass(Password::class)]
+#[CoversClass(AbstractPasswordString::class)]
+#[CoversClass(AbstractAttributedString::class)]
+#[CoversClass(AbstractWsseElement::class)]
 final class PasswordTest extends TestCase
 {
     use SerializableElementTestTrait;
diff --git a/tests/WSSecurity/XML/wsse/ReferenceTest.php b/tests/WSSecurity/XML/wsse/ReferenceTest.php
index e806302d..3c1f678e 100644
--- a/tests/WSSecurity/XML/wsse/ReferenceTest.php
+++ b/tests/WSSecurity/XML/wsse/ReferenceTest.php
@@ -4,7 +4,10 @@
 
 namespace SimpleSAML\Test\WSSecurity\XML\wsse;
 
+use PHPUnit\Framework\Attributes\CoversClass;
 use PHPUnit\Framework\TestCase;
+use SimpleSAML\WSSecurity\XML\wsse\AbstractReferenceType;
+use SimpleSAML\WSSecurity\XML\wsse\AbstractWsseElement;
 use SimpleSAML\WSSecurity\XML\wsse\Reference;
 use SimpleSAML\XML\Attribute as XMLAttribute;
 use SimpleSAML\XML\DOMDocumentFactory;
@@ -17,11 +20,11 @@
 /**
  * Tests for wsse:Reference.
  *
- * @covers \SimpleSAML\WSSecurity\XML\wsse\Reference
- * @covers \SimpleSAML\WSSecurity\XML\wsse\AbstractReferenceType
- * @covers \SimpleSAML\WSSecurity\XML\wsse\AbstractWsseElement
  * @package simplesamlphp/ws-security
  */
+#[CoversClass(Reference::class)]
+#[CoversClass(AbstractReferenceType::class)]
+#[CoversClass(AbstractWsseElement::class)]
 final class ReferenceTest extends TestCase
 {
     use SchemaValidationTestTrait;
diff --git a/tests/WSSecurity/XML/wsse/SecurityTest.php b/tests/WSSecurity/XML/wsse/SecurityTest.php
index 6b70df57..a8791bda 100644
--- a/tests/WSSecurity/XML/wsse/SecurityTest.php
+++ b/tests/WSSecurity/XML/wsse/SecurityTest.php
@@ -4,7 +4,10 @@
 
 namespace SimpleSAML\Test\WSSecurity\XML\wsse;
 
+use PHPUnit\Framework\Attributes\CoversClass;
 use PHPUnit\Framework\TestCase;
+use SimpleSAML\WSSecurity\XML\wsse\AbstractSecurityHeaderType;
+use SimpleSAML\WSSecurity\XML\wsse\AbstractWsseElement;
 use SimpleSAML\WSSecurity\XML\wsse\Security;
 use SimpleSAML\XML\Attribute as XMLAttribute;
 use SimpleSAML\XML\Chunk;
@@ -18,11 +21,11 @@
 /**
  * Tests for wsse:Security.
  *
- * @covers \SimpleSAML\WSSecurity\XML\wsse\Security
- * @covers \SimpleSAML\WSSecurity\XML\wsse\AbstractSecurityHeaderType
- * @covers \SimpleSAML\WSSecurity\XML\wsse\AbstractWsseElement
  * @package simplesamlphp/ws-security
  */
+#[CoversClass(Security::class)]
+#[CoversClass(AbstractSecurityHeaderType::class)]
+#[CoversClass(AbstractWsseElement::class)]
 final class SecurityTest extends TestCase
 {
     use SchemaValidationTestTrait;
diff --git a/tests/WSSecurity/XML/wsse/SecurityTokenReferenceTest.php b/tests/WSSecurity/XML/wsse/SecurityTokenReferenceTest.php
index 60b7a4c9..c0a8ad2f 100644
--- a/tests/WSSecurity/XML/wsse/SecurityTokenReferenceTest.php
+++ b/tests/WSSecurity/XML/wsse/SecurityTokenReferenceTest.php
@@ -4,7 +4,10 @@
 
 namespace SimpleSAML\Test\WSSecurity\XML\wsse;
 
+use PHPUnit\Framework\Attributes\CoversClass;
 use PHPUnit\Framework\TestCase;
+use SimpleSAML\WSSecurity\XML\wsse\AbstractSecurityTokenReferenceType;
+use SimpleSAML\WSSecurity\XML\wsse\AbstractWsseElement;
 use SimpleSAML\WSSecurity\XML\wsse\SecurityTokenReference;
 use SimpleSAML\XML\Attribute as XMLAttribute;
 use SimpleSAML\XML\Chunk;
@@ -18,11 +21,11 @@
 /**
  * Tests for wsse:SecurityTokenReference.
  *
- * @covers \SimpleSAML\WSSecurity\XML\wsse\SecurityTokenReference
- * @covers \SimpleSAML\WSSecurity\XML\wsse\AbstractSecurityTokenReferenceType
- * @covers \SimpleSAML\WSSecurity\XML\wsse\AbstractWsseElement
  * @package simplesamlphp/ws-security
  */
+#[CoversClass(SecurityTokenReference::class)]
+#[CoversClass(AbstractSecurityTokenReferenceType::class)]
+#[CoversClass(AbstractWsseElement::class)]
 final class SecurityTokenReferenceTest extends TestCase
 {
     use SchemaValidationTestTrait;
diff --git a/tests/WSSecurity/XML/wsse/TransformationParametersTest.php b/tests/WSSecurity/XML/wsse/TransformationParametersTest.php
index 82144ada..45513a99 100644
--- a/tests/WSSecurity/XML/wsse/TransformationParametersTest.php
+++ b/tests/WSSecurity/XML/wsse/TransformationParametersTest.php
@@ -4,7 +4,10 @@
 
 namespace SimpleSAML\Test\WSSecurity\XML\wsse;
 
+use PHPUnit\Framework\Attributes\CoversClass;
 use PHPUnit\Framework\TestCase;
+use SimpleSAML\WSSecurity\XML\wsse\AbstractTransformParametersType;
+use SimpleSAML\WSSecurity\XML\wsse\AbstractWsseElement;
 use SimpleSAML\WSSecurity\XML\wsse\TransformationParameters;
 use SimpleSAML\XML\Attribute as XMLAttribute;
 use SimpleSAML\XML\Chunk;
@@ -18,11 +21,11 @@
 /**
  * Tests for wsse:TransformationParameters.
  *
- * @covers \SimpleSAML\WSSecurity\XML\wsse\TransformationParameters
- * @covers \SimpleSAML\WSSecurity\XML\wsse\AbstractTransformationParametersType
- * @covers \SimpleSAML\WSSecurity\XML\wsse\AbstractWsseElement
  * @package simplesamlphp/ws-security
  */
+#[CoversClass(TransformationParameters::class)]
+#[CoversClass(AbstractTransformationParametersType::class)]
+#[CoversClass(AbstractWsseElement::class)]
 final class TransformationParametersTest extends TestCase
 {
     use SchemaValidationTestTrait;
diff --git a/tests/WSSecurity/XML/wsse/UsernameTest.php b/tests/WSSecurity/XML/wsse/UsernameTest.php
index fab06686..fe6e51ed 100644
--- a/tests/WSSecurity/XML/wsse/UsernameTest.php
+++ b/tests/WSSecurity/XML/wsse/UsernameTest.php
@@ -4,7 +4,10 @@
 
 namespace SimpleSAML\Test\WSSecurity\XML\wsse;
 
+use PHPUnit\Framework\Attributes\CoversClass;
 use PHPUnit\Framework\TestCase;
+use SimpleSAML\WSSecurity\XML\wsse\AbstractAttributedString;
+use SimpleSAML\WSSecurity\XML\wsse\AbstractWsseElement;
 use SimpleSAML\WSSecurity\XML\wsse\Username;
 use SimpleSAML\XML\Attribute as XMLAttribute;
 use SimpleSAML\XML\DOMDocumentFactory;
@@ -16,11 +19,11 @@
 /**
  * Tests for wsse:Username.
  *
- * @covers \SimpleSAML\WSSecurity\XML\wsse\Username
- * @covers \SimpleSAML\WSSecurity\XML\wsse\AbstractAttributedString
- * @covers \SimpleSAML\WSSecurity\XML\wsse\AbstractWsseElement
  * @package simplesamlphp/ws-security
  */
+#[CoversClass(Username::class)]
+#[CoversClass(AbstractAttributedString::class)]
+#[CoversClass(AbstractWsseElement::class)]
 final class UsernameTest extends TestCase
 {
     use SerializableElementTestTrait;
diff --git a/tests/WSSecurity/XML/wsse/UsernameTokenTest.php b/tests/WSSecurity/XML/wsse/UsernameTokenTest.php
index b2f106aa..89f4c576 100644
--- a/tests/WSSecurity/XML/wsse/UsernameTokenTest.php
+++ b/tests/WSSecurity/XML/wsse/UsernameTokenTest.php
@@ -4,7 +4,10 @@
 
 namespace SimpleSAML\Test\WSSecurity\XML\wsse;
 
+use PHPUnit\Framework\Attributes\CoversClass;
 use PHPUnit\Framework\TestCase;
+use SimpleSAML\WSSecurity\XML\wsse\AbstractUsernameToken;
+use SimpleSAML\WSSecurity\XML\wsse\AbstractWsseElement;
 use SimpleSAML\WSSecurity\XML\wsse\Username;
 use SimpleSAML\WSSecurity\XML\wsse\UsernameToken;
 use SimpleSAML\XML\Attribute as XMLAttribute;
@@ -19,11 +22,11 @@
 /**
  * Tests for wsse:UsernameToken.
  *
- * @covers \SimpleSAML\WSSecurity\XML\wsse\UsernameToken
- * @covers \SimpleSAML\WSSecurity\XML\wsse\AbstractUsernameTokenType
- * @covers \SimpleSAML\WSSecurity\XML\wsse\AbstractWsseElement
  * @package simplesamlphp/ws-security
  */
+#[CoversClass(UsernameToken::class)]
+#[CoversClass(AbstractUsernameTokenType::class)]
+#[CoversClass(AbstractWsseElement::class)]
 final class UsernameTokenTest extends TestCase
 {
     use SchemaValidationTestTrait;
diff --git a/tests/WSSecurity/XML/wst/AllowPostdatingTest.php b/tests/WSSecurity/XML/wst/AllowPostdatingTest.php
index 45e07b26..e8a05065 100644
--- a/tests/WSSecurity/XML/wst/AllowPostdatingTest.php
+++ b/tests/WSSecurity/XML/wst/AllowPostdatingTest.php
@@ -4,7 +4,9 @@
 
 namespace SimpleSAML\Test\WSSecurity\XML\wst;
 
+use PHPUnit\Framework\Attributes\CoversClass;
 use PHPUnit\Framework\TestCase;
+use SimpleSAML\WSSecurity\XML\wst\AbstractWstElement;
 use SimpleSAML\WSSecurity\XML\wst\AllowPostdating;
 use SimpleSAML\XML\DOMDocumentFactory;
 use SimpleSAML\XML\TestUtils\SchemaValidationTestTrait;
@@ -15,11 +17,10 @@
 /**
  * Class \SimpleSAML\WSSecurity\XML\wst\AllowPostdatingTest
  *
- * @covers \SimpleSAML\WSSecurity\XML\wst\AllowPostdating
- * @covers \SimpleSAML\WSSecurity\XML\wst\AbstractWstElement
- *
  * @package simplesamlphp/ws-security
  */
+#[CoversClass(AllowPostdating::class)]
+#[CoversClass(AbstractWstElement::class)]
 final class AllowPostdatingTest extends TestCase
 {
     use SchemaValidationTestTrait;
diff --git a/tests/WSSecurity/XML/wst/AuthenticationTypeTest.php b/tests/WSSecurity/XML/wst/AuthenticationTypeTest.php
index 19e7eb34..2ae12ad2 100644
--- a/tests/WSSecurity/XML/wst/AuthenticationTypeTest.php
+++ b/tests/WSSecurity/XML/wst/AuthenticationTypeTest.php
@@ -4,8 +4,10 @@
 
 namespace SimpleSAML\Test\WSSecurity\XML\wst;
 
+use PHPUnit\Framework\Attributes\CoversClass;
 use PHPUnit\Framework\TestCase;
 use SimpleSAML\Test\WSSecurity\Constants as C;
+use SimpleSAML\WSSecurity\XML\wst\AbstractWstElement;
 use SimpleSAML\WSSecurity\XML\wst\AuthenticationType;
 use SimpleSAML\XML\DOMDocumentFactory;
 use SimpleSAML\XML\TestUtils\SchemaValidationTestTrait;
@@ -16,11 +18,10 @@
 /**
  * Class \SimpleSAML\WSSecurity\XML\wst\AuthenticationTypeTest
  *
- * @covers \SimpleSAML\WSSecurity\XML\wst\AuthenticationType
- * @covers \SimpleSAML\WSSecurity\XML\wst\AbstractWstElement
- *
  * @package simplesamlphp/ws-security
  */
+#[CoversClass(AuthenticationType::class)]
+#[CoversClass(AbstractWstElement::class)]
 final class AuthenticationTypeTest extends TestCase
 {
     use SchemaValidationTestTrait;
diff --git a/tests/WSSecurity/XML/wst/AuthenticatorTest.php b/tests/WSSecurity/XML/wst/AuthenticatorTest.php
index 5cd21911..2ed81295 100644
--- a/tests/WSSecurity/XML/wst/AuthenticatorTest.php
+++ b/tests/WSSecurity/XML/wst/AuthenticatorTest.php
@@ -4,10 +4,13 @@
 
 namespace SimpleSAML\Test\WSSecurity\XML\wst;
 
+use PHPUnit\Framework\Attributes\CoversClass;
 use PHPUnit\Framework\TestCase;
 use SimpleSAML\SOAP\Constants as SOAP;
 use SimpleSAML\WSSecurity\XML\wsa\MessageID;
+use SimpleSAML\WSSecurity\XML\wst\AbstractWstElement;
 use SimpleSAML\WSSecurity\XML\wst\Authenticator;
+use SimpleSAML\WSSecurity\XML\wst\AuthenticatorType;
 use SimpleSAML\WSSecurity\XML\wst\CombinedHash;
 use SimpleSAML\XML\Attribute as XMLAttribute;
 use SimpleSAML\XML\DOMDocumentFactory;
@@ -19,12 +22,11 @@
 /**
  * Class \SimpleSAML\WSSecurity\XML\wst\AuthenticatorTest
  *
- * @covers \SimpleSAML\WSSecurity\XML\wst\Authenticator
- * @covers \SimpleSAML\WSSecurity\XML\wst\AbstractAuthenticatorType
- * @covers \SimpleSAML\WSSecurity\XML\wst\AbstractWstElement
- *
  * @package simplesamlphp/ws-security
  */
+#[CoversClass(Authenticator::class)]
+#[CoversClass(AbstractAuthenticatorType::class)]
+#[CoversClass(AbstractWstElement::class)]
 final class AuthenticatorTest extends TestCase
 {
     use SchemaValidationTestTrait;
diff --git a/tests/WSSecurity/XML/wst/BinaryExchangeTest.php b/tests/WSSecurity/XML/wst/BinaryExchangeTest.php
index b72927a2..33aa773f 100644
--- a/tests/WSSecurity/XML/wst/BinaryExchangeTest.php
+++ b/tests/WSSecurity/XML/wst/BinaryExchangeTest.php
@@ -4,8 +4,11 @@
 
 namespace SimpleSAML\Test\WSSecurity\XML\wst;
 
+use PHPUnit\Framework\Attributes\CoversClass;
 use PHPUnit\Framework\TestCase;
 use SimpleSAML\Test\WSSecurity\Constants as C;
+use SimpleSAML\WSSecurity\XML\wst\AbstractBinaryExchangeType;
+use SimpleSAML\WSSecurity\XML\wst\AbstractWstElement;
 use SimpleSAML\WSSecurity\XML\wst\BinaryExchange;
 use SimpleSAML\XML\Attribute as XMLAttribute;
 use SimpleSAML\XML\DOMDocumentFactory;
@@ -17,12 +20,11 @@
 /**
  * Class \SimpleSAML\WSSecurity\XML\wst\BinaryExchangeTest
  *
- * @covers \SimpleSAML\WSSecurity\XML\wst\BinaryExchange
- * @covers \SimpleSAML\WSSecurity\XML\wst\AbstractBinaryExchangeType
- * @covers \SimpleSAML\WSSecurity\XML\wst\AbstractWstElement
- *
  * @package simplesamlphp/ws-security
  */
+#[CoversClass(BinaryExchange::class)]
+#[CoversClass(AbstractBinaryExchangeType::class)]
+#[CoversClass(AbstractWstElement::class)]
 final class BinaryExchangeTest extends TestCase
 {
     use SchemaValidationTestTrait;
diff --git a/tests/WSSecurity/XML/wst/BinarySecretTest.php b/tests/WSSecurity/XML/wst/BinarySecretTest.php
index 320f5cdc..362cbd54 100644
--- a/tests/WSSecurity/XML/wst/BinarySecretTest.php
+++ b/tests/WSSecurity/XML/wst/BinarySecretTest.php
@@ -4,8 +4,11 @@
 
 namespace SimpleSAML\Test\WSSecurity\XML\wst;
 
+use PHPUnit\Framework\Attributes\CoversClass;
 use PHPUnit\Framework\TestCase;
 use SimpleSAML\Test\WSSecurity\Constants as C;
+use SimpleSAML\WSSecurity\XML\wst\AbstractBinarySecretType;
+use SimpleSAML\WSSecurity\XML\wst\AbstractWstElement;
 use SimpleSAML\WSSecurity\XML\wst\BinarySecret;
 use SimpleSAML\WSSecurity\XML\wst\BinarySecretTypeEnum;
 use SimpleSAML\XML\Attribute as XMLAttribute;
@@ -18,12 +21,11 @@
 /**
  * Class \SimpleSAML\WSSecurity\XML\wst\BinarySecretTest
  *
- * @covers \SimpleSAML\WSSecurity\XML\wst\BinarySecret
- * @covers \SimpleSAML\WSSecurity\XML\wst\AbstractBinarySecretType
- * @covers \SimpleSAML\WSSecurity\XML\wst\AbstractWstElement
- *
  * @package simplesamlphp/ws-security
  */
+#[CoversClass(BinarySecret::class)]
+#[CoversClass(AbstractBinarySecretType::class)]
+#[CoversClass(AbstractWstElement::class)]
 final class BinarySecretTest extends TestCase
 {
     use SchemaValidationTestTrait;
diff --git a/tests/WSSecurity/XML/wst/CancelTargetTest.php b/tests/WSSecurity/XML/wst/CancelTargetTest.php
index 7e5a6623..64d5f4a4 100644
--- a/tests/WSSecurity/XML/wst/CancelTargetTest.php
+++ b/tests/WSSecurity/XML/wst/CancelTargetTest.php
@@ -4,9 +4,12 @@
 
 namespace SimpleSAML\Test\WSSecurity\XML\wst;
 
+use PHPUnit\Framework\Attributes\CoversClass;
 use PHPUnit\Framework\TestCase;
 use SimpleSAML\SOAP\Constants as SOAP;
 use SimpleSAML\WSSecurity\XML\wsa\MessageID;
+use SimpleSAML\WSSecurity\XML\wst\AbstractCancelTargetType;
+use SimpleSAML\WSSecurity\XML\wst\AbstractWstElement;
 use SimpleSAML\WSSecurity\XML\wst\CancelTarget;
 use SimpleSAML\XML\Attribute as XMLAttribute;
 use SimpleSAML\XML\DOMDocumentFactory;
@@ -18,12 +21,11 @@
 /**
  * Class \SimpleSAML\WSSecurity\XML\wst\CancelTargetTest
  *
- * @covers \SimpleSAML\WSSecurity\XML\wst\CancelTarget
- * @covers \SimpleSAML\WSSecurity\XML\wst\AbstractCancelTargetType
- * @covers \SimpleSAML\WSSecurity\XML\wst\AbstractWstElement
- *
  * @package simplesamlphp/ws-security
  */
+#[CoversClass(CancelTarget::class)]
+#[CoversClass(AbstractCancelTargetType::class)]
+#[CoversClass(AbstractWstElement::class)]
 final class CancelTargetTest extends TestCase
 {
     use SchemaValidationTestTrait;
diff --git a/tests/WSSecurity/XML/wst/CanonicalizationAlgorithmTest.php b/tests/WSSecurity/XML/wst/CanonicalizationAlgorithmTest.php
index fb0ba399..11cc45ff 100644
--- a/tests/WSSecurity/XML/wst/CanonicalizationAlgorithmTest.php
+++ b/tests/WSSecurity/XML/wst/CanonicalizationAlgorithmTest.php
@@ -4,8 +4,10 @@
 
 namespace SimpleSAML\Test\WSSecurity\XML\wst;
 
+use PHPUnit\Framework\Attributes\CoversClass;
 use PHPUnit\Framework\TestCase;
 use SimpleSAML\Test\WSSecurity\Constants as C;
+use SimpleSAML\WSSecurity\XML\wst\AbstractWstElement;
 use SimpleSAML\WSSecurity\XML\wst\CanonicalizationAlgorithm;
 use SimpleSAML\XML\DOMDocumentFactory;
 use SimpleSAML\XML\TestUtils\SchemaValidationTestTrait;
@@ -16,11 +18,10 @@
 /**
  * Class \SimpleSAML\WSSecurity\XML\wst\CanonicalizationAlgorithmTest
  *
- * @covers \SimpleSAML\WSSecurity\XML\wst\CanonicalizationAlgorithm
- * @covers \SimpleSAML\WSSecurity\XML\wst\AbstractWstElement
- *
  * @package simplesamlphp/ws-security
  */
+#[CoversClass(CanonicalizationAlgorithm::class)]
+#[CoversClass(AbstractWstElement::class)]
 final class CanonicalizationAlgorithmTest extends TestCase
 {
     use SchemaValidationTestTrait;
diff --git a/tests/WSSecurity/XML/wst/ChallengeTest.php b/tests/WSSecurity/XML/wst/ChallengeTest.php
index 8c098215..8889114f 100644
--- a/tests/WSSecurity/XML/wst/ChallengeTest.php
+++ b/tests/WSSecurity/XML/wst/ChallengeTest.php
@@ -4,7 +4,9 @@
 
 namespace SimpleSAML\Test\WSSecurity\XML\wst;
 
+use PHPUnit\Framework\Attributes\CoversClass;
 use PHPUnit\Framework\TestCase;
+use SimpleSAML\WSSecurity\XML\wst\AbstractWstElement;
 use SimpleSAML\WSSecurity\XML\wst\Challenge;
 use SimpleSAML\XML\DOMDocumentFactory;
 use SimpleSAML\XML\TestUtils\SchemaValidationTestTrait;
@@ -15,11 +17,10 @@
 /**
  * Class \SimpleSAML\WSSecurity\XML\wst\ChallengeTest
  *
- * @covers \SimpleSAML\WSSecurity\XML\wst\Challenge
- * @covers \SimpleSAML\WSSecurity\XML\wst\AbstractWstElement
- *
  * @package simplesamlphp/ws-security
  */
+#[CoversClass(Challenge::class)]
+#[CoversClass(AbstractWstElement::class)]
 final class ChallengeTest extends TestCase
 {
     use SchemaValidationTestTrait;
diff --git a/tests/WSSecurity/XML/wst/ClaimsTest.php b/tests/WSSecurity/XML/wst/ClaimsTest.php
index b88c36a5..1bd1f64a 100644
--- a/tests/WSSecurity/XML/wst/ClaimsTest.php
+++ b/tests/WSSecurity/XML/wst/ClaimsTest.php
@@ -4,10 +4,13 @@
 
 namespace SimpleSAML\Test\WSSecurity\XML\wst;
 
+use PHPUnit\Framework\Attributes\CoversClass;
 use PHPUnit\Framework\TestCase;
 use SimpleSAML\SOAP\Constants as SOAP;
 use SimpleSAML\Test\WSSecurity\Constants as C;
 use SimpleSAML\WSSecurity\XML\wsa\MessageID;
+use SimpleSAML\WSSecurity\XML\wst\AbstractClaimsType;
+use SimpleSAML\WSSecurity\XML\wst\AbstractWstElement;
 use SimpleSAML\WSSecurity\XML\wst\Claims;
 use SimpleSAML\XML\Attribute as XMLAttribute;
 use SimpleSAML\XML\DOMDocumentFactory;
@@ -19,12 +22,11 @@
 /**
  * Class \SimpleSAML\WSSecurity\XML\wst\ClaimsTest
  *
- * @covers \SimpleSAML\WSSecurity\XML\wst\Claims
- * @covers \SimpleSAML\WSSecurity\XML\wst\AbstractClaimsType
- * @covers \SimpleSAML\WSSecurity\XML\wst\AbstractWstElement
- *
  * @package simplesamlphp/ws-security
  */
+#[CoversClass(Claims::class)]
+#[CoversClass(AbstractClaimsType::class)]
+#[CoversClass(AbstractWstElement::class)]
 final class ClaimsTest extends TestCase
 {
     use SchemaValidationTestTrait;
diff --git a/tests/WSSecurity/XML/wst/CodeTest.php b/tests/WSSecurity/XML/wst/CodeTest.php
index 74f70b1d..d202886c 100644
--- a/tests/WSSecurity/XML/wst/CodeTest.php
+++ b/tests/WSSecurity/XML/wst/CodeTest.php
@@ -4,7 +4,10 @@
 
 namespace SimpleSAML\Test\WSSecurity\XML\wst;
 
+use PHPUnit\Framework\Attributes\CoversClass;
 use PHPUnit\Framework\TestCase;
+use SimpleSAML\WSSecurity\XML\wst\AbstractStatusCodeOpenEnumType;
+use SimpleSAML\WSSecurity\XML\wst\AbstractWstElement;
 use SimpleSAML\WSSecurity\XML\wst\Code;
 use SimpleSAML\WSSecurity\XML\wst\StatusCodeEnum;
 use SimpleSAML\XML\DOMDocumentFactory;
@@ -15,12 +18,11 @@
 /**
  * Class \SimpleSAML\WSSecurity\XML\wst\CodeTest
  *
- * @covers \SimpleSAML\WSSecurity\XML\wst\Code
- * @covers \SimpleSAML\WSSecurity\XML\wst\AbstractStatusCodeOpenEnum
- * @covers \SimpleSAML\WSSecurity\XML\wst\AbstractWstElement
- *
  * @package simplesamlphp/ws-security
  */
+#[CoversClass(Code::class)]
+#[CoversClass(AbstractStatusCodeOpenEnumType::class)]
+#[CoversClass(AbstractWstElement::class)]
 final class CodeTest extends TestCase
 {
     use SerializableElementTestTrait;
diff --git a/tests/WSSecurity/XML/wst/CombinedHashTest.php b/tests/WSSecurity/XML/wst/CombinedHashTest.php
index 7bcedfed..bc6480b5 100644
--- a/tests/WSSecurity/XML/wst/CombinedHashTest.php
+++ b/tests/WSSecurity/XML/wst/CombinedHashTest.php
@@ -4,7 +4,9 @@
 
 namespace SimpleSAML\Test\WSSecurity\XML\wst;
 
+use PHPUnit\Framework\Attributes\CoversClass;
 use PHPUnit\Framework\TestCase;
+use SimpleSAML\WSSecurity\XML\wst\AbstractWstElement;
 use SimpleSAML\WSSecurity\XML\wst\CombinedHash;
 use SimpleSAML\XML\DOMDocumentFactory;
 use SimpleSAML\XML\TestUtils\SchemaValidationTestTrait;
@@ -15,11 +17,10 @@
 /**
  * Class \SimpleSAML\WSSecurity\XML\wst\CombinedHashTest
  *
- * @covers \SimpleSAML\WSSecurity\XML\wst\CombinedHash
- * @covers \SimpleSAML\WSSecurity\XML\wst\AbstractWstElement
- *
  * @package simplesamlphp/ws-security
  */
+#[CoversClass(CombinedHash::class)]
+#[CoversClass(AbstractWstElement::class)]
 final class CombinedHashTest extends TestCase
 {
     use SchemaValidationTestTrait;
diff --git a/tests/WSSecurity/XML/wst/ComputedKeyAlgorithmTest.php b/tests/WSSecurity/XML/wst/ComputedKeyAlgorithmTest.php
index 5bf99bd1..480a589c 100644
--- a/tests/WSSecurity/XML/wst/ComputedKeyAlgorithmTest.php
+++ b/tests/WSSecurity/XML/wst/ComputedKeyAlgorithmTest.php
@@ -4,8 +4,10 @@
 
 namespace SimpleSAML\Test\WSSecurity\XML\wst;
 
+use PHPUnit\Framework\Attributes\CoversClass;
 use PHPUnit\Framework\TestCase;
 use SimpleSAML\Test\WSSecurity\Constants as C;
+use SimpleSAML\WSSecurity\XML\wst\AbstractWstElement;
 use SimpleSAML\WSSecurity\XML\wst\ComputedKeyAlgorithm;
 use SimpleSAML\XML\DOMDocumentFactory;
 use SimpleSAML\XML\TestUtils\SchemaValidationTestTrait;
@@ -16,11 +18,10 @@
 /**
  * Class \SimpleSAML\WSSecurity\XML\wst\ComputedKeyAlgorithmTest
  *
- * @covers \SimpleSAML\WSSecurity\XML\wst\ComputedKeyAlgorithm
- * @covers \SimpleSAML\WSSecurity\XML\wst\AbstractWstElement
- *
  * @package simplesamlphp/ws-security
  */
+#[CoversClass(ComputedKeyAlgorithm::class)]
+#[CoversClass(AbstractWstElement::class)]
 final class ComputedKeyAlgorithmTest extends TestCase
 {
     use SchemaValidationTestTrait;
diff --git a/tests/WSSecurity/XML/wst/ComputedKeyTest.php b/tests/WSSecurity/XML/wst/ComputedKeyTest.php
index e2b788b9..be0c2067 100644
--- a/tests/WSSecurity/XML/wst/ComputedKeyTest.php
+++ b/tests/WSSecurity/XML/wst/ComputedKeyTest.php
@@ -4,7 +4,10 @@
 
 namespace SimpleSAML\Test\WSSecurity\XML\wst;
 
+use PHPUnit\Framework\Attributes\CoversClass;
 use PHPUnit\Framework\TestCase;
+use SimpleSAML\WSSecurity\XML\wst\AbstractComputedKeyOpenEnum;
+use SimpleSAML\WSSecurity\XML\wst\AbstractWstElement;
 use SimpleSAML\WSSecurity\XML\wst\ComputedKey;
 use SimpleSAML\WSSecurity\XML\wst\ComputedKeyEnum;
 use SimpleSAML\XML\DOMDocumentFactory;
@@ -16,12 +19,11 @@
 /**
  * Class \SimpleSAML\WSSecurity\XML\wst\ComputedKeyTest
  *
- * @covers \SimpleSAML\WSSecurity\XML\wst\ComputedKey
- * @covers \SimpleSAML\WSSecurity\XML\wst\AbstractComputedKeyOpenEnum
- * @covers \SimpleSAML\WSSecurity\XML\wst\AbstractWstElement
- *
  * @package simplesamlphp/ws-security
  */
+#[CoversClass(ComputedKey::class)]
+#[CoversClass(AbstractComputedKeyOpenEnum::class)]
+#[CoversClass(AbstractWstElement::class)]
 final class ComputedKeyTest extends TestCase
 {
     use SchemaValidationTestTrait;
diff --git a/tests/WSSecurity/XML/wst/DelegatableTest.php b/tests/WSSecurity/XML/wst/DelegatableTest.php
index 760a628c..48e79c3b 100644
--- a/tests/WSSecurity/XML/wst/DelegatableTest.php
+++ b/tests/WSSecurity/XML/wst/DelegatableTest.php
@@ -4,7 +4,9 @@
 
 namespace SimpleSAML\Test\WSSecurity\XML\wst;
 
+use PHPUnit\Framework\Attributes\CoversClass;
 use PHPUnit\Framework\TestCase;
+use SimpleSAML\WSSecurity\XML\wst\AbstractWstElement;
 use SimpleSAML\WSSecurity\XML\wst\Delegatable;
 use SimpleSAML\XML\DOMDocumentFactory;
 use SimpleSAML\XML\TestUtils\SchemaValidationTestTrait;
@@ -15,11 +17,10 @@
 /**
  * Class \SimpleSAML\WSSecurity\XML\wst\DelegatableTest
  *
- * @covers \SimpleSAML\WSSecurity\XML\wst\Delegatable
- * @covers \SimpleSAML\WSSecurity\XML\wst\AbstractWstElement
- *
  * @package simplesamlphp/ws-security
  */
+#[CoversClass(Delegatable::class)]
+#[CoversClass(AbstractWstElement::class)]
 final class DelegatableTest extends TestCase
 {
     use SchemaValidationTestTrait;
diff --git a/tests/WSSecurity/XML/wst/DelegateToTest.php b/tests/WSSecurity/XML/wst/DelegateToTest.php
index cf3d1a7c..eefbc779 100644
--- a/tests/WSSecurity/XML/wst/DelegateToTest.php
+++ b/tests/WSSecurity/XML/wst/DelegateToTest.php
@@ -4,9 +4,12 @@
 
 namespace SimpleSAML\Test\WSSecurity\XML\wst;
 
+use PHPUnit\Framework\Attributes\CoversClass;
 use PHPUnit\Framework\TestCase;
 use SimpleSAML\SOAP\Constants as SOAP;
 use SimpleSAML\WSSecurity\XML\wsa\MessageID;
+use SimpleSAML\WSSecurity\XML\wst\AbstractDelegateToType;
+use SimpleSAML\WSSecurity\XML\wst\AbstractWstElement;
 use SimpleSAML\WSSecurity\XML\wst\DelegateTo;
 use SimpleSAML\XML\Attribute as XMLAttribute;
 use SimpleSAML\XML\DOMDocumentFactory;
@@ -18,12 +21,11 @@
 /**
  * Class \SimpleSAML\WSSecurity\XML\wst\DelegateToTest
  *
- * @covers \SimpleSAML\WSSecurity\XML\wst\DelegateTo
- * @covers \SimpleSAML\WSSecurity\XML\wst\AbstractDelegateToType
- * @covers \SimpleSAML\WSSecurity\XML\wst\AbstractWstElement
- *
  * @package simplesamlphp/ws-security
  */
+#[CoversClass(DelegateTo::class)]
+#[CoversClass(AbstractDelegateToType::class)]
+#[CoversClass(AbstractWstElement::class)]
 final class DelegateToTest extends TestCase
 {
     use SchemaValidationTestTrait;
diff --git a/tests/WSSecurity/XML/wst/EncryptWithTest.php b/tests/WSSecurity/XML/wst/EncryptWithTest.php
index 52928df4..8d7e2d60 100644
--- a/tests/WSSecurity/XML/wst/EncryptWithTest.php
+++ b/tests/WSSecurity/XML/wst/EncryptWithTest.php
@@ -4,8 +4,10 @@
 
 namespace SimpleSAML\Test\WSSecurity\XML\wst;
 
+use PHPUnit\Framework\Attributes\CoversClass;
 use PHPUnit\Framework\TestCase;
 use SimpleSAML\Test\WSSecurity\Constants as C;
+use SimpleSAML\WSSecurity\XML\wst\AbstractWstElement;
 use SimpleSAML\WSSecurity\XML\wst\EncryptWith;
 use SimpleSAML\XML\DOMDocumentFactory;
 use SimpleSAML\XML\TestUtils\SchemaValidationTestTrait;
@@ -16,11 +18,10 @@
 /**
  * Class \SimpleSAML\WSSecurity\XML\wst\EncryptWithTest
  *
- * @covers \SimpleSAML\WSSecurity\XML\wst\EncryptWith
- * @covers \SimpleSAML\WSSecurity\XML\wst\AbstractWstElement
- *
  * @package simplesamlphp/ws-security
  */
+#[CoversClass(EncryptWith::class)]
+#[CoversClass(AbstractWstElement::class)]
 final class EncryptWithTest extends TestCase
 {
     use SchemaValidationTestTrait;
diff --git a/tests/WSSecurity/XML/wst/EncryptionAlgorithmTest.php b/tests/WSSecurity/XML/wst/EncryptionAlgorithmTest.php
index 39d48c3d..abacfa51 100644
--- a/tests/WSSecurity/XML/wst/EncryptionAlgorithmTest.php
+++ b/tests/WSSecurity/XML/wst/EncryptionAlgorithmTest.php
@@ -4,8 +4,10 @@
 
 namespace SimpleSAML\Test\WSSecurity\XML\wst;
 
+use PHPUnit\Framework\Attributes\CoversClass;
 use PHPUnit\Framework\TestCase;
 use SimpleSAML\Test\WSSecurity\Constants as C;
+use SimpleSAML\WSSecurity\XML\wst\AbstractWstElement;
 use SimpleSAML\WSSecurity\XML\wst\EncryptionAlgorithm;
 use SimpleSAML\XML\DOMDocumentFactory;
 use SimpleSAML\XML\TestUtils\SchemaValidationTestTrait;
@@ -16,11 +18,10 @@
 /**
  * Class \SimpleSAML\WSSecurity\XML\wst\EncryptionAlgorithmTest
  *
- * @covers \SimpleSAML\WSSecurity\XML\wst\EncryptionAlgorithm
- * @covers \SimpleSAML\WSSecurity\XML\wst\AbstractWstElement
- *
  * @package simplesamlphp/ws-security
  */
+#[CoversClass(EncryptionAlgorithm::class)]
+#[CoversClass(AbstractWstElement::class)]
 final class EncryptionAlgorithmTest extends TestCase
 {
     use SchemaValidationTestTrait;
diff --git a/tests/WSSecurity/XML/wst/EncryptionTest.php b/tests/WSSecurity/XML/wst/EncryptionTest.php
index 91c78a58..db5f56a7 100644
--- a/tests/WSSecurity/XML/wst/EncryptionTest.php
+++ b/tests/WSSecurity/XML/wst/EncryptionTest.php
@@ -4,9 +4,12 @@
 
 namespace SimpleSAML\Test\WSSecurity\XML\wst;
 
+use PHPUnit\Framework\Attributes\CoversClass;
 use PHPUnit\Framework\TestCase;
 use SimpleSAML\SOAP\Constants as SOAP;
 use SimpleSAML\WSSecurity\XML\wsa\MessageID;
+use SimpleSAML\WSSecurity\XML\wst\AbstractEncryptionType;
+use SimpleSAML\WSSecurity\XML\wst\AbstractWstElement;
 use SimpleSAML\WSSecurity\XML\wst\Encryption;
 use SimpleSAML\XML\Attribute as XMLAttribute;
 use SimpleSAML\XML\DOMDocumentFactory;
@@ -18,12 +21,11 @@
 /**
  * Class \SimpleSAML\WSSecurity\XML\wst\EncryptionTest
  *
- * @covers \SimpleSAML\WSSecurity\XML\wst\Encryption
- * @covers \SimpleSAML\WSSecurity\XML\wst\AbstractEncryptionType
- * @covers \SimpleSAML\WSSecurity\XML\wst\AbstractWstElement
- *
  * @package simplesamlphp/ws-security
  */
+#[CoversClass(Encryption::class)]
+#[CoversClass(AbstractEncryptionType::class)]
+#[CoversClass(AbstractWstElement::class)]
 final class EncryptionTest extends TestCase
 {
     use SchemaValidationTestTrait;
diff --git a/tests/WSSecurity/XML/wst/EntropyTest.php b/tests/WSSecurity/XML/wst/EntropyTest.php
index a3a718df..6a4c0955 100644
--- a/tests/WSSecurity/XML/wst/EntropyTest.php
+++ b/tests/WSSecurity/XML/wst/EntropyTest.php
@@ -4,10 +4,13 @@
 
 namespace SimpleSAML\Test\WSSecurity\XML\wst;
 
+use PHPUnit\Framework\Attributes\CoversClass;
 use PHPUnit\Framework\TestCase;
 use SimpleSAML\SOAP\Constants as SOAP;
 use SimpleSAML\Test\WSSecurity\Constants as C;
 use SimpleSAML\WSSecurity\XML\wsa\MessageID;
+use SimpleSAML\WSSecurity\XML\wst\AbstractEntropyType;
+use SimpleSAML\WSSecurity\XML\wst\AbstractWstElement;
 use SimpleSAML\WSSecurity\XML\wst\Entropy;
 use SimpleSAML\XML\Attribute as XMLAttribute;
 use SimpleSAML\XML\DOMDocumentFactory;
@@ -19,12 +22,11 @@
 /**
  * Class \SimpleSAML\WSSecurity\XML\wst\EntropyTest
  *
- * @covers \SimpleSAML\WSSecurity\XML\wst\Entropy
- * @covers \SimpleSAML\WSSecurity\XML\wst\AbstractEntropyType
- * @covers \SimpleSAML\WSSecurity\XML\wst\AbstractWstElement
- *
  * @package simplesamlphp/ws-security
  */
+#[CoversClass(Entropy::class)]
+#[CoversClass(AbstractEntropyType::class)]
+#[CoversClass(AbstractWstElement::class)]
 final class EntropyTest extends TestCase
 {
     use SchemaValidationTestTrait;
diff --git a/tests/WSSecurity/XML/wst/ForwardableTest.php b/tests/WSSecurity/XML/wst/ForwardableTest.php
index fdbc0f00..9573a67e 100644
--- a/tests/WSSecurity/XML/wst/ForwardableTest.php
+++ b/tests/WSSecurity/XML/wst/ForwardableTest.php
@@ -4,7 +4,9 @@
 
 namespace SimpleSAML\Test\WSSecurity\XML\wst;
 
+use PHPUnit\Framework\Attributes\CoversClass;
 use PHPUnit\Framework\TestCase;
+use SimpleSAML\WSSecurity\XML\wst\AbstractWstElement;
 use SimpleSAML\WSSecurity\XML\wst\Forwardable;
 use SimpleSAML\XML\DOMDocumentFactory;
 use SimpleSAML\XML\TestUtils\SchemaValidationTestTrait;
@@ -15,11 +17,10 @@
 /**
  * Class \SimpleSAML\WSSecurity\XML\wst\ForwardableTest
  *
- * @covers \SimpleSAML\WSSecurity\XML\wst\Forwardable
- * @covers \SimpleSAML\WSSecurity\XML\wst\AbstractWstElement
- *
  * @package simplesamlphp/ws-security
  */
+#[CoversClass(Forwardable::class)]
+#[CoversClass(AbstractWstElement::class)]
 final class ForwardableTest extends TestCase
 {
     use SchemaValidationTestTrait;
diff --git a/tests/WSSecurity/XML/wst/IssuedTokensTest.php b/tests/WSSecurity/XML/wst/IssuedTokensTest.php
index 9540ee30..ba414855 100644
--- a/tests/WSSecurity/XML/wst/IssuedTokensTest.php
+++ b/tests/WSSecurity/XML/wst/IssuedTokensTest.php
@@ -4,10 +4,13 @@
 
 namespace SimpleSAML\Test\WSSecurity\XML\wst;
 
+use PHPUnit\Framework\Attributes\CoversClass;
 use PHPUnit\Framework\TestCase;
 use SimpleSAML\SOAP\Constants as SOAP;
 use SimpleSAML\Test\WSSecurity\Constants as C;
 use SimpleSAML\WSSecurity\XML\wsa\MessageID;
+use SimpleSAML\WSSecurity\XML\wst\AbstractEndpointReferenceType;
+use SimpleSAML\WSSecurity\XML\wst\AbstractWstElement;
 use SimpleSAML\WSSecurity\XML\wst\IssuedTokens;
 use SimpleSAML\WSSecurity\XML\wst\RequestSecurityTokenResponse;
 use SimpleSAML\XML\Attribute as XMLAttribute;
@@ -20,12 +23,11 @@
 /**
  * Class \SimpleSAML\WSSecurity\XML\wst\IssuedTokensTest
  *
- * @covers \SimpleSAML\WSSecurity\XML\wst\IssuedTokens
- * @covers \SimpleSAML\WSSecurity\XML\wsa\AbstractEndpointReferenceType
- * @covers \SimpleSAML\WSSecurity\XML\wsa\AbstractWsaElement
- *
  * @package simplesamlphp/ws-security
  */
+#[CoversClass(IssuedTokens::class)]
+#[CoversClass(AbstractEndpointReferenceType::class)]
+#[CoversClass(AbstractWstElement::class)]
 final class IssuedTokensTest extends TestCase
 {
     use SchemaValidationTestTrait;
diff --git a/tests/WSSecurity/XML/wst/IssuerTest.php b/tests/WSSecurity/XML/wst/IssuerTest.php
index afed5b3a..90624e3b 100644
--- a/tests/WSSecurity/XML/wst/IssuerTest.php
+++ b/tests/WSSecurity/XML/wst/IssuerTest.php
@@ -5,10 +5,13 @@
 namespace SimpleSAML\Test\WSSecurity\XML\wst;
 
 use DOMElement;
+use PHPUnit\Framework\Attributes\CoversClass;
 use PHPUnit\Framework\TestCase;
+use SimpleSAML\WSSecurity\XML\wsa\AbstractEndpointReferenceType;
 use SimpleSAML\WSSecurity\XML\wsa\Address;
 use SimpleSAML\WSSecurity\XML\wsa\Metadata;
 use SimpleSAML\WSSecurity\XML\wsa\ReferenceParameters;
+use SimpleSAML\WSSecurity\XML\wst\AbstractWstElement;
 use SimpleSAML\WSSecurity\XML\wst\Issuer;
 use SimpleSAML\XML\Attribute;
 use SimpleSAML\XML\Chunk;
@@ -21,11 +24,11 @@
 /**
  * Tests for wst:Issuer.
  *
- * @covers \SimpleSAML\WSSecurity\XML\wst\Issuer
- * @covers \SimpleSAML\WSSecurity\XML\wsa\AbstractEndpointReferenceType
- * @covers \SimpleSAML\WSSecurity\XML\wsa\AbstractWsaElement
  * @package simplesamlphp/ws-security
  */
+#[CoversClass(Issuer::class)]
+#[CoversClass(AbstractEndpointReferenceType::class)]
+#[CoversClass(AbstractWstElement::class)]
 final class IssuerTest extends TestCase
 {
     use SerializableElementTestTrait;
diff --git a/tests/WSSecurity/XML/wst/KeyExchangeTokenTest.php b/tests/WSSecurity/XML/wst/KeyExchangeTokenTest.php
index 9d6cb624..f5ccee97 100644
--- a/tests/WSSecurity/XML/wst/KeyExchangeTokenTest.php
+++ b/tests/WSSecurity/XML/wst/KeyExchangeTokenTest.php
@@ -4,9 +4,12 @@
 
 namespace SimpleSAML\Test\WSSecurity\XML\wst;
 
+use PHPUnit\Framework\Attributes\CoversClass;
 use PHPUnit\Framework\TestCase;
 use SimpleSAML\SOAP\Constants as SOAP;
 use SimpleSAML\WSSecurity\XML\wsa\MessageID;
+use SimpleSAML\WSSecurity\XML\wst\AbstractKeyExchangeTokenType;
+use SimpleSAML\WSSecurity\XML\wst\AbstractWstElement;
 use SimpleSAML\WSSecurity\XML\wst\KeyExchangeToken;
 use SimpleSAML\XML\Attribute as XMLAttribute;
 use SimpleSAML\XML\DOMDocumentFactory;
@@ -18,12 +21,11 @@
 /**
  * Class \SimpleSAML\WSSecurity\XML\wst\KeyExchangeTokenTest
  *
- * @covers \SimpleSAML\WSSecurity\XML\wst\KeyExchangeToken
- * @covers \SimpleSAML\WSSecurity\XML\wst\AbstractKeyExchangeTokenType
- * @covers \SimpleSAML\WSSecurity\XML\wst\AbstractWstElement
- *
  * @package simplesamlphp/ws-security
  */
+#[CoversClass(KeyExchangeToken::class)]
+#[CoversClass(AbstractKeyExchangeTokenType::class)]
+#[CoversClass(AbstractWstElement::class)]
 final class KeyExchangeTokenTest extends TestCase
 {
     use SchemaValidationTestTrait;
diff --git a/tests/WSSecurity/XML/wst/KeySizeTest.php b/tests/WSSecurity/XML/wst/KeySizeTest.php
index 9846c5e2..c86cd40e 100644
--- a/tests/WSSecurity/XML/wst/KeySizeTest.php
+++ b/tests/WSSecurity/XML/wst/KeySizeTest.php
@@ -4,7 +4,9 @@
 
 namespace SimpleSAML\Test\WSSecurity\XML\wst;
 
+use PHPUnit\Framework\Attributes\CoversClass;
 use PHPUnit\Framework\TestCase;
+use SimpleSAML\WSSecurity\XML\wst\AbstractWstElement;
 use SimpleSAML\WSSecurity\XML\wst\KeySize;
 use SimpleSAML\XML\DOMDocumentFactory;
 use SimpleSAML\XML\TestUtils\SchemaValidationTestTrait;
@@ -15,11 +17,10 @@
 /**
  * Class \SimpleSAML\WSSecurity\XML\wst\KeySizeTest
  *
- * @covers \SimpleSAML\WSSecurity\XML\wst\KeySize
- * @covers \SimpleSAML\WSSecurity\XML\wst\AbstractWstElement
- *
  * @package simplesamlphp/ws-security
  */
+#[CoversClass(KeySize::class)]
+#[CoversClass(AbstractWstElement::class)]
 final class KeySizeTest extends TestCase
 {
     use SchemaValidationTestTrait;
diff --git a/tests/WSSecurity/XML/wst/KeyTypeTest.php b/tests/WSSecurity/XML/wst/KeyTypeTest.php
index 9a92ed98..16b61365 100644
--- a/tests/WSSecurity/XML/wst/KeyTypeTest.php
+++ b/tests/WSSecurity/XML/wst/KeyTypeTest.php
@@ -4,7 +4,10 @@
 
 namespace SimpleSAML\Test\WSSecurity\XML\wst;
 
+use PHPUnit\Framework\Attributes\CoversClass;
 use PHPUnit\Framework\TestCase;
+use SimpleSAML\WSSecurity\XML\wst\AbstractKeyTypeOpenEnum;
+use SimpleSAML\WSSecurity\XML\wst\AbstractWstElement;
 use SimpleSAML\WSSecurity\XML\wst\KeyType;
 use SimpleSAML\WSSecurity\XML\wst\KeyTypeEnum;
 use SimpleSAML\XML\DOMDocumentFactory;
@@ -16,12 +19,11 @@
 /**
  * Class \SimpleSAML\WSSecurity\XML\wst\KeyTypeTest
  *
- * @covers \SimpleSAML\WSSecurity\XML\wst\KeyType
- * @covers \SimpleSAML\WSSecurity\XML\wst\AbstractKeyTypeOpenEnum
- * @covers \SimpleSAML\WSSecurity\XML\wst\AbstractWstElement
- *
  * @package simplesamlphp/ws-security
  */
+#[CoversClass(KeyType::class)]
+#[CoversClass(AbstractKeyTypeOpenEnum::class)]
+#[CoversClass(AbstractWstElement::class)]
 final class KeyTypeTest extends TestCase
 {
     use SchemaValidationTestTrait;
diff --git a/tests/WSSecurity/XML/wst/KeyWrapAlgorithmTest.php b/tests/WSSecurity/XML/wst/KeyWrapAlgorithmTest.php
index cd24d99c..8c942fc2 100644
--- a/tests/WSSecurity/XML/wst/KeyWrapAlgorithmTest.php
+++ b/tests/WSSecurity/XML/wst/KeyWrapAlgorithmTest.php
@@ -4,8 +4,10 @@
 
 namespace SimpleSAML\Test\WSSecurity\XML\wst;
 
+use PHPUnit\Framework\Attributes\CoversClass;
 use PHPUnit\Framework\TestCase;
 use SimpleSAML\Test\WSSecurity\Constants as C;
+use SimpleSAML\WSSecurity\XML\wst\AbstractWstElement;
 use SimpleSAML\WSSecurity\XML\wst\KeyWrapAlgorithm;
 use SimpleSAML\XML\DOMDocumentFactory;
 use SimpleSAML\XML\TestUtils\SchemaValidationTestTrait;
@@ -16,11 +18,10 @@
 /**
  * Class \SimpleSAML\WSSecurity\XML\wst\KeyWrapAlgorithmTest
  *
- * @covers \SimpleSAML\WSSecurity\XML\wst\KeyWrapAlgorithm
- * @covers \SimpleSAML\WSSecurity\XML\wst\AbstractWstElement
- *
  * @package simplesamlphp/ws-security
  */
+#[CoversClass(KeyWrapAlgorithm::class)]
+#[CoversClass(AbstractWstElement::class)]
 final class KeyWrapAlgorithmTest extends TestCase
 {
     use SchemaValidationTestTrait;
diff --git a/tests/WSSecurity/XML/wst/LifetimeTest.php b/tests/WSSecurity/XML/wst/LifetimeTest.php
index 1b246608..2a27a859 100644
--- a/tests/WSSecurity/XML/wst/LifetimeTest.php
+++ b/tests/WSSecurity/XML/wst/LifetimeTest.php
@@ -5,7 +5,10 @@
 namespace SimpleSAML\Test\WSSecurity\XML\wst;
 
 use DateTimeImmutable;
+use PHPUnit\Framework\Attributes\CoversClass;
 use PHPUnit\Framework\TestCase;
+use SimpleSAML\WSSecurity\XML\wst\AbstractLifetimeType;
+use SimpleSAML\WSSecurity\XML\wst\AbstractWstElement;
 use SimpleSAML\WSSecurity\XML\wst\Lifetime;
 use SimpleSAML\WSSecurity\XML\wsu\Created;
 use SimpleSAML\WSSecurity\XML\wsu\Expires;
@@ -18,12 +21,11 @@
 /**
  * Class \SimpleSAML\WSSecurity\XML\wst\LifetimeTest
  *
- * @covers \SimpleSAML\WSSecurity\XML\wst\Lifetime
- * @covers \SimpleSAML\WSSecurity\XML\wst\AbstractLifetimeType
- * @covers \SimpleSAML\WSSecurity\XML\wst\AbstractWstElement
- *
  * @package simplesamlphp/ws-security
  */
+#[CoversClass(Lifetime::class)]
+#[CoversClass(AbstractLifetimeType::class)]
+#[CoversClass(AbstractWstElement::class)]
 final class LifetimeTest extends TestCase
 {
     use SchemaValidationTestTrait;
diff --git a/tests/WSSecurity/XML/wst/OnBehalfOfTest.php b/tests/WSSecurity/XML/wst/OnBehalfOfTest.php
index 8e183e45..e29afa66 100644
--- a/tests/WSSecurity/XML/wst/OnBehalfOfTest.php
+++ b/tests/WSSecurity/XML/wst/OnBehalfOfTest.php
@@ -4,9 +4,12 @@
 
 namespace SimpleSAML\Test\WSSecurity\XML\wst;
 
+use PHPUnit\Framework\Attributes\CoversClass;
 use PHPUnit\Framework\TestCase;
 use SimpleSAML\SOAP\Constants as SOAP;
 use SimpleSAML\WSSecurity\XML\wsa\MessageID;
+use SimpleSAML\WSSecurity\XML\wst\AbstractOnBehalfOfType;
+use SimpleSAML\WSSecurity\XML\wst\AbstractWstElement;
 use SimpleSAML\WSSecurity\XML\wst\OnBehalfOf;
 use SimpleSAML\XML\Attribute as XMLAttribute;
 use SimpleSAML\XML\DOMDocumentFactory;
@@ -18,12 +21,11 @@
 /**
  * Class \SimpleSAML\WSSecurity\XML\wst\OnBehalfOfTest
  *
- * @covers \SimpleSAML\WSSecurity\XML\wst\OnBehalfOf
- * @covers \SimpleSAML\WSSecurity\XML\wst\AbstractOnBehalfOfType
- * @covers \SimpleSAML\WSSecurity\XML\wst\AbstractWstElement
- *
  * @package simplesamlphp/ws-security
  */
+#[CoversClass(OnBehalfOf::class)]
+#[CoversClass(AbstractOnBehalfOfType::class)]
+#[CoversClass(AbstractWstElement::class)]
 final class OnBehalfOfTest extends TestCase
 {
     use SchemaValidationTestTrait;
diff --git a/tests/WSSecurity/XML/wst/ParticipantTest.php b/tests/WSSecurity/XML/wst/ParticipantTest.php
index 986a4c1a..56146aff 100644
--- a/tests/WSSecurity/XML/wst/ParticipantTest.php
+++ b/tests/WSSecurity/XML/wst/ParticipantTest.php
@@ -4,9 +4,12 @@
 
 namespace SimpleSAML\Test\WSSecurity\XML\wst;
 
+use PHPUnit\Framework\Attributes\CoversClass;
 use PHPUnit\Framework\TestCase;
 use SimpleSAML\SOAP\Constants as SOAP;
 use SimpleSAML\WSSecurity\XML\wsa\MessageID;
+use SimpleSAML\WSSecurity\XML\wst\AbstractParticipantType;
+use SimpleSAML\WSSecurity\XML\wst\AbstractWstElement;
 use SimpleSAML\WSSecurity\XML\wst\Participant;
 use SimpleSAML\XML\Attribute as XMLAttribute;
 use SimpleSAML\XML\DOMDocumentFactory;
@@ -17,12 +20,11 @@
 /**
  * Class \SimpleSAML\WSSecurity\XML\wst\ParticipantTest
  *
- * @covers \SimpleSAML\WSSecurity\XML\wst\Participant
- * @covers \SimpleSAML\WSSecurity\XML\wst\AbstractParticipantType
- * @covers \SimpleSAML\WSSecurity\XML\wst\AbstractWstElement
- *
  * @package simplesamlphp/ws-security
  */
+#[CoversClass(Participant::class)]
+#[CoversClass(AbstractParticipantType::class)]
+#[CoversClass(AbstractWstElement::class)]
 final class ParticipantTest extends TestCase
 {
     use SerializableElementTestTrait;
diff --git a/tests/WSSecurity/XML/wst/ParticipantsTest.php b/tests/WSSecurity/XML/wst/ParticipantsTest.php
index d06182e6..3bc011b0 100644
--- a/tests/WSSecurity/XML/wst/ParticipantsTest.php
+++ b/tests/WSSecurity/XML/wst/ParticipantsTest.php
@@ -4,10 +4,13 @@
 
 namespace SimpleSAML\Test\WSSecurity\XML\wst;
 
+use PHPUnit\Framework\Attributes\CoversClass;
 use PHPUnit\Framework\TestCase;
 use SimpleSAML\SOAP\Constants as SOAP;
 use SimpleSAML\WSSecurity\Constants as C;
 use SimpleSAML\WSSecurity\XML\wsa\MessageID;
+use SimpleSAML\WSSecurity\XML\wst\AbstractParticipantsType;
+use SimpleSAML\WSSecurity\XML\wst\AbstractWstElement;
 use SimpleSAML\WSSecurity\XML\wst\Participant;
 use SimpleSAML\WSSecurity\XML\wst\Participants;
 use SimpleSAML\WSSecurity\XML\wst\Primary;
@@ -21,12 +24,11 @@
 /**
  * Class \SimpleSAML\WSSecurity\XML\wst\ParticipantsTest
  *
- * @covers \SimpleSAML\WSSecurity\XML\wst\Participants
- * @covers \SimpleSAML\WSSecurity\XML\wst\AbstractParticipantsType
- * @covers \SimpleSAML\WSSecurity\XML\wst\AbstractWstElement
- *
  * @package simplesamlphp/ws-security
  */
+#[CoversClass(Participants::class)]
+#[CoversClass(AbstractParticipantsType::class)]
+#[CoversClass(AbstractWstElement::class)]
 final class ParticipantsTest extends TestCase
 {
     use SchemaValidationTestTrait;
diff --git a/tests/WSSecurity/XML/wst/PrimaryTest.php b/tests/WSSecurity/XML/wst/PrimaryTest.php
index 4787d509..ab70a232 100644
--- a/tests/WSSecurity/XML/wst/PrimaryTest.php
+++ b/tests/WSSecurity/XML/wst/PrimaryTest.php
@@ -4,9 +4,12 @@
 
 namespace SimpleSAML\Test\WSSecurity\XML\wst;
 
+use PHPUnit\Framework\Attributes\CoversClass;
 use PHPUnit\Framework\TestCase;
 use SimpleSAML\SOAP\Constants as SOAP;
 use SimpleSAML\WSSecurity\XML\wsa\MessageID;
+use SimpleSAML\WSSecurity\XML\wst\AbstractParticipantType;
+use SimpleSAML\WSSecurity\XML\wst\AbstractWstElement;
 use SimpleSAML\WSSecurity\XML\wst\Primary;
 use SimpleSAML\XML\Attribute as XMLAttribute;
 use SimpleSAML\XML\DOMDocumentFactory;
@@ -17,12 +20,11 @@
 /**
  * Class \SimpleSAML\WSSecurity\XML\wst\PrimaryTest
  *
- * @covers \SimpleSAML\WSSecurity\XML\wst\Primary
- * @covers \SimpleSAML\WSSecurity\XML\wst\AbstractParticipantType
- * @covers \SimpleSAML\WSSecurity\XML\wst\AbstractWstElement
- *
  * @package simplesamlphp/ws-security
  */
+#[CoversClass(Primary::class)]
+#[CoversClass(AbstractParticipantType::class)]
+#[CoversClass(AbstractWstElement::class)]
 final class PrimaryTest extends TestCase
 {
     use SerializableElementTestTrait;
diff --git a/tests/WSSecurity/XML/wst/ProofEncryptionTest.php b/tests/WSSecurity/XML/wst/ProofEncryptionTest.php
index f1d805e8..c97b98b3 100644
--- a/tests/WSSecurity/XML/wst/ProofEncryptionTest.php
+++ b/tests/WSSecurity/XML/wst/ProofEncryptionTest.php
@@ -4,9 +4,12 @@
 
 namespace SimpleSAML\Test\WSSecurity\XML\wst;
 
+use PHPUnit\Framework\Attributes\CoversClass;
 use PHPUnit\Framework\TestCase;
 use SimpleSAML\SOAP\Constants as SOAP;
 use SimpleSAML\WSSecurity\XML\wsa\MessageID;
+use SimpleSAML\WSSecurity\XML\wst\AbstractProofEncryptionType;
+use SimpleSAML\WSSecurity\XML\wst\AbstractWstElement;
 use SimpleSAML\WSSecurity\XML\wst\ProofEncryption;
 use SimpleSAML\XML\Attribute as XMLAttribute;
 use SimpleSAML\XML\DOMDocumentFactory;
@@ -18,12 +21,11 @@
 /**
  * Class \SimpleSAML\WSSecurity\XML\wst\ProofEncryptionTest
  *
- * @covers \SimpleSAML\WSSecurity\XML\wst\ProofEncryption
- * @covers \SimpleSAML\WSSecurity\XML\wst\AbstractProofEncryptionType
- * @covers \SimpleSAML\WSSecurity\XML\wst\AbstractWstElement
- *
  * @package simplesamlphp/ws-security
  */
+#[CoversClass(ProofEncryption::class)]
+#[CoversClass(AbstractProofEncryptionType::class)]
+#[CoversClass(AbstractWstElement::class)]
 final class ProofEncryptionTest extends TestCase
 {
     use SchemaValidationTestTrait;
diff --git a/tests/WSSecurity/XML/wst/ReasonTest.php b/tests/WSSecurity/XML/wst/ReasonTest.php
index 1e4b1a5f..5017321e 100644
--- a/tests/WSSecurity/XML/wst/ReasonTest.php
+++ b/tests/WSSecurity/XML/wst/ReasonTest.php
@@ -4,7 +4,9 @@
 
 namespace SimpleSAML\Test\WSSecurity\XML\wst;
 
+use PHPUnit\Framework\Attributes\CoversClass;
 use PHPUnit\Framework\TestCase;
+use SimpleSAML\WSSecurity\XML\wst\AbstractWstElement;
 use SimpleSAML\WSSecurity\XML\wst\Reason;
 use SimpleSAML\XML\DOMDocumentFactory;
 use SimpleSAML\XML\TestUtils\SerializableElementTestTrait;
@@ -14,11 +16,10 @@
 /**
  * Class \SimpleSAML\WSSecurity\XML\wst\ReasonTest
  *
- * @covers \SimpleSAML\WSSecurity\XML\wst\Reason
- * @covers \SimpleSAML\WSSecurity\XML\wst\AbstractWstElement
- *
  * @package simplesamlphp/ws-security
  */
+#[CoversClass(Reason::class)]
+#[CoversClass(AbstractWstElement::class)]
 final class ReasonTest extends TestCase
 {
     use SerializableElementTestTrait;
diff --git a/tests/WSSecurity/XML/wst/RenewTargetTest.php b/tests/WSSecurity/XML/wst/RenewTargetTest.php
index 8287f5b9..ef9b1994 100644
--- a/tests/WSSecurity/XML/wst/RenewTargetTest.php
+++ b/tests/WSSecurity/XML/wst/RenewTargetTest.php
@@ -4,9 +4,12 @@
 
 namespace SimpleSAML\Test\WSSecurity\XML\wst;
 
+use PHPUnit\Framework\Attributes\CoversClass;
 use PHPUnit\Framework\TestCase;
 use SimpleSAML\SOAP\Constants as SOAP;
 use SimpleSAML\WSSecurity\XML\wsa\MessageID;
+use SimpleSAML\WSSecurity\XML\wst\AbstractRenewTargetType;
+use SimpleSAML\WSSecurity\XML\wst\AbstractWstElement;
 use SimpleSAML\WSSecurity\XML\wst\RenewTarget;
 use SimpleSAML\XML\Attribute as XMLAttribute;
 use SimpleSAML\XML\DOMDocumentFactory;
@@ -18,12 +21,11 @@
 /**
  * Class \SimpleSAML\WSSecurity\XML\wst\RenewTargetTest
  *
- * @covers \SimpleSAML\WSSecurity\XML\wst\RenewTarget
- * @covers \SimpleSAML\WSSecurity\XML\wst\AbstractRenewTargetType
- * @covers \SimpleSAML\WSSecurity\XML\wst\AbstractWstElement
- *
  * @package simplesamlphp/ws-security
  */
+#[CoversClass(RenewTarget::class)]
+#[CoversClass(AbstractRenewTargetType::class)]
+#[CoversClass(AbstractWstElement::class)]
 final class RenewTargetTest extends TestCase
 {
     use SchemaValidationTestTrait;
diff --git a/tests/WSSecurity/XML/wst/RenewingTest.php b/tests/WSSecurity/XML/wst/RenewingTest.php
index 6aca2b3c..a03503de 100644
--- a/tests/WSSecurity/XML/wst/RenewingTest.php
+++ b/tests/WSSecurity/XML/wst/RenewingTest.php
@@ -4,7 +4,10 @@
 
 namespace SimpleSAML\Test\WSSecurity\XML\wst;
 
+use PHPUnit\Framework\Attributes\CoversClass;
 use PHPUnit\Framework\TestCase;
+use SimpleSAML\WSSecurity\XML\wst\AbstractRenewingType;
+use SimpleSAML\WSSecurity\XML\wst\AbstractWstElement;
 use SimpleSAML\WSSecurity\XML\wst\Renewing;
 use SimpleSAML\XML\DOMDocumentFactory;
 use SimpleSAML\XML\TestUtils\SchemaValidationTestTrait;
@@ -15,12 +18,11 @@
 /**
  * Class \SimpleSAML\WSSecurity\XML\wst\RenewingTest
  *
- * @covers \SimpleSAML\WSSecurity\XML\wst\Renewing
- * @covers \SimpleSAML\WSSecurity\XML\wst\AbstractRenewingType
- * @covers \SimpleSAML\WSSecurity\XML\wst\AbstractWstElement
- *
  * @package simplesamlphp/ws-security
  */
+#[CoversClass(Renewing::class)]
+#[CoversClass(AbstractRenewingType::class)]
+#[CoversClass(AbstractWstElement::class)]
 final class RenewingTest extends TestCase
 {
     use SchemaValidationTestTrait;
diff --git a/tests/WSSecurity/XML/wst/RequestKETTest.php b/tests/WSSecurity/XML/wst/RequestKETTest.php
index e778ed17..a51748e2 100644
--- a/tests/WSSecurity/XML/wst/RequestKETTest.php
+++ b/tests/WSSecurity/XML/wst/RequestKETTest.php
@@ -4,7 +4,9 @@
 
 namespace SimpleSAML\Test\WSSecurity\XML\wst;
 
+use PHPUnit\Framework\Attributes\CoversClass;
 use PHPUnit\Framework\TestCase;
+use SimpleSAML\WSSecurity\XML\wst\AbstractWstElement;
 use SimpleSAML\WSSecurity\XML\wst\RequestKET;
 use SimpleSAML\XML\DOMDocumentFactory;
 use SimpleSAML\XML\TestUtils\SchemaValidationTestTrait;
@@ -15,11 +17,10 @@
 /**
  * Class \SimpleSAML\WSSecurity\XML\wst\RequestKETTest
  *
- * @covers \SimpleSAML\WSSecurity\XML\wst\RequestKET
- * @covers \SimpleSAML\WSSecurity\XML\wst\AbstractWstElement
- *
  * @package simplesamlphp/ws-security
  */
+#[CoversClass(RequestKET::class)]
+#[CoversClass(AbstractWstElement::class)]
 final class RequestKETTest extends TestCase
 {
     use SchemaValidationTestTrait;
diff --git a/tests/WSSecurity/XML/wst/RequestSecurityTokenCollectionTest.php b/tests/WSSecurity/XML/wst/RequestSecurityTokenCollectionTest.php
index 82889290..5e51d838 100644
--- a/tests/WSSecurity/XML/wst/RequestSecurityTokenCollectionTest.php
+++ b/tests/WSSecurity/XML/wst/RequestSecurityTokenCollectionTest.php
@@ -4,10 +4,13 @@
 
 namespace SimpleSAML\Test\WSSecurity\XML\wst;
 
+use PHPUnit\Framework\Attributes\CoversClass;
 use PHPUnit\Framework\TestCase;
 use SimpleSAML\SOAP\Constants as SOAP;
 use SimpleSAML\Test\WSSecurity\Constants as C;
 use SimpleSAML\WSSecurity\XML\wsa\MessageID;
+use SimpleSAML\WSSecurity\XML\wst\AbstractRequestSecurityTokenCollectionType;
+use SimpleSAML\WSSecurity\XML\wst\AbstractWstElement;
 use SimpleSAML\WSSecurity\XML\wst\RequestSecurityToken;
 use SimpleSAML\WSSecurity\XML\wst\RequestSecurityTokenCollection;
 use SimpleSAML\XML\Attribute as XMLAttribute;
@@ -20,12 +23,11 @@
 /**
  * Class \SimpleSAML\WSSecurity\XML\wst\RequestSecurityTokenCollectionTest
  *
- * @covers \SimpleSAML\WSSecurity\XML\wst\RequestSecurityTokenCollection
- * @covers \SimpleSAML\WSSecurity\XML\wst\AbstractRequestSecurityTokenCollectionType
- * @covers \SimpleSAML\WSSecurity\XML\wst\AbstractWstElement
- *
  * @package simplesamlphp/ws-security
  */
+#[CoversClass(RequestSecurityTokenCollection::class)]
+#[CoversClass(AbstractRequestSecurityTokenCollectionType::class)]
+#[CoversClass(AbstractWstElement::class)]
 final class RequestSecurityTokenCollectionTest extends TestCase
 {
     use SchemaValidationTestTrait;
diff --git a/tests/WSSecurity/XML/wst/RequestSecurityTokenResponseCollectionTest.php b/tests/WSSecurity/XML/wst/RequestSecurityTokenResponseCollectionTest.php
index 683d2e76..a32430f1 100644
--- a/tests/WSSecurity/XML/wst/RequestSecurityTokenResponseCollectionTest.php
+++ b/tests/WSSecurity/XML/wst/RequestSecurityTokenResponseCollectionTest.php
@@ -4,10 +4,13 @@
 
 namespace SimpleSAML\Test\WSSecurity\XML\wst;
 
+use PHPUnit\Framework\Attributes\CoversClass;
 use PHPUnit\Framework\TestCase;
 use SimpleSAML\SOAP\Constants as SOAP;
 use SimpleSAML\Test\WSSecurity\Constants as C;
 use SimpleSAML\WSSecurity\XML\wsa\MessageID;
+use SimpleSAML\WSSecurity\XML\wst\AbstractRequestSecurityTokenResponseCollectionType;
+use SimpleSAML\WSSecurity\XML\wst\AbstractWstElement;
 use SimpleSAML\WSSecurity\XML\wst\RequestSecurityTokenResponse;
 use SimpleSAML\WSSecurity\XML\wst\RequestSecurityTokenResponseCollection;
 use SimpleSAML\XML\Attribute as XMLAttribute;
@@ -20,12 +23,11 @@
 /**
  * Class \SimpleSAML\WSSecurity\XML\wst\RequestSecurityTokenResponseCollectionTest
  *
- * @covers \SimpleSAML\WSSecurity\XML\wst\RequestSecurityTokenResponseCollection
- * @covers \SimpleSAML\WSSecurity\XML\wst\AbstractRequestSecurityTokenResponseCollectionType
- * @covers \SimpleSAML\WSSecurity\XML\wst\AbstractWstElement
- *
  * @package simplesamlphp/ws-security
  */
+#[CoversClass(RequestSecurityTokenResponseCollection::class)]
+#[CoversClass(AbstractRequestSecurityTokenResponseCollectionType::class)]
+#[CoversClass(AbstractWstElement::class)]
 final class RequestSecurityTokenResponseCollectionTest extends TestCase
 {
     use SchemaValidationTestTrait;
diff --git a/tests/WSSecurity/XML/wst/RequestSecurityTokenResponseTest.php b/tests/WSSecurity/XML/wst/RequestSecurityTokenResponseTest.php
index 645b2875..2d47271a 100644
--- a/tests/WSSecurity/XML/wst/RequestSecurityTokenResponseTest.php
+++ b/tests/WSSecurity/XML/wst/RequestSecurityTokenResponseTest.php
@@ -4,10 +4,13 @@
 
 namespace SimpleSAML\Test\WSSecurity\XML\wst;
 
+use PHPUnit\Framework\Attributes\CoversClass;
 use PHPUnit\Framework\TestCase;
 use SimpleSAML\SOAP\Constants as SOAP;
 use SimpleSAML\Test\WSSecurity\Constants as C;
 use SimpleSAML\WSSecurity\XML\wsa\MessageID;
+use SimpleSAML\WSSecurity\XML\wst\AbstractRequestSecurityTokenResponseType;
+use SimpleSAML\WSSecurity\XML\wst\AbstractWstElement;
 use SimpleSAML\WSSecurity\XML\wst\RequestSecurityTokenResponse;
 use SimpleSAML\XML\Attribute as XMLAttribute;
 use SimpleSAML\XML\DOMDocumentFactory;
@@ -19,12 +22,11 @@
 /**
  * Class \SimpleSAML\WSSecurity\XML\wst\RequestSecurityTokenResponseTest
  *
- * @covers \SimpleSAML\WSSecurity\XML\wst\RequestSecurityTokenResponse
- * @covers \SimpleSAML\WSSecurity\XML\wst\AbstractRequestSecurityTokenResponseType
- * @covers \SimpleSAML\WSSecurity\XML\wst\AbstractWstElement
- *
  * @package simplesamlphp/ws-security
  */
+#[CoversClass(RequestSecurityTokenResponse::class)]
+#[CoversClass(AbstractRequestSecurityTokenResponseType::class)]
+#[CoversClass(AbstractWstElement::class)]
 final class RequestSecurityTokenResponseTest extends TestCase
 {
     use SchemaValidationTestTrait;
diff --git a/tests/WSSecurity/XML/wst/RequestSecurityTokenTest.php b/tests/WSSecurity/XML/wst/RequestSecurityTokenTest.php
index 30800342..8f5dfbba 100644
--- a/tests/WSSecurity/XML/wst/RequestSecurityTokenTest.php
+++ b/tests/WSSecurity/XML/wst/RequestSecurityTokenTest.php
@@ -4,10 +4,13 @@
 
 namespace SimpleSAML\Test\WSSecurity\XML\wst;
 
+use PHPUnit\Framework\Attributes\CoversClass;
 use PHPUnit\Framework\TestCase;
 use SimpleSAML\SOAP\Constants as SOAP;
 use SimpleSAML\Test\WSSecurity\Constants as C;
 use SimpleSAML\WSSecurity\XML\wsa\MessageID;
+use SimpleSAML\WSSecurity\XML\wst\AbstractRequestSecurityTokenType;
+use SimpleSAML\WSSecurity\XML\wst\AbstractWstElement;
 use SimpleSAML\WSSecurity\XML\wst\RequestSecurityToken;
 use SimpleSAML\XML\Attribute as XMLAttribute;
 use SimpleSAML\XML\DOMDocumentFactory;
@@ -19,12 +22,11 @@
 /**
  * Class \SimpleSAML\WSSecurity\XML\wst\RequestSecurityTokenTest
  *
- * @covers \SimpleSAML\WSSecurity\XML\wst\RequestSecurityToken
- * @covers \SimpleSAML\WSSecurity\XML\wst\AbstractRequestSecurityTokenType
- * @covers \SimpleSAML\WSSecurity\XML\wst\AbstractWstElement
- *
  * @package simplesamlphp/ws-security
  */
+#[CoversClass(RequestSecurityToken::class)]
+#[CoversClass(AbstractRequestSecurityTokenType::class)]
+#[CoversClass(AbstractWstElement::class)]
 final class RequestSecurityTokenTest extends TestCase
 {
     use SchemaValidationTestTrait;
diff --git a/tests/WSSecurity/XML/wst/RequestTypeTest.php b/tests/WSSecurity/XML/wst/RequestTypeTest.php
index 688f6e66..64bcc4db 100644
--- a/tests/WSSecurity/XML/wst/RequestTypeTest.php
+++ b/tests/WSSecurity/XML/wst/RequestTypeTest.php
@@ -4,7 +4,10 @@
 
 namespace SimpleSAML\Test\WSSecurity\XML\wst;
 
+use PHPUnit\Framework\Attributes\CoversClass;
 use PHPUnit\Framework\TestCase;
+use SimpleSAML\WSSecurity\XML\wst\AbstractRequestTypeOpenEnum;
+use SimpleSAML\WSSecurity\XML\wst\AbstractWstElement;
 use SimpleSAML\WSSecurity\XML\wst\RequestType;
 use SimpleSAML\WSSecurity\XML\wst\RequestTypeEnum;
 use SimpleSAML\XML\DOMDocumentFactory;
@@ -16,12 +19,11 @@
 /**
  * Class \SimpleSAML\WSSecurity\XML\wst\RequestTypeTest
  *
- * @covers \SimpleSAML\WSSecurity\XML\wst\RequestType
- * @covers \SimpleSAML\WSSecurity\XML\wst\AbstractRequestTypeOpenEnum
- * @covers \SimpleSAML\WSSecurity\XML\wst\AbstractWstElement
- *
  * @package simplesamlphp/ws-security
  */
+#[CoversClass(RequestType::class)]
+#[CoversClass(AbstractRequestTypeOpenEnum::class)]
+#[CoversClass(AbstractWstElement::class)]
 final class RequestTypeTest extends TestCase
 {
     use SchemaValidationTestTrait;
diff --git a/tests/WSSecurity/XML/wst/RequestedAttachedReferenceTest.php b/tests/WSSecurity/XML/wst/RequestedAttachedReferenceTest.php
index 5fd4ad54..6fa917d1 100644
--- a/tests/WSSecurity/XML/wst/RequestedAttachedReferenceTest.php
+++ b/tests/WSSecurity/XML/wst/RequestedAttachedReferenceTest.php
@@ -4,8 +4,11 @@
 
 namespace SimpleSAML\Test\WSSecurity\XML\wst;
 
+use PHPUnit\Framework\Attributes\CoversClass;
 use PHPUnit\Framework\TestCase;
 use SimpleSAML\WSSecurity\XML\wsse\SecurityTokenReference;
+use SimpleSAML\WSSecurity\XML\wst\AbstractRequestedReferenceType;
+use SimpleSAML\WSSecurity\XML\wst\AbstractWstElement;
 use SimpleSAML\WSSecurity\XML\wst\RequestedAttachedReference;
 use SimpleSAML\XML\Attribute as XMLAttribute;
 use SimpleSAML\XML\Chunk;
@@ -18,12 +21,11 @@
 /**
  * Class \SimpleSAML\WSSecurity\XML\wst\RequestedAttachedReferenceTest
  *
- * @covers \SimpleSAML\WSSecurity\XML\wst\RequestedAttachedReference
- * @covers \SimpleSAML\WSSecurity\XML\wst\AbstractRequestedReferenceType
- * @covers \SimpleSAML\WSSecurity\XML\wst\AbstractWstElement
- *
  * @package simplesamlphp/ws-security
  */
+#[CoversClass(RequestedAttachedReference::class)]
+#[CoversClass(AbstractRequestedReferenceType::class)]
+#[CoversClass(AbstractWstElement::class)]
 final class RequestedAttachedReferenceTest extends TestCase
 {
     use SchemaValidationTestTrait;
diff --git a/tests/WSSecurity/XML/wst/RequestedProofTokenTest.php b/tests/WSSecurity/XML/wst/RequestedProofTokenTest.php
index cf2bb3dc..cf6f6f55 100644
--- a/tests/WSSecurity/XML/wst/RequestedProofTokenTest.php
+++ b/tests/WSSecurity/XML/wst/RequestedProofTokenTest.php
@@ -4,9 +4,12 @@
 
 namespace SimpleSAML\Test\WSSecurity\XML\wst;
 
+use PHPUnit\Framework\Attributes\CoversClass;
 use PHPUnit\Framework\TestCase;
 use SimpleSAML\SOAP\Constants as SOAP;
 use SimpleSAML\WSSecurity\XML\wsa\MessageID;
+use SimpleSAML\WSSecurity\XML\wst\AbstractRequestedProofTokenType;
+use SimpleSAML\WSSecurity\XML\wst\AbstractWstElement;
 use SimpleSAML\WSSecurity\XML\wst\RequestedProofToken;
 use SimpleSAML\XML\Attribute as XMLAttribute;
 use SimpleSAML\XML\DOMDocumentFactory;
@@ -18,12 +21,11 @@
 /**
  * Class \SimpleSAML\WSSecurity\XML\wst\RequestedProofTokenTest
  *
- * @covers \SimpleSAML\WSSecurity\XML\wst\RequestedProofToken
- * @covers \SimpleSAML\WSSecurity\XML\wst\AbstractRequestedProofTokenType
- * @covers \SimpleSAML\WSSecurity\XML\wst\AbstractWstElement
- *
  * @package simplesamlphp/ws-security
  */
+#[CoversClass(RequestedProofToken::class)]
+#[CoversClass(AbstractRequestedProofTokenType::class)]
+#[CoversClass(AbstractWstElement::class)]
 final class RequestedProofTokenTest extends TestCase
 {
     use SchemaValidationTestTrait;
diff --git a/tests/WSSecurity/XML/wst/RequestedSecurityTokenTest.php b/tests/WSSecurity/XML/wst/RequestedSecurityTokenTest.php
index 36ebb2b3..5299c7f4 100644
--- a/tests/WSSecurity/XML/wst/RequestedSecurityTokenTest.php
+++ b/tests/WSSecurity/XML/wst/RequestedSecurityTokenTest.php
@@ -4,9 +4,12 @@
 
 namespace SimpleSAML\Test\WSSecurity\XML\wst;
 
+use PHPUnit\Framework\Attributes\CoversClass;
 use PHPUnit\Framework\TestCase;
 use SimpleSAML\SOAP\Constants as SOAP;
 use SimpleSAML\WSSecurity\XML\wsa\MessageID;
+use SimpleSAML\WSSecurity\XML\wst\AbstractRequestedSecurityTokenType;
+use SimpleSAML\WSSecurity\XML\wst\AbstractWstElement;
 use SimpleSAML\WSSecurity\XML\wst\RequestedSecurityToken;
 use SimpleSAML\XML\Attribute as XMLAttribute;
 use SimpleSAML\XML\DOMDocumentFactory;
@@ -18,12 +21,11 @@
 /**
  * Class \SimpleSAML\WSSecurity\XML\wst\RequestedSecurityTokenTest
  *
- * @covers \SimpleSAML\WSSecurity\XML\wst\RequestedSecurityToken
- * @covers \SimpleSAML\WSSecurity\XML\wst\AbstractRequestedSecurityTokenType
- * @covers \SimpleSAML\WSSecurity\XML\wst\AbstractWstElement
- *
  * @package simplesamlphp/ws-security
  */
+#[CoversClass(RequestedSecurityToken::class)]
+#[CoversClass(AbstractRequestedSecurityTokenType::class)]
+#[CoversClass(AbstractWstElement::class)]
 final class RequestedSecurityTokenTest extends TestCase
 {
     use SchemaValidationTestTrait;
diff --git a/tests/WSSecurity/XML/wst/RequestedTokenCancelledTest.php b/tests/WSSecurity/XML/wst/RequestedTokenCancelledTest.php
index f1e3027b..5f705817 100644
--- a/tests/WSSecurity/XML/wst/RequestedTokenCancelledTest.php
+++ b/tests/WSSecurity/XML/wst/RequestedTokenCancelledTest.php
@@ -4,7 +4,9 @@
 
 namespace SimpleSAML\Test\WSSecurity\XML\wst;
 
+use PHPUnit\Framework\Attributes\CoversClass;
 use PHPUnit\Framework\TestCase;
+use SimpleSAML\WSSecurity\XML\wst\AbstractWstElement;
 use SimpleSAML\WSSecurity\XML\wst\RequestedTokenCancelled;
 use SimpleSAML\XML\DOMDocumentFactory;
 use SimpleSAML\XML\TestUtils\SchemaValidationTestTrait;
@@ -15,11 +17,10 @@
 /**
  * Class \SimpleSAML\WSSecurity\XML\wst\RequestedTokenCancelledTest
  *
- * @covers \SimpleSAML\WSSecurity\XML\wst\RequestedTokenCancelled
- * @covers \SimpleSAML\WSSecurity\XML\wst\AbstractWstElement
- *
  * @package simplesamlphp/ws-security
  */
+#[CoversClass(RequestedTokenCancelled::class)]
+#[CoversClass(AbstractWstElement::class)]
 final class RequestedTokenCancelledTest extends TestCase
 {
     use SchemaValidationTestTrait;
diff --git a/tests/WSSecurity/XML/wst/RequestedUnattachedReferenceTest.php b/tests/WSSecurity/XML/wst/RequestedUnattachedReferenceTest.php
index 4c2dd542..52bf3254 100644
--- a/tests/WSSecurity/XML/wst/RequestedUnattachedReferenceTest.php
+++ b/tests/WSSecurity/XML/wst/RequestedUnattachedReferenceTest.php
@@ -4,8 +4,11 @@
 
 namespace SimpleSAML\Test\WSSecurity\XML\wst;
 
+use PHPUnit\Framework\Attributes\CoversClass;
 use PHPUnit\Framework\TestCase;
 use SimpleSAML\WSSecurity\XML\wsse\SecurityTokenReference;
+use SimpleSAML\WSSecurity\XML\wst\AbstractRequestedReferenceType;
+use SimpleSAML\WSSecurity\XML\wst\AbstractWstElement;
 use SimpleSAML\WSSecurity\XML\wst\RequestedUnattachedReference;
 use SimpleSAML\XML\Attribute as XMLAttribute;
 use SimpleSAML\XML\Chunk;
@@ -18,12 +21,11 @@
 /**
  * Class \SimpleSAML\WSSecurity\XML\wst\RequestedUnattachedReferenceTest
  *
- * @covers \SimpleSAML\WSSecurity\XML\wst\RequestedUnattachedReference
- * @covers \SimpleSAML\WSSecurity\XML\wst\AbstractRequestedReferenceType
- * @covers \SimpleSAML\WSSecurity\XML\wst\AbstractWstElement
- *
  * @package simplesamlphp/ws-security
  */
+#[CoversClass(RequestedUnattachedReference::class)]
+#[CoversClass(AbstractRequestedReferenceType::class)]
+#[CoversClass(AbstractWstElement::class)]
 final class RequestedUnattachedReferenceTest extends TestCase
 {
     use SchemaValidationTestTrait;
diff --git a/tests/WSSecurity/XML/wst/SignChallengeResponseTest.php b/tests/WSSecurity/XML/wst/SignChallengeResponseTest.php
index 26bec58a..32222fe7 100644
--- a/tests/WSSecurity/XML/wst/SignChallengeResponseTest.php
+++ b/tests/WSSecurity/XML/wst/SignChallengeResponseTest.php
@@ -4,10 +4,13 @@
 
 namespace SimpleSAML\Test\WSSecurity\XML\wst;
 
+use PHPUnit\Framework\Attributes\CoversClass;
 use PHPUnit\Framework\TestCase;
 use SimpleSAML\SOAP\Constants as SOAP;
 use SimpleSAML\Test\WSSecurity\Constants as C;
 use SimpleSAML\WSSecurity\XML\wsa\MessageID;
+use SimpleSAML\WSSecurity\XML\wst\AbstractSignChallengeType;
+use SimpleSAML\WSSecurity\XML\wst\AbstractWstElement;
 use SimpleSAML\WSSecurity\XML\wst\Challenge;
 use SimpleSAML\WSSecurity\XML\wst\SignChallengeResponse;
 use SimpleSAML\XML\Attribute as XMLAttribute;
@@ -20,12 +23,11 @@
 /**
  * Class \SimpleSAML\WSSecurity\XML\wst\SignChallengeResponseTest
  *
- * @covers \SimpleSAML\WSSecurity\XML\wst\SignChallengeResponse
- * @covers \SimpleSAML\WSSecurity\XML\wst\AbstractSignChallengeType
- * @covers \SimpleSAML\WSSecurity\XML\wst\AbstractWstElement
- *
  * @package simplesamlphp/ws-security
  */
+#[CoversClass(SignChallengeResponse::class)]
+#[CoversClass(AbstractSignChallengeType::class)]
+#[CoversClass(AbstractWstElement::class)]
 final class SignChallengeResponseTest extends TestCase
 {
     use SchemaValidationTestTrait;
diff --git a/tests/WSSecurity/XML/wst/SignChallengeTest.php b/tests/WSSecurity/XML/wst/SignChallengeTest.php
index 6416ad80..113c1c44 100644
--- a/tests/WSSecurity/XML/wst/SignChallengeTest.php
+++ b/tests/WSSecurity/XML/wst/SignChallengeTest.php
@@ -4,10 +4,13 @@
 
 namespace SimpleSAML\Test\WSSecurity\XML\wst;
 
+use PHPUnit\Framework\Attributes\CoversClass;
 use PHPUnit\Framework\TestCase;
 use SimpleSAML\SOAP\Constants as SOAP;
 use SimpleSAML\Test\WSSecurity\Constants as C;
 use SimpleSAML\WSSecurity\XML\wsa\MessageID;
+use SimpleSAML\WSSecurity\XML\wst\AbstractSignChallengeType;
+use SimpleSAML\WSSecurity\XML\wst\AbstractWstElement;
 use SimpleSAML\WSSecurity\XML\wst\Challenge;
 use SimpleSAML\WSSecurity\XML\wst\SignChallenge;
 use SimpleSAML\XML\Attribute as XMLAttribute;
@@ -20,12 +23,11 @@
 /**
  * Class \SimpleSAML\WSSecurity\XML\wst\SignChallengeTest
  *
- * @covers \SimpleSAML\WSSecurity\XML\wst\SignChallenge
- * @covers \SimpleSAML\WSSecurity\XML\wst\AbstractSignChallengeType
- * @covers \SimpleSAML\WSSecurity\XML\wst\AbstractWstElement
- *
  * @package simplesamlphp/ws-security
  */
+#[CoversClass(SignChallenge::class)]
+#[CoversClass(AbstractSignChallengeType::class)]
+#[CoversClass(AbstractWstElement::class)]
 final class SignChallengeTest extends TestCase
 {
     use SchemaValidationTestTrait;
diff --git a/tests/WSSecurity/XML/wst/SignWithTest.php b/tests/WSSecurity/XML/wst/SignWithTest.php
index 2a448618..74676c39 100644
--- a/tests/WSSecurity/XML/wst/SignWithTest.php
+++ b/tests/WSSecurity/XML/wst/SignWithTest.php
@@ -4,8 +4,10 @@
 
 namespace SimpleSAML\Test\WSSecurity\XML\wst;
 
+use PHPUnit\Framework\Attributes\CoversClass;
 use PHPUnit\Framework\TestCase;
 use SimpleSAML\Test\WSSecurity\Constants as C;
+use SimpleSAML\WSSecurity\XML\wst\AbstractWstElement;
 use SimpleSAML\WSSecurity\XML\wst\SignWith;
 use SimpleSAML\XML\DOMDocumentFactory;
 use SimpleSAML\XML\TestUtils\SchemaValidationTestTrait;
@@ -16,11 +18,10 @@
 /**
  * Class \SimpleSAML\WSSecurity\XML\wst\SignWithTest
  *
- * @covers \SimpleSAML\WSSecurity\XML\wst\SignWith
- * @covers \SimpleSAML\WSSecurity\XML\wst\AbstractWstElement
- *
  * @package simplesamlphp/ws-security
  */
+#[CoversClass(SignWith::class)]
+#[CoversClass(AbstractWstElement::class)]
 final class SignWithTest extends TestCase
 {
     use SchemaValidationTestTrait;
diff --git a/tests/WSSecurity/XML/wst/SignatureAlgorithmTest.php b/tests/WSSecurity/XML/wst/SignatureAlgorithmTest.php
index 1c9605ab..20f49ca0 100644
--- a/tests/WSSecurity/XML/wst/SignatureAlgorithmTest.php
+++ b/tests/WSSecurity/XML/wst/SignatureAlgorithmTest.php
@@ -4,8 +4,10 @@
 
 namespace SimpleSAML\Test\WSSecurity\XML\wst;
 
+use PHPUnit\Framework\Attributes\CoversClass;
 use PHPUnit\Framework\TestCase;
 use SimpleSAML\Test\WSSecurity\Constants as C;
+use SimpleSAML\WSSecurity\XML\wst\AbstractWstElement;
 use SimpleSAML\WSSecurity\XML\wst\SignatureAlgorithm;
 use SimpleSAML\XML\DOMDocumentFactory;
 use SimpleSAML\XML\TestUtils\SchemaValidationTestTrait;
@@ -16,11 +18,10 @@
 /**
  * Class \SimpleSAML\WSSecurity\XML\wst\SignatureAlgorithmTest
  *
- * @covers \SimpleSAML\WSSecurity\XML\wst\SignatureAlgorithm
- * @covers \SimpleSAML\WSSecurity\XML\wst\AbstractWstElement
- *
  * @package simplesamlphp/ws-security
  */
+#[CoversClass(SignatureAlgorithm::class)]
+#[CoversClass(AbstractWstElement::class)]
 final class SignatureAlgorithmTest extends TestCase
 {
     use SchemaValidationTestTrait;
diff --git a/tests/WSSecurity/XML/wst/StatusTest.php b/tests/WSSecurity/XML/wst/StatusTest.php
index dc70caa6..cc472e99 100644
--- a/tests/WSSecurity/XML/wst/StatusTest.php
+++ b/tests/WSSecurity/XML/wst/StatusTest.php
@@ -4,7 +4,10 @@
 
 namespace SimpleSAML\Test\WSSecurity\XML\wst;
 
+use PHPUnit\Framework\Attributes\CoversClass;
 use PHPUnit\Framework\TestCase;
+use SimpleSAML\WSSecurity\XML\wst\AbstractStatusType;
+use SimpleSAML\WSSecurity\XML\wst\AbstractWstElement;
 use SimpleSAML\WSSecurity\XML\wst\Code;
 use SimpleSAML\WSSecurity\XML\wst\Reason;
 use SimpleSAML\WSSecurity\XML\wst\Status;
@@ -18,12 +21,11 @@
 /**
  * Class \SimpleSAML\WSSecurity\XML\wst\StatusTest
  *
- * @covers \SimpleSAML\WSSecurity\XML\wst\Status
- * @covers \SimpleSAML\WSSecurity\XML\wst\AbstractStatusType
- * @covers \SimpleSAML\WSSecurity\XML\wst\AbstractWstElement
- *
  * @package simplesamlphp/ws-security
  */
+#[CoversClass(Status::class)]
+#[CoversClass(AbstractStatusType::class)]
+#[CoversClass(AbstractWstElement::class)]
 final class StatusTest extends TestCase
 {
     use SchemaValidationTestTrait;
diff --git a/tests/WSSecurity/XML/wst/TokenTypeTest.php b/tests/WSSecurity/XML/wst/TokenTypeTest.php
index fd05bbe1..56778ae2 100644
--- a/tests/WSSecurity/XML/wst/TokenTypeTest.php
+++ b/tests/WSSecurity/XML/wst/TokenTypeTest.php
@@ -4,8 +4,10 @@
 
 namespace SimpleSAML\Test\WSSecurity\XML\wst;
 
+use PHPUnit\Framework\Attributes\CoversClass;
 use PHPUnit\Framework\TestCase;
 use SimpleSAML\Test\WSSecurity\Constants as C;
+use SimpleSAML\WSSecurity\XML\wst\AbstractWstElement;
 use SimpleSAML\WSSecurity\XML\wst\TokenType;
 use SimpleSAML\XML\DOMDocumentFactory;
 use SimpleSAML\XML\TestUtils\SchemaValidationTestTrait;
@@ -16,11 +18,10 @@
 /**
  * Class \SimpleSAML\WSSecurity\XML\wst\TokenTypeTest
  *
- * @covers \SimpleSAML\WSSecurity\XML\wst\TokenType
- * @covers \SimpleSAML\WSSecurity\XML\wst\AbstractWstElement
- *
  * @package simplesamlphp/ws-security
  */
+#[CoversClass(TokenType::class)]
+#[CoversClass(AbstractWstElement::class)]
 final class TokenTypeTest extends TestCase
 {
     use SchemaValidationTestTrait;
diff --git a/tests/WSSecurity/XML/wst/UseKeyTest.php b/tests/WSSecurity/XML/wst/UseKeyTest.php
index b4f08212..affadef2 100644
--- a/tests/WSSecurity/XML/wst/UseKeyTest.php
+++ b/tests/WSSecurity/XML/wst/UseKeyTest.php
@@ -4,10 +4,13 @@
 
 namespace SimpleSAML\Test\WSSecurity\XML\wst;
 
+use PHPUnit\Framework\Attributes\CoversClass;
 use PHPUnit\Framework\TestCase;
 use SimpleSAML\SOAP\Constants as SOAP;
 use SimpleSAML\Test\WSSecurity\Constants as C;
 use SimpleSAML\WSSecurity\XML\wsa\MessageID;
+use SimpleSAML\WSSecurity\XML\wst\AbstractUseKeyType;
+use SimpleSAML\WSSecurity\XML\wst\AbstractWstElement;
 use SimpleSAML\WSSecurity\XML\wst\UseKey;
 use SimpleSAML\XML\Attribute as XMLAttribute;
 use SimpleSAML\XML\DOMDocumentFactory;
@@ -19,12 +22,11 @@
 /**
  * Class \SimpleSAML\WSSecurity\XML\wst\UseKeyTest
  *
- * @covers \SimpleSAML\WSSecurity\XML\wst\UseKey
- * @covers \SimpleSAML\WSSecurity\XML\wst\AbstractUseKeyType
- * @covers \SimpleSAML\WSSecurity\XML\wst\AbstractWstElement
- *
  * @package simplesamlphp/ws-security
  */
+#[CoversClass(UseKey::class)]
+#[CoversClass(AbstractUseKeyType::class)]
+#[CoversClass(AbstractWstElement::class)]
 final class UseKeyTest extends TestCase
 {
     use SchemaValidationTestTrait;
diff --git a/tests/WSSecurity/XML/wst/ValidateTargetTest.php b/tests/WSSecurity/XML/wst/ValidateTargetTest.php
index c47980fd..8b4cc8ce 100644
--- a/tests/WSSecurity/XML/wst/ValidateTargetTest.php
+++ b/tests/WSSecurity/XML/wst/ValidateTargetTest.php
@@ -4,9 +4,12 @@
 
 namespace SimpleSAML\Test\WSSecurity\XML\wst;
 
+use PHPUnit\Framework\Attributes\CoversClass;
 use PHPUnit\Framework\TestCase;
 use SimpleSAML\SOAP\Constants as SOAP;
 use SimpleSAML\WSSecurity\XML\wsa\MessageID;
+use SimpleSAML\WSSecurity\XML\wst\AbstractValidateTargetType;
+use SimpleSAML\WSSecurity\XML\wst\AbstractWstElement;
 use SimpleSAML\WSSecurity\XML\wst\ValidateTarget;
 use SimpleSAML\XML\Attribute as XMLAttribute;
 use SimpleSAML\XML\DOMDocumentFactory;
@@ -18,12 +21,11 @@
 /**
  * Class \SimpleSAML\WSSecurity\XML\wst\ValidateTargetTest
  *
- * @covers \SimpleSAML\WSSecurity\XML\wst\ValidateTarget
- * @covers \SimpleSAML\WSSecurity\XML\wst\AbstractValidateTargetType
- * @covers \SimpleSAML\WSSecurity\XML\wst\AbstractWstElement
- *
  * @package simplesamlphp/ws-security
  */
+#[CoversClass(ValidateTarget::class)]
+#[CoversClass(AbstractValidateTargetType::class)]
+#[CoversClass(AbstractWstElement::class)]
 final class ValidateTargetTest extends TestCase
 {
     use SchemaValidationTestTrait;
diff --git a/tests/WSSecurity/XML/wsu/CreatedTest.php b/tests/WSSecurity/XML/wsu/CreatedTest.php
index c84bbba5..932591f6 100644
--- a/tests/WSSecurity/XML/wsu/CreatedTest.php
+++ b/tests/WSSecurity/XML/wsu/CreatedTest.php
@@ -5,7 +5,10 @@
 namespace SimpleSAML\Test\WSSecurity\XML\wsu;
 
 use DateTimeImmutable;
+use PHPUnit\Framework\Attributes\CoversClass;
 use PHPUnit\Framework\TestCase;
+use SimpleSAML\WSSecurity\XML\wsu\AbstractAttributedDateTime;
+use SimpleSAML\WSSecurity\XML\wsu\AbstractWsuElement;
 use SimpleSAML\WSSecurity\XML\wsu\Created;
 use SimpleSAML\XML\DOMDocumentFactory;
 use SimpleSAML\XML\TestUtils\SchemaValidationTestTrait;
@@ -17,11 +20,11 @@
 /**
  * Tests for wsu:Created.
  *
- * @covers \SimpleSAML\WSSecurity\XML\wsu\Created
- * @covers \SimpleSAML\WSSecurity\XML\wsu\AbstractAttributedDateTime
- * @covers \SimpleSAML\WSSecurity\XML\wsu\AbstractWsuElement
  * @package simplesamlphp/ws-security
  */
+#[CoversClass(Created::class)]
+#[CoversClass(AbstractAttributedDateTime::class)]
+#[CoversClass(AbstractWsuElement::class)]
 final class CreatedTest extends TestCase
 {
     use SchemaValidationTestTrait;
diff --git a/tests/WSSecurity/XML/wsu/ExpiresTest.php b/tests/WSSecurity/XML/wsu/ExpiresTest.php
index 46f1beb1..9e69c0d3 100644
--- a/tests/WSSecurity/XML/wsu/ExpiresTest.php
+++ b/tests/WSSecurity/XML/wsu/ExpiresTest.php
@@ -5,7 +5,10 @@
 namespace SimpleSAML\Test\WSSecurity\XML\wsu;
 
 use DateTimeImmutable;
+use PHPUnit\Framework\Attributes\CoversClass;
 use PHPUnit\Framework\TestCase;
+use SimpleSAML\WSSecurity\XML\wsu\AbstractAttributedDateTime;
+use SimpleSAML\WSSecurity\XML\wsu\AbstractWsuElement;
 use SimpleSAML\WSSecurity\XML\wsu\Expires;
 use SimpleSAML\XML\DOMDocumentFactory;
 use SimpleSAML\XML\TestUtils\SchemaValidationTestTrait;
@@ -17,11 +20,11 @@
 /**
  * Tests for wsu:Expires.
  *
- * @covers \SimpleSAML\WSSecurity\XML\wsu\Expires
- * @covers \SimpleSAML\WSSecurity\XML\wsu\AbstractAttributedDateTime
- * @covers \SimpleSAML\WSSecurity\XML\wsu\AbstractWsuElement
  * @package simplesamlphp/ws-security
  */
+#[CoversClass(Expires::class)]
+#[CoversClass(AbstractAttributedDateTime::class)]
+#[CoversClass(AbstractWsuElement::class)]
 final class ExpiresTest extends TestCase
 {
     use SchemaValidationTestTrait;
diff --git a/tests/WSSecurity/XML/wsu/TimestampTest.php b/tests/WSSecurity/XML/wsu/TimestampTest.php
index d9a6ccbb..4d1550b5 100644
--- a/tests/WSSecurity/XML/wsu/TimestampTest.php
+++ b/tests/WSSecurity/XML/wsu/TimestampTest.php
@@ -5,7 +5,10 @@
 namespace SimpleSAML\Test\WSSecurity\XML\wsu;
 
 use DateTimeImmutable;
+use PHPUnit\Framework\Attributes\CoversClass;
 use PHPUnit\Framework\TestCase;
+use SimpleSAML\WSSecurity\XML\wsu\AbstractTimestamp;
+use SimpleSAML\WSSecurity\XML\wsu\AbstractWsuElement;
 use SimpleSAML\WSSecurity\XML\wsu\Created;
 use SimpleSAML\WSSecurity\XML\wsu\Expires;
 use SimpleSAML\WSSecurity\XML\wsu\Timestamp;
@@ -19,11 +22,11 @@
 /**
  * Tests for wsu:Timestamp.
  *
- * @covers \SimpleSAML\WSSecurity\XML\wsu\Timestamp
- * @covers \SimpleSAML\WSSecurity\XML\wsu\AbstractTimestamp
- * @covers \SimpleSAML\WSSecurity\XML\wsu\AbstractWsuElement
  * @package simplesamlphp/ws-security
  */
+#[CoversClass(Timestamp::class)]
+#[CoversClass(AbstractTimestamp::class)]
+#[CoversClass(AbstractWsuElement::class)]
 final class TimestampTest extends TestCase
 {
     use SchemaValidationTestTrait;
diff --git a/tests/WSSecurity/XML/wsx/DialectTest.php b/tests/WSSecurity/XML/wsx/DialectTest.php
index aa863ec2..1376cadd 100644
--- a/tests/WSSecurity/XML/wsx/DialectTest.php
+++ b/tests/WSSecurity/XML/wsx/DialectTest.php
@@ -4,8 +4,10 @@
 
 namespace SimpleSAML\Test\WSSecurity\XML\wsx;
 
+use PHPUnit\Framework\Attributes\CoversClass;
 use PHPUnit\Framework\TestCase;
 use SimpleSAML\Test\WSSecurity\Constants as C;
+use SimpleSAML\WSSecurity\XML\wsx\AbstractWsxElement;
 use SimpleSAML\WSSecurity\XML\wsx\Dialect;
 use SimpleSAML\XML\DOMDocumentFactory;
 use SimpleSAML\XML\TestUtils\SchemaValidationTestTrait;
@@ -16,11 +18,10 @@
 /**
  * Class \SimpleSAML\WSSecurity\XML\wsx\DialectTest
  *
- * @covers \SimpleSAML\WSSecurity\XML\wsx\Dialect
- * @covers \SimpleSAML\WSSecurity\XML\wsx\AbstractWsxElement
- *
  * @package simplesamlphp/ws-security
  */
+#[CoversClass(Dialect::class)]
+#[CoversClass(AbstractWsxElement::class)]
 final class DialectTest extends TestCase
 {
     use SchemaValidationTestTrait;
diff --git a/tests/WSSecurity/XML/wsx/GetMetadataTest.php b/tests/WSSecurity/XML/wsx/GetMetadataTest.php
index f9191898..bd55641d 100644
--- a/tests/WSSecurity/XML/wsx/GetMetadataTest.php
+++ b/tests/WSSecurity/XML/wsx/GetMetadataTest.php
@@ -4,7 +4,9 @@
 
 namespace SimpleSAML\Test\WSSecurity\XML\wsx;
 
+use PHPUnit\Framework\Attributes\CoversClass;
 use PHPUnit\Framework\TestCase;
+use SimpleSAML\WSSecurity\XML\wsx\AbstractWsxElement;
 use SimpleSAML\WSSecurity\XML\wsx\Dialect;
 use SimpleSAML\WSSecurity\XML\wsx\GetMetadata;
 use SimpleSAML\WSSecurity\XML\wsx\Identifier;
@@ -19,10 +21,10 @@
 /**
  * Tests for wsx:GetMetadata.
  *
- * @covers \SimpleSAML\WSSecurity\XML\wsx\GetMetadata
- * @covers \SimpleSAML\WSSecurity\XML\wsx\AbstractWsxElement
  * @package simplesamlphp/ws-security
  */
+#[CoversClass(GetMetadata::class)]
+#[CoversClass(AbstractWsxElement::class)]
 final class GetMetadataTest extends TestCase
 {
     use SchemaValidationTestTrait;
diff --git a/tests/WSSecurity/XML/wsx/IdentifierTest.php b/tests/WSSecurity/XML/wsx/IdentifierTest.php
index 38a727f9..837e94bf 100644
--- a/tests/WSSecurity/XML/wsx/IdentifierTest.php
+++ b/tests/WSSecurity/XML/wsx/IdentifierTest.php
@@ -4,8 +4,10 @@
 
 namespace SimpleSAML\Test\WSSecurity\XML\wsx;
 
+use PHPUnit\Framework\Attributes\CoversClass;
 use PHPUnit\Framework\TestCase;
 use SimpleSAML\Test\WSSecurity\Constants as C;
+use SimpleSAML\WSSecurity\XML\wsx\AbstractWsxElement;
 use SimpleSAML\WSSecurity\XML\wsx\Identifier;
 use SimpleSAML\XML\DOMDocumentFactory;
 use SimpleSAML\XML\TestUtils\SchemaValidationTestTrait;
@@ -16,11 +18,10 @@
 /**
  * Class \SimpleSAML\WSSecurity\XML\wsx\IdentifierTest
  *
- * @covers \SimpleSAML\WSSecurity\XML\wsx\Identifier
- * @covers \SimpleSAML\WSSecurity\XML\wsx\AbstractWsxElement
- *
  * @package simplesamlphp/ws-security
  */
+#[CoversClass(Identifier::class)]
+#[CoversClass(AbstractWsxElement::class)]
 final class IdentifierTest extends TestCase
 {
     use SchemaValidationTestTrait;
diff --git a/tests/WSSecurity/XML/wsx/LocationTest.php b/tests/WSSecurity/XML/wsx/LocationTest.php
index 3468e54d..7952c1f1 100644
--- a/tests/WSSecurity/XML/wsx/LocationTest.php
+++ b/tests/WSSecurity/XML/wsx/LocationTest.php
@@ -4,8 +4,10 @@
 
 namespace SimpleSAML\Test\WSSecurity\XML\wsx;
 
+use PHPUnit\Framework\Attributes\CoversClass;
 use PHPUnit\Framework\TestCase;
 use SimpleSAML\Test\WSSecurity\Constants as C;
+use SimpleSAML\WSSecurity\XML\wsx\AbstractWsxElement;
 use SimpleSAML\WSSecurity\XML\wsx\Location;
 use SimpleSAML\XML\DOMDocumentFactory;
 use SimpleSAML\XML\TestUtils\SchemaValidationTestTrait;
@@ -16,11 +18,10 @@
 /**
  * Class \SimpleSAML\WSSecurity\XML\wsx\LocationTest
  *
- * @covers \SimpleSAML\WSSecurity\XML\wsx\Location
- * @covers \SimpleSAML\WSSecurity\XML\wsx\AbstractWsxElement
- *
  * @package simplesamlphp/ws-security
  */
+#[CoversClass(Location::class)]
+#[CoversClass(AbstractWsxElement::class)]
 final class LocationTest extends TestCase
 {
     use SchemaValidationTestTrait;
diff --git a/tests/WSSecurity/XML/wsx/MetadataReferenceTest.php b/tests/WSSecurity/XML/wsx/MetadataReferenceTest.php
index 3ccdba5b..8c39ebb8 100644
--- a/tests/WSSecurity/XML/wsx/MetadataReferenceTest.php
+++ b/tests/WSSecurity/XML/wsx/MetadataReferenceTest.php
@@ -5,9 +5,11 @@
 namespace SimpleSAML\Test\WSSecurity\XML\wsx;
 
 use DOMElement;
+use PHPUnit\Framework\Attributes\CoversClass;
 use PHPUnit\Framework\TestCase;
 use SimpleSAML\WSSecurity\XML\wsa\Address;
 use SimpleSAML\WSSecurity\XML\wsa\EndpointReference;
+use SimpleSAML\WSSecurity\XML\wsx\AbstractWsxElement;
 use SimpleSAML\WSSecurity\XML\wsx\MetadataReference;
 use SimpleSAML\XML\Attribute;
 use SimpleSAML\XML\Chunk;
@@ -21,10 +23,10 @@
 /**
  * Tests for wsx:MetadataReference.
  *
- * @covers \SimpleSAML\WSSecurity\XML\wsx\MetadataReference
- * @covers \SimpleSAML\WSSecurity\XML\wsx\AbstractWsxElement
  * @package simplesamlphp/ws-security
  */
+#[CoversClass(MetadataReference::class)]
+#[CoversClass(AbstractWsxElement::class)]
 final class MetadataReferenceTest extends TestCase
 {
     use SchemaValidationTestTrait;
diff --git a/tests/WSSecurity/XML/wsx/MetadataSectionTest.php b/tests/WSSecurity/XML/wsx/MetadataSectionTest.php
index 8edc2e94..467a13cf 100644
--- a/tests/WSSecurity/XML/wsx/MetadataSectionTest.php
+++ b/tests/WSSecurity/XML/wsx/MetadataSectionTest.php
@@ -4,7 +4,9 @@
 
 namespace SimpleSAML\Test\WSSecurity\XML\wsx;
 
+use PHPUnit\Framework\Attributes\CoversClass;
 use PHPUnit\Framework\TestCase;
+use SimpleSAML\WSSecurity\XML\wsx\AbstractWsxElement;
 use SimpleSAML\WSSecurity\XML\wsx\Location;
 use SimpleSAML\WSSecurity\XML\wsx\MetadataSection;
 use SimpleSAML\XML\Attribute;
@@ -18,10 +20,10 @@
 /**
  * Tests for wsx:MetadataSection.
  *
- * @covers \SimpleSAML\WSSecurity\XML\wsx\MetadataSection
- * @covers \SimpleSAML\WSSecurity\XML\wsx\AbstractWsxElement
  * @package simplesamlphp/ws-security
  */
+#[CoversClass(MetadataSection::class)]
+#[CoversClass(AbstractWsxElement::class)]
 final class MetadataSectionTest extends TestCase
 {
     use SchemaValidationTestTrait;
diff --git a/tests/WSSecurity/XML/wsx/MetadataTest.php b/tests/WSSecurity/XML/wsx/MetadataTest.php
index b7ce824e..a39562be 100644
--- a/tests/WSSecurity/XML/wsx/MetadataTest.php
+++ b/tests/WSSecurity/XML/wsx/MetadataTest.php
@@ -4,7 +4,9 @@
 
 namespace SimpleSAML\Test\WSSecurity\XML\wsx;
 
+use PHPUnit\Framework\Attributes\CoversClass;
 use PHPUnit\Framework\TestCase;
+use SimpleSAML\WSSecurity\XML\wsx\AbstractWsxElement;
 use SimpleSAML\WSSecurity\XML\wsx\Location;
 use SimpleSAML\WSSecurity\XML\wsx\Metadata;
 use SimpleSAML\WSSecurity\XML\wsx\MetadataSection;
@@ -20,10 +22,10 @@
 /**
  * Tests for wsx:Metadata.
  *
- * @covers \SimpleSAML\WSSecurity\XML\wsx\Metadata
- * @covers \SimpleSAML\WSSecurity\XML\wsx\AbstractWsxElement
  * @package simplesamlphp/ws-security
  */
+#[CoversClass(Metadata::class)]
+#[CoversClass(AbstractWsxElement::class)]
 final class MetadataTest extends TestCase
 {
     use SchemaValidationTestTrait;