diff --git a/tests/WSSecurity/XML/auth/ClaimTypeTest.php b/tests/WSSecurity/XML/auth/ClaimTypeTest.php
index 6bf676bd..db1452c0 100644
--- a/tests/WSSecurity/XML/auth/ClaimTypeTest.php
+++ b/tests/WSSecurity/XML/auth/ClaimTypeTest.php
@@ -5,6 +5,7 @@
 namespace SimpleSAML\Test\WSSecurity\XML\auth;
 
 use PHPUnit\Framework\Attributes\CoversClass;
+use PHPUnit\Framework\Attributes\Group;
 use PHPUnit\Framework\TestCase;
 use SimpleSAML\Test\WSSecurity\Constants as C;
 use SimpleSAML\WSSecurity\Utils\XPath;
@@ -28,6 +29,7 @@
  *
  * @package simplesamlphp/ws-security
  */
+#[Group('auth')]
 #[CoversClass(ClaimType::class)]
 #[CoversClass(AbstractClaimType::class)]
 #[CoversClass(AbstractAuthElement::class)]
diff --git a/tests/WSSecurity/XML/auth/ConstrainedManyValueTest.php b/tests/WSSecurity/XML/auth/ConstrainedManyValueTest.php
index 5af7b0ec..5574b016 100644
--- a/tests/WSSecurity/XML/auth/ConstrainedManyValueTest.php
+++ b/tests/WSSecurity/XML/auth/ConstrainedManyValueTest.php
@@ -6,6 +6,7 @@
 
 use PHPUnit\Framework\Attributes\CoversClass;
 use PHPUnit\Framework\Attributes\DataProvider;
+use PHPUnit\Framework\Attributes\Group;
 use PHPUnit\Framework\TestCase;
 use SimpleSAML\Assert\AssertionFailedException;
 use SimpleSAML\WSSecurity\XML\auth\AbstractAuthElement;
@@ -22,6 +23,7 @@
  *
  * @package simplesamlphp/ws-security
  */
+#[Group('auth')]
 #[CoversClass(StructuredValue::class)]
 #[CoversClass(ValueOneOf::class)]
 #[CoversClass(AbstractConstrainedManyValueType::class)]
diff --git a/tests/WSSecurity/XML/auth/ConstrainedSingleValueTest.php b/tests/WSSecurity/XML/auth/ConstrainedSingleValueTest.php
index ec8fa7ed..9a7d7c0d 100644
--- a/tests/WSSecurity/XML/auth/ConstrainedSingleValueTest.php
+++ b/tests/WSSecurity/XML/auth/ConstrainedSingleValueTest.php
@@ -6,6 +6,7 @@
 
 use PHPUnit\Framework\Attributes\CoversClass;
 use PHPUnit\Framework\Attributes\DataProvider;
+use PHPUnit\Framework\Attributes\Group;
 use PHPUnit\Framework\TestCase;
 use SimpleSAML\Assert\AssertionFailedException;
 use SimpleSAML\WSSecurity\XML\auth\AbstractAuthElement;
@@ -27,6 +28,7 @@
  *
  * @package simplesamlphp/ws-security
  */
+#[Group('auth')]
 #[CoversClass(ValueGreaterThan::class)]
 #[CoversClass(ValueGreaterThanOrEqual::class)]
 #[CoversClass(ValueLessThan::class)]
diff --git a/tests/WSSecurity/XML/auth/ConstrainedValueTest.php b/tests/WSSecurity/XML/auth/ConstrainedValueTest.php
index e4bcc15d..63f1a4e9 100644
--- a/tests/WSSecurity/XML/auth/ConstrainedValueTest.php
+++ b/tests/WSSecurity/XML/auth/ConstrainedValueTest.php
@@ -6,6 +6,7 @@
 
 use PHPUnit\Framework\Attributes\CoversClass;
 use PHPUnit\Framework\Attributes\DataProvider;
+use PHPUnit\Framework\Attributes\Group;
 use PHPUnit\Framework\TestCase;
 use SimpleSAML\WSSecurity\XML\auth\AbstractAuthElement;
 use SimpleSAML\WSSecurity\XML\auth\AbstractConstrainedValueType;
@@ -28,6 +29,7 @@
  *
  * @package simplesamlphp/ws-security
  */
+#[Group('auth')]
 #[CoversClass(ConstrainedValue::class)]
 #[CoversClass(AbstractConstrainedValueType::class)]
 #[CoversClass(AbstractAuthElement::class)]
diff --git a/tests/WSSecurity/XML/auth/DescriptionTest.php b/tests/WSSecurity/XML/auth/DescriptionTest.php
index 650ebe6b..8658f6b4 100644
--- a/tests/WSSecurity/XML/auth/DescriptionTest.php
+++ b/tests/WSSecurity/XML/auth/DescriptionTest.php
@@ -5,6 +5,7 @@
 namespace SimpleSAML\Test\WSSecurity\XML\auth;
 
 use PHPUnit\Framework\Attributes\CoversClass;
+use PHPUnit\Framework\Attributes\Group;
 use PHPUnit\Framework\TestCase;
 use SimpleSAML\WSSecurity\XML\auth\AbstractAuthElement;
 use SimpleSAML\WSSecurity\XML\auth\AbstractDescriptionType;
@@ -21,6 +22,7 @@
  *
  * @package simplesamlphp/ws-security
  */
+#[Group('auth')]
 #[CoversClass(Description::class)]
 #[CoversClass(AbstractDescriptionType::class)]
 #[CoversClass(AbstractAuthElement::class)]
diff --git a/tests/WSSecurity/XML/auth/DisplayNameTest.php b/tests/WSSecurity/XML/auth/DisplayNameTest.php
index ffeb9448..09ccb5b5 100644
--- a/tests/WSSecurity/XML/auth/DisplayNameTest.php
+++ b/tests/WSSecurity/XML/auth/DisplayNameTest.php
@@ -5,6 +5,7 @@
 namespace SimpleSAML\Test\WSSecurity\XML\auth;
 
 use PHPUnit\Framework\Attributes\CoversClass;
+use PHPUnit\Framework\Attributes\Group;
 use PHPUnit\Framework\TestCase;
 use SimpleSAML\WSSecurity\XML\auth\AbstractAuthElement;
 use SimpleSAML\WSSecurity\XML\auth\AbstractDisplayNameType;
@@ -21,6 +22,7 @@
  *
  * @package simplesamlphp/ws-security
  */
+#[Group('auth')]
 #[CoversClass(DisplayName::class)]
 #[CoversClass(AbstractDisplayNameType::class)]
 #[CoversClass(AbstractAuthElement::class)]
diff --git a/tests/WSSecurity/XML/auth/DisplayValueTest.php b/tests/WSSecurity/XML/auth/DisplayValueTest.php
index 8ff9a6a4..ff594ba8 100644
--- a/tests/WSSecurity/XML/auth/DisplayValueTest.php
+++ b/tests/WSSecurity/XML/auth/DisplayValueTest.php
@@ -5,6 +5,7 @@
 namespace SimpleSAML\Test\WSSecurity\XML\auth;
 
 use PHPUnit\Framework\Attributes\CoversClass;
+use PHPUnit\Framework\Attributes\Group;
 use PHPUnit\Framework\TestCase;
 use SimpleSAML\WSSecurity\XML\auth\AbstractAuthElement;
 use SimpleSAML\WSSecurity\XML\auth\AbstractDisplayValueType;
@@ -21,6 +22,7 @@
  *
  * @package simplesamlphp/ws-security
  */
+#[Group('auth')]
 #[CoversClass(DisplayValue::class)]
 #[CoversClass(AbstractDisplayValueType::class)]
 #[CoversClass(AbstractAuthElement::class)]
diff --git a/tests/WSSecurity/XML/auth/EncryptedValueTest.php b/tests/WSSecurity/XML/auth/EncryptedValueTest.php
index 9727e22b..433d05b4 100644
--- a/tests/WSSecurity/XML/auth/EncryptedValueTest.php
+++ b/tests/WSSecurity/XML/auth/EncryptedValueTest.php
@@ -5,6 +5,7 @@
 namespace SimpleSAML\Test\WSSecurity\XML\auth;
 
 use PHPUnit\Framework\Attributes\CoversClass;
+use PHPUnit\Framework\Attributes\Group;
 use PHPUnit\Framework\TestCase;
 use SimpleSAML\WSSecurity\XML\auth\AbstractAuthElement;
 use SimpleSAML\WSSecurity\XML\auth\AbstractEncryptedValueType;
@@ -26,6 +27,7 @@
  *
  * @package simplesamlphp/ws-security
  */
+#[Group('auth')]
 #[CoversClass(EncryptedValue::class)]
 #[CoversClass(AbstractEncryptedValueType::class)]
 #[CoversClass(AbstractAuthElement::class)]
diff --git a/tests/WSSecurity/XML/auth/StructuredValueTest.php b/tests/WSSecurity/XML/auth/StructuredValueTest.php
index bea7a821..22775671 100644
--- a/tests/WSSecurity/XML/auth/StructuredValueTest.php
+++ b/tests/WSSecurity/XML/auth/StructuredValueTest.php
@@ -5,6 +5,7 @@
 namespace SimpleSAML\Test\WSSecurity\XML\auth;
 
 use PHPUnit\Framework\Attributes\CoversClass;
+use PHPUnit\Framework\Attributes\Group;
 use PHPUnit\Framework\TestCase;
 use SimpleSAML\WSSecurity\XML\auth\AbstractAuthElement;
 use SimpleSAML\WSSecurity\XML\auth\AbstractStructuredValueType;
@@ -22,6 +23,7 @@
  *
  * @package simplesamlphp/ws-security
  */
+#[Group('auth')]
 #[CoversClass(StructuredValue::class)]
 #[CoversClass(AbstractStructuredValueType::class)]
 #[CoversClass(AbstractAuthElement::class)]
diff --git a/tests/WSSecurity/XML/auth/ValueGreaterThanOrEqualTest.php b/tests/WSSecurity/XML/auth/ValueGreaterThanOrEqualTest.php
index 0fd62e33..bcf8f0d2 100644
--- a/tests/WSSecurity/XML/auth/ValueGreaterThanOrEqualTest.php
+++ b/tests/WSSecurity/XML/auth/ValueGreaterThanOrEqualTest.php
@@ -5,6 +5,7 @@
 namespace SimpleSAML\Test\WSSecurity\XML\auth;
 
 use PHPUnit\Framework\Attributes\CoversClass;
+use PHPUnit\Framework\Attributes\Group;
 use PHPUnit\Framework\TestCase;
 use SimpleSAML\WSSecurity\XML\auth\AbstractAuthElement;
 use SimpleSAML\WSSecurity\XML\auth\AbstractConstrainedSingleValueType;
@@ -23,6 +24,7 @@
  *
  * @package simplesamlphp/ws-security
  */
+#[Group('auth')]
 #[CoversClass(ValueGreaterThanOrEqual::class)]
 #[CoversClass(AbstractConstrainedSingleValueType::class)]
 #[CoversClass(AbstractAuthElement::class)]
diff --git a/tests/WSSecurity/XML/auth/ValueGreaterThanTest.php b/tests/WSSecurity/XML/auth/ValueGreaterThanTest.php
index c9051a85..98920174 100644
--- a/tests/WSSecurity/XML/auth/ValueGreaterThanTest.php
+++ b/tests/WSSecurity/XML/auth/ValueGreaterThanTest.php
@@ -5,6 +5,7 @@
 namespace SimpleSAML\Test\WSSecurity\XML\auth;
 
 use PHPUnit\Framework\Attributes\CoversClass;
+use PHPUnit\Framework\Attributes\Group;
 use PHPUnit\Framework\TestCase;
 use SimpleSAML\WSSecurity\XML\auth\AbstractAuthElement;
 use SimpleSAML\WSSecurity\XML\auth\AbstractConstrainedSingleValueType;
@@ -23,6 +24,7 @@
  *
  * @package simplesamlphp/ws-security
  */
+#[Group('auth')]
 #[CoversClass(ValueGreaterThan::class)]
 #[CoversClass(AbstractConstrainedSingleValueType::class)]
 #[CoversClass(AbstractAuthElement::class)]
diff --git a/tests/WSSecurity/XML/auth/ValueInRangenTest.php b/tests/WSSecurity/XML/auth/ValueInRangenTest.php
index 709fdc9c..026f0ced 100644
--- a/tests/WSSecurity/XML/auth/ValueInRangenTest.php
+++ b/tests/WSSecurity/XML/auth/ValueInRangenTest.php
@@ -5,6 +5,7 @@
 namespace SimpleSAML\Test\WSSecurity\XML\auth;
 
 use PHPUnit\Framework\Attributes\CoversClass;
+use PHPUnit\Framework\Attributes\Group;
 use PHPUnit\Framework\TestCase;
 use SimpleSAML\WSSecurity\XML\auth\AbstractAuthElement;
 use SimpleSAML\WSSecurity\XML\auth\AbstractValueInRangeType;
@@ -26,6 +27,7 @@
  *
  * @package simplesamlphp/ws-security
  */
+#[Group('auth')]
 #[CoversClass(ValueInRangen::class)]
 #[CoversClass(AbstractValueInRangeType::class)]
 #[CoversClass(AbstractAuthElement::class)]
diff --git a/tests/WSSecurity/XML/auth/ValueLessThanOrEqualTest.php b/tests/WSSecurity/XML/auth/ValueLessThanOrEqualTest.php
index 4a7a293b..eb7140a7 100644
--- a/tests/WSSecurity/XML/auth/ValueLessThanOrEqualTest.php
+++ b/tests/WSSecurity/XML/auth/ValueLessThanOrEqualTest.php
@@ -5,6 +5,7 @@
 namespace SimpleSAML\Test\WSSecurity\XML\auth;
 
 use PHPUnit\Framework\Attributes\CoversClass;
+use PHPUnit\Framework\Attributes\Group;
 use PHPUnit\Framework\TestCase;
 use SimpleSAML\WSSecurity\XML\auth\AbstractAuthElement;
 use SimpleSAML\WSSecurity\XML\auth\AbstractConstrainedSingleValueType;
@@ -23,6 +24,7 @@
  *
  * @package simplesamlphp/ws-security
  */
+#[Group('auth')]
 #[CoversClass(ValueLessThanOrEqual::class)]
 #[CoversClass(AbstractConstrainedSingleValueType::class)]
 #[CoversClass(AbstractAuthElement::class)]
diff --git a/tests/WSSecurity/XML/auth/ValueLessThanTest.php b/tests/WSSecurity/XML/auth/ValueLessThanTest.php
index e2625161..713c6a10 100644
--- a/tests/WSSecurity/XML/auth/ValueLessThanTest.php
+++ b/tests/WSSecurity/XML/auth/ValueLessThanTest.php
@@ -5,6 +5,7 @@
 namespace SimpleSAML\Test\WSSecurity\XML\auth;
 
 use PHPUnit\Framework\Attributes\CoversClass;
+use PHPUnit\Framework\Attributes\Group;
 use PHPUnit\Framework\TestCase;
 use SimpleSAML\WSSecurity\XML\auth\AbstractAuthElement;
 use SimpleSAML\WSSecurity\XML\auth\AbstractConstrainedSingleValueType;
@@ -23,6 +24,7 @@
  *
  * @package simplesamlphp/ws-security
  */
+#[Group('auth')]
 #[CoversClass(ValueLessThan::class)]
 #[CoversClass(AbstractConstrainedSingleValueType::class)]
 #[CoversClass(AbstractAuthElement::class)]
diff --git a/tests/WSSecurity/XML/auth/ValueLowerBoundTest.php b/tests/WSSecurity/XML/auth/ValueLowerBoundTest.php
index 606dec02..9cb336fe 100644
--- a/tests/WSSecurity/XML/auth/ValueLowerBoundTest.php
+++ b/tests/WSSecurity/XML/auth/ValueLowerBoundTest.php
@@ -5,6 +5,7 @@
 namespace SimpleSAML\Test\WSSecurity\XML\auth;
 
 use PHPUnit\Framework\Attributes\CoversClass;
+use PHPUnit\Framework\Attributes\Group;
 use PHPUnit\Framework\TestCase;
 use SimpleSAML\WSSecurity\XML\auth\AbstractAuthElement;
 use SimpleSAML\WSSecurity\XML\auth\AbstractConstrainedSingleValueType;
@@ -21,6 +22,7 @@
  *
  * @package simplesamlphp/ws-security
  */
+#[Group('auth')]
 #[CoversClass(ValueLowerBound::class)]
 #[CoversClass(AbstractConstrainedSingleValueType::class)]
 #[CoversClass(AbstractAuthElement::class)]
diff --git a/tests/WSSecurity/XML/auth/ValueOneOfWithStructuredValuesTest.php b/tests/WSSecurity/XML/auth/ValueOneOfWithStructuredValuesTest.php
index b0aa97f7..2855afa6 100644
--- a/tests/WSSecurity/XML/auth/ValueOneOfWithStructuredValuesTest.php
+++ b/tests/WSSecurity/XML/auth/ValueOneOfWithStructuredValuesTest.php
@@ -5,6 +5,7 @@
 namespace SimpleSAML\Test\WSSecurity\XML\auth;
 
 use PHPUnit\Framework\Attributes\CoversClass;
+use PHPUnit\Framework\Attributes\Group;
 use PHPUnit\Framework\TestCase;
 use SimpleSAML\WSSecurity\XML\auth\AbstractAuthElement;
 use SimpleSAML\WSSecurity\XML\auth\AbstractConstrainedManyValueType;
@@ -23,6 +24,7 @@
  *
  * @package simplesamlphp/ws-security
  */
+#[Group('auth')]
 #[CoversClass(ValueOneOf::class)]
 #[CoversClass(AbstractConstrainedManyValueType::class)]
 #[CoversClass(AbstractAuthElement::class)]
diff --git a/tests/WSSecurity/XML/auth/ValueOneOfWithValuesTest.php b/tests/WSSecurity/XML/auth/ValueOneOfWithValuesTest.php
index 81a4f14d..d9ba4522 100644
--- a/tests/WSSecurity/XML/auth/ValueOneOfWithValuesTest.php
+++ b/tests/WSSecurity/XML/auth/ValueOneOfWithValuesTest.php
@@ -5,6 +5,7 @@
 namespace SimpleSAML\Test\WSSecurity\XML\auth;
 
 use PHPUnit\Framework\Attributes\CoversClass;
+use PHPUnit\Framework\Attributes\Group;
 use PHPUnit\Framework\TestCase;
 use SimpleSAML\WSSecurity\XML\auth\AbstractAuthElement;
 use SimpleSAML\WSSecurity\XML\auth\AbstractConstrainedManyValueType;
@@ -21,6 +22,7 @@
  *
  * @package simplesamlphp/ws-security
  */
+#[Group('auth')]
 #[CoversClass(ValueOneOf::class)]
 #[CoversClass(AbstractConstrainedManyValueType::class)]
 #[CoversClass(AbstractAuthElement::class)]
diff --git a/tests/WSSecurity/XML/auth/ValueTest.php b/tests/WSSecurity/XML/auth/ValueTest.php
index a038641f..7838072f 100644
--- a/tests/WSSecurity/XML/auth/ValueTest.php
+++ b/tests/WSSecurity/XML/auth/ValueTest.php
@@ -5,6 +5,7 @@
 namespace SimpleSAML\Test\WSSecurity\XML\auth;
 
 use PHPUnit\Framework\Attributes\CoversClass;
+use PHPUnit\Framework\Attributes\Group;
 use PHPUnit\Framework\TestCase;
 use SimpleSAML\WSSecurity\XML\auth\AbstractAuthElement;
 use SimpleSAML\WSSecurity\XML\auth\Value;
@@ -19,6 +20,7 @@
  *
  * @package simplesamlphp/ws-security
  */
+#[Group('auth')]
 #[CoversClass(Value::class)]
 #[CoversClass(AbstractAuthElement::class)]
 final class ValueTest extends TestCase
diff --git a/tests/WSSecurity/XML/auth/ValueUpperBoundTest.php b/tests/WSSecurity/XML/auth/ValueUpperBoundTest.php
index fe433378..103ddef4 100644
--- a/tests/WSSecurity/XML/auth/ValueUpperBoundTest.php
+++ b/tests/WSSecurity/XML/auth/ValueUpperBoundTest.php
@@ -5,6 +5,7 @@
 namespace SimpleSAML\Test\WSSecurity\XML\auth;
 
 use PHPUnit\Framework\Attributes\CoversClass;
+use PHPUnit\Framework\Attributes\Group;
 use PHPUnit\Framework\TestCase;
 use SimpleSAML\WSSecurity\XML\auth\AbstractAuthElement;
 use SimpleSAML\WSSecurity\XML\auth\AbstractConstrainedSingleValueType;
@@ -23,6 +24,7 @@
  *
  * @package simplesamlphp/ws-security
  */
+#[Group('auth')]
 #[CoversClass(ValueUpperBound::class)]
 #[CoversClass(AbstractConstrainedSingleValueType::class)]
 #[CoversClass(AbstractAuthElement::class)]
diff --git a/tests/WSSecurity/XML/fed/AdditionalContextProcessedTest.php b/tests/WSSecurity/XML/fed/AdditionalContextProcessedTest.php
index 9dc82e4f..583a09f6 100644
--- a/tests/WSSecurity/XML/fed/AdditionalContextProcessedTest.php
+++ b/tests/WSSecurity/XML/fed/AdditionalContextProcessedTest.php
@@ -5,6 +5,7 @@
 namespace SimpleSAML\Test\WSSecurity\XML\fed;
 
 use PHPUnit\Framework\Attributes\CoversClass;
+use PHPUnit\Framework\Attributes\Group;
 use PHPUnit\Framework\TestCase;
 use SimpleSAML\Test\WSSecurity\Constants as C;
 use SimpleSAML\WSSecurity\XML\fed\AbstractAssertionType;
@@ -23,6 +24,7 @@
  *
  * @package simplesamlphp/ws-security
  */
+#[Group('fed')]
 #[CoversClass(AdditionalContextProcessed::class)]
 #[CoversClass(AbstractAssertionType::class)]
 #[CoversClass(AbstractFedElement::class)]
diff --git a/tests/WSSecurity/XML/fed/ApplicationServiceEndpointTest.php b/tests/WSSecurity/XML/fed/ApplicationServiceEndpointTest.php
index 32d30380..58ccc6c5 100644
--- a/tests/WSSecurity/XML/fed/ApplicationServiceEndpointTest.php
+++ b/tests/WSSecurity/XML/fed/ApplicationServiceEndpointTest.php
@@ -6,6 +6,7 @@
 
 use DOMElement;
 use PHPUnit\Framework\Attributes\CoversClass;
+use PHPUnit\Framework\Attributes\Group;
 use PHPUnit\Framework\TestCase;
 use SimpleSAML\WSSecurity\XML\fed\AbstractEndpointType;
 use SimpleSAML\WSSecurity\XML\fed\AbstractFedElement;
@@ -28,6 +29,7 @@
  *
  * @package simplesamlphp/ws-security
  */
+#[Group('fed')]
 #[CoversClass(ApplicationServiceEndpoint::class)]
 #[CoversClass(AbstractEndpointType::class)]
 #[CoversClass(AbstractFedElement::class)]
diff --git a/tests/WSSecurity/XML/fed/AttributeServiceEndpointTest.php b/tests/WSSecurity/XML/fed/AttributeServiceEndpointTest.php
index 508e3758..33e9da42 100644
--- a/tests/WSSecurity/XML/fed/AttributeServiceEndpointTest.php
+++ b/tests/WSSecurity/XML/fed/AttributeServiceEndpointTest.php
@@ -6,6 +6,7 @@
 
 use DOMElement;
 use PHPUnit\Framework\Attributes\CoversClass;
+use PHPUnit\Framework\Attributes\Group;
 use PHPUnit\Framework\TestCase;
 use SimpleSAML\WSSecurity\XML\fed\AbstractEndpointType;
 use SimpleSAML\WSSecurity\XML\fed\AbstractFedElement;
@@ -31,6 +32,7 @@
  * @covers \SimpleSAML\WSSecurity\XML\fed\AbstractFedElement
  * @package simplesamlphp/ws-security
  */
+#[Group('fed')]
 #[CoversClass(AttributeServiceEndpoint::class)]
 #[CoversClass(AbstractEndpointType::class)]
 #[CoversClass(AbstractFedElement::class)]
diff --git a/tests/WSSecurity/XML/fed/AttributeServiceEndpointsTest.php b/tests/WSSecurity/XML/fed/AttributeServiceEndpointsTest.php
index d807652b..582243cd 100644
--- a/tests/WSSecurity/XML/fed/AttributeServiceEndpointsTest.php
+++ b/tests/WSSecurity/XML/fed/AttributeServiceEndpointsTest.php
@@ -6,6 +6,7 @@
 
 use DOMElement;
 use PHPUnit\Framework\Attributes\CoversClass;
+use PHPUnit\Framework\Attributes\Group;
 use PHPUnit\Framework\TestCase;
 use SimpleSAML\WSSecurity\XML\fed\AbstractEndpointType;
 use SimpleSAML\WSSecurity\XML\fed\AbstractFedElement;
@@ -28,6 +29,7 @@
  *
  * @package simplesamlphp/ws-security
  */
+#[Group('fed')]
 #[CoversClass(AttributeServiceEndpoints::class)]
 #[CoversClass(AbstractEndpointType::class)]
 #[CoversClass(AbstractFedElement::class)]
diff --git a/tests/WSSecurity/XML/fed/AuthenticationTokenTest.php b/tests/WSSecurity/XML/fed/AuthenticationTokenTest.php
index 4d1292a9..9c514240 100644
--- a/tests/WSSecurity/XML/fed/AuthenticationTokenTest.php
+++ b/tests/WSSecurity/XML/fed/AuthenticationTokenTest.php
@@ -5,6 +5,7 @@
 namespace SimpleSAML\Test\WSSecurity\XML\fed;
 
 use PHPUnit\Framework\Attributes\CoversClass;
+use PHPUnit\Framework\Attributes\Group;
 use PHPUnit\Framework\TestCase;
 use SimpleSAML\Test\WSSecurity\Constants as C;
 use SimpleSAML\Test\WSSecurity\XML\sp\NestedPolicyTypeTestTrait;
@@ -24,6 +25,7 @@
  *
  * @package simplesamlphp/ws-security
  */
+#[Group('fed')]
 #[CoversClass(AuthenticationToken::class)]
 #[CoversClass(AbstractNestedPolicyType::class)]
 #[CoversClass(AbstractSpElement::class)]
diff --git a/tests/WSSecurity/XML/fed/AutomaticPseudonymsTest.php b/tests/WSSecurity/XML/fed/AutomaticPseudonymsTest.php
index aa4a274e..cfd097ba 100644
--- a/tests/WSSecurity/XML/fed/AutomaticPseudonymsTest.php
+++ b/tests/WSSecurity/XML/fed/AutomaticPseudonymsTest.php
@@ -5,6 +5,7 @@
 namespace SimpleSAML\Test\WSSecurity\XML\fed;
 
 use PHPUnit\Framework\Attributes\CoversClass;
+use PHPUnit\Framework\Attributes\Group;
 use PHPUnit\Framework\TestCase;
 use SimpleSAML\WSSecurity\XML\fed\AbstractFedElement;
 use SimpleSAML\WSSecurity\XML\fed\AutomaticPseudonyms;
@@ -19,6 +20,7 @@
  *
  * @package simplesamlphp/ws-security
  */
+#[Group('fed')]
 #[CoversClass(AutomaticPseudonyms::class)]
 #[CoversClass(AbstractFedElement::class)]
 final class AutomaticPseudonymsTest extends TestCase
diff --git a/tests/WSSecurity/XML/fed/ClaimDialectTest.php b/tests/WSSecurity/XML/fed/ClaimDialectTest.php
index 20010e7b..02afc654 100644
--- a/tests/WSSecurity/XML/fed/ClaimDialectTest.php
+++ b/tests/WSSecurity/XML/fed/ClaimDialectTest.php
@@ -5,6 +5,7 @@
 namespace SimpleSAML\Test\WSSecurity\XML\fed;
 
 use PHPUnit\Framework\Attributes\CoversClass;
+use PHPUnit\Framework\Attributes\Group;
 use PHPUnit\Framework\TestCase;
 use SimpleSAML\Assert\AssertionFailedException;
 use SimpleSAML\WSSecurity\XML\fed\AbstractClaimDialectType;
@@ -23,6 +24,7 @@
  *
  * @package simplesamlphp/ws-security
  */
+#[Group('fed')]
 #[CoversClass(ClaimDialect::class)]
 #[CoversClass(AbstractClaimDialectType::class)]
 #[CoversClass(AbstractFedElement::class)]
diff --git a/tests/WSSecurity/XML/fed/ClaimDialectsOfferedTest.php b/tests/WSSecurity/XML/fed/ClaimDialectsOfferedTest.php
index 348db219..34093497 100644
--- a/tests/WSSecurity/XML/fed/ClaimDialectsOfferedTest.php
+++ b/tests/WSSecurity/XML/fed/ClaimDialectsOfferedTest.php
@@ -5,6 +5,7 @@
 namespace SimpleSAML\Test\WSSecurity\XML\fed;
 
 use PHPUnit\Framework\Attributes\CoversClass;
+use PHPUnit\Framework\Attributes\Group;
 use PHPUnit\Framework\TestCase;
 use SimpleSAML\WSSecurity\XML\fed\AbstractClaimDialectsOfferedType;
 use SimpleSAML\WSSecurity\XML\fed\AbstractFedElement;
@@ -24,6 +25,7 @@
  *
  * @package simplesamlphp/ws-security
  */
+#[Group('fed')]
 #[CoversClass(ClaimDialectsOffered::class)]
 #[CoversClass(AbstractClaimDialectsOfferedType::class)]
 #[CoversClass(AbstractFedElement::class)]
diff --git a/tests/WSSecurity/XML/fed/ClaimTypesOfferedTest.php b/tests/WSSecurity/XML/fed/ClaimTypesOfferedTest.php
index f03013d1..baea2a49 100644
--- a/tests/WSSecurity/XML/fed/ClaimTypesOfferedTest.php
+++ b/tests/WSSecurity/XML/fed/ClaimTypesOfferedTest.php
@@ -5,6 +5,7 @@
 namespace SimpleSAML\Test\WSSecurity\XML\fed;
 
 use PHPUnit\Framework\Attributes\CoversClass;
+use PHPUnit\Framework\Attributes\Group;
 use PHPUnit\Framework\TestCase;
 use SimpleSAML\Test\WSSecurity\Constants as C;
 use SimpleSAML\WSSecurity\XML\auth\ClaimType;
@@ -27,6 +28,7 @@
  *
  * @package simplesamlphp/ws-security
  */
+#[Group('fed')]
 #[CoversClass(ClaimTypesOffered::class)]
 #[CoversClass(AbstractClaimTypesOfferedType::class)]
 #[CoversClass(AbstractFedElement::class)]
diff --git a/tests/WSSecurity/XML/fed/ClaimTypesRequestedTest.php b/tests/WSSecurity/XML/fed/ClaimTypesRequestedTest.php
index 08164cc6..5afc7796 100644
--- a/tests/WSSecurity/XML/fed/ClaimTypesRequestedTest.php
+++ b/tests/WSSecurity/XML/fed/ClaimTypesRequestedTest.php
@@ -5,6 +5,7 @@
 namespace SimpleSAML\Test\WSSecurity\XML\fed;
 
 use PHPUnit\Framework\Attributes\CoversClass;
+use PHPUnit\Framework\Attributes\Group;
 use PHPUnit\Framework\TestCase;
 use SimpleSAML\Test\WSSecurity\Constants as C;
 use SimpleSAML\WSSecurity\XML\auth\ClaimType;
@@ -27,6 +28,7 @@
  *
  * @package simplesamlphp/ws-security
  */
+#[Group('fed')]
 #[CoversClass(ClaimTypesRequested::class)]
 #[CoversClass(AbstractClaimTypesRequestedType::class)]
 #[CoversClass(AbstractFedElement::class)]
diff --git a/tests/WSSecurity/XML/fed/ClientPseudonymTest.php b/tests/WSSecurity/XML/fed/ClientPseudonymTest.php
index ddce0f30..d79a5396 100644
--- a/tests/WSSecurity/XML/fed/ClientPseudonymTest.php
+++ b/tests/WSSecurity/XML/fed/ClientPseudonymTest.php
@@ -5,6 +5,7 @@
 namespace SimpleSAML\Test\WSSecurity\XML\fed;
 
 use PHPUnit\Framework\Attributes\CoversClass;
+use PHPUnit\Framework\Attributes\Group;
 use PHPUnit\Framework\TestCase;
 use SimpleSAML\WSSecurity\XML\fed\AbstractClientPseudonymType;
 use SimpleSAML\WSSecurity\XML\fed\AbstractFedElement;
@@ -27,6 +28,7 @@
  *
  * @package simplesamlphp/ws-security
  */
+#[Group('fed')]
 #[CoversClass(ClientPseudonym::class)]
 #[CoversClass(AbstractClientPseudonymType::class)]
 #[CoversClass(AbstractFedElement::class)]
diff --git a/tests/WSSecurity/XML/fed/DisplayNameTest.php b/tests/WSSecurity/XML/fed/DisplayNameTest.php
index 2f347100..45ca48db 100644
--- a/tests/WSSecurity/XML/fed/DisplayNameTest.php
+++ b/tests/WSSecurity/XML/fed/DisplayNameTest.php
@@ -5,6 +5,7 @@
 namespace SimpleSAML\Test\WSSecurity\XML\fed;
 
 use PHPUnit\Framework\Attributes\CoversClass;
+use PHPUnit\Framework\Attributes\Group;
 use PHPUnit\Framework\TestCase;
 use SimpleSAML\Test\WSSecurity\Constants as C;
 use SimpleSAML\WSSecurity\XML\fed\AbstractAttributeExtensibleString;
@@ -21,6 +22,7 @@
  *
  * @package simplesamlphp/ws-security
  */
+#[Group('fed')]
 #[CoversClass(DisplayName::class)]
 #[CoversClass(AbstractAttributeExtensibleString::class)]
 #[CoversClass(AbstractFedElement::class)]
diff --git a/tests/WSSecurity/XML/fed/EMailTest.php b/tests/WSSecurity/XML/fed/EMailTest.php
index 44104a96..9a14df8c 100644
--- a/tests/WSSecurity/XML/fed/EMailTest.php
+++ b/tests/WSSecurity/XML/fed/EMailTest.php
@@ -5,6 +5,7 @@
 namespace SimpleSAML\Test\WSSecurity\XML\fed;
 
 use PHPUnit\Framework\Attributes\CoversClass;
+use PHPUnit\Framework\Attributes\Group;
 use PHPUnit\Framework\TestCase;
 use SimpleSAML\Test\WSSecurity\Constants as C;
 use SimpleSAML\WSSecurity\XML\fed\AbstractAttributeExtensibleString;
@@ -21,6 +22,7 @@
  *
  * @package simplesamlphp/ws-security
  */
+#[Group('fed')]
 #[CoversClass(EMail::class)]
 #[CoversClass(AbstractAttributeExtensibleString::class)]
 #[CoversClass(AbstractFedElement::class)]
diff --git a/tests/WSSecurity/XML/fed/FederationIDTest.php b/tests/WSSecurity/XML/fed/FederationIDTest.php
index 8c1be323..748757b0 100644
--- a/tests/WSSecurity/XML/fed/FederationIDTest.php
+++ b/tests/WSSecurity/XML/fed/FederationIDTest.php
@@ -5,6 +5,7 @@
 namespace SimpleSAML\Test\WSSecurity\XML\fed;
 
 use PHPUnit\Framework\Attributes\CoversClass;
+use PHPUnit\Framework\Attributes\Group;
 use PHPUnit\Framework\TestCase;
 use SimpleSAML\Test\WSSecurity\Constants as C;
 use SimpleSAML\WSSecurity\XML\fed\AbstractAttributeExtensibleString;
@@ -23,6 +24,7 @@
  *
  * @package simplesamlphp/ws-security
  */
+#[Group('fed')]
 #[CoversClass(FederationID::class)]
 #[CoversClass(AbstractAttributeExtensibleURI::class)]
 #[CoversClass(AbstractAttributeExtensibleString::class)]
diff --git a/tests/WSSecurity/XML/fed/FederationMetadataHandlerTest.php b/tests/WSSecurity/XML/fed/FederationMetadataHandlerTest.php
index 632744dc..94e2051d 100644
--- a/tests/WSSecurity/XML/fed/FederationMetadataHandlerTest.php
+++ b/tests/WSSecurity/XML/fed/FederationMetadataHandlerTest.php
@@ -5,6 +5,7 @@
 namespace SimpleSAML\Test\WSSecurity\XML\fed;
 
 use PHPUnit\Framework\Attributes\CoversClass;
+use PHPUnit\Framework\Attributes\Group;
 use PHPUnit\Framework\TestCase;
 use SimpleSAML\Test\WSSecurity\Constants as C;
 use SimpleSAML\WSSecurity\XML\fed\AbstractFedElement;
@@ -22,6 +23,7 @@
  *
  * @package simplesamlphp/ws-security
  */
+#[Group('fed')]
 #[CoversClass(FederationMetadataHandler::class)]
 #[CoversClass(AbstractFederationMetadataHandlerType::class)]
 #[CoversClass(AbstractFedElement::class)]
diff --git a/tests/WSSecurity/XML/fed/FederationMetadataTest.php b/tests/WSSecurity/XML/fed/FederationMetadataTest.php
index c67210b9..4d5f4bf9 100644
--- a/tests/WSSecurity/XML/fed/FederationMetadataTest.php
+++ b/tests/WSSecurity/XML/fed/FederationMetadataTest.php
@@ -5,6 +5,7 @@
 namespace SimpleSAML\Test\WSSecurity\XML\fed;
 
 use PHPUnit\Framework\Attributes\CoversClass;
+use PHPUnit\Framework\Attributes\Group;
 use PHPUnit\Framework\TestCase;
 use SimpleSAML\WSSecurity\XML\fed\AbstractFedElement;
 use SimpleSAML\WSSecurity\XML\fed\AbstractFederationMetadataType;
@@ -24,6 +25,7 @@
  *
  * @package simplesamlphp/ws-security
  */
+#[Group('fed')]
 #[CoversClass(FederationMetadata::class)]
 #[CoversClass(AbstractFederationMetadataType::class)]
 #[CoversClass(AbstractFedElement::class)]
diff --git a/tests/WSSecurity/XML/fed/FederationTest.php b/tests/WSSecurity/XML/fed/FederationTest.php
index 48c87a67..7c5be19e 100644
--- a/tests/WSSecurity/XML/fed/FederationTest.php
+++ b/tests/WSSecurity/XML/fed/FederationTest.php
@@ -5,6 +5,7 @@
 namespace SimpleSAML\Test\WSSecurity\XML\fed;
 
 use PHPUnit\Framework\Attributes\CoversClass;
+use PHPUnit\Framework\Attributes\Group;
 use PHPUnit\Framework\TestCase;
 use SimpleSAML\WSSecurity\XML\fed\AbstractFedElement;
 use SimpleSAML\WSSecurity\XML\fed\AbstractFederationType;
@@ -22,6 +23,7 @@
  *
  * @package simplesamlphp/ws-security
  */
+#[Group('fed')]
 #[CoversClass(Federation::class)]
 #[CoversClass(AbstractFederationType::class)]
 #[CoversClass(AbstractFedElement::class)]
diff --git a/tests/WSSecurity/XML/fed/FilterPseudonymsTest.php b/tests/WSSecurity/XML/fed/FilterPseudonymsTest.php
index 004b3770..4856aa27 100644
--- a/tests/WSSecurity/XML/fed/FilterPseudonymsTest.php
+++ b/tests/WSSecurity/XML/fed/FilterPseudonymsTest.php
@@ -5,6 +5,7 @@
 namespace SimpleSAML\Test\WSSecurity\XML\fed;
 
 use PHPUnit\Framework\Attributes\CoversClass;
+use PHPUnit\Framework\Attributes\Group;
 use PHPUnit\Framework\TestCase;
 use SimpleSAML\WSSecurity\Constants as C;
 use SimpleSAML\WSSecurity\XML\fed\AbstractFedElement;
@@ -27,6 +28,7 @@
  *
  * @package simplesamlphp/ws-security
  */
+#[Group('fed')]
 #[CoversClass(FilterPseudonyms::class)]
 #[CoversClass(AbstractFilterPseudonymsType::class)]
 #[CoversClass(AbstractFedElement::class)]
diff --git a/tests/WSSecurity/XML/fed/FreshnessTest.php b/tests/WSSecurity/XML/fed/FreshnessTest.php
index 84b0a14a..6aa1fe4a 100644
--- a/tests/WSSecurity/XML/fed/FreshnessTest.php
+++ b/tests/WSSecurity/XML/fed/FreshnessTest.php
@@ -5,6 +5,7 @@
 namespace SimpleSAML\Test\WSSecurity\XML\fed;
 
 use PHPUnit\Framework\Attributes\CoversClass;
+use PHPUnit\Framework\Attributes\Group;
 use PHPUnit\Framework\TestCase;
 use SimpleSAML\Test\WSSecurity\Constants as C;
 use SimpleSAML\WSSecurity\XML\fed\AbstractFedElement;
@@ -22,6 +23,7 @@
  *
  * @package simplesamlphp/ws-security
  */
+#[Group('fed')]
 #[CoversClass(Freshness::class)]
 #[CoversClass(AbstractFreshnessType::class)]
 #[CoversClass(AbstractFedElement::class)]
diff --git a/tests/WSSecurity/XML/fed/IssuerNameTest.php b/tests/WSSecurity/XML/fed/IssuerNameTest.php
index 62f26a42..330f7a28 100644
--- a/tests/WSSecurity/XML/fed/IssuerNameTest.php
+++ b/tests/WSSecurity/XML/fed/IssuerNameTest.php
@@ -5,6 +5,7 @@
 namespace SimpleSAML\Test\WSSecurity\XML\fed;
 
 use PHPUnit\Framework\Attributes\CoversClass;
+use PHPUnit\Framework\Attributes\Group;
 use PHPUnit\Framework\TestCase;
 use SimpleSAML\WSSecurity\XML\fed\AbstractFedElement;
 use SimpleSAML\WSSecurity\XML\fed\AbstractIssuerNameType;
@@ -21,6 +22,7 @@
  *
  * @package simplesamlphp/ws-security
  */
+#[Group('fed')]
 #[CoversClass(IssuerName::class)]
 #[CoversClass(AbstractIssuerNameType::class)]
 #[CoversClass(AbstractFedElement::class)]
diff --git a/tests/WSSecurity/XML/fed/IssuesSpecificPolicyFaultTest.php b/tests/WSSecurity/XML/fed/IssuesSpecificPolicyFaultTest.php
index 7fee0535..c6af4b0c 100644
--- a/tests/WSSecurity/XML/fed/IssuesSpecificPolicyFaultTest.php
+++ b/tests/WSSecurity/XML/fed/IssuesSpecificPolicyFaultTest.php
@@ -5,6 +5,7 @@
 namespace SimpleSAML\Test\WSSecurity\XML\fed;
 
 use PHPUnit\Framework\Attributes\CoversClass;
+use PHPUnit\Framework\Attributes\Group;
 use PHPUnit\Framework\TestCase;
 use SimpleSAML\Test\WSSecurity\Constants as C;
 use SimpleSAML\WSSecurity\XML\fed\AbstractAssertionType;
@@ -23,6 +24,7 @@
  *
  * @package simplesamlphp/ws-security
  */
+#[Group('fed')]
 #[CoversClass(IssuesSpecificPolicyFault::class)]
 #[CoversClass(AbstractAssertionType::class)]
 #[CoversClass(AbstractFedElement::class)]
diff --git a/tests/WSSecurity/XML/fed/LogicalServiceNamesOfferedTest.php b/tests/WSSecurity/XML/fed/LogicalServiceNamesOfferedTest.php
index 59a507ef..78f458e7 100644
--- a/tests/WSSecurity/XML/fed/LogicalServiceNamesOfferedTest.php
+++ b/tests/WSSecurity/XML/fed/LogicalServiceNamesOfferedTest.php
@@ -5,6 +5,7 @@
 namespace SimpleSAML\Test\WSSecurity\XML\fed;
 
 use PHPUnit\Framework\Attributes\CoversClass;
+use PHPUnit\Framework\Attributes\Group;
 use PHPUnit\Framework\TestCase;
 use SimpleSAML\WSSecurity\XML\fed\AbstractFedElement;
 use SimpleSAML\WSSecurity\XML\fed\AbstractLogicalServiceNamesOfferedType;
@@ -23,6 +24,7 @@
  *
  * @package simplesamlphp/ws-security
  */
+#[Group('fed')]
 #[CoversClass(LogicalServiceNamesOffered::class)]
 #[CoversClass(AbstractLogicalServiceNamesOfferedType::class)]
 #[CoversClass(AbstractFedElement::class)]
diff --git a/tests/WSSecurity/XML/fed/PPIDTest.php b/tests/WSSecurity/XML/fed/PPIDTest.php
index 5f3cbad0..31682085 100644
--- a/tests/WSSecurity/XML/fed/PPIDTest.php
+++ b/tests/WSSecurity/XML/fed/PPIDTest.php
@@ -5,6 +5,7 @@
 namespace SimpleSAML\Test\WSSecurity\XML\fed;
 
 use PHPUnit\Framework\Attributes\CoversClass;
+use PHPUnit\Framework\Attributes\Group;
 use PHPUnit\Framework\TestCase;
 use SimpleSAML\Test\WSSecurity\Constants as C;
 use SimpleSAML\WSSecurity\XML\fed\AbstractAttributeExtensibleString;
@@ -25,6 +26,7 @@
  *
  * @package simplesamlphp/ws-security
  */
+#[Group('fed')]
 #[CoversClass(PPID::class)]
 #[CoversClass(AbstractAttributeExtensibleString::class)]
 #[CoversClass(AbstractFedElement::class)]
diff --git a/tests/WSSecurity/XML/fed/PassiveRequestorEndpointTest.php b/tests/WSSecurity/XML/fed/PassiveRequestorEndpointTest.php
index f61a4844..47c8dc07 100644
--- a/tests/WSSecurity/XML/fed/PassiveRequestorEndpointTest.php
+++ b/tests/WSSecurity/XML/fed/PassiveRequestorEndpointTest.php
@@ -6,6 +6,7 @@
 
 use DOMElement;
 use PHPUnit\Framework\Attributes\CoversClass;
+use PHPUnit\Framework\Attributes\Group;
 use PHPUnit\Framework\TestCase;
 use SimpleSAML\WSSecurity\XML\fed\AbstractEndpointType;
 use SimpleSAML\WSSecurity\XML\fed\AbstractFedElement;
@@ -28,6 +29,7 @@
  *
  * @package simplesamlphp/ws-security
  */
+#[Group('fed')]
 #[CoversClass(PassiveRequestorEndpoint::class)]
 #[CoversClass(AbstractEndpointType::class)]
 #[CoversClass(AbstractFedElement::class)]
diff --git a/tests/WSSecurity/XML/fed/PassiveRequestorEndpointsTest.php b/tests/WSSecurity/XML/fed/PassiveRequestorEndpointsTest.php
index 3dcbeb39..83bd799e 100644
--- a/tests/WSSecurity/XML/fed/PassiveRequestorEndpointsTest.php
+++ b/tests/WSSecurity/XML/fed/PassiveRequestorEndpointsTest.php
@@ -6,6 +6,7 @@
 
 use DOMElement;
 use PHPUnit\Framework\Attributes\CoversClass;
+use PHPUnit\Framework\Attributes\Group;
 use PHPUnit\Framework\TestCase;
 use SimpleSAML\WSSecurity\XML\fed\AbstractEndpointType;
 use SimpleSAML\WSSecurity\XML\fed\AbstractFedElement;
@@ -28,6 +29,7 @@
  *
  * @package simplesamlphp/ws-security
  */
+#[Group('fed')]
 #[CoversClass(PassiveRequestorEndpoints::class)]
 #[CoversClass(AbstractEndpointType::class)]
 #[CoversClass(AbstractFedElement::class)]
diff --git a/tests/WSSecurity/XML/fed/ProofTokenTest.php b/tests/WSSecurity/XML/fed/ProofTokenTest.php
index b973efb7..85390f83 100644
--- a/tests/WSSecurity/XML/fed/ProofTokenTest.php
+++ b/tests/WSSecurity/XML/fed/ProofTokenTest.php
@@ -5,6 +5,7 @@
 namespace SimpleSAML\Test\WSSecurity\XML\fed;
 
 use PHPUnit\Framework\Attributes\CoversClass;
+use PHPUnit\Framework\Attributes\Group;
 use PHPUnit\Framework\TestCase;
 use SimpleSAML\WSSecurity\XML\fed\AbstractFedElement;
 use SimpleSAML\WSSecurity\XML\fed\AbstractProofTokenType;
@@ -23,6 +24,7 @@
  *
  * @package simplesamlphp/ws-security
  */
+#[Group('fed')]
 #[CoversClass(ProofToken::class)]
 #[CoversClass(AbstractProofTokenType::class)]
 #[CoversClass(AbstractProofTokenType::class)]
diff --git a/tests/WSSecurity/XML/fed/PseudonymBasisTest.php b/tests/WSSecurity/XML/fed/PseudonymBasisTest.php
index 8250d76a..2d9fcf8d 100644
--- a/tests/WSSecurity/XML/fed/PseudonymBasisTest.php
+++ b/tests/WSSecurity/XML/fed/PseudonymBasisTest.php
@@ -5,6 +5,7 @@
 namespace SimpleSAML\Test\WSSecurity\XML\fed;
 
 use PHPUnit\Framework\Attributes\CoversClass;
+use PHPUnit\Framework\Attributes\Group;
 use PHPUnit\Framework\TestCase;
 use SimpleSAML\WSSecurity\XML\fed\AbstractFedElement;
 use SimpleSAML\WSSecurity\XML\fed\AbstractPseudonymBasisType;
@@ -23,6 +24,7 @@
  *
  * @package simplesamlphp/ws-security
  */
+#[Group('fed')]
 #[CoversClass(PseudonymBasis::class)]
 #[CoversClass(AbstractPseudonymBasisType::class)]
 #[CoversClass(AbstractFedElement::class)]
diff --git a/tests/WSSecurity/XML/fed/PseudonymServiceEndpointTest.php b/tests/WSSecurity/XML/fed/PseudonymServiceEndpointTest.php
index d47295a4..158c096f 100644
--- a/tests/WSSecurity/XML/fed/PseudonymServiceEndpointTest.php
+++ b/tests/WSSecurity/XML/fed/PseudonymServiceEndpointTest.php
@@ -6,6 +6,7 @@
 
 use DOMElement;
 use PHPUnit\Framework\Attributes\CoversClass;
+use PHPUnit\Framework\Attributes\Group;
 use PHPUnit\Framework\TestCase;
 use SimpleSAML\WSSecurity\XML\fed\AbstractEndpointType;
 use SimpleSAML\WSSecurity\XML\fed\AbstractFedElement;
@@ -28,6 +29,7 @@
  *
  * @package simplesamlphp/ws-security
  */
+#[Group('fed')]
 #[CoversClass(PseudonymServiceEndpoint::class)]
 #[CoversClass(AbstractEndpointType::class)]
 #[CoversClass(AbstractFedElement::class)]
diff --git a/tests/WSSecurity/XML/fed/PseudonymTest.php b/tests/WSSecurity/XML/fed/PseudonymTest.php
index f9a18232..9744b095 100644
--- a/tests/WSSecurity/XML/fed/PseudonymTest.php
+++ b/tests/WSSecurity/XML/fed/PseudonymTest.php
@@ -6,6 +6,7 @@
 
 use DateTimeImmutable;
 use PHPUnit\Framework\Attributes\CoversClass;
+use PHPUnit\Framework\Attributes\Group;
 use PHPUnit\Framework\TestCase;
 use SimpleSAML\WSSecurity\XML\fed\AbstractFedElement;
 use SimpleSAML\WSSecurity\XML\fed\AbstractPseudonymType;
@@ -30,6 +31,7 @@
  *
  * @package simplesamlphp/ws-security
  */
+#[Group('fed')]
 #[CoversClass(Pseudonym::class)]
 #[CoversClass(AbstractPseudonymType::class)]
 #[CoversClass(AbstractFedElement::class)]
diff --git a/tests/WSSecurity/XML/fed/RealmTest.php b/tests/WSSecurity/XML/fed/RealmTest.php
index dbda27f0..f53b154a 100644
--- a/tests/WSSecurity/XML/fed/RealmTest.php
+++ b/tests/WSSecurity/XML/fed/RealmTest.php
@@ -5,6 +5,7 @@
 namespace SimpleSAML\Test\WSSecurity\XML\fed;
 
 use PHPUnit\Framework\Attributes\CoversClass;
+use PHPUnit\Framework\Attributes\Group;
 use PHPUnit\Framework\TestCase;
 use SimpleSAML\Test\WSSecurity\Constants as C;
 use SimpleSAML\WSSecurity\XML\fed\AbstractFedElement;
@@ -20,6 +21,7 @@
  *
  * @package simplesamlphp/ws-security
  */
+#[Group('fed')]
 #[CoversClass(Realm::class)]
 #[CoversClass(AbstractFedElement::class)]
 final class RealmTest extends TestCase
diff --git a/tests/WSSecurity/XML/fed/ReferenceDigestTest.php b/tests/WSSecurity/XML/fed/ReferenceDigestTest.php
index a7f110e2..418850f4 100644
--- a/tests/WSSecurity/XML/fed/ReferenceDigestTest.php
+++ b/tests/WSSecurity/XML/fed/ReferenceDigestTest.php
@@ -5,6 +5,7 @@
 namespace SimpleSAML\Test\WSSecurity\XML\fed;
 
 use PHPUnit\Framework\Attributes\CoversClass;
+use PHPUnit\Framework\Attributes\Group;
 use PHPUnit\Framework\TestCase;
 use SimpleSAML\Test\WSSecurity\Constants as C;
 use SimpleSAML\WSSecurity\XML\fed\AbstractFedElement;
@@ -21,6 +22,7 @@
  *
  * @package simplesamlphp/ws-security
  */
+#[Group('fed')]
 #[CoversClass(ReferenceDigest::class)]
 #[CoversClass(AbstractReferenceDigestType::class)]
 #[CoversClass(AbstractFedElement::class)]
diff --git a/tests/WSSecurity/XML/fed/ReferenceEPRTest.php b/tests/WSSecurity/XML/fed/ReferenceEPRTest.php
index 510f0f37..0496fdb1 100644
--- a/tests/WSSecurity/XML/fed/ReferenceEPRTest.php
+++ b/tests/WSSecurity/XML/fed/ReferenceEPRTest.php
@@ -6,6 +6,7 @@
 
 use DOMElement;
 use PHPUnit\Framework\Attributes\CoversClass;
+use PHPUnit\Framework\Attributes\Group;
 use PHPUnit\Framework\TestCase;
 use SimpleSAML\WSSecurity\XML\fed\ReferenceEPR;
 use SimpleSAML\WSSecurity\XML\wsa\AbstractEndpointReferenceType;
@@ -26,6 +27,7 @@
  *
  * @package simplesamlphp/ws-security
  */
+#[Group('fed')]
 #[CoversClass(ReferenceEPR::class)]
 #[CoversClass(AbstractEndpointReferenceType::class)]
 #[CoversClass(AbstractWsaElement::class)]
diff --git a/tests/WSSecurity/XML/fed/ReferenceToken11Test.php b/tests/WSSecurity/XML/fed/ReferenceToken11Test.php
index 5f9be8f0..49801330 100644
--- a/tests/WSSecurity/XML/fed/ReferenceToken11Test.php
+++ b/tests/WSSecurity/XML/fed/ReferenceToken11Test.php
@@ -5,6 +5,7 @@
 namespace SimpleSAML\Test\WSSecurity\XML\fed;
 
 use PHPUnit\Framework\Attributes\CoversClass;
+use PHPUnit\Framework\Attributes\Group;
 use PHPUnit\Framework\TestCase;
 use SimpleSAML\Test\WSSecurity\Constants as C;
 use SimpleSAML\WSSecurity\XML\fed\AbstractAssertionType;
@@ -23,6 +24,7 @@
  *
  * @package simplesamlphp/ws-security
  */
+#[Group('fed')]
 #[CoversClass(ReferenceToken11::class)]
 #[CoversClass(AbstractAssertionType::class)]
 #[CoversClass(AbstractFedElement::class)]
diff --git a/tests/WSSecurity/XML/fed/ReferenceTokenTest.php b/tests/WSSecurity/XML/fed/ReferenceTokenTest.php
index 6afbb072..3d634524 100644
--- a/tests/WSSecurity/XML/fed/ReferenceTokenTest.php
+++ b/tests/WSSecurity/XML/fed/ReferenceTokenTest.php
@@ -6,6 +6,7 @@
 
 use DOMElement;
 use PHPUnit\Framework\Attributes\CoversClass;
+use PHPUnit\Framework\Attributes\Group;
 use PHPUnit\Framework\TestCase;
 use SimpleSAML\Test\WSSecurity\Constants as C;
 use SimpleSAML\WSSecurity\XML\fed\AbstractReferenceTokenType;
@@ -33,6 +34,7 @@
  *
  * @package simplesamlphp/ws-security
  */
+#[Group('fed')]
 #[CoversClass(ReferenceToken::class)]
 #[CoversClass(AbstractReferenceTokenType::class)]
 #[CoversClass(AbstractEndpointReferenceType::class)]
diff --git a/tests/WSSecurity/XML/fed/ReferenceTypeTest.php b/tests/WSSecurity/XML/fed/ReferenceTypeTest.php
index 6a48fb1c..c0800da3 100644
--- a/tests/WSSecurity/XML/fed/ReferenceTypeTest.php
+++ b/tests/WSSecurity/XML/fed/ReferenceTypeTest.php
@@ -5,6 +5,7 @@
 namespace SimpleSAML\Test\WSSecurity\XML\fed;
 
 use PHPUnit\Framework\Attributes\CoversClass;
+use PHPUnit\Framework\Attributes\Group;
 use PHPUnit\Framework\TestCase;
 use SimpleSAML\Test\WSSecurity\Constants as C;
 use SimpleSAML\WSSecurity\XML\fed\AbstractAttributeExtensibleString;
@@ -22,6 +23,7 @@
  *
  * @package simplesamlphp/ws-security
  */
+#[Group('fed')]
 #[CoversClass(ReferenceType::class)]
 #[CoversClass(AbstractAttributeExtensibleURI::class)]
 #[CoversClass(AbstractAttributeExtensibleString::class)]
diff --git a/tests/WSSecurity/XML/fed/RelativeToTest.php b/tests/WSSecurity/XML/fed/RelativeToTest.php
index 84c73628..003838ea 100644
--- a/tests/WSSecurity/XML/fed/RelativeToTest.php
+++ b/tests/WSSecurity/XML/fed/RelativeToTest.php
@@ -5,6 +5,7 @@
 namespace SimpleSAML\Test\WSSecurity\XML\fed;
 
 use PHPUnit\Framework\Attributes\CoversClass;
+use PHPUnit\Framework\Attributes\Group;
 use PHPUnit\Framework\TestCase;
 use SimpleSAML\WSSecurity\Constants as C;
 use SimpleSAML\WSSecurity\XML\fed\AbstractFedElement;
@@ -24,6 +25,7 @@
  *
  * @package simplesamlphp/ws-security
  */
+#[Group('fed')]
 #[CoversClass(RelativeTo::class)]
 #[CoversClass(AbstractRelativeToType::class)]
 #[CoversClass(AbstractFedElement::class)]
diff --git a/tests/WSSecurity/XML/fed/RequestProofTokenTest.php b/tests/WSSecurity/XML/fed/RequestProofTokenTest.php
index 8fdf839b..8de408e1 100644
--- a/tests/WSSecurity/XML/fed/RequestProofTokenTest.php
+++ b/tests/WSSecurity/XML/fed/RequestProofTokenTest.php
@@ -5,6 +5,7 @@
 namespace SimpleSAML\Test\WSSecurity\XML\fed;
 
 use PHPUnit\Framework\Attributes\CoversClass;
+use PHPUnit\Framework\Attributes\Group;
 use PHPUnit\Framework\TestCase;
 use SimpleSAML\Test\WSSecurity\Constants as C;
 use SimpleSAML\WSSecurity\XML\fed\AbstractFedElement;
@@ -23,6 +24,7 @@
  *
  * @package simplesamlphp/ws-security
  */
+#[Group('fed')]
 #[CoversClass(RequestProofToken::class)]
 #[CoversClass(AbstractRequestProofTokenType::class)]
 #[CoversClass(AbstractFedElement::class)]
diff --git a/tests/WSSecurity/XML/fed/RequestPseudonymTest.php b/tests/WSSecurity/XML/fed/RequestPseudonymTest.php
index 8710da3a..d2cc29f1 100644
--- a/tests/WSSecurity/XML/fed/RequestPseudonymTest.php
+++ b/tests/WSSecurity/XML/fed/RequestPseudonymTest.php
@@ -5,6 +5,7 @@
 namespace SimpleSAML\Test\WSSecurity\XML\fed;
 
 use PHPUnit\Framework\Attributes\CoversClass;
+use PHPUnit\Framework\Attributes\Group;
 use PHPUnit\Framework\TestCase;
 use SimpleSAML\WSSecurity\XML\fed\AbstractFedElement;
 use SimpleSAML\WSSecurity\XML\fed\AbstractRequestPseudonymType;
@@ -23,6 +24,7 @@
  *
  * @package simplesamlphp/ws-security
  */
+#[Group('fed')]
 #[CoversClass(RequestPseudonym::class)]
 #[CoversClass(AbstractRequestPseudonymType::class)]
 #[CoversClass(AbstractFedElement::class)]
diff --git a/tests/WSSecurity/XML/fed/RequireBearerTokensTest.php b/tests/WSSecurity/XML/fed/RequireBearerTokensTest.php
index eb187b19..f63d4ac3 100644
--- a/tests/WSSecurity/XML/fed/RequireBearerTokensTest.php
+++ b/tests/WSSecurity/XML/fed/RequireBearerTokensTest.php
@@ -5,6 +5,7 @@
 namespace SimpleSAML\Test\WSSecurity\XML\fed;
 
 use PHPUnit\Framework\Attributes\CoversClass;
+use PHPUnit\Framework\Attributes\Group;
 use PHPUnit\Framework\TestCase;
 use SimpleSAML\Test\WSSecurity\Constants as C;
 use SimpleSAML\WSSecurity\XML\fed\AbstractAssertionType;
@@ -23,6 +24,7 @@
  *
  * @package simplesamlphp/ws-security
  */
+#[Group('fed')]
 #[CoversClass(RequireBearerTokens::class)]
 #[CoversClass(AbstractAssertionType::class)]
 #[CoversClass(AbstractFedElement::class)]
diff --git a/tests/WSSecurity/XML/fed/RequireReferenceTokenTest.php b/tests/WSSecurity/XML/fed/RequireReferenceTokenTest.php
index 705c2268..3db2b348 100644
--- a/tests/WSSecurity/XML/fed/RequireReferenceTokenTest.php
+++ b/tests/WSSecurity/XML/fed/RequireReferenceTokenTest.php
@@ -5,6 +5,7 @@
 namespace SimpleSAML\Test\WSSecurity\XML\fed;
 
 use PHPUnit\Framework\Attributes\CoversClass;
+use PHPUnit\Framework\Attributes\Group;
 use PHPUnit\Framework\TestCase;
 use SimpleSAML\Test\WSSecurity\Constants as C;
 use SimpleSAML\WSSecurity\XML\fed\RequireReferenceToken;
@@ -25,6 +26,7 @@
  *
  * @package simplesamlphp/ws-security
  */
+#[Group('fed')]
 #[CoversClass(RequireReferenceToken::class)]
 #[CoversClass(IncludeTokenTypeTrait::class)]
 #[CoversClass(AbstractTokenAssertionType::class)]
diff --git a/tests/WSSecurity/XML/fed/RequireSharedCookiesTest.php b/tests/WSSecurity/XML/fed/RequireSharedCookiesTest.php
index eda0053e..88840e66 100644
--- a/tests/WSSecurity/XML/fed/RequireSharedCookiesTest.php
+++ b/tests/WSSecurity/XML/fed/RequireSharedCookiesTest.php
@@ -5,6 +5,7 @@
 namespace SimpleSAML\Test\WSSecurity\XML\fed;
 
 use PHPUnit\Framework\Attributes\CoversClass;
+use PHPUnit\Framework\Attributes\Group;
 use PHPUnit\Framework\TestCase;
 use SimpleSAML\Test\WSSecurity\Constants as C;
 use SimpleSAML\WSSecurity\XML\fed\AbstractAssertionType;
@@ -23,6 +24,7 @@
  *
  * @package simplesamlphp/ws-security
  */
+#[Group('fed')]
 #[CoversClass(RequireSharedCookies::class)]
 #[CoversClass(AbstractAssertionType::class)]
 #[CoversClass(AbstractFedElement::class)]
diff --git a/tests/WSSecurity/XML/fed/RequireSignedTokensTest.php b/tests/WSSecurity/XML/fed/RequireSignedTokensTest.php
index 968a6c1a..35b4f889 100644
--- a/tests/WSSecurity/XML/fed/RequireSignedTokensTest.php
+++ b/tests/WSSecurity/XML/fed/RequireSignedTokensTest.php
@@ -5,6 +5,7 @@
 namespace SimpleSAML\Test\WSSecurity\XML\fed;
 
 use PHPUnit\Framework\Attributes\CoversClass;
+use PHPUnit\Framework\Attributes\Group;
 use PHPUnit\Framework\TestCase;
 use SimpleSAML\Test\WSSecurity\Constants as C;
 use SimpleSAML\WSSecurity\XML\fed\AbstractAssertionType;
@@ -23,6 +24,7 @@
  *
  * @package simplesamlphp/ws-security
  */
+#[Group('fed')]
 #[CoversClass(RequireSignedTokens::class)]
 #[CoversClass(AbstractAssertionType::class)]
 #[CoversClass(AbstractFedElement::class)]
diff --git a/tests/WSSecurity/XML/fed/RequiresGenericClaimDialectTest.php b/tests/WSSecurity/XML/fed/RequiresGenericClaimDialectTest.php
index 46d652c9..1146a7b0 100644
--- a/tests/WSSecurity/XML/fed/RequiresGenericClaimDialectTest.php
+++ b/tests/WSSecurity/XML/fed/RequiresGenericClaimDialectTest.php
@@ -5,6 +5,7 @@
 namespace SimpleSAML\Test\WSSecurity\XML\fed;
 
 use PHPUnit\Framework\Attributes\CoversClass;
+use PHPUnit\Framework\Attributes\Group;
 use PHPUnit\Framework\TestCase;
 use SimpleSAML\Test\WSSecurity\Constants as C;
 use SimpleSAML\WSSecurity\XML\fed\AbstractAssertionType;
@@ -23,6 +24,7 @@
  *
  * @package simplesamlphp/ws-security
  */
+#[Group('fed')]
 #[CoversClass(RequiresGenericClaimDialect::class)]
 #[CoversClass(AbstractAssertionType::class)]
 #[CoversClass(AbstractFedElement::class)]
diff --git a/tests/WSSecurity/XML/fed/SecurityTokenServiceEndpointTest.php b/tests/WSSecurity/XML/fed/SecurityTokenServiceEndpointTest.php
index ef871031..9c08feb4 100644
--- a/tests/WSSecurity/XML/fed/SecurityTokenServiceEndpointTest.php
+++ b/tests/WSSecurity/XML/fed/SecurityTokenServiceEndpointTest.php
@@ -6,6 +6,7 @@
 
 use DOMElement;
 use PHPUnit\Framework\Attributes\CoversClass;
+use PHPUnit\Framework\Attributes\Group;
 use PHPUnit\Framework\TestCase;
 use SimpleSAML\WSSecurity\XML\fed\AbstractEndpointType;
 use SimpleSAML\WSSecurity\XML\fed\AbstractFedElement;
@@ -28,6 +29,7 @@
  *
  * @package simplesamlphp/ws-security
  */
+#[Group('fed')]
 #[CoversClass(SecurityTokenServiceEndpoint::class)]
 #[CoversClass(AbstractEndpointType::class)]
 #[CoversClass(AbstractFedElement::class)]
diff --git a/tests/WSSecurity/XML/fed/SecurityTokenTest.php b/tests/WSSecurity/XML/fed/SecurityTokenTest.php
index 72e42593..683f95ad 100644
--- a/tests/WSSecurity/XML/fed/SecurityTokenTest.php
+++ b/tests/WSSecurity/XML/fed/SecurityTokenTest.php
@@ -5,6 +5,7 @@
 namespace SimpleSAML\Test\WSSecurity\XML\fed;
 
 use PHPUnit\Framework\Attributes\CoversClass;
+use PHPUnit\Framework\Attributes\Group;
 use PHPUnit\Framework\TestCase;
 use SimpleSAML\WSSecurity\XML\fed\AbstractFedElement;
 use SimpleSAML\WSSecurity\XML\fed\AbstractSecurityTokenType;
@@ -23,6 +24,7 @@
  *
  * @package simplesamlphp/ws-security
  */
+#[Group('fed')]
 #[CoversClass(SecurityToken::class)]
 #[CoversClass(AbstractSecurityTokenType::class)]
 #[CoversClass(AbstractFedElement::class)]
diff --git a/tests/WSSecurity/XML/fed/SerialNoTest.php b/tests/WSSecurity/XML/fed/SerialNoTest.php
index 3c3f51a4..26bce561 100644
--- a/tests/WSSecurity/XML/fed/SerialNoTest.php
+++ b/tests/WSSecurity/XML/fed/SerialNoTest.php
@@ -5,6 +5,7 @@
 namespace SimpleSAML\Test\WSSecurity\XML\fed;
 
 use PHPUnit\Framework\Attributes\CoversClass;
+use PHPUnit\Framework\Attributes\Group;
 use PHPUnit\Framework\TestCase;
 use SimpleSAML\Test\WSSecurity\Constants as C;
 use SimpleSAML\WSSecurity\XML\fed\AbstractAttributeExtensibleString;
@@ -22,6 +23,7 @@
  *
  * @package simplesamlphp/ws-security
  */
+#[Group('fed')]
 #[CoversClass(SerialNo::class)]
 #[CoversClass(AbstractAttributeExtensibleURI::class)]
 #[CoversClass(AbstractAttributeExtensibleString::class)]
diff --git a/tests/WSSecurity/XML/fed/SignOutBasisTest.php b/tests/WSSecurity/XML/fed/SignOutBasisTest.php
index 43f0570d..a7430c06 100644
--- a/tests/WSSecurity/XML/fed/SignOutBasisTest.php
+++ b/tests/WSSecurity/XML/fed/SignOutBasisTest.php
@@ -5,6 +5,7 @@
 namespace SimpleSAML\Test\WSSecurity\XML\fed;
 
 use PHPUnit\Framework\Attributes\CoversClass;
+use PHPUnit\Framework\Attributes\Group;
 use PHPUnit\Framework\TestCase;
 use SimpleSAML\WSSecurity\XML\fed\AbstractFedElement;
 use SimpleSAML\WSSecurity\XML\fed\AbstractSignOutBasisType;
@@ -22,6 +23,7 @@
  *
  * @package simplesamlphp/ws-security
  */
+#[Group('fed')]
 #[CoversClass(SignOutBasis::class)]
 #[CoversClass(AbstractSignOutBasisType::class)]
 #[CoversClass(AbstractFedElement::class)]
diff --git a/tests/WSSecurity/XML/fed/SignOutTest.php b/tests/WSSecurity/XML/fed/SignOutTest.php
index c7893ffa..7eccd773 100644
--- a/tests/WSSecurity/XML/fed/SignOutTest.php
+++ b/tests/WSSecurity/XML/fed/SignOutTest.php
@@ -5,6 +5,7 @@
 namespace SimpleSAML\Test\WSSecurity\XML\fed;
 
 use PHPUnit\Framework\Attributes\CoversClass;
+use PHPUnit\Framework\Attributes\Group;
 use PHPUnit\Framework\TestCase;
 use SimpleSAML\WSSecurity\XML\fed\AbstractFedElement;
 use SimpleSAML\WSSecurity\XML\fed\AbstractSignOutType;
@@ -26,6 +27,7 @@
  *
  * @package simplesamlphp/ws-security
  */
+#[Group('fed')]
 #[CoversClass(SignOut::class)]
 #[CoversClass(AbstractSignOutType::class)]
 #[CoversClass(AbstractFedElement::class)]
diff --git a/tests/WSSecurity/XML/fed/SingleSignOutNotificationEndpointTest.php b/tests/WSSecurity/XML/fed/SingleSignOutNotificationEndpointTest.php
index 02693f62..9ca90708 100644
--- a/tests/WSSecurity/XML/fed/SingleSignOutNotificationEndpointTest.php
+++ b/tests/WSSecurity/XML/fed/SingleSignOutNotificationEndpointTest.php
@@ -6,6 +6,7 @@
 
 use DOMElement;
 use PHPUnit\Framework\Attributes\CoversClass;
+use PHPUnit\Framework\Attributes\Group;
 use PHPUnit\Framework\TestCase;
 use SimpleSAML\WSSecurity\XML\fed\AbstractEndpointType;
 use SimpleSAML\WSSecurity\XML\fed\AbstractFedElement;
@@ -28,6 +29,7 @@
  *
  * @package simplesamlphp/ws-security
  */
+#[Group('fed')]
 #[CoversClass(SingleSignOutNotificationEndpoint::class)]
 #[CoversClass(AbstractEndpointType::class)]
 #[CoversClass(AbstractFedElement::class)]
diff --git a/tests/WSSecurity/XML/fed/SingleSignOutNotificationEndpointsTest.php b/tests/WSSecurity/XML/fed/SingleSignOutNotificationEndpointsTest.php
index d0f2f61e..3e5fb56b 100644
--- a/tests/WSSecurity/XML/fed/SingleSignOutNotificationEndpointsTest.php
+++ b/tests/WSSecurity/XML/fed/SingleSignOutNotificationEndpointsTest.php
@@ -6,6 +6,7 @@
 
 use DOMElement;
 use PHPUnit\Framework\Attributes\CoversClass;
+use PHPUnit\Framework\Attributes\Group;
 use PHPUnit\Framework\TestCase;
 use SimpleSAML\WSSecurity\XML\fed\AbstractEndpointType;
 use SimpleSAML\WSSecurity\XML\fed\AbstractFedElement;
@@ -28,6 +29,7 @@
  *
  * @package simplesamlphp/ws-security
  */
+#[Group('fed')]
 #[CoversClass(SingleSignOutNotificationEndpoints::class)]
 #[CoversClass(AbstractEndpointType::class)]
 #[CoversClass(AbstractFedElement::class)]
diff --git a/tests/WSSecurity/XML/fed/SingleSignOutSubscriptionEndpointTest.php b/tests/WSSecurity/XML/fed/SingleSignOutSubscriptionEndpointTest.php
index 169a3114..c32d062e 100644
--- a/tests/WSSecurity/XML/fed/SingleSignOutSubscriptionEndpointTest.php
+++ b/tests/WSSecurity/XML/fed/SingleSignOutSubscriptionEndpointTest.php
@@ -6,6 +6,7 @@
 
 use DOMElement;
 use PHPUnit\Framework\Attributes\CoversClass;
+use PHPUnit\Framework\Attributes\Group;
 use PHPUnit\Framework\TestCase;
 use SimpleSAML\WSSecurity\XML\fed\AbstractEndpointType;
 use SimpleSAML\WSSecurity\XML\fed\AbstractFedElement;
@@ -28,6 +29,7 @@
  *
  * @package simplesamlphp/ws-security
  */
+#[Group('fed')]
 #[CoversClass(SingleSignOutSubscriptionEndpoint::class)]
 #[CoversClass(AbstractEndpointType::class)]
 #[CoversClass(AbstractFedElement::class)]
diff --git a/tests/WSSecurity/XML/fed/SingleSignOutSubscriptionEndpointsTest.php b/tests/WSSecurity/XML/fed/SingleSignOutSubscriptionEndpointsTest.php
index 5324d965..d8c9c1ac 100644
--- a/tests/WSSecurity/XML/fed/SingleSignOutSubscriptionEndpointsTest.php
+++ b/tests/WSSecurity/XML/fed/SingleSignOutSubscriptionEndpointsTest.php
@@ -6,6 +6,7 @@
 
 use DOMElement;
 use PHPUnit\Framework\Attributes\CoversClass;
+use PHPUnit\Framework\Attributes\Group;
 use PHPUnit\Framework\TestCase;
 use SimpleSAML\WSSecurity\XML\fed\AbstractEndpointType;
 use SimpleSAML\WSSecurity\XML\fed\AbstractFedElement;
@@ -28,6 +29,7 @@
  *
  * @package simplesamlphp/ws-security
  */
+#[Group('fed')]
 #[CoversClass(SingleSignOutSubscriptionEndpoints::class)]
 #[CoversClass(AbstractEndpointType::class)]
 #[CoversClass(AbstractFedElement::class)]
diff --git a/tests/WSSecurity/XML/fed/TargetScopesTest.php b/tests/WSSecurity/XML/fed/TargetScopesTest.php
index 16bd4e96..b23179f7 100644
--- a/tests/WSSecurity/XML/fed/TargetScopesTest.php
+++ b/tests/WSSecurity/XML/fed/TargetScopesTest.php
@@ -6,6 +6,7 @@
 
 use DOMElement;
 use PHPUnit\Framework\Attributes\CoversClass;
+use PHPUnit\Framework\Attributes\Group;
 use PHPUnit\Framework\TestCase;
 use SimpleSAML\WSSecurity\XML\fed\AbstractEndpointType;
 use SimpleSAML\WSSecurity\XML\fed\AbstractFedElement;
@@ -28,6 +29,7 @@
  *
  * @package simplesamlphp/ws-security
  */
+#[Group('fed')]
 #[CoversClass(TargetScopes::class)]
 #[CoversClass(AbstractEndpointType::class)]
 #[CoversClass(AbstractFedElement::class)]
diff --git a/tests/WSSecurity/XML/fed/TokenTypeTest.php b/tests/WSSecurity/XML/fed/TokenTypeTest.php
index 12b5e5c6..f707e397 100644
--- a/tests/WSSecurity/XML/fed/TokenTypeTest.php
+++ b/tests/WSSecurity/XML/fed/TokenTypeTest.php
@@ -5,6 +5,7 @@
 namespace SimpleSAML\Test\WSSecurity\XML\fed;
 
 use PHPUnit\Framework\Attributes\CoversClass;
+use PHPUnit\Framework\Attributes\Group;
 use PHPUnit\Framework\TestCase;
 use SimpleSAML\WSSecurity\XML\fed\AbstractFedElement;
 use SimpleSAML\WSSecurity\XML\fed\AbstractTokenType;
@@ -22,6 +23,7 @@
  *
  * @package simplesamlphp/ws-security
  */
+#[Group('fed')]
 #[CoversClass(TokenType::class)]
 #[CoversClass(AbstractTokenType::class)]
 #[CoversClass(AbstractFedElement::class)]
diff --git a/tests/WSSecurity/XML/fed/TokenTypesOfferedTest.php b/tests/WSSecurity/XML/fed/TokenTypesOfferedTest.php
index 6dda9593..6936a598 100644
--- a/tests/WSSecurity/XML/fed/TokenTypesOfferedTest.php
+++ b/tests/WSSecurity/XML/fed/TokenTypesOfferedTest.php
@@ -5,6 +5,7 @@
 namespace SimpleSAML\Test\WSSecurity\XML\fed;
 
 use PHPUnit\Framework\Attributes\CoversClass;
+use PHPUnit\Framework\Attributes\Group;
 use PHPUnit\Framework\TestCase;
 use SimpleSAML\WSSecurity\XML\fed\AbstractFedElement;
 use SimpleSAML\WSSecurity\XML\fed\AbstractTokenTypesOfferedType;
@@ -24,6 +25,7 @@
  *
  * @package simplesamlphp/ws-security
  */
+#[Group('fed')]
 #[CoversClass(TokenTypesOffered::class)]
 #[CoversClass(AbstractTokenTypesOfferedType::class)]
 #[CoversClass(AbstractFedElement::class)]
diff --git a/tests/WSSecurity/XML/fed/WebBindingTest.php b/tests/WSSecurity/XML/fed/WebBindingTest.php
index 97f72a49..91a4fb16 100644
--- a/tests/WSSecurity/XML/fed/WebBindingTest.php
+++ b/tests/WSSecurity/XML/fed/WebBindingTest.php
@@ -5,6 +5,7 @@
 namespace SimpleSAML\Test\WSSecurity\XML\fed;
 
 use PHPUnit\Framework\Attributes\CoversClass;
+use PHPUnit\Framework\Attributes\Group;
 use PHPUnit\Framework\TestCase;
 use SimpleSAML\Test\WSSecurity\Constants as C;
 use SimpleSAML\Test\WSSecurity\XML\sp\NestedPolicyTypeTestTrait;
@@ -24,6 +25,7 @@
  *
  * @package simplesamlphp/ws-security
  */
+#[Group('fed')]
 #[CoversClass(WebBinding::class)]
 #[CoversClass(AbstractNestedPolicyType::class)]
 #[CoversClass(AbstractSpElement::class)]
diff --git a/tests/WSSecurity/XML/sp/AbsXPathTest.php b/tests/WSSecurity/XML/sp/AbsXPathTest.php
index aef03fe7..1d4c4d37 100644
--- a/tests/WSSecurity/XML/sp/AbsXPathTest.php
+++ b/tests/WSSecurity/XML/sp/AbsXPathTest.php
@@ -5,6 +5,7 @@
 namespace SimpleSAML\Test\WSSecurity\XML\sp;
 
 use PHPUnit\Framework\Attributes\CoversClass;
+use PHPUnit\Framework\Attributes\Group;
 use PHPUnit\Framework\TestCase;
 use SimpleSAML\WSSecurity\XML\sp\AbstractQNameAssertionType;
 use SimpleSAML\WSSecurity\XML\sp\AbstractSpElement;
@@ -20,6 +21,7 @@
  *
  * @package simplesamlphp/ws-security
  */
+#[Group('sp')]
 #[CoversClass(AbsXPath::class)]
 #[CoversClass(AbstractQNameAssertionType::class)]
 #[CoversClass(AbstractSpElement::class)]
diff --git a/tests/WSSecurity/XML/sp/AlgorithmSuiteTest.php b/tests/WSSecurity/XML/sp/AlgorithmSuiteTest.php
index 8b20b0ce..22575508 100644
--- a/tests/WSSecurity/XML/sp/AlgorithmSuiteTest.php
+++ b/tests/WSSecurity/XML/sp/AlgorithmSuiteTest.php
@@ -5,6 +5,7 @@
 namespace SimpleSAML\Test\WSSecurity\XML\sp;
 
 use PHPUnit\Framework\Attributes\CoversClass;
+use PHPUnit\Framework\Attributes\Group;
 use PHPUnit\Framework\TestCase;
 use SimpleSAML\Test\WSSecurity\Constants as C;
 use SimpleSAML\WSSecurity\XML\sp\AbstractNestedPolicyType;
@@ -23,6 +24,7 @@
  *
  * @package simplesamlphp/ws-security
  */
+#[Group('sp')]
 #[CoversClass(AlgorithmSuite::class)]
 #[CoversClass(AbstractNestedPolicyType::class)]
 #[CoversClass(AbstractSpElement::class)]
diff --git a/tests/WSSecurity/XML/sp/AsymmetricBindingTest.php b/tests/WSSecurity/XML/sp/AsymmetricBindingTest.php
index 4e416ddd..139c5540 100644
--- a/tests/WSSecurity/XML/sp/AsymmetricBindingTest.php
+++ b/tests/WSSecurity/XML/sp/AsymmetricBindingTest.php
@@ -5,6 +5,7 @@
 namespace SimpleSAML\Test\WSSecurity\XML\sp;
 
 use PHPUnit\Framework\Attributes\CoversClass;
+use PHPUnit\Framework\Attributes\Group;
 use PHPUnit\Framework\TestCase;
 use SimpleSAML\Test\WSSecurity\Constants as C;
 use SimpleSAML\WSSecurity\XML\sp\AbstractNestedPolicyType;
@@ -23,6 +24,7 @@
  *
  * @package simplesamlphp/ws-security
  */
+#[Group('sp')]
 #[CoversClass(AsymmetricBinding::class)]
 #[CoversClass(AbstractNestedPolicyType::class)]
 #[CoversClass(AbstractSpElement::class)]
diff --git a/tests/WSSecurity/XML/sp/AttachmentsTest.php b/tests/WSSecurity/XML/sp/AttachmentsTest.php
index b6e53fae..35e5be13 100644
--- a/tests/WSSecurity/XML/sp/AttachmentsTest.php
+++ b/tests/WSSecurity/XML/sp/AttachmentsTest.php
@@ -5,6 +5,7 @@
 namespace SimpleSAML\Test\WSSecurity\XML\sp;
 
 use PHPUnit\Framework\Attributes\CoversClass;
+use PHPUnit\Framework\Attributes\Group;
 use PHPUnit\Framework\TestCase;
 use SimpleSAML\WSSecurity\XML\sp\AbstractEmptyType;
 use SimpleSAML\WSSecurity\XML\sp\AbstractSpElement;
@@ -19,6 +20,7 @@
  *
  * @package simplesamlphp/ws-security
  */
+#[Group('sp')]
 #[CoversClass(Attachments::class)]
 #[CoversClass(AbstractEmptyType::class)]
 #[CoversClass(AbstractSpElement::class)]
diff --git a/tests/WSSecurity/XML/sp/Basic128Rsa15Test.php b/tests/WSSecurity/XML/sp/Basic128Rsa15Test.php
index 3328f314..4a09b56f 100644
--- a/tests/WSSecurity/XML/sp/Basic128Rsa15Test.php
+++ b/tests/WSSecurity/XML/sp/Basic128Rsa15Test.php
@@ -5,6 +5,7 @@
 namespace SimpleSAML\Test\WSSecurity\XML\sp;
 
 use PHPUnit\Framework\Attributes\CoversClass;
+use PHPUnit\Framework\Attributes\Group;
 use PHPUnit\Framework\TestCase;
 use SimpleSAML\WSSecurity\XML\sp\AbstractQNameAssertionType;
 use SimpleSAML\WSSecurity\XML\sp\AbstractSpElement;
@@ -20,6 +21,7 @@
  *
  * @package simplesamlphp/ws-security
  */
+#[Group('sp')]
 #[CoversClass(Basic128Rsa15::class)]
 #[CoversClass(AbstractQNameAssertionType::class)]
 #[CoversClass(AbstractSpElement::class)]
diff --git a/tests/WSSecurity/XML/sp/Basic128Sha256Rsa15Test.php b/tests/WSSecurity/XML/sp/Basic128Sha256Rsa15Test.php
index b48a84d0..1efaca29 100644
--- a/tests/WSSecurity/XML/sp/Basic128Sha256Rsa15Test.php
+++ b/tests/WSSecurity/XML/sp/Basic128Sha256Rsa15Test.php
@@ -5,6 +5,7 @@
 namespace SimpleSAML\Test\WSSecurity\XML\sp;
 
 use PHPUnit\Framework\Attributes\CoversClass;
+use PHPUnit\Framework\Attributes\Group;
 use PHPUnit\Framework\TestCase;
 use SimpleSAML\WSSecurity\XML\sp\AbstractQNameAssertionType;
 use SimpleSAML\WSSecurity\XML\sp\AbstractSpElement;
@@ -20,6 +21,7 @@
  *
  * @package simplesamlphp/ws-security
  */
+#[Group('sp')]
 #[CoversClass(Basic128Sha256Rsa15::class)]
 #[CoversClass(AbstractQNameAssertionType::class)]
 #[CoversClass(AbstractSpElement::class)]
diff --git a/tests/WSSecurity/XML/sp/Basic128Sha256Test.php b/tests/WSSecurity/XML/sp/Basic128Sha256Test.php
index cb42b3bd..c56f9f51 100644
--- a/tests/WSSecurity/XML/sp/Basic128Sha256Test.php
+++ b/tests/WSSecurity/XML/sp/Basic128Sha256Test.php
@@ -5,6 +5,7 @@
 namespace SimpleSAML\Test\WSSecurity\XML\sp;
 
 use PHPUnit\Framework\Attributes\CoversClass;
+use PHPUnit\Framework\Attributes\Group;
 use PHPUnit\Framework\TestCase;
 use SimpleSAML\WSSecurity\XML\sp\AbstractQNameAssertionType;
 use SimpleSAML\WSSecurity\XML\sp\AbstractSpElement;
@@ -20,6 +21,7 @@
  *
  * @package simplesamlphp/ws-security
  */
+#[Group('sp')]
 #[CoversClass(Basic128Sha256::class)]
 #[CoversClass(AbstractQNameAssertionType::class)]
 #[CoversClass(AbstractSpElement::class)]
diff --git a/tests/WSSecurity/XML/sp/Basic128Test.php b/tests/WSSecurity/XML/sp/Basic128Test.php
index 0fd6aa34..823adb7e 100644
--- a/tests/WSSecurity/XML/sp/Basic128Test.php
+++ b/tests/WSSecurity/XML/sp/Basic128Test.php
@@ -5,6 +5,7 @@
 namespace SimpleSAML\Test\WSSecurity\XML\sp;
 
 use PHPUnit\Framework\Attributes\CoversClass;
+use PHPUnit\Framework\Attributes\Group;
 use PHPUnit\Framework\TestCase;
 use SimpleSAML\WSSecurity\XML\sp\AbstractQNameAssertionType;
 use SimpleSAML\WSSecurity\XML\sp\AbstractSpElement;
@@ -20,6 +21,7 @@
  *
  * @package simplesamlphp/ws-security
  */
+#[Group('sp')]
 #[CoversClass(Basic128::class)]
 #[CoversClass(AbstractQNameAssertionType::class)]
 #[CoversClass(AbstractSpElement::class)]
diff --git a/tests/WSSecurity/XML/sp/Basic192Rsa15Test.php b/tests/WSSecurity/XML/sp/Basic192Rsa15Test.php
index 71cf111d..ca428e2e 100644
--- a/tests/WSSecurity/XML/sp/Basic192Rsa15Test.php
+++ b/tests/WSSecurity/XML/sp/Basic192Rsa15Test.php
@@ -5,6 +5,7 @@
 namespace SimpleSAML\Test\WSSecurity\XML\sp;
 
 use PHPUnit\Framework\Attributes\CoversClass;
+use PHPUnit\Framework\Attributes\Group;
 use PHPUnit\Framework\TestCase;
 use SimpleSAML\WSSecurity\XML\sp\AbstractQNameAssertionType;
 use SimpleSAML\WSSecurity\XML\sp\AbstractSpElement;
@@ -20,6 +21,7 @@
  *
  * @package simplesamlphp/ws-security
  */
+#[Group('sp')]
 #[CoversClass(Basic192Rsa15::class)]
 #[CoversClass(AbstractQNameAssertionType::class)]
 #[CoversClass(AbstractSpElement::class)]
diff --git a/tests/WSSecurity/XML/sp/Basic192Sha256Rsa15Test.php b/tests/WSSecurity/XML/sp/Basic192Sha256Rsa15Test.php
index 6cd53cbb..e7453ad5 100644
--- a/tests/WSSecurity/XML/sp/Basic192Sha256Rsa15Test.php
+++ b/tests/WSSecurity/XML/sp/Basic192Sha256Rsa15Test.php
@@ -5,6 +5,7 @@
 namespace SimpleSAML\Test\WSSecurity\XML\sp;
 
 use PHPUnit\Framework\Attributes\CoversClass;
+use PHPUnit\Framework\Attributes\Group;
 use PHPUnit\Framework\TestCase;
 use SimpleSAML\WSSecurity\XML\sp\AbstractQNameAssertionType;
 use SimpleSAML\WSSecurity\XML\sp\AbstractSpElement;
@@ -20,6 +21,7 @@
  *
  * @package simplesamlphp/ws-security
  */
+#[Group('sp')]
 #[CoversClass(Basic192Sha256Rsa15::class)]
 #[CoversClass(AbstractQNameAssertionType::class)]
 #[CoversClass(AbstractSpElement::class)]
diff --git a/tests/WSSecurity/XML/sp/Basic192Sha256Test.php b/tests/WSSecurity/XML/sp/Basic192Sha256Test.php
index 048c37d3..74e90da0 100644
--- a/tests/WSSecurity/XML/sp/Basic192Sha256Test.php
+++ b/tests/WSSecurity/XML/sp/Basic192Sha256Test.php
@@ -5,6 +5,7 @@
 namespace SimpleSAML\Test\WSSecurity\XML\sp;
 
 use PHPUnit\Framework\Attributes\CoversClass;
+use PHPUnit\Framework\Attributes\Group;
 use PHPUnit\Framework\TestCase;
 use SimpleSAML\WSSecurity\XML\sp\AbstractQNameAssertionType;
 use SimpleSAML\WSSecurity\XML\sp\AbstractSpElement;
@@ -20,6 +21,7 @@
  *
  * @package simplesamlphp/ws-security
  */
+#[Group('sp')]
 #[CoversClass(Basic192Sha256::class)]
 #[CoversClass(AbstractQNameAssertionType::class)]
 #[CoversClass(AbstractSpElement::class)]
diff --git a/tests/WSSecurity/XML/sp/Basic192Test.php b/tests/WSSecurity/XML/sp/Basic192Test.php
index 21961470..1577adf4 100644
--- a/tests/WSSecurity/XML/sp/Basic192Test.php
+++ b/tests/WSSecurity/XML/sp/Basic192Test.php
@@ -5,6 +5,7 @@
 namespace SimpleSAML\Test\WSSecurity\XML\sp;
 
 use PHPUnit\Framework\Attributes\CoversClass;
+use PHPUnit\Framework\Attributes\Group;
 use PHPUnit\Framework\TestCase;
 use SimpleSAML\WSSecurity\XML\sp\AbstractQNameAssertionType;
 use SimpleSAML\WSSecurity\XML\sp\AbstractSpElement;
@@ -20,6 +21,7 @@
  *
  * @package simplesamlphp/ws-security
  */
+#[Group('sp')]
 #[CoversClass(Basic192::class)]
 #[CoversClass(AbstractQNameAssertionType::class)]
 #[CoversClass(AbstractSpElement::class)]
diff --git a/tests/WSSecurity/XML/sp/Basic256Rsa15Test.php b/tests/WSSecurity/XML/sp/Basic256Rsa15Test.php
index 90bbd9d5..33b3ec0b 100644
--- a/tests/WSSecurity/XML/sp/Basic256Rsa15Test.php
+++ b/tests/WSSecurity/XML/sp/Basic256Rsa15Test.php
@@ -5,6 +5,7 @@
 namespace SimpleSAML\Test\WSSecurity\XML\sp;
 
 use PHPUnit\Framework\Attributes\CoversClass;
+use PHPUnit\Framework\Attributes\Group;
 use PHPUnit\Framework\TestCase;
 use SimpleSAML\WSSecurity\XML\sp\AbstractQNameAssertionType;
 use SimpleSAML\WSSecurity\XML\sp\AbstractSpElement;
@@ -20,6 +21,7 @@
  *
  * @package simplesamlphp/ws-security
  */
+#[Group('sp')]
 #[CoversClass(Basic256Rsa15::class)]
 #[CoversClass(AbstractQNameAssertionType::class)]
 #[CoversClass(AbstractSpElement::class)]
diff --git a/tests/WSSecurity/XML/sp/Basic256Sha256Rsa15Test.php b/tests/WSSecurity/XML/sp/Basic256Sha256Rsa15Test.php
index 13499e65..d1173ca9 100644
--- a/tests/WSSecurity/XML/sp/Basic256Sha256Rsa15Test.php
+++ b/tests/WSSecurity/XML/sp/Basic256Sha256Rsa15Test.php
@@ -5,6 +5,7 @@
 namespace SimpleSAML\Test\WSSecurity\XML\sp;
 
 use PHPUnit\Framework\Attributes\CoversClass;
+use PHPUnit\Framework\Attributes\Group;
 use PHPUnit\Framework\TestCase;
 use SimpleSAML\WSSecurity\XML\sp\AbstractQNameAssertionType;
 use SimpleSAML\WSSecurity\XML\sp\AbstractSpElement;
@@ -20,6 +21,7 @@
  *
  * @package simplesamlphp/ws-security
  */
+#[Group('sp')]
 #[CoversClass(Basic256Sha256Rsa15::class)]
 #[CoversClass(AbstractQNameAssertionType::class)]
 #[CoversClass(AbstractSpElement::class)]
diff --git a/tests/WSSecurity/XML/sp/Basic256Sha256Test.php b/tests/WSSecurity/XML/sp/Basic256Sha256Test.php
index 7a8d42a5..c0093a7a 100644
--- a/tests/WSSecurity/XML/sp/Basic256Sha256Test.php
+++ b/tests/WSSecurity/XML/sp/Basic256Sha256Test.php
@@ -5,6 +5,7 @@
 namespace SimpleSAML\Test\WSSecurity\XML\sp;
 
 use PHPUnit\Framework\Attributes\CoversClass;
+use PHPUnit\Framework\Attributes\Group;
 use PHPUnit\Framework\TestCase;
 use SimpleSAML\WSSecurity\XML\sp\AbstractQNameAssertionType;
 use SimpleSAML\WSSecurity\XML\sp\AbstractSpElement;
@@ -20,6 +21,7 @@
  *
  * @package simplesamlphp/ws-security
  */
+#[Group('sp')]
 #[CoversClass(Basic256Sha256::class)]
 #[CoversClass(AbstractQNameAssertionType::class)]
 #[CoversClass(AbstractSpElement::class)]
diff --git a/tests/WSSecurity/XML/sp/Basic256Test.php b/tests/WSSecurity/XML/sp/Basic256Test.php
index b15d13f6..f9606574 100644
--- a/tests/WSSecurity/XML/sp/Basic256Test.php
+++ b/tests/WSSecurity/XML/sp/Basic256Test.php
@@ -5,6 +5,7 @@
 namespace SimpleSAML\Test\WSSecurity\XML\sp;
 
 use PHPUnit\Framework\Attributes\CoversClass;
+use PHPUnit\Framework\Attributes\Group;
 use PHPUnit\Framework\TestCase;
 use SimpleSAML\WSSecurity\XML\sp\AbstractQNameAssertionType;
 use SimpleSAML\WSSecurity\XML\sp\AbstractSpElement;
@@ -20,6 +21,7 @@
  *
  * @package simplesamlphp/ws-security
  */
+#[Group('sp')]
 #[CoversClass(Basic256::class)]
 #[CoversClass(AbstractQNameAssertionType::class)]
 #[CoversClass(AbstractSpElement::class)]
diff --git a/tests/WSSecurity/XML/sp/BodyTest.php b/tests/WSSecurity/XML/sp/BodyTest.php
index aa0d1bf3..ed95f47d 100644
--- a/tests/WSSecurity/XML/sp/BodyTest.php
+++ b/tests/WSSecurity/XML/sp/BodyTest.php
@@ -5,6 +5,7 @@
 namespace SimpleSAML\Test\WSSecurity\XML\sp;
 
 use PHPUnit\Framework\Attributes\CoversClass;
+use PHPUnit\Framework\Attributes\Group;
 use PHPUnit\Framework\TestCase;
 use SimpleSAML\WSSecurity\XML\sp\AbstractEmptyType;
 use SimpleSAML\WSSecurity\XML\sp\AbstractSpElement;
@@ -19,6 +20,7 @@
  *
  * @package simplesamlphp/ws-security
  */
+#[Group('sp')]
 #[CoversClass(Body::class)]
 #[CoversClass(AbstractEmptyType::class)]
 #[CoversClass(AbstractSpElement::class)]
diff --git a/tests/WSSecurity/XML/sp/BootstrapPolicyTest.php b/tests/WSSecurity/XML/sp/BootstrapPolicyTest.php
index 79131c61..fe9c2014 100644
--- a/tests/WSSecurity/XML/sp/BootstrapPolicyTest.php
+++ b/tests/WSSecurity/XML/sp/BootstrapPolicyTest.php
@@ -5,6 +5,7 @@
 namespace SimpleSAML\Test\WSSecurity\XML\sp;
 
 use PHPUnit\Framework\Attributes\CoversClass;
+use PHPUnit\Framework\Attributes\Group;
 use PHPUnit\Framework\TestCase;
 use SimpleSAML\Test\WSSecurity\Constants as C;
 use SimpleSAML\WSSecurity\XML\sp\AbstractNestedPolicyType;
@@ -23,6 +24,7 @@
  *
  * @package simplesamlphp/ws-security
  */
+#[Group('sp')]
 #[CoversClass(BootstrapPolicy::class)]
 #[CoversClass(AbstractNestedPolicyType::class)]
 #[CoversClass(AbstractSpElement::class)]
diff --git a/tests/WSSecurity/XML/sp/ContentEncryptedElementsTest.php b/tests/WSSecurity/XML/sp/ContentEncryptedElementsTest.php
index eb48c19a..294fc288 100644
--- a/tests/WSSecurity/XML/sp/ContentEncryptedElementsTest.php
+++ b/tests/WSSecurity/XML/sp/ContentEncryptedElementsTest.php
@@ -5,6 +5,7 @@
 namespace SimpleSAML\Test\WSSecurity\XML\sp;
 
 use PHPUnit\Framework\Attributes\CoversClass;
+use PHPUnit\Framework\Attributes\Group;
 use PHPUnit\Framework\TestCase;
 use SimpleSAML\Test\WSSecurity\Constants as C;
 use SimpleSAML\WSSecurity\Utils\XPath as XMLXPath;
@@ -25,6 +26,7 @@
  *
  * @package simplesamlphp/ws-security
  */
+#[Group('sp')]
 #[CoversClass(ContentEncryptedElements::class)]
 #[CoversClass(AbstractSerElementsType::class)]
 #[CoversClass(AbstractSpElement::class)]
diff --git a/tests/WSSecurity/XML/sp/EncryptBeforeSigningTest.php b/tests/WSSecurity/XML/sp/EncryptBeforeSigningTest.php
index d3a7858b..8245ceea 100644
--- a/tests/WSSecurity/XML/sp/EncryptBeforeSigningTest.php
+++ b/tests/WSSecurity/XML/sp/EncryptBeforeSigningTest.php
@@ -5,6 +5,7 @@
 namespace SimpleSAML\Test\WSSecurity\XML\sp;
 
 use PHPUnit\Framework\Attributes\CoversClass;
+use PHPUnit\Framework\Attributes\Group;
 use PHPUnit\Framework\TestCase;
 use SimpleSAML\WSSecurity\XML\sp\AbstractQNameAssertionType;
 use SimpleSAML\WSSecurity\XML\sp\AbstractSpElement;
@@ -20,6 +21,7 @@
  *
  * @package simplesamlphp/ws-security
  */
+#[Group('sp')]
 #[CoversClass(EncryptBeforeSigning::class)]
 #[CoversClass(AbstractQNameAssertionType::class)]
 #[CoversClass(AbstractSpElement::class)]
diff --git a/tests/WSSecurity/XML/sp/EncryptSignatureTest.php b/tests/WSSecurity/XML/sp/EncryptSignatureTest.php
index 9114ffc6..a76c3aa1 100644
--- a/tests/WSSecurity/XML/sp/EncryptSignatureTest.php
+++ b/tests/WSSecurity/XML/sp/EncryptSignatureTest.php
@@ -5,6 +5,7 @@
 namespace SimpleSAML\Test\WSSecurity\XML\sp;
 
 use PHPUnit\Framework\Attributes\CoversClass;
+use PHPUnit\Framework\Attributes\Group;
 use PHPUnit\Framework\TestCase;
 use SimpleSAML\WSSecurity\XML\sp\AbstractQNameAssertionType;
 use SimpleSAML\WSSecurity\XML\sp\AbstractSpElement;
@@ -20,6 +21,7 @@
  *
  * @package simplesamlphp/ws-security
  */
+#[Group('sp')]
 #[CoversClass(EncryptSignature::class)]
 #[CoversClass(AbstractQNameAssertionType::class)]
 #[CoversClass(AbstractSpElement::class)]
diff --git a/tests/WSSecurity/XML/sp/EncryptedElementsTest.php b/tests/WSSecurity/XML/sp/EncryptedElementsTest.php
index 0d3f3435..61ac6ea4 100644
--- a/tests/WSSecurity/XML/sp/EncryptedElementsTest.php
+++ b/tests/WSSecurity/XML/sp/EncryptedElementsTest.php
@@ -5,6 +5,7 @@
 namespace SimpleSAML\Test\WSSecurity\XML\sp;
 
 use PHPUnit\Framework\Attributes\CoversClass;
+use PHPUnit\Framework\Attributes\Group;
 use PHPUnit\Framework\TestCase;
 use SimpleSAML\Test\WSSecurity\Constants as C;
 use SimpleSAML\WSSecurity\Utils\XPath as XMLXPath;
@@ -25,6 +26,7 @@
  *
  * @package simplesamlphp/ws-security
  */
+#[Group('sp')]
 #[CoversClass(EncryptedElements::class)]
 #[CoversClass(AbstractSerElementsType::class)]
 #[CoversClass(AbstractSpElement::class)]
diff --git a/tests/WSSecurity/XML/sp/EncryptedPartsTest.php b/tests/WSSecurity/XML/sp/EncryptedPartsTest.php
index 683a76b9..5cb7159a 100644
--- a/tests/WSSecurity/XML/sp/EncryptedPartsTest.php
+++ b/tests/WSSecurity/XML/sp/EncryptedPartsTest.php
@@ -5,6 +5,7 @@
 namespace SimpleSAML\Test\WSSecurity\XML\sp;
 
 use PHPUnit\Framework\Attributes\CoversClass;
+use PHPUnit\Framework\Attributes\Group;
 use PHPUnit\Framework\TestCase;
 use SimpleSAML\Test\WSSecurity\Constants as C;
 use SimpleSAML\WSSecurity\Utils\XPath;
@@ -27,6 +28,7 @@
  *
  * @package simplesamlphp/ws-security
  */
+#[Group('sp')]
 #[CoversClass(EncryptedParts::class)]
 #[CoversClass(AbstractSePartsType::class)]
 #[CoversClass(AbstractSpElement::class)]
diff --git a/tests/WSSecurity/XML/sp/EncryptedSupportingTokensTest.php b/tests/WSSecurity/XML/sp/EncryptedSupportingTokensTest.php
index 7ffc7f9c..f84dd4ec 100644
--- a/tests/WSSecurity/XML/sp/EncryptedSupportingTokensTest.php
+++ b/tests/WSSecurity/XML/sp/EncryptedSupportingTokensTest.php
@@ -5,6 +5,7 @@
 namespace SimpleSAML\Test\WSSecurity\XML\sp;
 
 use PHPUnit\Framework\Attributes\CoversClass;
+use PHPUnit\Framework\Attributes\Group;
 use PHPUnit\Framework\TestCase;
 use SimpleSAML\Test\WSSecurity\Constants as C;
 use SimpleSAML\WSSecurity\XML\sp\AbstractNestedPolicyType;
@@ -23,6 +24,7 @@
  *
  * @package simplesamlphp/ws-security
  */
+#[Group('sp')]
 #[CoversClass(EncryptedSupportingTokens::class)]
 #[CoversClass(AbstractNestedPolicyType::class)]
 #[CoversClass(AbstractSpElement::class)]
diff --git a/tests/WSSecurity/XML/sp/EncryptionTokenTest.php b/tests/WSSecurity/XML/sp/EncryptionTokenTest.php
index 00f82567..102cbb29 100644
--- a/tests/WSSecurity/XML/sp/EncryptionTokenTest.php
+++ b/tests/WSSecurity/XML/sp/EncryptionTokenTest.php
@@ -5,6 +5,7 @@
 namespace SimpleSAML\Test\WSSecurity\XML\sp;
 
 use PHPUnit\Framework\Attributes\CoversClass;
+use PHPUnit\Framework\Attributes\Group;
 use PHPUnit\Framework\TestCase;
 use SimpleSAML\Test\WSSecurity\Constants as C;
 use SimpleSAML\WSSecurity\XML\sp\AbstractNestedPolicyType;
@@ -23,6 +24,7 @@
  *
  * @package simplesamlphp/ws-security
  */
+#[Group('sp')]
 #[CoversClass(EncryptionToken::class)]
 #[CoversClass(AbstractNestedPolicyType::class)]
 #[CoversClass(AbstractSpElement::class)]
diff --git a/tests/WSSecurity/XML/sp/EndorsingEncryptedSupportingTokensTest.php b/tests/WSSecurity/XML/sp/EndorsingEncryptedSupportingTokensTest.php
index 5014b090..56a1acc3 100644
--- a/tests/WSSecurity/XML/sp/EndorsingEncryptedSupportingTokensTest.php
+++ b/tests/WSSecurity/XML/sp/EndorsingEncryptedSupportingTokensTest.php
@@ -5,6 +5,7 @@
 namespace SimpleSAML\Test\WSSecurity\XML\sp;
 
 use PHPUnit\Framework\Attributes\CoversClass;
+use PHPUnit\Framework\Attributes\Group;
 use PHPUnit\Framework\TestCase;
 use SimpleSAML\Test\WSSecurity\Constants as C;
 use SimpleSAML\WSSecurity\XML\sp\AbstractNestedPolicyType;
@@ -23,6 +24,7 @@
  *
  * @package simplesamlphp/ws-security
  */
+#[Group('sp')]
 #[CoversClass(EndorsingEncryptedSupportingTokens::class)]
 #[CoversClass(AbstractNestedPolicyType::class)]
 #[CoversClass(AbstractSpElement::class)]
diff --git a/tests/WSSecurity/XML/sp/EndorsingSupportingTokensTest.php b/tests/WSSecurity/XML/sp/EndorsingSupportingTokensTest.php
index b85f2466..fd89bc7f 100644
--- a/tests/WSSecurity/XML/sp/EndorsingSupportingTokensTest.php
+++ b/tests/WSSecurity/XML/sp/EndorsingSupportingTokensTest.php
@@ -5,6 +5,7 @@
 namespace SimpleSAML\Test\WSSecurity\XML\sp;
 
 use PHPUnit\Framework\Attributes\CoversClass;
+use PHPUnit\Framework\Attributes\Group;
 use PHPUnit\Framework\TestCase;
 use SimpleSAML\Test\WSSecurity\Constants as C;
 use SimpleSAML\WSSecurity\XML\sp\AbstractNestedPolicyType;
@@ -23,6 +24,7 @@
  *
  * @package simplesamlphp/ws-security
  */
+#[Group('sp')]
 #[CoversClass(EndorsingSupportingTokens::class)]
 #[CoversClass(AbstractNestedPolicyType::class)]
 #[CoversClass(AbstractSpElement::class)]
diff --git a/tests/WSSecurity/XML/sp/HashPasswordTest.php b/tests/WSSecurity/XML/sp/HashPasswordTest.php
index 27ec387f..b1d2201b 100644
--- a/tests/WSSecurity/XML/sp/HashPasswordTest.php
+++ b/tests/WSSecurity/XML/sp/HashPasswordTest.php
@@ -5,6 +5,7 @@
 namespace SimpleSAML\Test\WSSecurity\XML\sp;
 
 use PHPUnit\Framework\Attributes\CoversClass;
+use PHPUnit\Framework\Attributes\Group;
 use PHPUnit\Framework\TestCase;
 use SimpleSAML\WSSecurity\XML\sp\AbstractQNameAssertionType;
 use SimpleSAML\WSSecurity\XML\sp\AbstractSpElement;
@@ -20,6 +21,7 @@
  *
  * @package simplesamlphp/ws-security
  */
+#[Group('sp')]
 #[CoversClass(HashPassword::class)]
 #[CoversClass(AbstractQNameAssertionType::class)]
 #[CoversClass(AbstractSpElement::class)]
diff --git a/tests/WSSecurity/XML/sp/HeaderTest.php b/tests/WSSecurity/XML/sp/HeaderTest.php
index 0858ecac..85c51292 100644
--- a/tests/WSSecurity/XML/sp/HeaderTest.php
+++ b/tests/WSSecurity/XML/sp/HeaderTest.php
@@ -5,6 +5,7 @@
 namespace SimpleSAML\Test\WSSecurity\XML\sp;
 
 use PHPUnit\Framework\Attributes\CoversClass;
+use PHPUnit\Framework\Attributes\Group;
 use PHPUnit\Framework\TestCase;
 use SimpleSAML\Test\WSSecurity\Constants as C;
 use SimpleSAML\WSSecurity\XML\sp\AbstractHeaderType;
@@ -21,6 +22,7 @@
  *
  * @package simplesamlphp/ws-security
  */
+#[Group('sp')]
 #[CoversClass(Header::class)]
 #[CoversClass(AbstractHeaderType::class)]
 #[CoversClass(AbstractSpElement::class)]
diff --git a/tests/WSSecurity/XML/sp/HttpBasicAuthenticationTest.php b/tests/WSSecurity/XML/sp/HttpBasicAuthenticationTest.php
index 64f8d6f8..c4c05894 100644
--- a/tests/WSSecurity/XML/sp/HttpBasicAuthenticationTest.php
+++ b/tests/WSSecurity/XML/sp/HttpBasicAuthenticationTest.php
@@ -5,6 +5,7 @@
 namespace SimpleSAML\Test\WSSecurity\XML\sp;
 
 use PHPUnit\Framework\Attributes\CoversClass;
+use PHPUnit\Framework\Attributes\Group;
 use PHPUnit\Framework\TestCase;
 use SimpleSAML\WSSecurity\XML\sp\AbstractQNameAssertionType;
 use SimpleSAML\WSSecurity\XML\sp\AbstractSpElement;
@@ -20,6 +21,7 @@
  *
  * @package simplesamlphp/ws-security
  */
+#[Group('sp')]
 #[CoversClass(HttpBasicAuthentication::class)]
 #[CoversClass(AbstractQNameAssertionType::class)]
 #[CoversClass(AbstractSpElement::class)]
diff --git a/tests/WSSecurity/XML/sp/HttpDigestAuthenticationTest.php b/tests/WSSecurity/XML/sp/HttpDigestAuthenticationTest.php
index 4d960972..cbabe635 100644
--- a/tests/WSSecurity/XML/sp/HttpDigestAuthenticationTest.php
+++ b/tests/WSSecurity/XML/sp/HttpDigestAuthenticationTest.php
@@ -5,6 +5,7 @@
 namespace SimpleSAML\Test\WSSecurity\XML\sp;
 
 use PHPUnit\Framework\Attributes\CoversClass;
+use PHPUnit\Framework\Attributes\Group;
 use PHPUnit\Framework\TestCase;
 use SimpleSAML\WSSecurity\XML\sp\AbstractQNameAssertionType;
 use SimpleSAML\WSSecurity\XML\sp\AbstractSpElement;
@@ -20,6 +21,7 @@
  *
  * @package simplesamlphp/ws-security
  */
+#[Group('sp')]
 #[CoversClass(HttpDigestAuthentication::class)]
 #[CoversClass(AbstractQNameAssertionType::class)]
 #[CoversClass(AbstractSpElement::class)]
diff --git a/tests/WSSecurity/XML/sp/HttpsTokenTest.php b/tests/WSSecurity/XML/sp/HttpsTokenTest.php
index 3421f5c2..28300a62 100644
--- a/tests/WSSecurity/XML/sp/HttpsTokenTest.php
+++ b/tests/WSSecurity/XML/sp/HttpsTokenTest.php
@@ -5,6 +5,7 @@
 namespace SimpleSAML\Test\WSSecurity\XML\sp;
 
 use PHPUnit\Framework\Attributes\CoversClass;
+use PHPUnit\Framework\Attributes\Group;
 use PHPUnit\Framework\TestCase;
 use SimpleSAML\Test\WSSecurity\Constants as C;
 use SimpleSAML\WSSecurity\XML\sp\AbstractSpElement;
@@ -25,6 +26,7 @@
  *
  * @package simplesamlphp/ws-security
  */
+#[Group('sp')]
 #[CoversClass(HttpsToken::class)]
 #[CoversClass(IncludeTokenTypeTrait::class)]
 #[CoversClass(AbstractTokenAssertionType::class)]
diff --git a/tests/WSSecurity/XML/sp/IncludeTimestampTest.php b/tests/WSSecurity/XML/sp/IncludeTimestampTest.php
index efd78f42..f1bcce49 100644
--- a/tests/WSSecurity/XML/sp/IncludeTimestampTest.php
+++ b/tests/WSSecurity/XML/sp/IncludeTimestampTest.php
@@ -5,6 +5,7 @@
 namespace SimpleSAML\Test\WSSecurity\XML\sp;
 
 use PHPUnit\Framework\Attributes\CoversClass;
+use PHPUnit\Framework\Attributes\Group;
 use PHPUnit\Framework\TestCase;
 use SimpleSAML\WSSecurity\XML\sp\AbstractQNameAssertionType;
 use SimpleSAML\WSSecurity\XML\sp\AbstractSpElement;
@@ -20,6 +21,7 @@
  *
  * @package simplesamlphp/ws-security
  */
+#[Group('sp')]
 #[CoversClass(IncludeTimestamp::class)]
 #[CoversClass(AbstractQNameAssertionType::class)]
 #[CoversClass(AbstractSpElement::class)]
diff --git a/tests/WSSecurity/XML/sp/InclusiveC14NTest.php b/tests/WSSecurity/XML/sp/InclusiveC14NTest.php
index 027fffe7..425ce507 100644
--- a/tests/WSSecurity/XML/sp/InclusiveC14NTest.php
+++ b/tests/WSSecurity/XML/sp/InclusiveC14NTest.php
@@ -5,6 +5,7 @@
 namespace SimpleSAML\Test\WSSecurity\XML\sp;
 
 use PHPUnit\Framework\Attributes\CoversClass;
+use PHPUnit\Framework\Attributes\Group;
 use PHPUnit\Framework\TestCase;
 use SimpleSAML\WSSecurity\XML\sp\AbstractQNameAssertionType;
 use SimpleSAML\WSSecurity\XML\sp\AbstractSpElement;
@@ -20,6 +21,7 @@
  *
  * @package simplesamlphp/ws-security
  */
+#[Group('sp')]
 #[CoversClass(InclusiveC14N::class)]
 #[CoversClass(AbstractQNameAssertionType::class)]
 #[CoversClass(AbstractSpElement::class)]
diff --git a/tests/WSSecurity/XML/sp/InitiatorEncryptionTokenTest.php b/tests/WSSecurity/XML/sp/InitiatorEncryptionTokenTest.php
index 7cc86902..0358f9f6 100644
--- a/tests/WSSecurity/XML/sp/InitiatorEncryptionTokenTest.php
+++ b/tests/WSSecurity/XML/sp/InitiatorEncryptionTokenTest.php
@@ -5,6 +5,7 @@
 namespace SimpleSAML\Test\WSSecurity\XML\sp;
 
 use PHPUnit\Framework\Attributes\CoversClass;
+use PHPUnit\Framework\Attributes\Group;
 use PHPUnit\Framework\TestCase;
 use SimpleSAML\Test\WSSecurity\Constants as C;
 use SimpleSAML\WSSecurity\XML\sp\AbstractNestedPolicyType;
@@ -23,6 +24,7 @@
  *
  * @package simplesamlphp/ws-security
  */
+#[Group('sp')]
 #[CoversClass(InitiatorEncryptionToken::class)]
 #[CoversClass(AbstractNestedPolicyType::class)]
 #[CoversClass(AbstractSpElement::class)]
diff --git a/tests/WSSecurity/XML/sp/InitiatorSignatureTokenTest.php b/tests/WSSecurity/XML/sp/InitiatorSignatureTokenTest.php
index dc7ac6c2..5f329b7f 100644
--- a/tests/WSSecurity/XML/sp/InitiatorSignatureTokenTest.php
+++ b/tests/WSSecurity/XML/sp/InitiatorSignatureTokenTest.php
@@ -5,6 +5,7 @@
 namespace SimpleSAML\Test\WSSecurity\XML\sp;
 
 use PHPUnit\Framework\Attributes\CoversClass;
+use PHPUnit\Framework\Attributes\Group;
 use PHPUnit\Framework\TestCase;
 use SimpleSAML\Test\WSSecurity\Constants as C;
 use SimpleSAML\WSSecurity\XML\sp\AbstractNestedPolicyType;
@@ -23,6 +24,7 @@
  *
  * @package simplesamlphp/ws-security
  */
+#[Group('sp')]
 #[CoversClass(InitiatorSignatureToken::class)]
 #[CoversClass(AbstractNestedPolicyType::class)]
 #[CoversClass(AbstractSpElement::class)]
diff --git a/tests/WSSecurity/XML/sp/InitiatorTokenTest.php b/tests/WSSecurity/XML/sp/InitiatorTokenTest.php
index fee2fdcd..250e86a2 100644
--- a/tests/WSSecurity/XML/sp/InitiatorTokenTest.php
+++ b/tests/WSSecurity/XML/sp/InitiatorTokenTest.php
@@ -5,6 +5,7 @@
 namespace SimpleSAML\Test\WSSecurity\XML\sp;
 
 use PHPUnit\Framework\Attributes\CoversClass;
+use PHPUnit\Framework\Attributes\Group;
 use PHPUnit\Framework\TestCase;
 use SimpleSAML\Test\WSSecurity\Constants as C;
 use SimpleSAML\WSSecurity\XML\sp\AbstractNestedPolicyType;
@@ -23,6 +24,7 @@
  *
  * @package simplesamlphp/ws-security
  */
+#[Group('sp')]
 #[CoversClass(InitiatorToken::class)]
 #[CoversClass(AbstractNestedPolicyType::class)]
 #[CoversClass(AbstractSpElement::class)]
diff --git a/tests/WSSecurity/XML/sp/IssuedTokenTest.php b/tests/WSSecurity/XML/sp/IssuedTokenTest.php
index 5e8511cc..809984e0 100644
--- a/tests/WSSecurity/XML/sp/IssuedTokenTest.php
+++ b/tests/WSSecurity/XML/sp/IssuedTokenTest.php
@@ -5,6 +5,7 @@
 namespace SimpleSAML\Test\WSSecurity\XML\sp;
 
 use PHPUnit\Framework\Attributes\CoversClass;
+use PHPUnit\Framework\Attributes\Group;
 use PHPUnit\Framework\TestCase;
 use SimpleSAML\Test\WSSecurity\Constants as C;
 use SimpleSAML\WSSecurity\Utils\XPath;
@@ -28,6 +29,7 @@
  *
  * @package simplesamlphp/ws-security
  */
+#[Group('sp')]
 #[CoversClass(IssuedToken::class)]
 #[CoversClass(IncludeTokenTypeTrait::class)]
 #[CoversClass(AbstractIssuedTokenType::class)]
diff --git a/tests/WSSecurity/XML/sp/IssuerNameTest.php b/tests/WSSecurity/XML/sp/IssuerNameTest.php
index a7bc8c86..14e85fee 100644
--- a/tests/WSSecurity/XML/sp/IssuerNameTest.php
+++ b/tests/WSSecurity/XML/sp/IssuerNameTest.php
@@ -5,6 +5,7 @@
 namespace SimpleSAML\Test\WSSecurity\XML\sp;
 
 use PHPUnit\Framework\Attributes\CoversClass;
+use PHPUnit\Framework\Attributes\Group;
 use PHPUnit\Framework\TestCase;
 use SimpleSAML\WSSecurity\XML\sp\AbstractSpElement;
 use SimpleSAML\WSSecurity\XML\sp\IssuerName;
@@ -19,6 +20,7 @@
  *
  * @package simplesamlphp/ws-security
  */
+#[Group('sp')]
 #[CoversClass(IssuerName::class)]
 #[CoversClass(AbstractSpElement::class)]
 final class IssuerNameTest extends TestCase
diff --git a/tests/WSSecurity/XML/sp/IssuerTest.php b/tests/WSSecurity/XML/sp/IssuerTest.php
index be8857a3..09946661 100644
--- a/tests/WSSecurity/XML/sp/IssuerTest.php
+++ b/tests/WSSecurity/XML/sp/IssuerTest.php
@@ -6,6 +6,7 @@
 
 use DOMElement;
 use PHPUnit\Framework\Attributes\CoversClass;
+use PHPUnit\Framework\Attributes\Group;
 use PHPUnit\Framework\TestCase;
 use SimpleSAML\WSSecurity\XML\sp\Issuer;
 use SimpleSAML\WSSecurity\XML\wsa\AbstractEndpointReferenceType;
@@ -26,6 +27,7 @@
  *
  * @package simplesamlphp/ws-security
  */
+#[Group('sp')]
 #[CoversClass(Issuer::class)]
 #[CoversClass(AbstractEndpointReferenceType::class)]
 #[CoversClass(AbstractWsaElement::class)]
diff --git a/tests/WSSecurity/XML/sp/KerberosTokenTest.php b/tests/WSSecurity/XML/sp/KerberosTokenTest.php
index f71e3b9d..2602332e 100644
--- a/tests/WSSecurity/XML/sp/KerberosTokenTest.php
+++ b/tests/WSSecurity/XML/sp/KerberosTokenTest.php
@@ -5,6 +5,7 @@
 namespace SimpleSAML\Test\WSSecurity\XML\sp;
 
 use PHPUnit\Framework\Attributes\CoversClass;
+use PHPUnit\Framework\Attributes\Group;
 use PHPUnit\Framework\TestCase;
 use SimpleSAML\Test\WSSecurity\Constants as C;
 use SimpleSAML\WSSecurity\XML\sp\AbstractSpElement;
@@ -25,6 +26,7 @@
  *
  * @package simplesamlphp/ws-security
  */
+#[Group('sp')]
 #[CoversClass(KerberosToken::class)]
 #[CoversClass(IncludeTokenTypeTrait::class)]
 #[CoversClass(AbstractTokenAssertionType::class)]
diff --git a/tests/WSSecurity/XML/sp/KeyValueTokenTest.php b/tests/WSSecurity/XML/sp/KeyValueTokenTest.php
index b424a729..48de7aca 100644
--- a/tests/WSSecurity/XML/sp/KeyValueTokenTest.php
+++ b/tests/WSSecurity/XML/sp/KeyValueTokenTest.php
@@ -5,6 +5,7 @@
 namespace SimpleSAML\Test\WSSecurity\XML\sp;
 
 use PHPUnit\Framework\Attributes\CoversClass;
+use PHPUnit\Framework\Attributes\Group;
 use PHPUnit\Framework\TestCase;
 use SimpleSAML\Test\WSSecurity\Constants as C;
 use SimpleSAML\WSSecurity\XML\sp\AbstractKeyValueTokenType;
@@ -25,6 +26,7 @@
  *
  * @package simplesamlphp/ws-security
  */
+#[Group('sp')]
 #[CoversClass(KeyValueToken::class)]
 #[CoversClass(IncludeTokenTypeTrait::class)]
 #[CoversClass(AbstractKeyValueTokenType::class)]
diff --git a/tests/WSSecurity/XML/sp/LaxTest.php b/tests/WSSecurity/XML/sp/LaxTest.php
index bbb75ba7..e1556183 100644
--- a/tests/WSSecurity/XML/sp/LaxTest.php
+++ b/tests/WSSecurity/XML/sp/LaxTest.php
@@ -5,6 +5,7 @@
 namespace SimpleSAML\Test\WSSecurity\XML\sp;
 
 use PHPUnit\Framework\Attributes\CoversClass;
+use PHPUnit\Framework\Attributes\Group;
 use PHPUnit\Framework\TestCase;
 use SimpleSAML\WSSecurity\XML\sp\AbstractQNameAssertionType;
 use SimpleSAML\WSSecurity\XML\sp\AbstractSpElement;
@@ -20,6 +21,7 @@
  *
  * @package simplesamlphp/ws-security
  */
+#[Group('sp')]
 #[CoversClass(Lax::class)]
 #[CoversClass(AbstractQNameAssertionType::class)]
 #[CoversClass(AbstractSpElement::class)]
diff --git a/tests/WSSecurity/XML/sp/LaxTsFirstTest.php b/tests/WSSecurity/XML/sp/LaxTsFirstTest.php
index 9ccd8329..69932863 100644
--- a/tests/WSSecurity/XML/sp/LaxTsFirstTest.php
+++ b/tests/WSSecurity/XML/sp/LaxTsFirstTest.php
@@ -5,6 +5,7 @@
 namespace SimpleSAML\Test\WSSecurity\XML\sp;
 
 use PHPUnit\Framework\Attributes\CoversClass;
+use PHPUnit\Framework\Attributes\Group;
 use PHPUnit\Framework\TestCase;
 use SimpleSAML\WSSecurity\XML\sp\AbstractQNameAssertionType;
 use SimpleSAML\WSSecurity\XML\sp\AbstractSpElement;
@@ -20,6 +21,7 @@
  *
  * @package simplesamlphp/ws-security
  */
+#[Group('sp')]
 #[CoversClass(LaxTsFirst::class)]
 #[CoversClass(AbstractQNameAssertionType::class)]
 #[CoversClass(AbstractSpElement::class)]
diff --git a/tests/WSSecurity/XML/sp/LaxTsLastTest.php b/tests/WSSecurity/XML/sp/LaxTsLastTest.php
index b824f118..4c022d3d 100644
--- a/tests/WSSecurity/XML/sp/LaxTsLastTest.php
+++ b/tests/WSSecurity/XML/sp/LaxTsLastTest.php
@@ -5,6 +5,7 @@
 namespace SimpleSAML\Test\WSSecurity\XML\sp;
 
 use PHPUnit\Framework\Attributes\CoversClass;
+use PHPUnit\Framework\Attributes\Group;
 use PHPUnit\Framework\TestCase;
 use SimpleSAML\WSSecurity\XML\sp\AbstractQNameAssertionType;
 use SimpleSAML\WSSecurity\XML\sp\AbstractSpElement;
@@ -20,6 +21,7 @@
  *
  * @package simplesamlphp/ws-security
  */
+#[Group('sp')]
 #[CoversClass(LaxTsLast::class)]
 #[CoversClass(AbstractQNameAssertionType::class)]
 #[CoversClass(AbstractSpElement::class)]
diff --git a/tests/WSSecurity/XML/sp/LayoutTest.php b/tests/WSSecurity/XML/sp/LayoutTest.php
index b00c80b3..b6d47079 100644
--- a/tests/WSSecurity/XML/sp/LayoutTest.php
+++ b/tests/WSSecurity/XML/sp/LayoutTest.php
@@ -5,6 +5,7 @@
 namespace SimpleSAML\Test\WSSecurity\XML\sp;
 
 use PHPUnit\Framework\Attributes\CoversClass;
+use PHPUnit\Framework\Attributes\Group;
 use PHPUnit\Framework\TestCase;
 use SimpleSAML\Test\WSSecurity\Constants as C;
 use SimpleSAML\WSSecurity\XML\sp\AbstractNestedPolicyType;
@@ -23,6 +24,7 @@
  *
  * @package simplesamlphp/ws-security
  */
+#[Group('sp')]
 #[CoversClass(Layout::class)]
 #[CoversClass(AbstractNestedPolicyType::class)]
 #[CoversClass(AbstractSpElement::class)]
diff --git a/tests/WSSecurity/XML/sp/MustNotSendAmendTest.php b/tests/WSSecurity/XML/sp/MustNotSendAmendTest.php
index 864b46b3..1a6674dc 100644
--- a/tests/WSSecurity/XML/sp/MustNotSendAmendTest.php
+++ b/tests/WSSecurity/XML/sp/MustNotSendAmendTest.php
@@ -5,6 +5,7 @@
 namespace SimpleSAML\Test\WSSecurity\XML\sp;
 
 use PHPUnit\Framework\Attributes\CoversClass;
+use PHPUnit\Framework\Attributes\Group;
 use PHPUnit\Framework\TestCase;
 use SimpleSAML\WSSecurity\XML\sp\AbstractQNameAssertionType;
 use SimpleSAML\WSSecurity\XML\sp\AbstractSpElement;
@@ -20,6 +21,7 @@
  *
  * @package simplesamlphp/ws-security
  */
+#[Group('sp')]
 #[CoversClass(MustNotSendAmend::class)]
 #[CoversClass(AbstractQNameAssertionType::class)]
 #[CoversClass(AbstractSpElement::class)]
diff --git a/tests/WSSecurity/XML/sp/MustNotSendCancelTest.php b/tests/WSSecurity/XML/sp/MustNotSendCancelTest.php
index ccae61c8..c875d2b1 100644
--- a/tests/WSSecurity/XML/sp/MustNotSendCancelTest.php
+++ b/tests/WSSecurity/XML/sp/MustNotSendCancelTest.php
@@ -5,6 +5,7 @@
 namespace SimpleSAML\Test\WSSecurity\XML\sp;
 
 use PHPUnit\Framework\Attributes\CoversClass;
+use PHPUnit\Framework\Attributes\Group;
 use PHPUnit\Framework\TestCase;
 use SimpleSAML\WSSecurity\XML\sp\AbstractQNameAssertionType;
 use SimpleSAML\WSSecurity\XML\sp\AbstractSpElement;
@@ -20,6 +21,7 @@
  *
  * @package simplesamlphp/ws-security
  */
+#[Group('sp')]
 #[CoversClass(MustNotSendCancel::class)]
 #[CoversClass(AbstractQNameAssertionType::class)]
 #[CoversClass(AbstractSpElement::class)]
diff --git a/tests/WSSecurity/XML/sp/MustNotSendRenewTest.php b/tests/WSSecurity/XML/sp/MustNotSendRenewTest.php
index 18faf646..454f5b09 100644
--- a/tests/WSSecurity/XML/sp/MustNotSendRenewTest.php
+++ b/tests/WSSecurity/XML/sp/MustNotSendRenewTest.php
@@ -5,6 +5,7 @@
 namespace SimpleSAML\Test\WSSecurity\XML\sp;
 
 use PHPUnit\Framework\Attributes\CoversClass;
+use PHPUnit\Framework\Attributes\Group;
 use PHPUnit\Framework\TestCase;
 use SimpleSAML\WSSecurity\XML\sp\AbstractQNameAssertionType;
 use SimpleSAML\WSSecurity\XML\sp\AbstractSpElement;
@@ -20,6 +21,7 @@
  *
  * @package simplesamlphp/ws-security
  */
+#[Group('sp')]
 #[CoversClass(MustNotSendRenew::class)]
 #[CoversClass(AbstractQNameAssertionType::class)]
 #[CoversClass(AbstractSpElement::class)]
diff --git a/tests/WSSecurity/XML/sp/MustSupportClientChallengeTest.php b/tests/WSSecurity/XML/sp/MustSupportClientChallengeTest.php
index 5d959db9..20a1a3ca 100644
--- a/tests/WSSecurity/XML/sp/MustSupportClientChallengeTest.php
+++ b/tests/WSSecurity/XML/sp/MustSupportClientChallengeTest.php
@@ -5,6 +5,7 @@
 namespace SimpleSAML\Test\WSSecurity\XML\sp;
 
 use PHPUnit\Framework\Attributes\CoversClass;
+use PHPUnit\Framework\Attributes\Group;
 use PHPUnit\Framework\TestCase;
 use SimpleSAML\WSSecurity\XML\sp\AbstractQNameAssertionType;
 use SimpleSAML\WSSecurity\XML\sp\AbstractSpElement;
@@ -20,6 +21,7 @@
  *
  * @package simplesamlphp/ws-security
  */
+#[Group('sp')]
 #[CoversClass(MustSupportClientChallenge::class)]
 #[CoversClass(AbstractQNameAssertionType::class)]
 #[CoversClass(AbstractSpElement::class)]
diff --git a/tests/WSSecurity/XML/sp/MustSupportIssuedTokensTest.php b/tests/WSSecurity/XML/sp/MustSupportIssuedTokensTest.php
index e7029e53..7f552b7b 100644
--- a/tests/WSSecurity/XML/sp/MustSupportIssuedTokensTest.php
+++ b/tests/WSSecurity/XML/sp/MustSupportIssuedTokensTest.php
@@ -5,6 +5,7 @@
 namespace SimpleSAML\Test\WSSecurity\XML\sp;
 
 use PHPUnit\Framework\Attributes\CoversClass;
+use PHPUnit\Framework\Attributes\Group;
 use PHPUnit\Framework\TestCase;
 use SimpleSAML\WSSecurity\XML\sp\AbstractQNameAssertionType;
 use SimpleSAML\WSSecurity\XML\sp\AbstractSpElement;
@@ -20,6 +21,7 @@
  *
  * @package simplesamlphp/ws-security
  */
+#[Group('sp')]
 #[CoversClass(MustSupportIssuedTokens::class)]
 #[CoversClass(AbstractQNameAssertionType::class)]
 #[CoversClass(AbstractSpElement::class)]
diff --git a/tests/WSSecurity/XML/sp/MustSupportRefEmbeddedTokenTest.php b/tests/WSSecurity/XML/sp/MustSupportRefEmbeddedTokenTest.php
index f5f5a5f9..596439cc 100644
--- a/tests/WSSecurity/XML/sp/MustSupportRefEmbeddedTokenTest.php
+++ b/tests/WSSecurity/XML/sp/MustSupportRefEmbeddedTokenTest.php
@@ -5,6 +5,7 @@
 namespace SimpleSAML\Test\WSSecurity\XML\sp;
 
 use PHPUnit\Framework\Attributes\CoversClass;
+use PHPUnit\Framework\Attributes\Group;
 use PHPUnit\Framework\TestCase;
 use SimpleSAML\WSSecurity\XML\sp\AbstractQNameAssertionType;
 use SimpleSAML\WSSecurity\XML\sp\AbstractSpElement;
@@ -20,6 +21,7 @@
  *
  * @package simplesamlphp/ws-security
  */
+#[Group('sp')]
 #[CoversClass(MustSupportRefEmbeddedToken::class)]
 #[CoversClass(AbstractQNameAssertionType::class)]
 #[CoversClass(AbstractSpElement::class)]
diff --git a/tests/WSSecurity/XML/sp/MustSupportRefEncryptedKeyTest.php b/tests/WSSecurity/XML/sp/MustSupportRefEncryptedKeyTest.php
index b2ced539..b17c7e43 100644
--- a/tests/WSSecurity/XML/sp/MustSupportRefEncryptedKeyTest.php
+++ b/tests/WSSecurity/XML/sp/MustSupportRefEncryptedKeyTest.php
@@ -5,6 +5,7 @@
 namespace SimpleSAML\Test\WSSecurity\XML\sp;
 
 use PHPUnit\Framework\Attributes\CoversClass;
+use PHPUnit\Framework\Attributes\Group;
 use PHPUnit\Framework\TestCase;
 use SimpleSAML\WSSecurity\XML\sp\AbstractQNameAssertionType;
 use SimpleSAML\WSSecurity\XML\sp\AbstractSpElement;
@@ -20,6 +21,7 @@
  *
  * @package simplesamlphp/ws-security
  */
+#[Group('sp')]
 #[CoversClass(MustSupportRefEncryptedKey::class)]
 #[CoversClass(AbstractQNameAssertionType::class)]
 #[CoversClass(AbstractSpElement::class)]
diff --git a/tests/WSSecurity/XML/sp/MustSupportRefExternalURITest.php b/tests/WSSecurity/XML/sp/MustSupportRefExternalURITest.php
index 4e8d6c07..2940f081 100644
--- a/tests/WSSecurity/XML/sp/MustSupportRefExternalURITest.php
+++ b/tests/WSSecurity/XML/sp/MustSupportRefExternalURITest.php
@@ -5,6 +5,7 @@
 namespace SimpleSAML\Test\WSSecurity\XML\sp;
 
 use PHPUnit\Framework\Attributes\CoversClass;
+use PHPUnit\Framework\Attributes\Group;
 use PHPUnit\Framework\TestCase;
 use SimpleSAML\WSSecurity\XML\sp\AbstractQNameAssertionType;
 use SimpleSAML\WSSecurity\XML\sp\AbstractSpElement;
@@ -20,6 +21,7 @@
  *
  * @package simplesamlphp/ws-security
  */
+#[Group('sp')]
 #[CoversClass(MustSupportRefExternalURI::class)]
 #[CoversClass(AbstractQNameAssertionType::class)]
 #[CoversClass(AbstractSpElement::class)]
diff --git a/tests/WSSecurity/XML/sp/MustSupportRefIssuerSerialTest.php b/tests/WSSecurity/XML/sp/MustSupportRefIssuerSerialTest.php
index f44025ae..d96d0e30 100644
--- a/tests/WSSecurity/XML/sp/MustSupportRefIssuerSerialTest.php
+++ b/tests/WSSecurity/XML/sp/MustSupportRefIssuerSerialTest.php
@@ -5,6 +5,7 @@
 namespace SimpleSAML\Test\WSSecurity\XML\sp;
 
 use PHPUnit\Framework\Attributes\CoversClass;
+use PHPUnit\Framework\Attributes\Group;
 use PHPUnit\Framework\TestCase;
 use SimpleSAML\WSSecurity\XML\sp\AbstractQNameAssertionType;
 use SimpleSAML\WSSecurity\XML\sp\AbstractSpElement;
@@ -20,6 +21,7 @@
  *
  * @package simplesamlphp/ws-security
  */
+#[Group('sp')]
 #[CoversClass(MustSupportRefIssuerSerial::class)]
 #[CoversClass(AbstractQNameAssertionType::class)]
 #[CoversClass(AbstractSpElement::class)]
diff --git a/tests/WSSecurity/XML/sp/MustSupportRefKeyIdentifierTest.php b/tests/WSSecurity/XML/sp/MustSupportRefKeyIdentifierTest.php
index 7974bc5d..3317c94f 100644
--- a/tests/WSSecurity/XML/sp/MustSupportRefKeyIdentifierTest.php
+++ b/tests/WSSecurity/XML/sp/MustSupportRefKeyIdentifierTest.php
@@ -5,6 +5,7 @@
 namespace SimpleSAML\Test\WSSecurity\XML\sp;
 
 use PHPUnit\Framework\Attributes\CoversClass;
+use PHPUnit\Framework\Attributes\Group;
 use PHPUnit\Framework\TestCase;
 use SimpleSAML\WSSecurity\XML\sp\AbstractQNameAssertionType;
 use SimpleSAML\WSSecurity\XML\sp\AbstractSpElement;
@@ -20,6 +21,7 @@
  *
  * @package simplesamlphp/ws-security
  */
+#[Group('sp')]
 #[CoversClass(MustSupportRefKeyIdentifier::class)]
 #[CoversClass(AbstractQNameAssertionType::class)]
 #[CoversClass(AbstractSpElement::class)]
diff --git a/tests/WSSecurity/XML/sp/MustSupportRefThumbprintTest.php b/tests/WSSecurity/XML/sp/MustSupportRefThumbprintTest.php
index 02c46b7f..66c3e52f 100644
--- a/tests/WSSecurity/XML/sp/MustSupportRefThumbprintTest.php
+++ b/tests/WSSecurity/XML/sp/MustSupportRefThumbprintTest.php
@@ -5,6 +5,7 @@
 namespace SimpleSAML\Test\WSSecurity\XML\sp;
 
 use PHPUnit\Framework\Attributes\CoversClass;
+use PHPUnit\Framework\Attributes\Group;
 use PHPUnit\Framework\TestCase;
 use SimpleSAML\WSSecurity\XML\sp\AbstractQNameAssertionType;
 use SimpleSAML\WSSecurity\XML\sp\AbstractSpElement;
@@ -20,6 +21,7 @@
  *
  * @package simplesamlphp/ws-security
  */
+#[Group('sp')]
 #[CoversClass(MustSupportRefThumbprint::class)]
 #[CoversClass(AbstractQNameAssertionType::class)]
 #[CoversClass(AbstractSpElement::class)]
diff --git a/tests/WSSecurity/XML/sp/MustSupportServerChallengeTest.php b/tests/WSSecurity/XML/sp/MustSupportServerChallengeTest.php
index 1f606d0a..086d5536 100644
--- a/tests/WSSecurity/XML/sp/MustSupportServerChallengeTest.php
+++ b/tests/WSSecurity/XML/sp/MustSupportServerChallengeTest.php
@@ -5,6 +5,7 @@
 namespace SimpleSAML\Test\WSSecurity\XML\sp;
 
 use PHPUnit\Framework\Attributes\CoversClass;
+use PHPUnit\Framework\Attributes\Group;
 use PHPUnit\Framework\TestCase;
 use SimpleSAML\WSSecurity\XML\sp\AbstractQNameAssertionType;
 use SimpleSAML\WSSecurity\XML\sp\AbstractSpElement;
@@ -20,6 +21,7 @@
  *
  * @package simplesamlphp/ws-security
  */
+#[Group('sp')]
 #[CoversClass(MustSupportServerChallenge::class)]
 #[CoversClass(AbstractQNameAssertionType::class)]
 #[CoversClass(AbstractSpElement::class)]
diff --git a/tests/WSSecurity/XML/sp/NoPasswordTest.php b/tests/WSSecurity/XML/sp/NoPasswordTest.php
index e2327799..32ff7cd6 100644
--- a/tests/WSSecurity/XML/sp/NoPasswordTest.php
+++ b/tests/WSSecurity/XML/sp/NoPasswordTest.php
@@ -5,6 +5,7 @@
 namespace SimpleSAML\Test\WSSecurity\XML\sp;
 
 use PHPUnit\Framework\Attributes\CoversClass;
+use PHPUnit\Framework\Attributes\Group;
 use PHPUnit\Framework\TestCase;
 use SimpleSAML\WSSecurity\XML\sp\AbstractQNameAssertionType;
 use SimpleSAML\WSSecurity\XML\sp\AbstractSpElement;
@@ -20,6 +21,7 @@
  *
  * @package simplesamlphp/ws-security
  */
+#[Group('sp')]
 #[CoversClass(NoPassword::class)]
 #[CoversClass(AbstractQNameAssertionType::class)]
 #[CoversClass(AbstractSpElement::class)]
diff --git a/tests/WSSecurity/XML/sp/OnlySignEntireHeadersAndBodyTest.php b/tests/WSSecurity/XML/sp/OnlySignEntireHeadersAndBodyTest.php
index 3ab3c6c1..cc62fe39 100644
--- a/tests/WSSecurity/XML/sp/OnlySignEntireHeadersAndBodyTest.php
+++ b/tests/WSSecurity/XML/sp/OnlySignEntireHeadersAndBodyTest.php
@@ -5,6 +5,7 @@
 namespace SimpleSAML\Test\WSSecurity\XML\sp;
 
 use PHPUnit\Framework\Attributes\CoversClass;
+use PHPUnit\Framework\Attributes\Group;
 use PHPUnit\Framework\TestCase;
 use SimpleSAML\WSSecurity\XML\sp\AbstractQNameAssertionType;
 use SimpleSAML\WSSecurity\XML\sp\AbstractSpElement;
@@ -20,6 +21,7 @@
  *
  * @package simplesamlphp/ws-security
  */
+#[Group('sp')]
 #[CoversClass(OnlySignEntireHeadersAndBody::class)]
 #[CoversClass(AbstractQNameAssertionType::class)]
 #[CoversClass(AbstractSpElement::class)]
diff --git a/tests/WSSecurity/XML/sp/ProtectTokensTest.php b/tests/WSSecurity/XML/sp/ProtectTokensTest.php
index 0ce430df..b253a1d7 100644
--- a/tests/WSSecurity/XML/sp/ProtectTokensTest.php
+++ b/tests/WSSecurity/XML/sp/ProtectTokensTest.php
@@ -5,6 +5,7 @@
 namespace SimpleSAML\Test\WSSecurity\XML\sp;
 
 use PHPUnit\Framework\Attributes\CoversClass;
+use PHPUnit\Framework\Attributes\Group;
 use PHPUnit\Framework\TestCase;
 use SimpleSAML\WSSecurity\XML\sp\AbstractQNameAssertionType;
 use SimpleSAML\WSSecurity\XML\sp\AbstractSpElement;
@@ -20,6 +21,7 @@
  *
  * @package simplesamlphp/ws-security
  */
+#[Group('sp')]
 #[CoversClass(ProtectTokens::class)]
 #[CoversClass(AbstractQNameAssertionType::class)]
 #[CoversClass(AbstractSpElement::class)]
diff --git a/tests/WSSecurity/XML/sp/ProtectionTokenTest.php b/tests/WSSecurity/XML/sp/ProtectionTokenTest.php
index e4ad49bd..e36027cf 100644
--- a/tests/WSSecurity/XML/sp/ProtectionTokenTest.php
+++ b/tests/WSSecurity/XML/sp/ProtectionTokenTest.php
@@ -5,6 +5,7 @@
 namespace SimpleSAML\Test\WSSecurity\XML\sp;
 
 use PHPUnit\Framework\Attributes\CoversClass;
+use PHPUnit\Framework\Attributes\Group;
 use PHPUnit\Framework\TestCase;
 use SimpleSAML\Test\WSSecurity\Constants as C;
 use SimpleSAML\WSSecurity\XML\sp\AbstractNestedPolicyType;
@@ -23,6 +24,7 @@
  *
  * @package simplesamlphp/ws-security
  */
+#[Group('sp')]
 #[CoversClass(ProtectionToken::class)]
 #[CoversClass(AbstractNestedPolicyType::class)]
 #[CoversClass(AbstractSpElement::class)]
diff --git a/tests/WSSecurity/XML/sp/RecipientEncryptionTokenTest.php b/tests/WSSecurity/XML/sp/RecipientEncryptionTokenTest.php
index 878b8b60..ad119b85 100644
--- a/tests/WSSecurity/XML/sp/RecipientEncryptionTokenTest.php
+++ b/tests/WSSecurity/XML/sp/RecipientEncryptionTokenTest.php
@@ -5,6 +5,7 @@
 namespace SimpleSAML\Test\WSSecurity\XML\sp;
 
 use PHPUnit\Framework\Attributes\CoversClass;
+use PHPUnit\Framework\Attributes\Group;
 use PHPUnit\Framework\TestCase;
 use SimpleSAML\Test\WSSecurity\Constants as C;
 use SimpleSAML\WSSecurity\XML\sp\AbstractNestedPolicyType;
@@ -23,6 +24,7 @@
  *
  * @package simplesamlphp/ws-security
  */
+#[Group('sp')]
 #[CoversClass(RecipientEncryptionToken::class)]
 #[CoversClass(AbstractNestedPolicyType::class)]
 #[CoversClass(AbstractSpElement::class)]
diff --git a/tests/WSSecurity/XML/sp/RecipientSignatureTokenTest.php b/tests/WSSecurity/XML/sp/RecipientSignatureTokenTest.php
index 060d00ac..6c943f75 100644
--- a/tests/WSSecurity/XML/sp/RecipientSignatureTokenTest.php
+++ b/tests/WSSecurity/XML/sp/RecipientSignatureTokenTest.php
@@ -5,6 +5,7 @@
 namespace SimpleSAML\Test\WSSecurity\XML\sp;
 
 use PHPUnit\Framework\Attributes\CoversClass;
+use PHPUnit\Framework\Attributes\Group;
 use PHPUnit\Framework\TestCase;
 use SimpleSAML\Test\WSSecurity\Constants as C;
 use SimpleSAML\WSSecurity\XML\sp\AbstractNestedPolicyType;
@@ -23,6 +24,7 @@
  *
  * @package simplesamlphp/ws-security
  */
+#[Group('sp')]
 #[CoversClass(RecipientSignatureToken::class)]
 #[CoversClass(AbstractNestedPolicyType::class)]
 #[CoversClass(AbstractSpElement::class)]
diff --git a/tests/WSSecurity/XML/sp/RecipientTokenTest.php b/tests/WSSecurity/XML/sp/RecipientTokenTest.php
index b3ff7822..bebecb80 100644
--- a/tests/WSSecurity/XML/sp/RecipientTokenTest.php
+++ b/tests/WSSecurity/XML/sp/RecipientTokenTest.php
@@ -5,6 +5,7 @@
 namespace SimpleSAML\Test\WSSecurity\XML\sp;
 
 use PHPUnit\Framework\Attributes\CoversClass;
+use PHPUnit\Framework\Attributes\Group;
 use PHPUnit\Framework\TestCase;
 use SimpleSAML\Test\WSSecurity\Constants as C;
 use SimpleSAML\WSSecurity\XML\sp\AbstractNestedPolicyType;
@@ -23,6 +24,7 @@
  *
  * @package simplesamlphp/ws-security
  */
+#[Group('sp')]
 #[CoversClass(RecipientToken::class)]
 #[CoversClass(AbstractNestedPolicyType::class)]
 #[CoversClass(AbstractSpElement::class)]
diff --git a/tests/WSSecurity/XML/sp/RelTokenTest.php b/tests/WSSecurity/XML/sp/RelTokenTest.php
index 5a2ada69..0be7aa90 100644
--- a/tests/WSSecurity/XML/sp/RelTokenTest.php
+++ b/tests/WSSecurity/XML/sp/RelTokenTest.php
@@ -5,6 +5,7 @@
 namespace SimpleSAML\Test\WSSecurity\XML\sp;
 
 use PHPUnit\Framework\Attributes\CoversClass;
+use PHPUnit\Framework\Attributes\Group;
 use PHPUnit\Framework\TestCase;
 use SimpleSAML\Test\WSSecurity\Constants as C;
 use SimpleSAML\WSSecurity\XML\sp\AbstractSpElement;
@@ -25,6 +26,7 @@
  *
  * @package simplesamlphp/ws-security
  */
+#[Group('sp')]
 #[CoversClass(RelToken::class)]
 #[CoversClass(IncludeTokenTypeTrait::class)]
 #[CoversClass(AbstractTokenAssertionType::class)]
diff --git a/tests/WSSecurity/XML/sp/RequestSecurityTokenTemplateTest.php b/tests/WSSecurity/XML/sp/RequestSecurityTokenTemplateTest.php
index 9b3e65c4..4aa474a0 100644
--- a/tests/WSSecurity/XML/sp/RequestSecurityTokenTemplateTest.php
+++ b/tests/WSSecurity/XML/sp/RequestSecurityTokenTemplateTest.php
@@ -5,6 +5,7 @@
 namespace SimpleSAML\Test\WSSecurity\XML\sp;
 
 use PHPUnit\Framework\Attributes\CoversClass;
+use PHPUnit\Framework\Attributes\Group;
 use PHPUnit\Framework\TestCase;
 use SimpleSAML\Test\WSSecurity\Constants as C;
 use SimpleSAML\WSSecurity\XML\sp\AbstractRequestSecurityTokenTemplateType;
@@ -22,6 +23,7 @@
  *
  * @package simplesamlphp/ws-security
  */
+#[Group('sp')]
 #[CoversClass(RequestSecurityTokenTemplate::class)]
 #[CoversClass(AbstractRequestSecurityTokenTemplateType::class)]
 #[CoversClass(AbstractSpElement::class)]
diff --git a/tests/WSSecurity/XML/sp/RequireAppliesToTest.php b/tests/WSSecurity/XML/sp/RequireAppliesToTest.php
index 323cf257..a0149416 100644
--- a/tests/WSSecurity/XML/sp/RequireAppliesToTest.php
+++ b/tests/WSSecurity/XML/sp/RequireAppliesToTest.php
@@ -5,6 +5,7 @@
 namespace SimpleSAML\Test\WSSecurity\XML\sp;
 
 use PHPUnit\Framework\Attributes\CoversClass;
+use PHPUnit\Framework\Attributes\Group;
 use PHPUnit\Framework\TestCase;
 use SimpleSAML\WSSecurity\XML\sp\AbstractQNameAssertionType;
 use SimpleSAML\WSSecurity\XML\sp\AbstractSpElement;
@@ -20,6 +21,7 @@
  *
  * @package simplesamlphp/ws-security
  */
+#[Group('sp')]
 #[CoversClass(RequireAppliesTo::class)]
 #[CoversClass(AbstractQNameAssertionType::class)]
 #[CoversClass(AbstractSpElement::class)]
diff --git a/tests/WSSecurity/XML/sp/RequireClientCertificateTest.php b/tests/WSSecurity/XML/sp/RequireClientCertificateTest.php
index abf41cd6..1b92c460 100644
--- a/tests/WSSecurity/XML/sp/RequireClientCertificateTest.php
+++ b/tests/WSSecurity/XML/sp/RequireClientCertificateTest.php
@@ -5,6 +5,7 @@
 namespace SimpleSAML\Test\WSSecurity\XML\sp;
 
 use PHPUnit\Framework\Attributes\CoversClass;
+use PHPUnit\Framework\Attributes\Group;
 use PHPUnit\Framework\TestCase;
 use SimpleSAML\WSSecurity\XML\sp\AbstractQNameAssertionType;
 use SimpleSAML\WSSecurity\XML\sp\AbstractSpElement;
@@ -20,6 +21,7 @@
  *
  * @package simplesamlphp/ws-security
  */
+#[Group('sp')]
 #[CoversClass(RequireClientCertificate::class)]
 #[CoversClass(AbstractQNameAssertionType::class)]
 #[CoversClass(AbstractSpElement::class)]
diff --git a/tests/WSSecurity/XML/sp/RequireClientEntropyTest.php b/tests/WSSecurity/XML/sp/RequireClientEntropyTest.php
index db78cf9c..d666e419 100644
--- a/tests/WSSecurity/XML/sp/RequireClientEntropyTest.php
+++ b/tests/WSSecurity/XML/sp/RequireClientEntropyTest.php
@@ -5,6 +5,7 @@
 namespace SimpleSAML\Test\WSSecurity\XML\sp;
 
 use PHPUnit\Framework\Attributes\CoversClass;
+use PHPUnit\Framework\Attributes\Group;
 use PHPUnit\Framework\TestCase;
 use SimpleSAML\WSSecurity\XML\sp\AbstractQNameAssertionType;
 use SimpleSAML\WSSecurity\XML\sp\AbstractSpElement;
@@ -20,6 +21,7 @@
  *
  * @package simplesamlphp/ws-security
  */
+#[Group('sp')]
 #[CoversClass(RequireClientEntropy::class)]
 #[CoversClass(AbstractQNameAssertionType::class)]
 #[CoversClass(AbstractSpElement::class)]
diff --git a/tests/WSSecurity/XML/sp/RequireDerivedKeysTest.php b/tests/WSSecurity/XML/sp/RequireDerivedKeysTest.php
index 41c4167f..ce79fab0 100644
--- a/tests/WSSecurity/XML/sp/RequireDerivedKeysTest.php
+++ b/tests/WSSecurity/XML/sp/RequireDerivedKeysTest.php
@@ -5,6 +5,7 @@
 namespace SimpleSAML\Test\WSSecurity\XML\sp;
 
 use PHPUnit\Framework\Attributes\CoversClass;
+use PHPUnit\Framework\Attributes\Group;
 use PHPUnit\Framework\TestCase;
 use SimpleSAML\WSSecurity\XML\sp\AbstractQNameAssertionType;
 use SimpleSAML\WSSecurity\XML\sp\AbstractSpElement;
@@ -20,6 +21,7 @@
  *
  * @package simplesamlphp/ws-security
  */
+#[Group('sp')]
 #[CoversClass(RequireDerivedKeys::class)]
 #[CoversClass(AbstractQNameAssertionType::class)]
 #[CoversClass(AbstractSpElement::class)]
diff --git a/tests/WSSecurity/XML/sp/RequireEmbeddedTokenReferenceTest.php b/tests/WSSecurity/XML/sp/RequireEmbeddedTokenReferenceTest.php
index 4f2dd02c..cc04437a 100644
--- a/tests/WSSecurity/XML/sp/RequireEmbeddedTokenReferenceTest.php
+++ b/tests/WSSecurity/XML/sp/RequireEmbeddedTokenReferenceTest.php
@@ -5,6 +5,7 @@
 namespace SimpleSAML\Test\WSSecurity\XML\sp;
 
 use PHPUnit\Framework\Attributes\CoversClass;
+use PHPUnit\Framework\Attributes\Group;
 use PHPUnit\Framework\TestCase;
 use SimpleSAML\WSSecurity\XML\sp\AbstractQNameAssertionType;
 use SimpleSAML\WSSecurity\XML\sp\AbstractSpElement;
@@ -20,6 +21,7 @@
  *
  * @package simplesamlphp/ws-security
  */
+#[Group('sp')]
 #[CoversClass(RequireEmbeddedTokenReference::class)]
 #[CoversClass(AbstractQNameAssertionType::class)]
 #[CoversClass(AbstractSpElement::class)]
diff --git a/tests/WSSecurity/XML/sp/RequireExplicitDerivedKeysTest.php b/tests/WSSecurity/XML/sp/RequireExplicitDerivedKeysTest.php
index 596fcd4b..33cbf4fa 100644
--- a/tests/WSSecurity/XML/sp/RequireExplicitDerivedKeysTest.php
+++ b/tests/WSSecurity/XML/sp/RequireExplicitDerivedKeysTest.php
@@ -5,6 +5,7 @@
 namespace SimpleSAML\Test\WSSecurity\XML\sp;
 
 use PHPUnit\Framework\Attributes\CoversClass;
+use PHPUnit\Framework\Attributes\Group;
 use PHPUnit\Framework\TestCase;
 use SimpleSAML\WSSecurity\XML\sp\AbstractQNameAssertionType;
 use SimpleSAML\WSSecurity\XML\sp\AbstractSpElement;
@@ -20,6 +21,7 @@
  *
  * @package simplesamlphp/ws-security
  */
+#[Group('sp')]
 #[CoversClass(RequireExplicitDerivedKeys::class)]
 #[CoversClass(AbstractQNameAssertionType::class)]
 #[CoversClass(AbstractSpElement::class)]
diff --git a/tests/WSSecurity/XML/sp/RequireExternalUriReferenceTest.php b/tests/WSSecurity/XML/sp/RequireExternalUriReferenceTest.php
index 446d0522..9e44181f 100644
--- a/tests/WSSecurity/XML/sp/RequireExternalUriReferenceTest.php
+++ b/tests/WSSecurity/XML/sp/RequireExternalUriReferenceTest.php
@@ -5,6 +5,7 @@
 namespace SimpleSAML\Test\WSSecurity\XML\sp;
 
 use PHPUnit\Framework\Attributes\CoversClass;
+use PHPUnit\Framework\Attributes\Group;
 use PHPUnit\Framework\TestCase;
 use SimpleSAML\WSSecurity\XML\sp\AbstractQNameAssertionType;
 use SimpleSAML\WSSecurity\XML\sp\AbstractSpElement;
@@ -20,6 +21,7 @@
  *
  * @package simplesamlphp/ws-security
  */
+#[Group('sp')]
 #[CoversClass(RequireExternalUriReference::class)]
 #[CoversClass(AbstractQNameAssertionType::class)]
 #[CoversClass(AbstractSpElement::class)]
diff --git a/tests/WSSecurity/XML/sp/RequireImpliedDerivedKeysTest.php b/tests/WSSecurity/XML/sp/RequireImpliedDerivedKeysTest.php
index ba3e743e..172f4147 100644
--- a/tests/WSSecurity/XML/sp/RequireImpliedDerivedKeysTest.php
+++ b/tests/WSSecurity/XML/sp/RequireImpliedDerivedKeysTest.php
@@ -5,6 +5,7 @@
 namespace SimpleSAML\Test\WSSecurity\XML\sp;
 
 use PHPUnit\Framework\Attributes\CoversClass;
+use PHPUnit\Framework\Attributes\Group;
 use PHPUnit\Framework\TestCase;
 use SimpleSAML\WSSecurity\XML\sp\AbstractQNameAssertionType;
 use SimpleSAML\WSSecurity\XML\sp\AbstractSpElement;
@@ -20,6 +21,7 @@
  *
  * @package simplesamlphp/ws-security
  */
+#[Group('sp')]
 #[CoversClass(RequireImpliedDerivedKeys::class)]
 #[CoversClass(AbstractQNameAssertionType::class)]
 #[CoversClass(AbstractSpElement::class)]
diff --git a/tests/WSSecurity/XML/sp/RequireInternalReferenceTest.php b/tests/WSSecurity/XML/sp/RequireInternalReferenceTest.php
index c8a6f3d2..1c25b5bf 100644
--- a/tests/WSSecurity/XML/sp/RequireInternalReferenceTest.php
+++ b/tests/WSSecurity/XML/sp/RequireInternalReferenceTest.php
@@ -5,6 +5,7 @@
 namespace SimpleSAML\Test\WSSecurity\XML\sp;
 
 use PHPUnit\Framework\Attributes\CoversClass;
+use PHPUnit\Framework\Attributes\Group;
 use PHPUnit\Framework\TestCase;
 use SimpleSAML\WSSecurity\XML\sp\AbstractQNameAssertionType;
 use SimpleSAML\WSSecurity\XML\sp\AbstractSpElement;
@@ -20,6 +21,7 @@
  *
  * @package simplesamlphp/ws-security
  */
+#[Group('sp')]
 #[CoversClass(RequireInternalReference::class)]
 #[CoversClass(AbstractQNameAssertionType::class)]
 #[CoversClass(AbstractSpElement::class)]
diff --git a/tests/WSSecurity/XML/sp/RequireIssuerSerialReferenceTest.php b/tests/WSSecurity/XML/sp/RequireIssuerSerialReferenceTest.php
index 231af10b..8e2deabb 100644
--- a/tests/WSSecurity/XML/sp/RequireIssuerSerialReferenceTest.php
+++ b/tests/WSSecurity/XML/sp/RequireIssuerSerialReferenceTest.php
@@ -5,6 +5,7 @@
 namespace SimpleSAML\Test\WSSecurity\XML\sp;
 
 use PHPUnit\Framework\Attributes\CoversClass;
+use PHPUnit\Framework\Attributes\Group;
 use PHPUnit\Framework\TestCase;
 use SimpleSAML\WSSecurity\XML\sp\AbstractQNameAssertionType;
 use SimpleSAML\WSSecurity\XML\sp\AbstractSpElement;
@@ -20,6 +21,7 @@
  *
  * @package simplesamlphp/ws-security
  */
+#[Group('sp')]
 #[CoversClass(RequireIssuerSerialReference::class)]
 #[CoversClass(AbstractQNameAssertionType::class)]
 #[CoversClass(AbstractSpElement::class)]
diff --git a/tests/WSSecurity/XML/sp/RequireKeyIdentifierReferenceTest.php b/tests/WSSecurity/XML/sp/RequireKeyIdentifierReferenceTest.php
index d8d98e08..3c504f99 100644
--- a/tests/WSSecurity/XML/sp/RequireKeyIdentifierReferenceTest.php
+++ b/tests/WSSecurity/XML/sp/RequireKeyIdentifierReferenceTest.php
@@ -5,6 +5,7 @@
 namespace SimpleSAML\Test\WSSecurity\XML\sp;
 
 use PHPUnit\Framework\Attributes\CoversClass;
+use PHPUnit\Framework\Attributes\Group;
 use PHPUnit\Framework\TestCase;
 use SimpleSAML\WSSecurity\XML\sp\AbstractQNameAssertionType;
 use SimpleSAML\WSSecurity\XML\sp\AbstractSpElement;
@@ -20,6 +21,7 @@
  *
  * @package simplesamlphp/ws-security
  */
+#[Group('sp')]
 #[CoversClass(RequireKeyIdentifierReference::class)]
 #[CoversClass(AbstractQNameAssertionType::class)]
 #[CoversClass(AbstractSpElement::class)]
diff --git a/tests/WSSecurity/XML/sp/RequireRequestSecurityTokenCollectionTest.php b/tests/WSSecurity/XML/sp/RequireRequestSecurityTokenCollectionTest.php
index ab98c259..cbb273c9 100644
--- a/tests/WSSecurity/XML/sp/RequireRequestSecurityTokenCollectionTest.php
+++ b/tests/WSSecurity/XML/sp/RequireRequestSecurityTokenCollectionTest.php
@@ -5,6 +5,7 @@
 namespace SimpleSAML\Test\WSSecurity\XML\sp;
 
 use PHPUnit\Framework\Attributes\CoversClass;
+use PHPUnit\Framework\Attributes\Group;
 use PHPUnit\Framework\TestCase;
 use SimpleSAML\WSSecurity\XML\sp\AbstractQNameAssertionType;
 use SimpleSAML\WSSecurity\XML\sp\AbstractSpElement;
@@ -20,6 +21,7 @@
  *
  * @package simplesamlphp/ws-security
  */
+#[Group('sp')]
 #[CoversClass(RequireRequestSecurityTokenCollection::class)]
 #[CoversClass(AbstractQNameAssertionType::class)]
 #[CoversClass(AbstractSpElement::class)]
diff --git a/tests/WSSecurity/XML/sp/RequireServerEntropyTest.php b/tests/WSSecurity/XML/sp/RequireServerEntropyTest.php
index b8fa30af..59bcc94b 100644
--- a/tests/WSSecurity/XML/sp/RequireServerEntropyTest.php
+++ b/tests/WSSecurity/XML/sp/RequireServerEntropyTest.php
@@ -5,6 +5,7 @@
 namespace SimpleSAML\Test\WSSecurity\XML\sp;
 
 use PHPUnit\Framework\Attributes\CoversClass;
+use PHPUnit\Framework\Attributes\Group;
 use PHPUnit\Framework\TestCase;
 use SimpleSAML\WSSecurity\XML\sp\AbstractQNameAssertionType;
 use SimpleSAML\WSSecurity\XML\sp\AbstractSpElement;
@@ -20,6 +21,7 @@
  *
  * @package simplesamlphp/ws-security
  */
+#[Group('sp')]
 #[CoversClass(RequireServerEntropy::class)]
 #[CoversClass(AbstractQNameAssertionType::class)]
 #[CoversClass(AbstractSpElement::class)]
diff --git a/tests/WSSecurity/XML/sp/RequireSignatureConfirmationTest.php b/tests/WSSecurity/XML/sp/RequireSignatureConfirmationTest.php
index e30a865a..3ec30c8a 100644
--- a/tests/WSSecurity/XML/sp/RequireSignatureConfirmationTest.php
+++ b/tests/WSSecurity/XML/sp/RequireSignatureConfirmationTest.php
@@ -5,6 +5,7 @@
 namespace SimpleSAML\Test\WSSecurity\XML\sp;
 
 use PHPUnit\Framework\Attributes\CoversClass;
+use PHPUnit\Framework\Attributes\Group;
 use PHPUnit\Framework\TestCase;
 use SimpleSAML\WSSecurity\XML\sp\AbstractQNameAssertionType;
 use SimpleSAML\WSSecurity\XML\sp\AbstractSpElement;
@@ -20,6 +21,7 @@
  *
  * @package simplesamlphp/ws-security
  */
+#[Group('sp')]
 #[CoversClass(RequireSignatureConfirmation::class)]
 #[CoversClass(AbstractQNameAssertionType::class)]
 #[CoversClass(AbstractSpElement::class)]
diff --git a/tests/WSSecurity/XML/sp/RequireThumbprintReferenceTest.php b/tests/WSSecurity/XML/sp/RequireThumbprintReferenceTest.php
index ad98a9d3..b57da007 100644
--- a/tests/WSSecurity/XML/sp/RequireThumbprintReferenceTest.php
+++ b/tests/WSSecurity/XML/sp/RequireThumbprintReferenceTest.php
@@ -5,6 +5,7 @@
 namespace SimpleSAML\Test\WSSecurity\XML\sp;
 
 use PHPUnit\Framework\Attributes\CoversClass;
+use PHPUnit\Framework\Attributes\Group;
 use PHPUnit\Framework\TestCase;
 use SimpleSAML\WSSecurity\XML\sp\AbstractQNameAssertionType;
 use SimpleSAML\WSSecurity\XML\sp\AbstractSpElement;
@@ -20,6 +21,7 @@
  *
  * @package simplesamlphp/ws-security
  */
+#[Group('sp')]
 #[CoversClass(RequireThumbprintReference::class)]
 #[CoversClass(AbstractQNameAssertionType::class)]
 #[CoversClass(AbstractSpElement::class)]
diff --git a/tests/WSSecurity/XML/sp/RequiredElementsTest.php b/tests/WSSecurity/XML/sp/RequiredElementsTest.php
index 0c9ef614..5362de09 100644
--- a/tests/WSSecurity/XML/sp/RequiredElementsTest.php
+++ b/tests/WSSecurity/XML/sp/RequiredElementsTest.php
@@ -5,6 +5,7 @@
 namespace SimpleSAML\Test\WSSecurity\XML\sp;
 
 use PHPUnit\Framework\Attributes\CoversClass;
+use PHPUnit\Framework\Attributes\Group;
 use PHPUnit\Framework\TestCase;
 use SimpleSAML\Test\WSSecurity\Constants as C;
 use SimpleSAML\WSSecurity\Utils\XPath as XMLXPath;
@@ -25,6 +26,7 @@
  *
  * @package simplesamlphp/ws-security
  */
+#[Group('sp')]
 #[CoversClass(RequiredElements::class)]
 #[CoversClass(AbstractSerElementsType::class)]
 #[CoversClass(AbstractSpElement::class)]
diff --git a/tests/WSSecurity/XML/sp/RequiredPartsTest.php b/tests/WSSecurity/XML/sp/RequiredPartsTest.php
index d47c2551..f655c501 100644
--- a/tests/WSSecurity/XML/sp/RequiredPartsTest.php
+++ b/tests/WSSecurity/XML/sp/RequiredPartsTest.php
@@ -5,6 +5,7 @@
 namespace SimpleSAML\Test\WSSecurity\XML\sp;
 
 use PHPUnit\Framework\Attributes\CoversClass;
+use PHPUnit\Framework\Attributes\Group;
 use PHPUnit\Framework\TestCase;
 use SimpleSAML\Test\WSSecurity\Constants as C;
 use SimpleSAML\WSSecurity\Utils\XPath;
@@ -25,6 +26,7 @@
  *
  * @package simplesamlphp/ws-security
  */
+#[Group('sp')]
 #[CoversClass(RequiredParts::class)]
 #[CoversClass(AbstractReqPartsType::class)]
 #[CoversClass(AbstractSpElement::class)]
diff --git a/tests/WSSecurity/XML/sp/RsaKeyValueTest.php b/tests/WSSecurity/XML/sp/RsaKeyValueTest.php
index 17a68b7a..9d0e2d5e 100644
--- a/tests/WSSecurity/XML/sp/RsaKeyValueTest.php
+++ b/tests/WSSecurity/XML/sp/RsaKeyValueTest.php
@@ -5,6 +5,7 @@
 namespace SimpleSAML\Test\WSSecurity\XML\sp;
 
 use PHPUnit\Framework\Attributes\CoversClass;
+use PHPUnit\Framework\Attributes\Group;
 use PHPUnit\Framework\TestCase;
 use SimpleSAML\WSSecurity\XML\sp\AbstractQNameAssertionType;
 use SimpleSAML\WSSecurity\XML\sp\AbstractSpElement;
@@ -20,6 +21,7 @@
  *
  * @package simplesamlphp/ws-security
  */
+#[Group('sp')]
 #[CoversClass(RsaKeyValue::class)]
 #[CoversClass(AbstractQNameAssertionType::class)]
 #[CoversClass(AbstractSpElement::class)]
diff --git a/tests/WSSecurity/XML/sp/SC13SecurityContextTokenTest.php b/tests/WSSecurity/XML/sp/SC13SecurityContextTokenTest.php
index edc13179..f757a15c 100644
--- a/tests/WSSecurity/XML/sp/SC13SecurityContextTokenTest.php
+++ b/tests/WSSecurity/XML/sp/SC13SecurityContextTokenTest.php
@@ -5,6 +5,7 @@
 namespace SimpleSAML\Test\WSSecurity\XML\sp;
 
 use PHPUnit\Framework\Attributes\CoversClass;
+use PHPUnit\Framework\Attributes\Group;
 use PHPUnit\Framework\TestCase;
 use SimpleSAML\WSSecurity\XML\sp\AbstractQNameAssertionType;
 use SimpleSAML\WSSecurity\XML\sp\AbstractSpElement;
@@ -20,6 +21,7 @@
  *
  * @package simplesamlphp/ws-security
  */
+#[Group('sp')]
 #[CoversClass(SC13SecurityContextToken::class)]
 #[CoversClass(AbstractQNameAssertionType::class)]
 #[CoversClass(AbstractSpElement::class)]
diff --git a/tests/WSSecurity/XML/sp/SOAPNormalization10Test.php b/tests/WSSecurity/XML/sp/SOAPNormalization10Test.php
index f0fef21c..0f918a52 100644
--- a/tests/WSSecurity/XML/sp/SOAPNormalization10Test.php
+++ b/tests/WSSecurity/XML/sp/SOAPNormalization10Test.php
@@ -5,6 +5,7 @@
 namespace SimpleSAML\Test\WSSecurity\XML\sp;
 
 use PHPUnit\Framework\Attributes\CoversClass;
+use PHPUnit\Framework\Attributes\Group;
 use PHPUnit\Framework\TestCase;
 use SimpleSAML\WSSecurity\XML\sp\AbstractQNameAssertionType;
 use SimpleSAML\WSSecurity\XML\sp\AbstractSpElement;
@@ -20,6 +21,7 @@
  *
  * @package simplesamlphp/ws-security
  */
+#[Group('sp')]
 #[CoversClass(SOAPNormalization10::class)]
 #[CoversClass(AbstractQNameAssertionType::class)]
 #[CoversClass(AbstractSpElement::class)]
diff --git a/tests/WSSecurity/XML/sp/STRTransform10Test.php b/tests/WSSecurity/XML/sp/STRTransform10Test.php
index 76ad807d..6f2b5de9 100644
--- a/tests/WSSecurity/XML/sp/STRTransform10Test.php
+++ b/tests/WSSecurity/XML/sp/STRTransform10Test.php
@@ -5,6 +5,7 @@
 namespace SimpleSAML\Test\WSSecurity\XML\sp;
 
 use PHPUnit\Framework\Attributes\CoversClass;
+use PHPUnit\Framework\Attributes\Group;
 use PHPUnit\Framework\TestCase;
 use SimpleSAML\WSSecurity\XML\sp\AbstractQNameAssertionType;
 use SimpleSAML\WSSecurity\XML\sp\AbstractSpElement;
@@ -20,6 +21,7 @@
  *
  * @package simplesamlphp/ws-security
  */
+#[Group('sp')]
 #[CoversClass(STRTransform10::class)]
 #[CoversClass(AbstractQNameAssertionType::class)]
 #[CoversClass(AbstractSpElement::class)]
diff --git a/tests/WSSecurity/XML/sp/SamlTokenTest.php b/tests/WSSecurity/XML/sp/SamlTokenTest.php
index 0d64ab7a..f8c58262 100644
--- a/tests/WSSecurity/XML/sp/SamlTokenTest.php
+++ b/tests/WSSecurity/XML/sp/SamlTokenTest.php
@@ -5,6 +5,7 @@
 namespace SimpleSAML\Test\WSSecurity\XML\sp;
 
 use PHPUnit\Framework\Attributes\CoversClass;
+use PHPUnit\Framework\Attributes\Group;
 use PHPUnit\Framework\TestCase;
 use SimpleSAML\Test\WSSecurity\Constants as C;
 use SimpleSAML\WSSecurity\XML\sp\AbstractSpElement;
@@ -25,6 +26,7 @@
  *
  * @package simplesamlphp/ws-security
  */
+#[Group('sp')]
 #[CoversClass(SamlToken::class)]
 #[CoversClass(IncludeTokenTypeTrait::class)]
 #[CoversClass(AbstractTokenAssertionType::class)]
diff --git a/tests/WSSecurity/XML/sp/SecureConversationTokenTest.php b/tests/WSSecurity/XML/sp/SecureConversationTokenTest.php
index 1467e43f..6f4d2e72 100644
--- a/tests/WSSecurity/XML/sp/SecureConversationTokenTest.php
+++ b/tests/WSSecurity/XML/sp/SecureConversationTokenTest.php
@@ -5,6 +5,7 @@
 namespace SimpleSAML\Test\WSSecurity\XML\sp;
 
 use PHPUnit\Framework\Attributes\CoversClass;
+use PHPUnit\Framework\Attributes\Group;
 use PHPUnit\Framework\TestCase;
 use SimpleSAML\Test\WSSecurity\Constants as C;
 use SimpleSAML\WSSecurity\Utils\XPath;
@@ -27,6 +28,7 @@
  *
  * @package simplesamlphp/ws-security
  */
+#[Group('sp')]
 #[CoversClass(SecureConversationToken::class)]
 #[CoversClass(IncludeTokenTypeTrait::class)]
 #[CoversClass(AbstractSecureConversationTokenType::class)]
diff --git a/tests/WSSecurity/XML/sp/SecurityContextTokenTest.php b/tests/WSSecurity/XML/sp/SecurityContextTokenTest.php
index 49d3b701..ac2d4fa9 100644
--- a/tests/WSSecurity/XML/sp/SecurityContextTokenTest.php
+++ b/tests/WSSecurity/XML/sp/SecurityContextTokenTest.php
@@ -5,6 +5,7 @@
 namespace SimpleSAML\Test\WSSecurity\XML\sp;
 
 use PHPUnit\Framework\Attributes\CoversClass;
+use PHPUnit\Framework\Attributes\Group;
 use PHPUnit\Framework\TestCase;
 use SimpleSAML\Test\WSSecurity\Constants as C;
 use SimpleSAML\WSSecurity\XML\sp\AbstractSpElement;
@@ -25,6 +26,7 @@
  *
  * @package simplesamlphp/ws-security
  */
+#[Group('sp')]
 #[CoversClass(SecurityContextToken::class)]
 #[CoversClass(IncludeTokenTypeTrait::class)]
 #[CoversClass(AbstractTokenAssertionType::class)]
diff --git a/tests/WSSecurity/XML/sp/SignatureTokenTest.php b/tests/WSSecurity/XML/sp/SignatureTokenTest.php
index 955bac40..af34525f 100644
--- a/tests/WSSecurity/XML/sp/SignatureTokenTest.php
+++ b/tests/WSSecurity/XML/sp/SignatureTokenTest.php
@@ -5,6 +5,7 @@
 namespace SimpleSAML\Test\WSSecurity\XML\sp;
 
 use PHPUnit\Framework\Attributes\CoversClass;
+use PHPUnit\Framework\Attributes\Group;
 use PHPUnit\Framework\TestCase;
 use SimpleSAML\Test\WSSecurity\Constants as C;
 use SimpleSAML\WSSecurity\XML\sp\AbstractNestedPolicyType;
@@ -23,6 +24,7 @@
  *
  * @package simplesamlphp/ws-security
  */
+#[Group('sp')]
 #[CoversClass(SignatureToken::class)]
 #[CoversClass(AbstractNestedPolicyType::class)]
 #[CoversClass(AbstractSpElement::class)]
diff --git a/tests/WSSecurity/XML/sp/SignedElementsTest.php b/tests/WSSecurity/XML/sp/SignedElementsTest.php
index a240cd07..b08dab65 100644
--- a/tests/WSSecurity/XML/sp/SignedElementsTest.php
+++ b/tests/WSSecurity/XML/sp/SignedElementsTest.php
@@ -5,6 +5,7 @@
 namespace SimpleSAML\Test\WSSecurity\XML\sp;
 
 use PHPUnit\Framework\Attributes\CoversClass;
+use PHPUnit\Framework\Attributes\Group;
 use PHPUnit\Framework\TestCase;
 use SimpleSAML\Test\WSSecurity\Constants as C;
 use SimpleSAML\WSSecurity\Utils\XPath as XMLXPath;
@@ -25,6 +26,7 @@
  *
  * @package simplesamlphp/ws-security
  */
+#[Group('sp')]
 #[CoversClass(SignedElements::class)]
 #[CoversClass(AbstractSerElementsType::class)]
 #[CoversClass(AbstractSpElement::class)]
diff --git a/tests/WSSecurity/XML/sp/SignedEncryptedSupportingTokensTest.php b/tests/WSSecurity/XML/sp/SignedEncryptedSupportingTokensTest.php
index 0e4cb7a7..7d9df9b7 100644
--- a/tests/WSSecurity/XML/sp/SignedEncryptedSupportingTokensTest.php
+++ b/tests/WSSecurity/XML/sp/SignedEncryptedSupportingTokensTest.php
@@ -5,6 +5,7 @@
 namespace SimpleSAML\Test\WSSecurity\XML\sp;
 
 use PHPUnit\Framework\Attributes\CoversClass;
+use PHPUnit\Framework\Attributes\Group;
 use PHPUnit\Framework\TestCase;
 use SimpleSAML\Test\WSSecurity\Constants as C;
 use SimpleSAML\WSSecurity\XML\sp\AbstractNestedPolicyType;
@@ -23,6 +24,7 @@
  *
  * @package simplesamlphp/ws-security
  */
+#[Group('sp')]
 #[CoversClass(SignedEncryptedSupportingTokens::class)]
 #[CoversClass(AbstractNestedPolicyType::class)]
 #[CoversClass(AbstractSpElement::class)]
diff --git a/tests/WSSecurity/XML/sp/SignedEndorsingEncryptedSupportingTokensTest.php b/tests/WSSecurity/XML/sp/SignedEndorsingEncryptedSupportingTokensTest.php
index 19423005..40282032 100644
--- a/tests/WSSecurity/XML/sp/SignedEndorsingEncryptedSupportingTokensTest.php
+++ b/tests/WSSecurity/XML/sp/SignedEndorsingEncryptedSupportingTokensTest.php
@@ -5,6 +5,7 @@
 namespace SimpleSAML\Test\WSSecurity\XML\sp;
 
 use PHPUnit\Framework\Attributes\CoversClass;
+use PHPUnit\Framework\Attributes\Group;
 use PHPUnit\Framework\TestCase;
 use SimpleSAML\Test\WSSecurity\Constants as C;
 use SimpleSAML\WSSecurity\XML\sp\AbstractNestedPolicyType;
@@ -23,6 +24,7 @@
  *
  * @package simplesamlphp/ws-security
  */
+#[Group('sp')]
 #[CoversClass(SignedEndorsingEncryptedSupportingTokens::class)]
 #[CoversClass(AbstractNestedPolicyType::class)]
 #[CoversClass(AbstractSpElement::class)]
diff --git a/tests/WSSecurity/XML/sp/SignedEndorsingSupportingTokensTest.php b/tests/WSSecurity/XML/sp/SignedEndorsingSupportingTokensTest.php
index 0da9253d..fe936e95 100644
--- a/tests/WSSecurity/XML/sp/SignedEndorsingSupportingTokensTest.php
+++ b/tests/WSSecurity/XML/sp/SignedEndorsingSupportingTokensTest.php
@@ -5,6 +5,7 @@
 namespace SimpleSAML\Test\WSSecurity\XML\sp;
 
 use PHPUnit\Framework\Attributes\CoversClass;
+use PHPUnit\Framework\Attributes\Group;
 use PHPUnit\Framework\TestCase;
 use SimpleSAML\Test\WSSecurity\Constants as C;
 use SimpleSAML\WSSecurity\XML\sp\AbstractNestedPolicyType;
@@ -23,6 +24,7 @@
  *
  * @package simplesamlphp/ws-security
  */
+#[Group('sp')]
 #[CoversClass(SignedEndorsingSupportingTokens::class)]
 #[CoversClass(AbstractNestedPolicyType::class)]
 #[CoversClass(AbstractSpElement::class)]
diff --git a/tests/WSSecurity/XML/sp/SignedPartsTest.php b/tests/WSSecurity/XML/sp/SignedPartsTest.php
index 8c00faa0..63b86be0 100644
--- a/tests/WSSecurity/XML/sp/SignedPartsTest.php
+++ b/tests/WSSecurity/XML/sp/SignedPartsTest.php
@@ -5,6 +5,7 @@
 namespace SimpleSAML\Test\WSSecurity\XML\sp;
 
 use PHPUnit\Framework\Attributes\CoversClass;
+use PHPUnit\Framework\Attributes\Group;
 use PHPUnit\Framework\TestCase;
 use SimpleSAML\Test\WSSecurity\Constants as C;
 use SimpleSAML\WSSecurity\Utils\XPath;
@@ -27,6 +28,7 @@
  *
  * @package simplesamlphp/ws-security
  */
+#[Group('sp')]
 #[CoversClass(SignedParts::class)]
 #[CoversClass(AbstractSePartsType::class)]
 #[CoversClass(AbstractSpElement::class)]
diff --git a/tests/WSSecurity/XML/sp/SignedSupportingTokensTest.php b/tests/WSSecurity/XML/sp/SignedSupportingTokensTest.php
index e4ec4b02..9a758d6a 100644
--- a/tests/WSSecurity/XML/sp/SignedSupportingTokensTest.php
+++ b/tests/WSSecurity/XML/sp/SignedSupportingTokensTest.php
@@ -5,6 +5,7 @@
 namespace SimpleSAML\Test\WSSecurity\XML\sp;
 
 use PHPUnit\Framework\Attributes\CoversClass;
+use PHPUnit\Framework\Attributes\Group;
 use PHPUnit\Framework\TestCase;
 use SimpleSAML\Test\WSSecurity\Constants as C;
 use SimpleSAML\WSSecurity\XML\sp\AbstractNestedPolicyType;
@@ -23,6 +24,7 @@
  *
  * @package simplesamlphp/ws-security
  */
+#[Group('sp')]
 #[CoversClass(SignedSupportingTokens::class)]
 #[CoversClass(AbstractNestedPolicyType::class)]
 #[CoversClass(AbstractSpElement::class)]
diff --git a/tests/WSSecurity/XML/sp/SpnegoContextTokenTest.php b/tests/WSSecurity/XML/sp/SpnegoContextTokenTest.php
index e13a0873..b32a0372 100644
--- a/tests/WSSecurity/XML/sp/SpnegoContextTokenTest.php
+++ b/tests/WSSecurity/XML/sp/SpnegoContextTokenTest.php
@@ -5,6 +5,7 @@
 namespace SimpleSAML\Test\WSSecurity\XML\sp;
 
 use PHPUnit\Framework\Attributes\CoversClass;
+use PHPUnit\Framework\Attributes\Group;
 use PHPUnit\Framework\TestCase;
 use SimpleSAML\Test\WSSecurity\Constants as C;
 use SimpleSAML\WSSecurity\Utils\XPath;
@@ -27,6 +28,7 @@
  *
  * @package simplesamlphp/ws-security
  */
+#[Group('sp')]
 #[CoversClass(SpnegoContextToken::class)]
 #[CoversClass(IncludeTokenTypeTrait::class)]
 #[CoversClass(AbstractSpnegoContextTokenType::class)]
diff --git a/tests/WSSecurity/XML/sp/StrictTest.php b/tests/WSSecurity/XML/sp/StrictTest.php
index 8f0d181e..e8772790 100644
--- a/tests/WSSecurity/XML/sp/StrictTest.php
+++ b/tests/WSSecurity/XML/sp/StrictTest.php
@@ -5,6 +5,7 @@
 namespace SimpleSAML\Test\WSSecurity\XML\sp;
 
 use PHPUnit\Framework\Attributes\CoversClass;
+use PHPUnit\Framework\Attributes\Group;
 use PHPUnit\Framework\TestCase;
 use SimpleSAML\WSSecurity\XML\sp\AbstractQNameAssertionType;
 use SimpleSAML\WSSecurity\XML\sp\AbstractSpElement;
@@ -20,6 +21,7 @@
  *
  * @package simplesamlphp/ws-security
  */
+#[Group('sp')]
 #[CoversClass(Strict::class)]
 #[CoversClass(AbstractQNameAssertionType::class)]
 #[CoversClass(AbstractSpElement::class)]
diff --git a/tests/WSSecurity/XML/sp/SupportingTokensTest.php b/tests/WSSecurity/XML/sp/SupportingTokensTest.php
index 36d831ca..207edaaa 100644
--- a/tests/WSSecurity/XML/sp/SupportingTokensTest.php
+++ b/tests/WSSecurity/XML/sp/SupportingTokensTest.php
@@ -5,6 +5,7 @@
 namespace SimpleSAML\Test\WSSecurity\XML\sp;
 
 use PHPUnit\Framework\Attributes\CoversClass;
+use PHPUnit\Framework\Attributes\Group;
 use PHPUnit\Framework\TestCase;
 use SimpleSAML\Test\WSSecurity\Constants as C;
 use SimpleSAML\WSSecurity\XML\sp\AbstractNestedPolicyType;
@@ -23,6 +24,7 @@
  *
  * @package simplesamlphp/ws-security
  */
+#[Group('sp')]
 #[CoversClass(SupportingTokens::class)]
 #[CoversClass(AbstractNestedPolicyType::class)]
 #[CoversClass(AbstractSpElement::class)]
diff --git a/tests/WSSecurity/XML/sp/SymmetricBindingTest.php b/tests/WSSecurity/XML/sp/SymmetricBindingTest.php
index b660d172..f4354eac 100644
--- a/tests/WSSecurity/XML/sp/SymmetricBindingTest.php
+++ b/tests/WSSecurity/XML/sp/SymmetricBindingTest.php
@@ -5,6 +5,7 @@
 namespace SimpleSAML\Test\WSSecurity\XML\sp;
 
 use PHPUnit\Framework\Attributes\CoversClass;
+use PHPUnit\Framework\Attributes\Group;
 use PHPUnit\Framework\TestCase;
 use SimpleSAML\Test\WSSecurity\Constants as C;
 use SimpleSAML\WSSecurity\XML\sp\AbstractNestedPolicyType;
@@ -23,6 +24,7 @@
  *
  * @package simplesamlphp/ws-security
  */
+#[Group('sp')]
 #[CoversClass(SymmetricBinding::class)]
 #[CoversClass(AbstractNestedPolicyType::class)]
 #[CoversClass(AbstractSpElement::class)]
diff --git a/tests/WSSecurity/XML/sp/TransportBindingTest.php b/tests/WSSecurity/XML/sp/TransportBindingTest.php
index 4c91ec57..e8b9e435 100644
--- a/tests/WSSecurity/XML/sp/TransportBindingTest.php
+++ b/tests/WSSecurity/XML/sp/TransportBindingTest.php
@@ -5,6 +5,7 @@
 namespace SimpleSAML\Test\WSSecurity\XML\sp;
 
 use PHPUnit\Framework\Attributes\CoversClass;
+use PHPUnit\Framework\Attributes\Group;
 use PHPUnit\Framework\TestCase;
 use SimpleSAML\Test\WSSecurity\Constants as C;
 use SimpleSAML\WSSecurity\XML\sp\AbstractNestedPolicyType;
@@ -23,6 +24,7 @@
  *
  * @package simplesamlphp/ws-security
  */
+#[Group('sp')]
 #[CoversClass(TransportBinding::class)]
 #[CoversClass(AbstractNestedPolicyType::class)]
 #[CoversClass(AbstractSpElement::class)]
diff --git a/tests/WSSecurity/XML/sp/TransportTokenTest.php b/tests/WSSecurity/XML/sp/TransportTokenTest.php
index 60923732..6ad462cc 100644
--- a/tests/WSSecurity/XML/sp/TransportTokenTest.php
+++ b/tests/WSSecurity/XML/sp/TransportTokenTest.php
@@ -5,6 +5,7 @@
 namespace SimpleSAML\Test\WSSecurity\XML\sp;
 
 use PHPUnit\Framework\Attributes\CoversClass;
+use PHPUnit\Framework\Attributes\Group;
 use PHPUnit\Framework\TestCase;
 use SimpleSAML\Test\WSSecurity\Constants as C;
 use SimpleSAML\WSSecurity\XML\sp\AbstractNestedPolicyType;
@@ -23,6 +24,7 @@
  *
  * @package simplesamlphp/ws-security
  */
+#[Group('sp')]
 #[CoversClass(TransportToken::class)]
 #[CoversClass(AbstractNestedPolicyType::class)]
 #[CoversClass(AbstractSpElement::class)]
diff --git a/tests/WSSecurity/XML/sp/TripleDesRsa15Test.php b/tests/WSSecurity/XML/sp/TripleDesRsa15Test.php
index c497ce00..22e32466 100644
--- a/tests/WSSecurity/XML/sp/TripleDesRsa15Test.php
+++ b/tests/WSSecurity/XML/sp/TripleDesRsa15Test.php
@@ -5,6 +5,7 @@
 namespace SimpleSAML\Test\WSSecurity\XML\sp;
 
 use PHPUnit\Framework\Attributes\CoversClass;
+use PHPUnit\Framework\Attributes\Group;
 use PHPUnit\Framework\TestCase;
 use SimpleSAML\WSSecurity\XML\sp\AbstractQNameAssertionType;
 use SimpleSAML\WSSecurity\XML\sp\AbstractSpElement;
@@ -20,6 +21,7 @@
  *
  * @package simplesamlphp/ws-security
  */
+#[Group('sp')]
 #[CoversClass(TripleDesRsa15::class)]
 #[CoversClass(AbstractQNameAssertionType::class)]
 #[CoversClass(AbstractSpElement::class)]
diff --git a/tests/WSSecurity/XML/sp/TripleDesSha256Rsa15Test.php b/tests/WSSecurity/XML/sp/TripleDesSha256Rsa15Test.php
index 4600cf1d..245d9ebb 100644
--- a/tests/WSSecurity/XML/sp/TripleDesSha256Rsa15Test.php
+++ b/tests/WSSecurity/XML/sp/TripleDesSha256Rsa15Test.php
@@ -5,6 +5,7 @@
 namespace SimpleSAML\Test\WSSecurity\XML\sp;
 
 use PHPUnit\Framework\Attributes\CoversClass;
+use PHPUnit\Framework\Attributes\Group;
 use PHPUnit\Framework\TestCase;
 use SimpleSAML\WSSecurity\XML\sp\AbstractQNameAssertionType;
 use SimpleSAML\WSSecurity\XML\sp\AbstractSpElement;
@@ -20,6 +21,7 @@
  *
  * @package simplesamlphp/ws-security
  */
+#[Group('sp')]
 #[CoversClass(TripleDesSha256Rsa15::class)]
 #[CoversClass(AbstractQNameAssertionType::class)]
 #[CoversClass(AbstractSpElement::class)]
diff --git a/tests/WSSecurity/XML/sp/TripleDesSha256Test.php b/tests/WSSecurity/XML/sp/TripleDesSha256Test.php
index 12721cad..6eeff238 100644
--- a/tests/WSSecurity/XML/sp/TripleDesSha256Test.php
+++ b/tests/WSSecurity/XML/sp/TripleDesSha256Test.php
@@ -5,6 +5,7 @@
 namespace SimpleSAML\Test\WSSecurity\XML\sp;
 
 use PHPUnit\Framework\Attributes\CoversClass;
+use PHPUnit\Framework\Attributes\Group;
 use PHPUnit\Framework\TestCase;
 use SimpleSAML\WSSecurity\XML\sp\AbstractQNameAssertionType;
 use SimpleSAML\WSSecurity\XML\sp\AbstractSpElement;
@@ -20,6 +21,7 @@
  *
  * @package simplesamlphp/ws-security
  */
+#[Group('sp')]
 #[CoversClass(TripleDesSha256::class)]
 #[CoversClass(AbstractQNameAssertionType::class)]
 #[CoversClass(AbstractSpElement::class)]
diff --git a/tests/WSSecurity/XML/sp/TripleDesTest.php b/tests/WSSecurity/XML/sp/TripleDesTest.php
index ff943f37..12d40f76 100644
--- a/tests/WSSecurity/XML/sp/TripleDesTest.php
+++ b/tests/WSSecurity/XML/sp/TripleDesTest.php
@@ -5,6 +5,7 @@
 namespace SimpleSAML\Test\WSSecurity\XML\sp;
 
 use PHPUnit\Framework\Attributes\CoversClass;
+use PHPUnit\Framework\Attributes\Group;
 use PHPUnit\Framework\TestCase;
 use SimpleSAML\WSSecurity\XML\sp\AbstractQNameAssertionType;
 use SimpleSAML\WSSecurity\XML\sp\AbstractSpElement;
@@ -20,6 +21,7 @@
  *
  * @package simplesamlphp/ws-security
  */
+#[Group('sp')]
 #[CoversClass(TripleDes::class)]
 #[CoversClass(AbstractQNameAssertionType::class)]
 #[CoversClass(AbstractSpElement::class)]
diff --git a/tests/WSSecurity/XML/sp/Trust13Test.php b/tests/WSSecurity/XML/sp/Trust13Test.php
index 3f853054..cdf4dd84 100644
--- a/tests/WSSecurity/XML/sp/Trust13Test.php
+++ b/tests/WSSecurity/XML/sp/Trust13Test.php
@@ -5,6 +5,7 @@
 namespace SimpleSAML\Test\WSSecurity\XML\sp;
 
 use PHPUnit\Framework\Attributes\CoversClass;
+use PHPUnit\Framework\Attributes\Group;
 use PHPUnit\Framework\TestCase;
 use SimpleSAML\Test\WSSecurity\Constants as C;
 use SimpleSAML\WSSecurity\XML\sp\AbstractNestedPolicyType;
@@ -23,6 +24,7 @@
  *
  * @package simplesamlphp/ws-security
  */
+#[Group('sp')]
 #[CoversClass(Trust13::class)]
 #[CoversClass(AbstractNestedPolicyType::class)]
 #[CoversClass(AbstractSpElement::class)]
diff --git a/tests/WSSecurity/XML/sp/UsernameTokenTest.php b/tests/WSSecurity/XML/sp/UsernameTokenTest.php
index b1818eed..c7f04324 100644
--- a/tests/WSSecurity/XML/sp/UsernameTokenTest.php
+++ b/tests/WSSecurity/XML/sp/UsernameTokenTest.php
@@ -5,6 +5,7 @@
 namespace SimpleSAML\Test\WSSecurity\XML\sp;
 
 use PHPUnit\Framework\Attributes\CoversClass;
+use PHPUnit\Framework\Attributes\Group;
 use PHPUnit\Framework\TestCase;
 use SimpleSAML\Test\WSSecurity\Constants as C;
 use SimpleSAML\WSSecurity\XML\sp\AbstractSpElement;
@@ -25,6 +26,7 @@
  *
  * @package simplesamlphp/ws-security
  */
+#[Group('sp')]
 #[CoversClass(UsernameToken::class)]
 #[CoversClass(IncludeTokenTypeTrait::class)]
 #[CoversClass(AbstractTokenAssertionType::class)]
diff --git a/tests/WSSecurity/XML/sp/Wss10Test.php b/tests/WSSecurity/XML/sp/Wss10Test.php
index 1f0faa59..ab6f206f 100644
--- a/tests/WSSecurity/XML/sp/Wss10Test.php
+++ b/tests/WSSecurity/XML/sp/Wss10Test.php
@@ -5,6 +5,7 @@
 namespace SimpleSAML\Test\WSSecurity\XML\sp;
 
 use PHPUnit\Framework\Attributes\CoversClass;
+use PHPUnit\Framework\Attributes\Group;
 use PHPUnit\Framework\TestCase;
 use SimpleSAML\Test\WSSecurity\Constants as C;
 use SimpleSAML\WSSecurity\XML\sp\AbstractNestedPolicyType;
@@ -23,6 +24,7 @@
  *
  * @package simplesamlphp/ws-security
  */
+#[Group('sp')]
 #[CoversClass(Wss10::class)]
 #[CoversClass(AbstractNestedPolicyType::class)]
 #[CoversClass(AbstractSpElement::class)]
diff --git a/tests/WSSecurity/XML/sp/Wss11Test.php b/tests/WSSecurity/XML/sp/Wss11Test.php
index 81e96f4b..1ac2dbe5 100644
--- a/tests/WSSecurity/XML/sp/Wss11Test.php
+++ b/tests/WSSecurity/XML/sp/Wss11Test.php
@@ -5,6 +5,7 @@
 namespace SimpleSAML\Test\WSSecurity\XML\sp;
 
 use PHPUnit\Framework\Attributes\CoversClass;
+use PHPUnit\Framework\Attributes\Group;
 use PHPUnit\Framework\TestCase;
 use SimpleSAML\Test\WSSecurity\Constants as C;
 use SimpleSAML\WSSecurity\XML\sp\AbstractNestedPolicyType;
@@ -23,6 +24,7 @@
  *
  * @package simplesamlphp/ws-security
  */
+#[Group('sp')]
 #[CoversClass(Wss11::class)]
 #[CoversClass(AbstractNestedPolicyType::class)]
 #[CoversClass(AbstractSpElement::class)]
diff --git a/tests/WSSecurity/XML/sp/WssGssKerberosV5ApReqToken11Test.php b/tests/WSSecurity/XML/sp/WssGssKerberosV5ApReqToken11Test.php
index 3533b173..8c74dbed 100644
--- a/tests/WSSecurity/XML/sp/WssGssKerberosV5ApReqToken11Test.php
+++ b/tests/WSSecurity/XML/sp/WssGssKerberosV5ApReqToken11Test.php
@@ -5,6 +5,7 @@
 namespace SimpleSAML\Test\WSSecurity\XML\sp;
 
 use PHPUnit\Framework\Attributes\CoversClass;
+use PHPUnit\Framework\Attributes\Group;
 use PHPUnit\Framework\TestCase;
 use SimpleSAML\WSSecurity\XML\sp\AbstractQNameAssertionType;
 use SimpleSAML\WSSecurity\XML\sp\AbstractSpElement;
@@ -20,6 +21,7 @@
  *
  * @package simplesamlphp/ws-security
  */
+#[Group('sp')]
 #[CoversClass(WssGssKerberosV5ApReqToken11::class)]
 #[CoversClass(AbstractQNameAssertionType::class)]
 #[CoversClass(AbstractSpElement::class)]
diff --git a/tests/WSSecurity/XML/sp/WssKerberosV5ApReqToken11Test.php b/tests/WSSecurity/XML/sp/WssKerberosV5ApReqToken11Test.php
index 31ff0072..9d4eb28a 100644
--- a/tests/WSSecurity/XML/sp/WssKerberosV5ApReqToken11Test.php
+++ b/tests/WSSecurity/XML/sp/WssKerberosV5ApReqToken11Test.php
@@ -5,6 +5,7 @@
 namespace SimpleSAML\Test\WSSecurity\XML\sp;
 
 use PHPUnit\Framework\Attributes\CoversClass;
+use PHPUnit\Framework\Attributes\Group;
 use PHPUnit\Framework\TestCase;
 use SimpleSAML\WSSecurity\XML\sp\AbstractQNameAssertionType;
 use SimpleSAML\WSSecurity\XML\sp\AbstractSpElement;
@@ -20,6 +21,7 @@
  *
  * @package simplesamlphp/ws-security
  */
+#[Group('sp')]
 #[CoversClass(WssKerberosV5ApReqToken11::class)]
 #[CoversClass(AbstractQNameAssertionType::class)]
 #[CoversClass(AbstractSpElement::class)]
diff --git a/tests/WSSecurity/XML/sp/WssRelV10Token10Test.php b/tests/WSSecurity/XML/sp/WssRelV10Token10Test.php
index 113b42e4..24c56c3f 100644
--- a/tests/WSSecurity/XML/sp/WssRelV10Token10Test.php
+++ b/tests/WSSecurity/XML/sp/WssRelV10Token10Test.php
@@ -5,6 +5,7 @@
 namespace SimpleSAML\Test\WSSecurity\XML\sp;
 
 use PHPUnit\Framework\Attributes\CoversClass;
+use PHPUnit\Framework\Attributes\Group;
 use PHPUnit\Framework\TestCase;
 use SimpleSAML\WSSecurity\XML\sp\AbstractQNameAssertionType;
 use SimpleSAML\WSSecurity\XML\sp\AbstractSpElement;
@@ -20,6 +21,7 @@
  *
  * @package simplesamlphp/ws-security
  */
+#[Group('sp')]
 #[CoversClass(WssRelV10Token10::class)]
 #[CoversClass(AbstractQNameAssertionType::class)]
 #[CoversClass(AbstractSpElement::class)]
diff --git a/tests/WSSecurity/XML/sp/WssRelV10Token11Test.php b/tests/WSSecurity/XML/sp/WssRelV10Token11Test.php
index 975bc483..0bb77709 100644
--- a/tests/WSSecurity/XML/sp/WssRelV10Token11Test.php
+++ b/tests/WSSecurity/XML/sp/WssRelV10Token11Test.php
@@ -5,6 +5,7 @@
 namespace SimpleSAML\Test\WSSecurity\XML\sp;
 
 use PHPUnit\Framework\Attributes\CoversClass;
+use PHPUnit\Framework\Attributes\Group;
 use PHPUnit\Framework\TestCase;
 use SimpleSAML\WSSecurity\XML\sp\AbstractQNameAssertionType;
 use SimpleSAML\WSSecurity\XML\sp\AbstractSpElement;
@@ -20,6 +21,7 @@
  *
  * @package simplesamlphp/ws-security
  */
+#[Group('sp')]
 #[CoversClass(WssRelV10Token11::class)]
 #[CoversClass(AbstractQNameAssertionType::class)]
 #[CoversClass(AbstractSpElement::class)]
diff --git a/tests/WSSecurity/XML/sp/WssRelV20Token10Test.php b/tests/WSSecurity/XML/sp/WssRelV20Token10Test.php
index 75acdbd5..653e4674 100644
--- a/tests/WSSecurity/XML/sp/WssRelV20Token10Test.php
+++ b/tests/WSSecurity/XML/sp/WssRelV20Token10Test.php
@@ -5,6 +5,7 @@
 namespace SimpleSAML\Test\WSSecurity\XML\sp;
 
 use PHPUnit\Framework\Attributes\CoversClass;
+use PHPUnit\Framework\Attributes\Group;
 use PHPUnit\Framework\TestCase;
 use SimpleSAML\WSSecurity\XML\sp\AbstractQNameAssertionType;
 use SimpleSAML\WSSecurity\XML\sp\AbstractSpElement;
@@ -20,6 +21,7 @@
  *
  * @package simplesamlphp/ws-security
  */
+#[Group('sp')]
 #[CoversClass(WssRelV20Token10::class)]
 #[CoversClass(AbstractQNameAssertionType::class)]
 #[CoversClass(AbstractSpElement::class)]
diff --git a/tests/WSSecurity/XML/sp/WssRelV20Token11Test.php b/tests/WSSecurity/XML/sp/WssRelV20Token11Test.php
index 6a2b739f..5cac7252 100644
--- a/tests/WSSecurity/XML/sp/WssRelV20Token11Test.php
+++ b/tests/WSSecurity/XML/sp/WssRelV20Token11Test.php
@@ -5,6 +5,7 @@
 namespace SimpleSAML\Test\WSSecurity\XML\sp;
 
 use PHPUnit\Framework\Attributes\CoversClass;
+use PHPUnit\Framework\Attributes\Group;
 use PHPUnit\Framework\TestCase;
 use SimpleSAML\WSSecurity\XML\sp\AbstractQNameAssertionType;
 use SimpleSAML\WSSecurity\XML\sp\AbstractSpElement;
@@ -20,6 +21,7 @@
  *
  * @package simplesamlphp/ws-security
  */
+#[Group('sp')]
 #[CoversClass(WssRelV20Token11::class)]
 #[CoversClass(AbstractQNameAssertionType::class)]
 #[CoversClass(AbstractSpElement::class)]
diff --git a/tests/WSSecurity/XML/sp/WssSamlV11Token10Test.php b/tests/WSSecurity/XML/sp/WssSamlV11Token10Test.php
index e7221da1..ae8d5253 100644
--- a/tests/WSSecurity/XML/sp/WssSamlV11Token10Test.php
+++ b/tests/WSSecurity/XML/sp/WssSamlV11Token10Test.php
@@ -5,6 +5,7 @@
 namespace SimpleSAML\Test\WSSecurity\XML\sp;
 
 use PHPUnit\Framework\Attributes\CoversClass;
+use PHPUnit\Framework\Attributes\Group;
 use PHPUnit\Framework\TestCase;
 use SimpleSAML\WSSecurity\XML\sp\AbstractQNameAssertionType;
 use SimpleSAML\WSSecurity\XML\sp\AbstractSpElement;
@@ -20,6 +21,7 @@
  *
  * @package simplesamlphp/ws-security
  */
+#[Group('sp')]
 #[CoversClass(WssSamlV11Token10::class)]
 #[CoversClass(AbstractQNameAssertionType::class)]
 #[CoversClass(AbstractSpElement::class)]
diff --git a/tests/WSSecurity/XML/sp/WssSamlV11Token11Test.php b/tests/WSSecurity/XML/sp/WssSamlV11Token11Test.php
index 865bf863..c1ef7081 100644
--- a/tests/WSSecurity/XML/sp/WssSamlV11Token11Test.php
+++ b/tests/WSSecurity/XML/sp/WssSamlV11Token11Test.php
@@ -5,6 +5,7 @@
 namespace SimpleSAML\Test\WSSecurity\XML\sp;
 
 use PHPUnit\Framework\Attributes\CoversClass;
+use PHPUnit\Framework\Attributes\Group;
 use PHPUnit\Framework\TestCase;
 use SimpleSAML\WSSecurity\XML\sp\AbstractQNameAssertionType;
 use SimpleSAML\WSSecurity\XML\sp\AbstractSpElement;
@@ -20,6 +21,7 @@
  *
  * @package simplesamlphp/ws-security
  */
+#[Group('sp')]
 #[CoversClass(WssSamlV11Token11::class)]
 #[CoversClass(AbstractQNameAssertionType::class)]
 #[CoversClass(AbstractSpElement::class)]
diff --git a/tests/WSSecurity/XML/sp/WssSamlV20Token11Test.php b/tests/WSSecurity/XML/sp/WssSamlV20Token11Test.php
index 0df0ba39..9d0a9f98 100644
--- a/tests/WSSecurity/XML/sp/WssSamlV20Token11Test.php
+++ b/tests/WSSecurity/XML/sp/WssSamlV20Token11Test.php
@@ -5,6 +5,7 @@
 namespace SimpleSAML\Test\WSSecurity\XML\sp;
 
 use PHPUnit\Framework\Attributes\CoversClass;
+use PHPUnit\Framework\Attributes\Group;
 use PHPUnit\Framework\TestCase;
 use SimpleSAML\WSSecurity\XML\sp\AbstractQNameAssertionType;
 use SimpleSAML\WSSecurity\XML\sp\AbstractSpElement;
@@ -20,6 +21,7 @@
  *
  * @package simplesamlphp/ws-security
  */
+#[Group('sp')]
 #[CoversClass(WssSamlV20Token11::class)]
 #[CoversClass(AbstractQNameAssertionType::class)]
 #[CoversClass(AbstractSpElement::class)]
diff --git a/tests/WSSecurity/XML/sp/WssUsernameToken10Test.php b/tests/WSSecurity/XML/sp/WssUsernameToken10Test.php
index ca84f3f1..8eaa8b8e 100644
--- a/tests/WSSecurity/XML/sp/WssUsernameToken10Test.php
+++ b/tests/WSSecurity/XML/sp/WssUsernameToken10Test.php
@@ -5,6 +5,7 @@
 namespace SimpleSAML\Test\WSSecurity\XML\sp;
 
 use PHPUnit\Framework\Attributes\CoversClass;
+use PHPUnit\Framework\Attributes\Group;
 use PHPUnit\Framework\TestCase;
 use SimpleSAML\WSSecurity\XML\sp\AbstractQNameAssertionType;
 use SimpleSAML\WSSecurity\XML\sp\AbstractSpElement;
@@ -20,6 +21,7 @@
  *
  * @package simplesamlphp/ws-security
  */
+#[Group('sp')]
 #[CoversClass(WssUsernameToken10::class)]
 #[CoversClass(AbstractQNameAssertionType::class)]
 #[CoversClass(AbstractSpElement::class)]
diff --git a/tests/WSSecurity/XML/sp/WssUsernameToken11Test.php b/tests/WSSecurity/XML/sp/WssUsernameToken11Test.php
index 0432b551..07f9c1b6 100644
--- a/tests/WSSecurity/XML/sp/WssUsernameToken11Test.php
+++ b/tests/WSSecurity/XML/sp/WssUsernameToken11Test.php
@@ -5,6 +5,7 @@
 namespace SimpleSAML\Test\WSSecurity\XML\sp;
 
 use PHPUnit\Framework\Attributes\CoversClass;
+use PHPUnit\Framework\Attributes\Group;
 use PHPUnit\Framework\TestCase;
 use SimpleSAML\WSSecurity\XML\sp\AbstractQNameAssertionType;
 use SimpleSAML\WSSecurity\XML\sp\AbstractSpElement;
@@ -20,6 +21,7 @@
  *
  * @package simplesamlphp/ws-security
  */
+#[Group('sp')]
 #[CoversClass(WssUsernameToken11::class)]
 #[CoversClass(AbstractQNameAssertionType::class)]
 #[CoversClass(AbstractSpElement::class)]
diff --git a/tests/WSSecurity/XML/sp/WssX509Pkcs7Token10Test.php b/tests/WSSecurity/XML/sp/WssX509Pkcs7Token10Test.php
index 01871b4c..1636d331 100644
--- a/tests/WSSecurity/XML/sp/WssX509Pkcs7Token10Test.php
+++ b/tests/WSSecurity/XML/sp/WssX509Pkcs7Token10Test.php
@@ -5,6 +5,7 @@
 namespace SimpleSAML\Test\WSSecurity\XML\sp;
 
 use PHPUnit\Framework\Attributes\CoversClass;
+use PHPUnit\Framework\Attributes\Group;
 use PHPUnit\Framework\TestCase;
 use SimpleSAML\WSSecurity\XML\sp\AbstractQNameAssertionType;
 use SimpleSAML\WSSecurity\XML\sp\AbstractSpElement;
@@ -20,6 +21,7 @@
  *
  * @package simplesamlphp/ws-security
  */
+#[Group('sp')]
 #[CoversClass(WssX509Pkcs7Token10Test::class)]
 #[CoversClass(AbstractQNameAssertionType::class)]
 #[CoversClass(AbstractSpElement::class)]
diff --git a/tests/WSSecurity/XML/sp/WssX509Pkcs7Token11Test.php b/tests/WSSecurity/XML/sp/WssX509Pkcs7Token11Test.php
index 463342c4..c705e94a 100644
--- a/tests/WSSecurity/XML/sp/WssX509Pkcs7Token11Test.php
+++ b/tests/WSSecurity/XML/sp/WssX509Pkcs7Token11Test.php
@@ -5,6 +5,7 @@
 namespace SimpleSAML\Test\WSSecurity\XML\sp;
 
 use PHPUnit\Framework\Attributes\CoversClass;
+use PHPUnit\Framework\Attributes\Group;
 use PHPUnit\Framework\TestCase;
 use SimpleSAML\WSSecurity\XML\sp\AbstractQNameAssertionType;
 use SimpleSAML\WSSecurity\XML\sp\AbstractSpElement;
@@ -20,6 +21,7 @@
  *
  * @package simplesamlphp/ws-security
  */
+#[Group('sp')]
 #[CoversClass(WssX509Pkcs7Token11::class)]
 #[CoversClass(AbstractQNameAssertionType::class)]
 #[CoversClass(AbstractSpElement::class)]
diff --git a/tests/WSSecurity/XML/sp/WssX509PkiPathV1Token10Test.php b/tests/WSSecurity/XML/sp/WssX509PkiPathV1Token10Test.php
index 80855592..9a6a62c0 100644
--- a/tests/WSSecurity/XML/sp/WssX509PkiPathV1Token10Test.php
+++ b/tests/WSSecurity/XML/sp/WssX509PkiPathV1Token10Test.php
@@ -5,6 +5,7 @@
 namespace SimpleSAML\Test\WSSecurity\XML\sp;
 
 use PHPUnit\Framework\Attributes\CoversClass;
+use PHPUnit\Framework\Attributes\Group;
 use PHPUnit\Framework\TestCase;
 use SimpleSAML\WSSecurity\XML\sp\AbstractQNameAssertionType;
 use SimpleSAML\WSSecurity\XML\sp\AbstractSpElement;
@@ -20,6 +21,7 @@
  *
  * @package simplesamlphp/ws-security
  */
+#[Group('sp')]
 #[CoversClass(WssX509PkiPathV1Token10::class)]
 #[CoversClass(AbstractQNameAssertionType::class)]
 #[CoversClass(AbstractSpElement::class)]
diff --git a/tests/WSSecurity/XML/sp/WssX509PkiPathV1Token11Test.php b/tests/WSSecurity/XML/sp/WssX509PkiPathV1Token11Test.php
index d4cd4d60..768419f9 100644
--- a/tests/WSSecurity/XML/sp/WssX509PkiPathV1Token11Test.php
+++ b/tests/WSSecurity/XML/sp/WssX509PkiPathV1Token11Test.php
@@ -5,6 +5,7 @@
 namespace SimpleSAML\Test\WSSecurity\XML\sp;
 
 use PHPUnit\Framework\Attributes\CoversClass;
+use PHPUnit\Framework\Attributes\Group;
 use PHPUnit\Framework\TestCase;
 use SimpleSAML\WSSecurity\XML\sp\AbstractQNameAssertionType;
 use SimpleSAML\WSSecurity\XML\sp\AbstractSpElement;
@@ -20,6 +21,7 @@
  *
  * @package simplesamlphp/ws-security
  */
+#[Group('sp')]
 #[CoversClass(WssX509PkiPathV1Token11::class)]
 #[CoversClass(AbstractQNameAssertionType::class)]
 #[CoversClass(AbstractSpElement::class)]
diff --git a/tests/WSSecurity/XML/sp/WssX509V1Token11Test.php b/tests/WSSecurity/XML/sp/WssX509V1Token11Test.php
index 3bcaf9b9..94a8d8a9 100644
--- a/tests/WSSecurity/XML/sp/WssX509V1Token11Test.php
+++ b/tests/WSSecurity/XML/sp/WssX509V1Token11Test.php
@@ -5,6 +5,7 @@
 namespace SimpleSAML\Test\WSSecurity\XML\sp;
 
 use PHPUnit\Framework\Attributes\CoversClass;
+use PHPUnit\Framework\Attributes\Group;
 use PHPUnit\Framework\TestCase;
 use SimpleSAML\WSSecurity\XML\sp\AbstractQNameAssertionType;
 use SimpleSAML\WSSecurity\XML\sp\AbstractSpElement;
@@ -20,6 +21,7 @@
  *
  * @package simplesamlphp/ws-security
  */
+#[Group('sp')]
 #[CoversClass(WssX509V1Token11::class)]
 #[CoversClass(AbstractQNameAssertionType::class)]
 #[CoversClass(AbstractSpElement::class)]
diff --git a/tests/WSSecurity/XML/sp/WssX509V3Token10Test.php b/tests/WSSecurity/XML/sp/WssX509V3Token10Test.php
index fb93b02c..4548c71b 100644
--- a/tests/WSSecurity/XML/sp/WssX509V3Token10Test.php
+++ b/tests/WSSecurity/XML/sp/WssX509V3Token10Test.php
@@ -5,6 +5,7 @@
 namespace SimpleSAML\Test\WSSecurity\XML\sp;
 
 use PHPUnit\Framework\Attributes\CoversClass;
+use PHPUnit\Framework\Attributes\Group;
 use PHPUnit\Framework\TestCase;
 use SimpleSAML\WSSecurity\XML\sp\AbstractQNameAssertionType;
 use SimpleSAML\WSSecurity\XML\sp\AbstractSpElement;
@@ -20,6 +21,7 @@
  *
  * @package simplesamlphp/ws-security
  */
+#[Group('sp')]
 #[CoversClass(WssX509V3Token10::class)]
 #[CoversClass(AbstractQNameAssertionType::class)]
 #[CoversClass(AbstractSpElement::class)]
diff --git a/tests/WSSecurity/XML/sp/WssX509V3Token11Test.php b/tests/WSSecurity/XML/sp/WssX509V3Token11Test.php
index fa72a716..425c6f8a 100644
--- a/tests/WSSecurity/XML/sp/WssX509V3Token11Test.php
+++ b/tests/WSSecurity/XML/sp/WssX509V3Token11Test.php
@@ -5,6 +5,7 @@
 namespace SimpleSAML\Test\WSSecurity\XML\sp;
 
 use PHPUnit\Framework\Attributes\CoversClass;
+use PHPUnit\Framework\Attributes\Group;
 use PHPUnit\Framework\TestCase;
 use SimpleSAML\WSSecurity\XML\sp\AbstractQNameAssertionType;
 use SimpleSAML\WSSecurity\XML\sp\AbstractSpElement;
@@ -20,6 +21,7 @@
  *
  * @package simplesamlphp/ws-security
  */
+#[Group('sp')]
 #[CoversClass(WssX509V3Token11::class)]
 #[CoversClass(AbstractQNameAssertionType::class)]
 #[CoversClass(AbstractSpElement::class)]
diff --git a/tests/WSSecurity/XML/sp/X509TokenTest.php b/tests/WSSecurity/XML/sp/X509TokenTest.php
index 2af08986..ea191654 100644
--- a/tests/WSSecurity/XML/sp/X509TokenTest.php
+++ b/tests/WSSecurity/XML/sp/X509TokenTest.php
@@ -5,6 +5,7 @@
 namespace SimpleSAML\Test\WSSecurity\XML\sp;
 
 use PHPUnit\Framework\Attributes\CoversClass;
+use PHPUnit\Framework\Attributes\Group;
 use PHPUnit\Framework\TestCase;
 use SimpleSAML\Test\WSSecurity\Constants as C;
 use SimpleSAML\WSSecurity\XML\sp\AbstractSpElement;
@@ -25,6 +26,7 @@
  *
  * @package simplesamlphp/ws-security
  */
+#[Group('sp')]
 #[CoversClass(X509Token::class)]
 #[CoversClass(IncludeTokenTypeTrait::class)]
 #[CoversClass(AbstractTokenAssertionType::class)]
diff --git a/tests/WSSecurity/XML/sp/XPath10Test.php b/tests/WSSecurity/XML/sp/XPath10Test.php
index 50b82946..fd8cc38c 100644
--- a/tests/WSSecurity/XML/sp/XPath10Test.php
+++ b/tests/WSSecurity/XML/sp/XPath10Test.php
@@ -5,6 +5,7 @@
 namespace SimpleSAML\Test\WSSecurity\XML\sp;
 
 use PHPUnit\Framework\Attributes\CoversClass;
+use PHPUnit\Framework\Attributes\Group;
 use PHPUnit\Framework\TestCase;
 use SimpleSAML\WSSecurity\XML\sp\AbstractQNameAssertionType;
 use SimpleSAML\WSSecurity\XML\sp\AbstractSpElement;
@@ -20,6 +21,7 @@
  *
  * @package simplesamlphp/ws-security
  */
+#[Group('sp')]
 #[CoversClass(XPath10::class)]
 #[CoversClass(AbstractQNameAssertionType::class)]
 #[CoversClass(AbstractSpElement::class)]
diff --git a/tests/WSSecurity/XML/sp/XPathFilter20Test.php b/tests/WSSecurity/XML/sp/XPathFilter20Test.php
index 29d52ade..29bf905a 100644
--- a/tests/WSSecurity/XML/sp/XPathFilter20Test.php
+++ b/tests/WSSecurity/XML/sp/XPathFilter20Test.php
@@ -5,6 +5,7 @@
 namespace SimpleSAML\Test\WSSecurity\XML\sp;
 
 use PHPUnit\Framework\Attributes\CoversClass;
+use PHPUnit\Framework\Attributes\Group;
 use PHPUnit\Framework\TestCase;
 use SimpleSAML\WSSecurity\XML\sp\AbstractQNameAssertionType;
 use SimpleSAML\WSSecurity\XML\sp\AbstractSpElement;
@@ -20,6 +21,7 @@
  *
  * @package simplesamlphp/ws-security
  */
+#[Group('sp')]
 #[CoversClass(XPathFilter20::class)]
 #[CoversClass(AbstractQNameAssertionType::class)]
 #[CoversClass(AbstractSpElement::class)]
diff --git a/tests/WSSecurity/XML/sp/XPathTest.php b/tests/WSSecurity/XML/sp/XPathTest.php
index 20314de5..03d92a58 100644
--- a/tests/WSSecurity/XML/sp/XPathTest.php
+++ b/tests/WSSecurity/XML/sp/XPathTest.php
@@ -5,6 +5,7 @@
 namespace SimpleSAML\Test\WSSecurity\XML\sp;
 
 use PHPUnit\Framework\Attributes\CoversClass;
+use PHPUnit\Framework\Attributes\Group;
 use PHPUnit\Framework\TestCase;
 use SimpleSAML\WSSecurity\XML\sp\AbstractSpElement;
 use SimpleSAML\WSSecurity\XML\sp\XPath;
@@ -19,6 +20,7 @@
  *
  * @package simplesamlphp/ws-security
  */
+#[Group('sp')]
 #[CoversClass(XPath::class)]
 #[CoversClass(AbstractSpElement::class)]
 final class XPathTest extends TestCase
diff --git a/tests/WSSecurity/XML/wsa/ActionTest.php b/tests/WSSecurity/XML/wsa/ActionTest.php
index ddad5429..c3ffcb9b 100644
--- a/tests/WSSecurity/XML/wsa/ActionTest.php
+++ b/tests/WSSecurity/XML/wsa/ActionTest.php
@@ -5,6 +5,7 @@
 namespace SimpleSAML\Test\WSSecurity\XML\wsa;
 
 use PHPUnit\Framework\Attributes\CoversClass;
+use PHPUnit\Framework\Attributes\Group;
 use PHPUnit\Framework\TestCase;
 use SimpleSAML\WSSecurity\XML\wsa\AbstractAttributedURIType;
 use SimpleSAML\WSSecurity\XML\wsa\AbstractWsaElement;
@@ -22,6 +23,7 @@
  *
  * @package simplesamlphp/ws-security
  */
+#[Group('wsa')]
 #[CoversClass(Action::class)]
 #[CoversClass(AbstractAttributedURIType::class)]
 #[CoversClass(AbstractWsaElement::class)]
diff --git a/tests/WSSecurity/XML/wsa/AddressTest.php b/tests/WSSecurity/XML/wsa/AddressTest.php
index fb875029..f99a445e 100644
--- a/tests/WSSecurity/XML/wsa/AddressTest.php
+++ b/tests/WSSecurity/XML/wsa/AddressTest.php
@@ -5,6 +5,7 @@
 namespace SimpleSAML\Test\WSSecurity\XML\wsa;
 
 use PHPUnit\Framework\Attributes\CoversClass;
+use PHPUnit\Framework\Attributes\Group;
 use PHPUnit\Framework\TestCase;
 use SimpleSAML\WSSecurity\XML\wsa\AbstractAttributedURIType;
 use SimpleSAML\WSSecurity\XML\wsa\AbstractWsaElement;
@@ -21,6 +22,7 @@
  *
  * @package simplesamlphp/ws-security
  */
+#[Group('wsa')]
 #[CoversClass(Address::class)]
 #[CoversClass(AbstractAttributedURIType::class)]
 #[CoversClass(AbstractWsaElement::class)]
diff --git a/tests/WSSecurity/XML/wsa/EndpointReferenceTest.php b/tests/WSSecurity/XML/wsa/EndpointReferenceTest.php
index 251a0b74..0874c4cf 100644
--- a/tests/WSSecurity/XML/wsa/EndpointReferenceTest.php
+++ b/tests/WSSecurity/XML/wsa/EndpointReferenceTest.php
@@ -6,6 +6,7 @@
 
 use DOMElement;
 use PHPUnit\Framework\Attributes\CoversClass;
+use PHPUnit\Framework\Attributes\Group;
 use PHPUnit\Framework\TestCase;
 use SimpleSAML\WSSecurity\XML\wsa\AbstractEndpointReferenceType;
 use SimpleSAML\WSSecurity\XML\wsa\AbstractWsaElement;
@@ -27,6 +28,7 @@
  *
  * @package simplesamlphp/ws-security
  */
+#[Group('wsa')]
 #[CoversClass(EndpointReference::class)]
 #[CoversClass(AbstractEndpointReferenceType::class)]
 #[CoversClass(AbstractWsaElement::class)]
diff --git a/tests/WSSecurity/XML/wsa/FaultToTest.php b/tests/WSSecurity/XML/wsa/FaultToTest.php
index 268b82fd..87557ba7 100644
--- a/tests/WSSecurity/XML/wsa/FaultToTest.php
+++ b/tests/WSSecurity/XML/wsa/FaultToTest.php
@@ -6,6 +6,7 @@
 
 use DOMElement;
 use PHPUnit\Framework\Attributes\CoversClass;
+use PHPUnit\Framework\Attributes\Group;
 use PHPUnit\Framework\TestCase;
 use SimpleSAML\WSSecurity\XML\wsa\AbstractEndpointReferenceType;
 use SimpleSAML\WSSecurity\XML\wsa\AbstractWsaElement;
@@ -27,6 +28,7 @@
  *
  * @package simplesamlphp/ws-security
  */
+#[Group('wsa')]
 #[CoversClass(FaultTo::class)]
 #[CoversClass(AbstractEndpointReferenceType::class)]
 #[CoversClass(AbstractWsaElement::class)]
diff --git a/tests/WSSecurity/XML/wsa/FromTest.php b/tests/WSSecurity/XML/wsa/FromTest.php
index b83f87bc..5ef2dc86 100644
--- a/tests/WSSecurity/XML/wsa/FromTest.php
+++ b/tests/WSSecurity/XML/wsa/FromTest.php
@@ -6,6 +6,7 @@
 
 use DOMElement;
 use PHPUnit\Framework\Attributes\CoversClass;
+use PHPUnit\Framework\Attributes\Group;
 use PHPUnit\Framework\TestCase;
 use SimpleSAML\WSSecurity\XML\wsa\AbstractEndpointReferenceType;
 use SimpleSAML\WSSecurity\XML\wsa\AbstractWsaElement;
@@ -27,6 +28,7 @@
  *
  * @package simplesamlphp/ws-security
  */
+#[Group('wsa')]
 #[CoversClass(From::class)]
 #[CoversClass(AbstractEndpointReferenceType::class)]
 #[CoversClass(AbstractWsaElement::class)]
diff --git a/tests/WSSecurity/XML/wsa/MessageIDTest.php b/tests/WSSecurity/XML/wsa/MessageIDTest.php
index 675cd927..cd5c8ccc 100644
--- a/tests/WSSecurity/XML/wsa/MessageIDTest.php
+++ b/tests/WSSecurity/XML/wsa/MessageIDTest.php
@@ -5,6 +5,7 @@
 namespace SimpleSAML\Test\WSSecurity\XML\wsa;
 
 use PHPUnit\Framework\Attributes\CoversClass;
+use PHPUnit\Framework\Attributes\Group;
 use PHPUnit\Framework\TestCase;
 use SimpleSAML\SOAP\Constants as C;
 use SimpleSAML\WSSecurity\XML\wsa\AbstractAttributedURIType;
@@ -23,6 +24,7 @@
  *
  * @package simplesamlphp/ws-security
  */
+#[Group('wsa')]
 #[CoversClass(MessageID::class)]
 #[CoversClass(AbstractAttributedURIType::class)]
 #[CoversClass(AbstractWsaElement::class)]
diff --git a/tests/WSSecurity/XML/wsa/MetadataTest.php b/tests/WSSecurity/XML/wsa/MetadataTest.php
index 6e221d36..4b35650c 100644
--- a/tests/WSSecurity/XML/wsa/MetadataTest.php
+++ b/tests/WSSecurity/XML/wsa/MetadataTest.php
@@ -6,6 +6,7 @@
 
 use DOMElement;
 use PHPUnit\Framework\Attributes\CoversClass;
+use PHPUnit\Framework\Attributes\Group;
 use PHPUnit\Framework\TestCase;
 use SimpleSAML\WSSecurity\XML\wsa\AbstractWsaElement;
 use SimpleSAML\WSSecurity\XML\wsa\Metadata;
@@ -23,6 +24,7 @@
  *
  * @package simplesamlphp/ws-security
  */
+#[Group('wsa')]
 #[CoversClass(Metadata::class)]
 #[CoversClass(AbstractWsaElement::class)]
 final class MetadataTest extends TestCase
diff --git a/tests/WSSecurity/XML/wsa/ProblemActionTest.php b/tests/WSSecurity/XML/wsa/ProblemActionTest.php
index 6ba2a963..24442abb 100644
--- a/tests/WSSecurity/XML/wsa/ProblemActionTest.php
+++ b/tests/WSSecurity/XML/wsa/ProblemActionTest.php
@@ -5,6 +5,7 @@
 namespace SimpleSAML\Test\WSSecurity\XML\wsa;
 
 use PHPUnit\Framework\Attributes\CoversClass;
+use PHPUnit\Framework\Attributes\Group;
 use PHPUnit\Framework\TestCase;
 use SimpleSAML\WSSecurity\Constants as C;
 use SimpleSAML\WSSecurity\XML\wsa\AbstractProblemActionType;
@@ -25,6 +26,7 @@
  *
  * @package simplesamlphp/ws-security
  */
+#[Group('wsa')]
 #[CoversClass(ProblemAction::class)]
 #[CoversClass(AbstractProblemActionType::class)]
 #[CoversClass(AbstractWsaElement::class)]
diff --git a/tests/WSSecurity/XML/wsa/ProblemHeaderQNameTest.php b/tests/WSSecurity/XML/wsa/ProblemHeaderQNameTest.php
index 557d72d2..d93455d0 100644
--- a/tests/WSSecurity/XML/wsa/ProblemHeaderQNameTest.php
+++ b/tests/WSSecurity/XML/wsa/ProblemHeaderQNameTest.php
@@ -5,6 +5,7 @@
 namespace SimpleSAML\Test\WSSecurity\XML\wsa;
 
 use PHPUnit\Framework\Attributes\CoversClass;
+use PHPUnit\Framework\Attributes\Group;
 use PHPUnit\Framework\TestCase;
 use SimpleSAML\WSSecurity\XML\wsa\AbstractAttributedQNameType;
 use SimpleSAML\WSSecurity\XML\wsa\AbstractWsaElement;
@@ -22,6 +23,7 @@
  *
  * @package simplesamlphp/ws-security
  */
+#[Group('wsa')]
 #[CoversClass(ProblemHeaderQName::class)]
 #[CoversClass(AbstractAttributedQNameType::class)]
 #[CoversClass(AbstractWsaElement::class)]
diff --git a/tests/WSSecurity/XML/wsa/ProblemIRITest.php b/tests/WSSecurity/XML/wsa/ProblemIRITest.php
index 0fb45450..3ae101ff 100644
--- a/tests/WSSecurity/XML/wsa/ProblemIRITest.php
+++ b/tests/WSSecurity/XML/wsa/ProblemIRITest.php
@@ -5,6 +5,7 @@
 namespace SimpleSAML\Test\WSSecurity\XML\wsa;
 
 use PHPUnit\Framework\Attributes\CoversClass;
+use PHPUnit\Framework\Attributes\Group;
 use PHPUnit\Framework\TestCase;
 use SimpleSAML\WSSecurity\XML\wsa\AbstractAttributedURIType;
 use SimpleSAML\WSSecurity\XML\wsa\AbstractWsaElement;
@@ -22,6 +23,7 @@
  *
  * @package simplesamlphp/ws-security
  */
+#[Group('wsa')]
 #[CoversClass(ProblemIRI::class)]
 #[CoversClass(AbstractAttributedURIType::class)]
 #[CoversClass(AbstractWsaElement::class)]
diff --git a/tests/WSSecurity/XML/wsa/ReferenceParametersTest.php b/tests/WSSecurity/XML/wsa/ReferenceParametersTest.php
index 95999885..a3291da0 100644
--- a/tests/WSSecurity/XML/wsa/ReferenceParametersTest.php
+++ b/tests/WSSecurity/XML/wsa/ReferenceParametersTest.php
@@ -6,6 +6,7 @@
 
 use DOMElement;
 use PHPUnit\Framework\Attributes\CoversClass;
+use PHPUnit\Framework\Attributes\Group;
 use PHPUnit\Framework\TestCase;
 use SimpleSAML\WSSecurity\XML\wsa\AbstractWsaElement;
 use SimpleSAML\WSSecurity\XML\wsa\ReferenceParameters;
@@ -23,6 +24,7 @@
  *
  * @package simplesamlphp/ws-security
  */
+#[Group('wsa')]
 #[CoversClass(ReferenceParameters::class)]
 #[CoversClass(AbstractWsaElement::class)]
 final class ReferenceParametersTest extends TestCase
diff --git a/tests/WSSecurity/XML/wsa/RelatesToTest.php b/tests/WSSecurity/XML/wsa/RelatesToTest.php
index 17bc2888..6f24234e 100644
--- a/tests/WSSecurity/XML/wsa/RelatesToTest.php
+++ b/tests/WSSecurity/XML/wsa/RelatesToTest.php
@@ -5,6 +5,7 @@
 namespace SimpleSAML\Test\WSSecurity\XML\wsa;
 
 use PHPUnit\Framework\Attributes\CoversClass;
+use PHPUnit\Framework\Attributes\Group;
 use PHPUnit\Framework\TestCase;
 use SimpleSAML\WSSecurity\XML\wsa\AbstractWsaElement;
 use SimpleSAML\WSSecurity\XML\wsa\RelatesTo;
@@ -21,6 +22,7 @@
  *
  * @package simplesamlphp/ws-security
  */
+#[Group('wsa')]
 #[CoversClass(RelatesTo::class)]
 #[CoversClass(AbstractWsaElement::class)]
 final class RelatesToTest extends TestCase
diff --git a/tests/WSSecurity/XML/wsa/ReplyToTest.php b/tests/WSSecurity/XML/wsa/ReplyToTest.php
index a7b45213..e192d233 100644
--- a/tests/WSSecurity/XML/wsa/ReplyToTest.php
+++ b/tests/WSSecurity/XML/wsa/ReplyToTest.php
@@ -6,6 +6,7 @@
 
 use DOMElement;
 use PHPUnit\Framework\Attributes\CoversClass;
+use PHPUnit\Framework\Attributes\Group;
 use PHPUnit\Framework\TestCase;
 use SimpleSAML\WSSecurity\XML\wsa\AbstractEndpointReferenceType;
 use SimpleSAML\WSSecurity\XML\wsa\AbstractWsaElement;
@@ -27,6 +28,7 @@
  *
  * @package simplesamlphp/ws-security
  */
+#[Group('wsa')]
 #[CoversClass(ReplyTo::class)]
 #[CoversClass(AbstractEndpointReferenceType::class)]
 #[CoversClass(AbstractWsaElement::class)]
diff --git a/tests/WSSecurity/XML/wsa/RetryAfterTest.php b/tests/WSSecurity/XML/wsa/RetryAfterTest.php
index 184055be..7af8dc42 100644
--- a/tests/WSSecurity/XML/wsa/RetryAfterTest.php
+++ b/tests/WSSecurity/XML/wsa/RetryAfterTest.php
@@ -5,6 +5,7 @@
 namespace SimpleSAML\Test\WSSecurity\XML\wsa;
 
 use PHPUnit\Framework\Attributes\CoversClass;
+use PHPUnit\Framework\Attributes\Group;
 use PHPUnit\Framework\TestCase;
 use SimpleSAML\WSSecurity\XML\wsa\AbstractAttributedLongType;
 use SimpleSAML\WSSecurity\XML\wsa\AbstractWsaElement;
@@ -22,6 +23,7 @@
  *
  * @package simplesamlphp/ws-security
  */
+#[Group('wsa')]
 #[CoversClass(RetryAfter::class)]
 #[CoversClass(AbstractAttributedLongType::class)]
 #[CoversClass(AbstractWsaElement::class)]
diff --git a/tests/WSSecurity/XML/wsa/SoapActionTest.php b/tests/WSSecurity/XML/wsa/SoapActionTest.php
index 33797c74..cc02b699 100644
--- a/tests/WSSecurity/XML/wsa/SoapActionTest.php
+++ b/tests/WSSecurity/XML/wsa/SoapActionTest.php
@@ -5,6 +5,7 @@
 namespace SimpleSAML\Test\WSSecurity\XML\wsa;
 
 use PHPUnit\Framework\Attributes\CoversClass;
+use PHPUnit\Framework\Attributes\Group;
 use PHPUnit\Framework\TestCase;
 use SimpleSAML\WSSecurity\XML\wsa\AbstractWsaElement;
 use SimpleSAML\WSSecurity\XML\wsa\SoapAction;
@@ -19,6 +20,7 @@
  *
  * @package simplesamlphp/ws-security
  */
+#[Group('wsa')]
 #[CoversClass(SoapAction::class)]
 #[CoversClass(AbstractWsaElement::class)]
 final class SoapActionTest extends TestCase
diff --git a/tests/WSSecurity/XML/wsa/ToTest.php b/tests/WSSecurity/XML/wsa/ToTest.php
index 4b358235..c8df0d34 100644
--- a/tests/WSSecurity/XML/wsa/ToTest.php
+++ b/tests/WSSecurity/XML/wsa/ToTest.php
@@ -5,6 +5,7 @@
 namespace SimpleSAML\Test\WSSecurity\XML\wsa;
 
 use PHPUnit\Framework\Attributes\CoversClass;
+use PHPUnit\Framework\Attributes\Group;
 use PHPUnit\Framework\TestCase;
 use SimpleSAML\WSSecurity\XML\wsa\AbstractAttributedURIType;
 use SimpleSAML\WSSecurity\XML\wsa\AbstractWsaElement;
@@ -22,6 +23,7 @@
  *
  * @package simplesamlphp/ws-security
  */
+#[Group('wsa')]
 #[CoversClass(To::class)]
 #[CoversClass(AbstractAttributedURIType::class)]
 #[CoversClass(AbstractWsaElement::class)]
diff --git a/tests/WSSecurity/XML/wsp/AllTest.php b/tests/WSSecurity/XML/wsp/AllTest.php
index 92b773c6..fdea46f8 100644
--- a/tests/WSSecurity/XML/wsp/AllTest.php
+++ b/tests/WSSecurity/XML/wsp/AllTest.php
@@ -5,6 +5,7 @@
 namespace SimpleSAML\Test\WSSecurity\XML\wsp;
 
 use PHPUnit\Framework\Attributes\CoversClass;
+use PHPUnit\Framework\Attributes\Group;
 use PHPUnit\Framework\TestCase;
 use SimpleSAML\WSSecurity\XML\wsp\AbstractOperatorContentType;
 use SimpleSAML\WSSecurity\XML\wsp\AbstractWspElement;
@@ -23,6 +24,7 @@
  *
  * @package simplesamlphp/ws-security
  */
+#[Group('wsp')]
 #[CoversClass(All::class)]
 #[CoversClass(AbstractOperatorContentType::class)]
 #[CoversClass(AbstractWspElement::class)]
diff --git a/tests/WSSecurity/XML/wsp/AppliesToTest.php b/tests/WSSecurity/XML/wsp/AppliesToTest.php
index c51fb9f7..7941eb53 100644
--- a/tests/WSSecurity/XML/wsp/AppliesToTest.php
+++ b/tests/WSSecurity/XML/wsp/AppliesToTest.php
@@ -5,6 +5,7 @@
 namespace SimpleSAML\Test\WSSecurity\XML\wsp;
 
 use PHPUnit\Framework\Attributes\CoversClass;
+use PHPUnit\Framework\Attributes\Group;
 use PHPUnit\Framework\TestCase;
 use SimpleSAML\WSSecurity\XML\wsa\Address;
 use SimpleSAML\WSSecurity\XML\wsa\EndpointReference;
@@ -23,6 +24,7 @@
  *
  * @package simplesamlphp/ws-security
  */
+#[Group('wsp')]
 #[CoversClass(AppliesTo::class)]
 #[CoversClass(AbstractWspElement::class)]
 final class AppliesToTest extends TestCase
diff --git a/tests/WSSecurity/XML/wsp/ExactlyOneTest.php b/tests/WSSecurity/XML/wsp/ExactlyOneTest.php
index bea28aad..70275090 100644
--- a/tests/WSSecurity/XML/wsp/ExactlyOneTest.php
+++ b/tests/WSSecurity/XML/wsp/ExactlyOneTest.php
@@ -5,6 +5,7 @@
 namespace SimpleSAML\Test\WSSecurity\XML\wsp;
 
 use PHPUnit\Framework\Attributes\CoversClass;
+use PHPUnit\Framework\Attributes\Group;
 use PHPUnit\Framework\TestCase;
 use SimpleSAML\WSSecurity\XML\wsp\AbstractOperatorContentType;
 use SimpleSAML\WSSecurity\XML\wsp\AbstractWspElement;
@@ -23,6 +24,7 @@
  *
  * @package simplesamlphp/ws-security
  */
+#[Group('wsp')]
 #[CoversClass(ExactlyOne::class)]
 #[CoversClass(AbstractOperatorContentType::class)]
 #[CoversClass(AbstractWspElement::class)]
diff --git a/tests/WSSecurity/XML/wsp/PolicyAttachmentTest.php b/tests/WSSecurity/XML/wsp/PolicyAttachmentTest.php
index 87b35223..d1badc65 100644
--- a/tests/WSSecurity/XML/wsp/PolicyAttachmentTest.php
+++ b/tests/WSSecurity/XML/wsp/PolicyAttachmentTest.php
@@ -5,6 +5,7 @@
 namespace SimpleSAML\Test\WSSecurity\XML\wsp;
 
 use PHPUnit\Framework\Attributes\CoversClass;
+use PHPUnit\Framework\Attributes\Group;
 use PHPUnit\Framework\TestCase;
 use SimpleSAML\Test\WSSecurity\Constants as C;
 use SimpleSAML\WSSecurity\XML\wsa\Address;
@@ -30,6 +31,7 @@
  *
  * @package simplesamlphp/ws-security
  */
+#[Group('wsp')]
 #[CoversClass(PolicyAttachment::class)]
 #[CoversClass(AbstractWspElement::class)]
 final class PolicyAttachmentTest extends TestCase
diff --git a/tests/WSSecurity/XML/wsp/PolicyReferenceTest.php b/tests/WSSecurity/XML/wsp/PolicyReferenceTest.php
index fecf9cc8..759c0f39 100644
--- a/tests/WSSecurity/XML/wsp/PolicyReferenceTest.php
+++ b/tests/WSSecurity/XML/wsp/PolicyReferenceTest.php
@@ -5,6 +5,7 @@
 namespace SimpleSAML\Test\WSSecurity\XML\wsp;
 
 use PHPUnit\Framework\Attributes\CoversClass;
+use PHPUnit\Framework\Attributes\Group;
 use PHPUnit\Framework\TestCase;
 use SimpleSAML\Test\WSSecurity\Constants as C;
 use SimpleSAML\WSSecurity\XML\wsp\AbstractWspElement;
@@ -22,6 +23,7 @@
  *
  * @package simplesamlphp/ws-security
  */
+#[Group('wsp')]
 #[CoversClass(PolicyReference::class)]
 #[CoversClass(AbstractWspElement::class)]
 final class PolicyReferenceTest extends TestCase
diff --git a/tests/WSSecurity/XML/wsp/PolicyTest.php b/tests/WSSecurity/XML/wsp/PolicyTest.php
index 22fba135..2a1eaf57 100644
--- a/tests/WSSecurity/XML/wsp/PolicyTest.php
+++ b/tests/WSSecurity/XML/wsp/PolicyTest.php
@@ -5,6 +5,7 @@
 namespace SimpleSAML\Test\WSSecurity\XML\wsp;
 
 use PHPUnit\Framework\Attributes\CoversClass;
+use PHPUnit\Framework\Attributes\Group;
 use PHPUnit\Framework\TestCase;
 use SimpleSAML\Test\WSSecurity\Constants as C;
 use SimpleSAML\WSSecurity\XML\wsp\AbstractOperatorContentType;
@@ -25,6 +26,7 @@
  *
  * @package simplesamlphp/ws-security
  */
+#[Group('wsp')]
 #[CoversClass(Policy::class)]
 #[CoversClass(AbstractOperatorContentType::class)]
 #[CoversClass(AbstractWspElement::class)]
diff --git a/tests/WSSecurity/XML/wsse/BinarySecurityTokenTest.php b/tests/WSSecurity/XML/wsse/BinarySecurityTokenTest.php
index 953ab254..8ecae8a0 100644
--- a/tests/WSSecurity/XML/wsse/BinarySecurityTokenTest.php
+++ b/tests/WSSecurity/XML/wsse/BinarySecurityTokenTest.php
@@ -5,6 +5,7 @@
 namespace SimpleSAML\Test\WSSecurity\XML\wsse;
 
 use PHPUnit\Framework\Attributes\CoversClass;
+use PHPUnit\Framework\Attributes\Group;
 use PHPUnit\Framework\TestCase;
 use SimpleSAML\WSSecurity\XML\wsse\AbstractAttributedString;
 use SimpleSAML\WSSecurity\XML\wsse\AbstractBinarySecurityTokenType;
@@ -24,6 +25,7 @@
  *
  * @package simplesamlphp/ws-security
  */
+#[Group('wsp')]
 #[CoversClass(BinarySecurityToken::class)]
 #[CoversClass(AbstractBinarySecurityTokenType::class)]
 #[CoversClass(AbstractEncodedString::class)]
diff --git a/tests/WSSecurity/XML/wsse/EmbeddedTest.php b/tests/WSSecurity/XML/wsse/EmbeddedTest.php
index 34a2df20..2cbedf26 100644
--- a/tests/WSSecurity/XML/wsse/EmbeddedTest.php
+++ b/tests/WSSecurity/XML/wsse/EmbeddedTest.php
@@ -5,6 +5,7 @@
 namespace SimpleSAML\Test\WSSecurity\XML\wsse;
 
 use PHPUnit\Framework\Attributes\CoversClass;
+use PHPUnit\Framework\Attributes\Group;
 use PHPUnit\Framework\TestCase;
 use SimpleSAML\WSSecurity\XML\wsse\AbstractEmbeddedType;
 use SimpleSAML\WSSecurity\XML\wsse\AbstractWsseElement;
@@ -23,6 +24,7 @@
  *
  * @package simplesamlphp/ws-security
  */
+#[Group('wsp')]
 #[CoversClass(Embedded::class)]
 #[CoversClass(AbstractEmbeddedType::class)]
 #[CoversClass(AbstractWsseElement::class)]
diff --git a/tests/WSSecurity/XML/wsse/KeyIdentifierTest.php b/tests/WSSecurity/XML/wsse/KeyIdentifierTest.php
index d525015e..9b7151b1 100644
--- a/tests/WSSecurity/XML/wsse/KeyIdentifierTest.php
+++ b/tests/WSSecurity/XML/wsse/KeyIdentifierTest.php
@@ -5,6 +5,7 @@
 namespace SimpleSAML\Test\WSSecurity\XML\wsse;
 
 use PHPUnit\Framework\Attributes\CoversClass;
+use PHPUnit\Framework\Attributes\Group;
 use PHPUnit\Framework\TestCase;
 use SimpleSAML\WSSecurity\XML\wsse\AbstractAttributedString;
 use SimpleSAML\WSSecurity\XML\wsse\AbstractEncodedString;
@@ -24,6 +25,7 @@
  *
  * @package simplesamlphp/ws-security
  */
+#[Group('wsp')]
 #[CoversClass(KeyIdentifier::class)]
 #[CoversClass(AbstractKeyIdentifierType::class)]
 #[CoversClass(AbstractEncodedString::class)]
diff --git a/tests/WSSecurity/XML/wsse/NonceTest.php b/tests/WSSecurity/XML/wsse/NonceTest.php
index a4747570..1905811f 100644
--- a/tests/WSSecurity/XML/wsse/NonceTest.php
+++ b/tests/WSSecurity/XML/wsse/NonceTest.php
@@ -5,6 +5,7 @@
 namespace SimpleSAML\Test\WSSecurity\XML\wsse;
 
 use PHPUnit\Framework\Attributes\CoversClass;
+use PHPUnit\Framework\Attributes\Group;
 use PHPUnit\Framework\TestCase;
 use SimpleSAML\WSSecurity\XML\wsse\AbstractAttributedString;
 use SimpleSAML\WSSecurity\XML\wsse\AbstractEncodedString;
@@ -23,6 +24,7 @@
  *
  * @package simplesamlphp/ws-security
  */
+#[Group('wsp')]
 #[CoversClass(Nonce::class)]
 #[CoversClass(AbstractEncodedString::class)]
 #[CoversClass(AbstractAttributedString::class)]
diff --git a/tests/WSSecurity/XML/wsse/PasswordTest.php b/tests/WSSecurity/XML/wsse/PasswordTest.php
index 8dd90465..6475c3a1 100644
--- a/tests/WSSecurity/XML/wsse/PasswordTest.php
+++ b/tests/WSSecurity/XML/wsse/PasswordTest.php
@@ -5,6 +5,7 @@
 namespace SimpleSAML\Test\WSSecurity\XML\wsse;
 
 use PHPUnit\Framework\Attributes\CoversClass;
+use PHPUnit\Framework\Attributes\Group;
 use PHPUnit\Framework\TestCase;
 use SimpleSAML\WSSecurity\XML\wsse\AbstractAttributedString;
 use SimpleSAML\WSSecurity\XML\wsse\AbstractPasswordString;
@@ -22,6 +23,7 @@
  *
  * @package simplesamlphp/ws-security
  */
+#[Group('wsp')]
 #[CoversClass(Password::class)]
 #[CoversClass(AbstractPasswordString::class)]
 #[CoversClass(AbstractAttributedString::class)]
diff --git a/tests/WSSecurity/XML/wsse/ReferenceTest.php b/tests/WSSecurity/XML/wsse/ReferenceTest.php
index 3c1f678e..b938f2ec 100644
--- a/tests/WSSecurity/XML/wsse/ReferenceTest.php
+++ b/tests/WSSecurity/XML/wsse/ReferenceTest.php
@@ -5,6 +5,7 @@
 namespace SimpleSAML\Test\WSSecurity\XML\wsse;
 
 use PHPUnit\Framework\Attributes\CoversClass;
+use PHPUnit\Framework\Attributes\Group;
 use PHPUnit\Framework\TestCase;
 use SimpleSAML\WSSecurity\XML\wsse\AbstractReferenceType;
 use SimpleSAML\WSSecurity\XML\wsse\AbstractWsseElement;
@@ -22,6 +23,7 @@
  *
  * @package simplesamlphp/ws-security
  */
+#[Group('wsp')]
 #[CoversClass(Reference::class)]
 #[CoversClass(AbstractReferenceType::class)]
 #[CoversClass(AbstractWsseElement::class)]
diff --git a/tests/WSSecurity/XML/wsse/SecurityTest.php b/tests/WSSecurity/XML/wsse/SecurityTest.php
index a8791bda..2aaae155 100644
--- a/tests/WSSecurity/XML/wsse/SecurityTest.php
+++ b/tests/WSSecurity/XML/wsse/SecurityTest.php
@@ -5,6 +5,7 @@
 namespace SimpleSAML\Test\WSSecurity\XML\wsse;
 
 use PHPUnit\Framework\Attributes\CoversClass;
+use PHPUnit\Framework\Attributes\Group;
 use PHPUnit\Framework\TestCase;
 use SimpleSAML\WSSecurity\XML\wsse\AbstractSecurityHeaderType;
 use SimpleSAML\WSSecurity\XML\wsse\AbstractWsseElement;
@@ -23,6 +24,7 @@
  *
  * @package simplesamlphp/ws-security
  */
+#[Group('wsp')]
 #[CoversClass(Security::class)]
 #[CoversClass(AbstractSecurityHeaderType::class)]
 #[CoversClass(AbstractWsseElement::class)]
diff --git a/tests/WSSecurity/XML/wsse/SecurityTokenReferenceTest.php b/tests/WSSecurity/XML/wsse/SecurityTokenReferenceTest.php
index c0a8ad2f..02f93506 100644
--- a/tests/WSSecurity/XML/wsse/SecurityTokenReferenceTest.php
+++ b/tests/WSSecurity/XML/wsse/SecurityTokenReferenceTest.php
@@ -5,6 +5,7 @@
 namespace SimpleSAML\Test\WSSecurity\XML\wsse;
 
 use PHPUnit\Framework\Attributes\CoversClass;
+use PHPUnit\Framework\Attributes\Group;
 use PHPUnit\Framework\TestCase;
 use SimpleSAML\WSSecurity\XML\wsse\AbstractSecurityTokenReferenceType;
 use SimpleSAML\WSSecurity\XML\wsse\AbstractWsseElement;
@@ -23,6 +24,7 @@
  *
  * @package simplesamlphp/ws-security
  */
+#[Group('wsp')]
 #[CoversClass(SecurityTokenReference::class)]
 #[CoversClass(AbstractSecurityTokenReferenceType::class)]
 #[CoversClass(AbstractWsseElement::class)]
diff --git a/tests/WSSecurity/XML/wsse/TransformationParametersTest.php b/tests/WSSecurity/XML/wsse/TransformationParametersTest.php
index bc60f0fc..261717c1 100644
--- a/tests/WSSecurity/XML/wsse/TransformationParametersTest.php
+++ b/tests/WSSecurity/XML/wsse/TransformationParametersTest.php
@@ -5,6 +5,7 @@
 namespace SimpleSAML\Test\WSSecurity\XML\wsse;
 
 use PHPUnit\Framework\Attributes\CoversClass;
+use PHPUnit\Framework\Attributes\Group;
 use PHPUnit\Framework\TestCase;
 use SimpleSAML\WSSecurity\XML\wsse\AbstractTransformationParametersType;
 use SimpleSAML\WSSecurity\XML\wsse\AbstractWsseElement;
@@ -23,6 +24,7 @@
  *
  * @package simplesamlphp/ws-security
  */
+#[Group('wsp')]
 #[CoversClass(TransformationParameters::class)]
 #[CoversClass(AbstractTransformationParametersType::class)]
 #[CoversClass(AbstractWsseElement::class)]
diff --git a/tests/WSSecurity/XML/wsse/UsernameTest.php b/tests/WSSecurity/XML/wsse/UsernameTest.php
index fe6e51ed..3fe3cf0d 100644
--- a/tests/WSSecurity/XML/wsse/UsernameTest.php
+++ b/tests/WSSecurity/XML/wsse/UsernameTest.php
@@ -5,6 +5,7 @@
 namespace SimpleSAML\Test\WSSecurity\XML\wsse;
 
 use PHPUnit\Framework\Attributes\CoversClass;
+use PHPUnit\Framework\Attributes\Group;
 use PHPUnit\Framework\TestCase;
 use SimpleSAML\WSSecurity\XML\wsse\AbstractAttributedString;
 use SimpleSAML\WSSecurity\XML\wsse\AbstractWsseElement;
@@ -21,6 +22,7 @@
  *
  * @package simplesamlphp/ws-security
  */
+#[Group('wsp')]
 #[CoversClass(Username::class)]
 #[CoversClass(AbstractAttributedString::class)]
 #[CoversClass(AbstractWsseElement::class)]
diff --git a/tests/WSSecurity/XML/wsse/UsernameTokenTest.php b/tests/WSSecurity/XML/wsse/UsernameTokenTest.php
index edfac839..d9dcae7d 100644
--- a/tests/WSSecurity/XML/wsse/UsernameTokenTest.php
+++ b/tests/WSSecurity/XML/wsse/UsernameTokenTest.php
@@ -5,6 +5,7 @@
 namespace SimpleSAML\Test\WSSecurity\XML\wsse;
 
 use PHPUnit\Framework\Attributes\CoversClass;
+use PHPUnit\Framework\Attributes\Group;
 use PHPUnit\Framework\TestCase;
 use SimpleSAML\WSSecurity\XML\wsse\AbstractUsernameTokenType;
 use SimpleSAML\WSSecurity\XML\wsse\AbstractWsseElement;
@@ -24,6 +25,7 @@
  *
  * @package simplesamlphp/ws-security
  */
+#[Group('wsp')]
 #[CoversClass(UsernameToken::class)]
 #[CoversClass(AbstractUsernameTokenType::class)]
 #[CoversClass(AbstractWsseElement::class)]
diff --git a/tests/WSSecurity/XML/wst/AllowPostdatingTest.php b/tests/WSSecurity/XML/wst/AllowPostdatingTest.php
index e8a05065..3714df9f 100644
--- a/tests/WSSecurity/XML/wst/AllowPostdatingTest.php
+++ b/tests/WSSecurity/XML/wst/AllowPostdatingTest.php
@@ -5,6 +5,7 @@
 namespace SimpleSAML\Test\WSSecurity\XML\wst;
 
 use PHPUnit\Framework\Attributes\CoversClass;
+use PHPUnit\Framework\Attributes\Group;
 use PHPUnit\Framework\TestCase;
 use SimpleSAML\WSSecurity\XML\wst\AbstractWstElement;
 use SimpleSAML\WSSecurity\XML\wst\AllowPostdating;
@@ -19,6 +20,7 @@
  *
  * @package simplesamlphp/ws-security
  */
+#[Group('wst')]
 #[CoversClass(AllowPostdating::class)]
 #[CoversClass(AbstractWstElement::class)]
 final class AllowPostdatingTest extends TestCase
diff --git a/tests/WSSecurity/XML/wst/AuthenticationTypeTest.php b/tests/WSSecurity/XML/wst/AuthenticationTypeTest.php
index 2ae12ad2..ab8cbf81 100644
--- a/tests/WSSecurity/XML/wst/AuthenticationTypeTest.php
+++ b/tests/WSSecurity/XML/wst/AuthenticationTypeTest.php
@@ -5,6 +5,7 @@
 namespace SimpleSAML\Test\WSSecurity\XML\wst;
 
 use PHPUnit\Framework\Attributes\CoversClass;
+use PHPUnit\Framework\Attributes\Group;
 use PHPUnit\Framework\TestCase;
 use SimpleSAML\Test\WSSecurity\Constants as C;
 use SimpleSAML\WSSecurity\XML\wst\AbstractWstElement;
@@ -20,6 +21,7 @@
  *
  * @package simplesamlphp/ws-security
  */
+#[Group('wst')]
 #[CoversClass(AuthenticationType::class)]
 #[CoversClass(AbstractWstElement::class)]
 final class AuthenticationTypeTest extends TestCase
diff --git a/tests/WSSecurity/XML/wst/AuthenticatorTest.php b/tests/WSSecurity/XML/wst/AuthenticatorTest.php
index ce636cab..72aae790 100644
--- a/tests/WSSecurity/XML/wst/AuthenticatorTest.php
+++ b/tests/WSSecurity/XML/wst/AuthenticatorTest.php
@@ -5,6 +5,7 @@
 namespace SimpleSAML\Test\WSSecurity\XML\wst;
 
 use PHPUnit\Framework\Attributes\CoversClass;
+use PHPUnit\Framework\Attributes\Group;
 use PHPUnit\Framework\TestCase;
 use SimpleSAML\SOAP\Constants as SOAP;
 use SimpleSAML\WSSecurity\XML\wsa\MessageID;
@@ -24,6 +25,7 @@
  *
  * @package simplesamlphp/ws-security
  */
+#[Group('wst')]
 #[CoversClass(Authenticator::class)]
 #[CoversClass(AbstractAuthenticatorType::class)]
 #[CoversClass(AbstractWstElement::class)]
diff --git a/tests/WSSecurity/XML/wst/BinaryExchangeTest.php b/tests/WSSecurity/XML/wst/BinaryExchangeTest.php
index 33aa773f..76d221d9 100644
--- a/tests/WSSecurity/XML/wst/BinaryExchangeTest.php
+++ b/tests/WSSecurity/XML/wst/BinaryExchangeTest.php
@@ -5,6 +5,7 @@
 namespace SimpleSAML\Test\WSSecurity\XML\wst;
 
 use PHPUnit\Framework\Attributes\CoversClass;
+use PHPUnit\Framework\Attributes\Group;
 use PHPUnit\Framework\TestCase;
 use SimpleSAML\Test\WSSecurity\Constants as C;
 use SimpleSAML\WSSecurity\XML\wst\AbstractBinaryExchangeType;
@@ -22,6 +23,7 @@
  *
  * @package simplesamlphp/ws-security
  */
+#[Group('wst')]
 #[CoversClass(BinaryExchange::class)]
 #[CoversClass(AbstractBinaryExchangeType::class)]
 #[CoversClass(AbstractWstElement::class)]
diff --git a/tests/WSSecurity/XML/wst/BinarySecretTest.php b/tests/WSSecurity/XML/wst/BinarySecretTest.php
index 362cbd54..31ec2071 100644
--- a/tests/WSSecurity/XML/wst/BinarySecretTest.php
+++ b/tests/WSSecurity/XML/wst/BinarySecretTest.php
@@ -5,6 +5,7 @@
 namespace SimpleSAML\Test\WSSecurity\XML\wst;
 
 use PHPUnit\Framework\Attributes\CoversClass;
+use PHPUnit\Framework\Attributes\Group;
 use PHPUnit\Framework\TestCase;
 use SimpleSAML\Test\WSSecurity\Constants as C;
 use SimpleSAML\WSSecurity\XML\wst\AbstractBinarySecretType;
@@ -23,6 +24,7 @@
  *
  * @package simplesamlphp/ws-security
  */
+#[Group('wst')]
 #[CoversClass(BinarySecret::class)]
 #[CoversClass(AbstractBinarySecretType::class)]
 #[CoversClass(AbstractWstElement::class)]
diff --git a/tests/WSSecurity/XML/wst/CancelTargetTest.php b/tests/WSSecurity/XML/wst/CancelTargetTest.php
index 64d5f4a4..d3c69c18 100644
--- a/tests/WSSecurity/XML/wst/CancelTargetTest.php
+++ b/tests/WSSecurity/XML/wst/CancelTargetTest.php
@@ -5,6 +5,7 @@
 namespace SimpleSAML\Test\WSSecurity\XML\wst;
 
 use PHPUnit\Framework\Attributes\CoversClass;
+use PHPUnit\Framework\Attributes\Group;
 use PHPUnit\Framework\TestCase;
 use SimpleSAML\SOAP\Constants as SOAP;
 use SimpleSAML\WSSecurity\XML\wsa\MessageID;
@@ -23,6 +24,7 @@
  *
  * @package simplesamlphp/ws-security
  */
+#[Group('wst')]
 #[CoversClass(CancelTarget::class)]
 #[CoversClass(AbstractCancelTargetType::class)]
 #[CoversClass(AbstractWstElement::class)]
diff --git a/tests/WSSecurity/XML/wst/CanonicalizationAlgorithmTest.php b/tests/WSSecurity/XML/wst/CanonicalizationAlgorithmTest.php
index 11cc45ff..5634a363 100644
--- a/tests/WSSecurity/XML/wst/CanonicalizationAlgorithmTest.php
+++ b/tests/WSSecurity/XML/wst/CanonicalizationAlgorithmTest.php
@@ -5,6 +5,7 @@
 namespace SimpleSAML\Test\WSSecurity\XML\wst;
 
 use PHPUnit\Framework\Attributes\CoversClass;
+use PHPUnit\Framework\Attributes\Group;
 use PHPUnit\Framework\TestCase;
 use SimpleSAML\Test\WSSecurity\Constants as C;
 use SimpleSAML\WSSecurity\XML\wst\AbstractWstElement;
@@ -20,6 +21,7 @@
  *
  * @package simplesamlphp/ws-security
  */
+#[Group('wst')]
 #[CoversClass(CanonicalizationAlgorithm::class)]
 #[CoversClass(AbstractWstElement::class)]
 final class CanonicalizationAlgorithmTest extends TestCase
diff --git a/tests/WSSecurity/XML/wst/ChallengeTest.php b/tests/WSSecurity/XML/wst/ChallengeTest.php
index 8889114f..045b3f18 100644
--- a/tests/WSSecurity/XML/wst/ChallengeTest.php
+++ b/tests/WSSecurity/XML/wst/ChallengeTest.php
@@ -5,6 +5,7 @@
 namespace SimpleSAML\Test\WSSecurity\XML\wst;
 
 use PHPUnit\Framework\Attributes\CoversClass;
+use PHPUnit\Framework\Attributes\Group;
 use PHPUnit\Framework\TestCase;
 use SimpleSAML\WSSecurity\XML\wst\AbstractWstElement;
 use SimpleSAML\WSSecurity\XML\wst\Challenge;
@@ -19,6 +20,7 @@
  *
  * @package simplesamlphp/ws-security
  */
+#[Group('wst')]
 #[CoversClass(Challenge::class)]
 #[CoversClass(AbstractWstElement::class)]
 final class ChallengeTest extends TestCase
diff --git a/tests/WSSecurity/XML/wst/ClaimsTest.php b/tests/WSSecurity/XML/wst/ClaimsTest.php
index 1bd1f64a..41c9e8c6 100644
--- a/tests/WSSecurity/XML/wst/ClaimsTest.php
+++ b/tests/WSSecurity/XML/wst/ClaimsTest.php
@@ -5,6 +5,7 @@
 namespace SimpleSAML\Test\WSSecurity\XML\wst;
 
 use PHPUnit\Framework\Attributes\CoversClass;
+use PHPUnit\Framework\Attributes\Group;
 use PHPUnit\Framework\TestCase;
 use SimpleSAML\SOAP\Constants as SOAP;
 use SimpleSAML\Test\WSSecurity\Constants as C;
@@ -24,6 +25,7 @@
  *
  * @package simplesamlphp/ws-security
  */
+#[Group('wst')]
 #[CoversClass(Claims::class)]
 #[CoversClass(AbstractClaimsType::class)]
 #[CoversClass(AbstractWstElement::class)]
diff --git a/tests/WSSecurity/XML/wst/CodeTest.php b/tests/WSSecurity/XML/wst/CodeTest.php
index f544066e..b16e26aa 100644
--- a/tests/WSSecurity/XML/wst/CodeTest.php
+++ b/tests/WSSecurity/XML/wst/CodeTest.php
@@ -5,6 +5,7 @@
 namespace SimpleSAML\Test\WSSecurity\XML\wst;
 
 use PHPUnit\Framework\Attributes\CoversClass;
+use PHPUnit\Framework\Attributes\Group;
 use PHPUnit\Framework\TestCase;
 use SimpleSAML\WSSecurity\XML\wst\AbstractStatusCodeOpenEnum;
 use SimpleSAML\WSSecurity\XML\wst\AbstractWstElement;
@@ -20,6 +21,7 @@
  *
  * @package simplesamlphp/ws-security
  */
+#[Group('wst')]
 #[CoversClass(Code::class)]
 #[CoversClass(AbstractStatusCodeOpenEnum::class)]
 #[CoversClass(AbstractWstElement::class)]
diff --git a/tests/WSSecurity/XML/wst/CombinedHashTest.php b/tests/WSSecurity/XML/wst/CombinedHashTest.php
index bc6480b5..448e712b 100644
--- a/tests/WSSecurity/XML/wst/CombinedHashTest.php
+++ b/tests/WSSecurity/XML/wst/CombinedHashTest.php
@@ -5,6 +5,7 @@
 namespace SimpleSAML\Test\WSSecurity\XML\wst;
 
 use PHPUnit\Framework\Attributes\CoversClass;
+use PHPUnit\Framework\Attributes\Group;
 use PHPUnit\Framework\TestCase;
 use SimpleSAML\WSSecurity\XML\wst\AbstractWstElement;
 use SimpleSAML\WSSecurity\XML\wst\CombinedHash;
@@ -19,6 +20,7 @@
  *
  * @package simplesamlphp/ws-security
  */
+#[Group('wst')]
 #[CoversClass(CombinedHash::class)]
 #[CoversClass(AbstractWstElement::class)]
 final class CombinedHashTest extends TestCase
diff --git a/tests/WSSecurity/XML/wst/ComputedKeyAlgorithmTest.php b/tests/WSSecurity/XML/wst/ComputedKeyAlgorithmTest.php
index 480a589c..840c4212 100644
--- a/tests/WSSecurity/XML/wst/ComputedKeyAlgorithmTest.php
+++ b/tests/WSSecurity/XML/wst/ComputedKeyAlgorithmTest.php
@@ -5,6 +5,7 @@
 namespace SimpleSAML\Test\WSSecurity\XML\wst;
 
 use PHPUnit\Framework\Attributes\CoversClass;
+use PHPUnit\Framework\Attributes\Group;
 use PHPUnit\Framework\TestCase;
 use SimpleSAML\Test\WSSecurity\Constants as C;
 use SimpleSAML\WSSecurity\XML\wst\AbstractWstElement;
@@ -20,6 +21,7 @@
  *
  * @package simplesamlphp/ws-security
  */
+#[Group('wst')]
 #[CoversClass(ComputedKeyAlgorithm::class)]
 #[CoversClass(AbstractWstElement::class)]
 final class ComputedKeyAlgorithmTest extends TestCase
diff --git a/tests/WSSecurity/XML/wst/ComputedKeyTest.php b/tests/WSSecurity/XML/wst/ComputedKeyTest.php
index be0c2067..11f1489f 100644
--- a/tests/WSSecurity/XML/wst/ComputedKeyTest.php
+++ b/tests/WSSecurity/XML/wst/ComputedKeyTest.php
@@ -5,6 +5,7 @@
 namespace SimpleSAML\Test\WSSecurity\XML\wst;
 
 use PHPUnit\Framework\Attributes\CoversClass;
+use PHPUnit\Framework\Attributes\Group;
 use PHPUnit\Framework\TestCase;
 use SimpleSAML\WSSecurity\XML\wst\AbstractComputedKeyOpenEnum;
 use SimpleSAML\WSSecurity\XML\wst\AbstractWstElement;
@@ -21,6 +22,7 @@
  *
  * @package simplesamlphp/ws-security
  */
+#[Group('wst')]
 #[CoversClass(ComputedKey::class)]
 #[CoversClass(AbstractComputedKeyOpenEnum::class)]
 #[CoversClass(AbstractWstElement::class)]
diff --git a/tests/WSSecurity/XML/wst/DelegatableTest.php b/tests/WSSecurity/XML/wst/DelegatableTest.php
index 48e79c3b..12f68594 100644
--- a/tests/WSSecurity/XML/wst/DelegatableTest.php
+++ b/tests/WSSecurity/XML/wst/DelegatableTest.php
@@ -5,6 +5,7 @@
 namespace SimpleSAML\Test\WSSecurity\XML\wst;
 
 use PHPUnit\Framework\Attributes\CoversClass;
+use PHPUnit\Framework\Attributes\Group;
 use PHPUnit\Framework\TestCase;
 use SimpleSAML\WSSecurity\XML\wst\AbstractWstElement;
 use SimpleSAML\WSSecurity\XML\wst\Delegatable;
@@ -19,6 +20,7 @@
  *
  * @package simplesamlphp/ws-security
  */
+#[Group('wst')]
 #[CoversClass(Delegatable::class)]
 #[CoversClass(AbstractWstElement::class)]
 final class DelegatableTest extends TestCase
diff --git a/tests/WSSecurity/XML/wst/DelegateToTest.php b/tests/WSSecurity/XML/wst/DelegateToTest.php
index eefbc779..565a92d9 100644
--- a/tests/WSSecurity/XML/wst/DelegateToTest.php
+++ b/tests/WSSecurity/XML/wst/DelegateToTest.php
@@ -5,6 +5,7 @@
 namespace SimpleSAML\Test\WSSecurity\XML\wst;
 
 use PHPUnit\Framework\Attributes\CoversClass;
+use PHPUnit\Framework\Attributes\Group;
 use PHPUnit\Framework\TestCase;
 use SimpleSAML\SOAP\Constants as SOAP;
 use SimpleSAML\WSSecurity\XML\wsa\MessageID;
@@ -23,6 +24,7 @@
  *
  * @package simplesamlphp/ws-security
  */
+#[Group('wst')]
 #[CoversClass(DelegateTo::class)]
 #[CoversClass(AbstractDelegateToType::class)]
 #[CoversClass(AbstractWstElement::class)]
diff --git a/tests/WSSecurity/XML/wst/EncryptWithTest.php b/tests/WSSecurity/XML/wst/EncryptWithTest.php
index 8d7e2d60..a8c7022b 100644
--- a/tests/WSSecurity/XML/wst/EncryptWithTest.php
+++ b/tests/WSSecurity/XML/wst/EncryptWithTest.php
@@ -5,6 +5,7 @@
 namespace SimpleSAML\Test\WSSecurity\XML\wst;
 
 use PHPUnit\Framework\Attributes\CoversClass;
+use PHPUnit\Framework\Attributes\Group;
 use PHPUnit\Framework\TestCase;
 use SimpleSAML\Test\WSSecurity\Constants as C;
 use SimpleSAML\WSSecurity\XML\wst\AbstractWstElement;
@@ -20,6 +21,7 @@
  *
  * @package simplesamlphp/ws-security
  */
+#[Group('wst')]
 #[CoversClass(EncryptWith::class)]
 #[CoversClass(AbstractWstElement::class)]
 final class EncryptWithTest extends TestCase
diff --git a/tests/WSSecurity/XML/wst/EncryptionAlgorithmTest.php b/tests/WSSecurity/XML/wst/EncryptionAlgorithmTest.php
index abacfa51..1f364d0a 100644
--- a/tests/WSSecurity/XML/wst/EncryptionAlgorithmTest.php
+++ b/tests/WSSecurity/XML/wst/EncryptionAlgorithmTest.php
@@ -5,6 +5,7 @@
 namespace SimpleSAML\Test\WSSecurity\XML\wst;
 
 use PHPUnit\Framework\Attributes\CoversClass;
+use PHPUnit\Framework\Attributes\Group;
 use PHPUnit\Framework\TestCase;
 use SimpleSAML\Test\WSSecurity\Constants as C;
 use SimpleSAML\WSSecurity\XML\wst\AbstractWstElement;
@@ -20,6 +21,7 @@
  *
  * @package simplesamlphp/ws-security
  */
+#[Group('wst')]
 #[CoversClass(EncryptionAlgorithm::class)]
 #[CoversClass(AbstractWstElement::class)]
 final class EncryptionAlgorithmTest extends TestCase
diff --git a/tests/WSSecurity/XML/wst/EncryptionTest.php b/tests/WSSecurity/XML/wst/EncryptionTest.php
index db5f56a7..bf2e988e 100644
--- a/tests/WSSecurity/XML/wst/EncryptionTest.php
+++ b/tests/WSSecurity/XML/wst/EncryptionTest.php
@@ -5,6 +5,7 @@
 namespace SimpleSAML\Test\WSSecurity\XML\wst;
 
 use PHPUnit\Framework\Attributes\CoversClass;
+use PHPUnit\Framework\Attributes\Group;
 use PHPUnit\Framework\TestCase;
 use SimpleSAML\SOAP\Constants as SOAP;
 use SimpleSAML\WSSecurity\XML\wsa\MessageID;
@@ -23,6 +24,7 @@
  *
  * @package simplesamlphp/ws-security
  */
+#[Group('wst')]
 #[CoversClass(Encryption::class)]
 #[CoversClass(AbstractEncryptionType::class)]
 #[CoversClass(AbstractWstElement::class)]
diff --git a/tests/WSSecurity/XML/wst/EntropyTest.php b/tests/WSSecurity/XML/wst/EntropyTest.php
index 6a4c0955..938de8ec 100644
--- a/tests/WSSecurity/XML/wst/EntropyTest.php
+++ b/tests/WSSecurity/XML/wst/EntropyTest.php
@@ -5,6 +5,7 @@
 namespace SimpleSAML\Test\WSSecurity\XML\wst;
 
 use PHPUnit\Framework\Attributes\CoversClass;
+use PHPUnit\Framework\Attributes\Group;
 use PHPUnit\Framework\TestCase;
 use SimpleSAML\SOAP\Constants as SOAP;
 use SimpleSAML\Test\WSSecurity\Constants as C;
@@ -24,6 +25,7 @@
  *
  * @package simplesamlphp/ws-security
  */
+#[Group('wst')]
 #[CoversClass(Entropy::class)]
 #[CoversClass(AbstractEntropyType::class)]
 #[CoversClass(AbstractWstElement::class)]
diff --git a/tests/WSSecurity/XML/wst/ForwardableTest.php b/tests/WSSecurity/XML/wst/ForwardableTest.php
index 9573a67e..d0eaa1a2 100644
--- a/tests/WSSecurity/XML/wst/ForwardableTest.php
+++ b/tests/WSSecurity/XML/wst/ForwardableTest.php
@@ -5,6 +5,7 @@
 namespace SimpleSAML\Test\WSSecurity\XML\wst;
 
 use PHPUnit\Framework\Attributes\CoversClass;
+use PHPUnit\Framework\Attributes\Group;
 use PHPUnit\Framework\TestCase;
 use SimpleSAML\WSSecurity\XML\wst\AbstractWstElement;
 use SimpleSAML\WSSecurity\XML\wst\Forwardable;
@@ -19,6 +20,7 @@
  *
  * @package simplesamlphp/ws-security
  */
+#[Group('wst')]
 #[CoversClass(Forwardable::class)]
 #[CoversClass(AbstractWstElement::class)]
 final class ForwardableTest extends TestCase
diff --git a/tests/WSSecurity/XML/wst/IssuedTokensTest.php b/tests/WSSecurity/XML/wst/IssuedTokensTest.php
index e1429d40..59bf15d5 100644
--- a/tests/WSSecurity/XML/wst/IssuedTokensTest.php
+++ b/tests/WSSecurity/XML/wst/IssuedTokensTest.php
@@ -5,6 +5,7 @@
 namespace SimpleSAML\Test\WSSecurity\XML\wst;
 
 use PHPUnit\Framework\Attributes\CoversClass;
+use PHPUnit\Framework\Attributes\Group;
 use PHPUnit\Framework\TestCase;
 use SimpleSAML\SOAP\Constants as SOAP;
 use SimpleSAML\Test\WSSecurity\Constants as C;
@@ -25,6 +26,7 @@
  *
  * @package simplesamlphp/ws-security
  */
+#[Group('wst')]
 #[CoversClass(IssuedTokens::class)]
 #[CoversClass(AbstractEndpointReferenceType::class)]
 #[CoversClass(AbstractWstElement::class)]
diff --git a/tests/WSSecurity/XML/wst/IssuerTest.php b/tests/WSSecurity/XML/wst/IssuerTest.php
index 4d6420ae..fd17187c 100644
--- a/tests/WSSecurity/XML/wst/IssuerTest.php
+++ b/tests/WSSecurity/XML/wst/IssuerTest.php
@@ -6,6 +6,7 @@
 
 use DOMElement;
 use PHPUnit\Framework\Attributes\CoversClass;
+use PHPUnit\Framework\Attributes\Group;
 use PHPUnit\Framework\TestCase;
 use SimpleSAML\WSSecurity\XML\wsa\AbstractEndpointReferenceType;
 use SimpleSAML\WSSecurity\XML\wsa\Address;
@@ -26,6 +27,7 @@
  *
  * @package simplesamlphp/ws-security
  */
+#[Group('wst')]
 #[CoversClass(Issuer::class)]
 #[CoversClass(AbstractEndpointReferenceType::class)]
 #[CoversClass(AbstractWstElement::class)]
diff --git a/tests/WSSecurity/XML/wst/KeyExchangeTokenTest.php b/tests/WSSecurity/XML/wst/KeyExchangeTokenTest.php
index f5ccee97..3fafac18 100644
--- a/tests/WSSecurity/XML/wst/KeyExchangeTokenTest.php
+++ b/tests/WSSecurity/XML/wst/KeyExchangeTokenTest.php
@@ -5,6 +5,7 @@
 namespace SimpleSAML\Test\WSSecurity\XML\wst;
 
 use PHPUnit\Framework\Attributes\CoversClass;
+use PHPUnit\Framework\Attributes\Group;
 use PHPUnit\Framework\TestCase;
 use SimpleSAML\SOAP\Constants as SOAP;
 use SimpleSAML\WSSecurity\XML\wsa\MessageID;
@@ -23,6 +24,7 @@
  *
  * @package simplesamlphp/ws-security
  */
+#[Group('wst')]
 #[CoversClass(KeyExchangeToken::class)]
 #[CoversClass(AbstractKeyExchangeTokenType::class)]
 #[CoversClass(AbstractWstElement::class)]
diff --git a/tests/WSSecurity/XML/wst/KeySizeTest.php b/tests/WSSecurity/XML/wst/KeySizeTest.php
index c86cd40e..9f100cc9 100644
--- a/tests/WSSecurity/XML/wst/KeySizeTest.php
+++ b/tests/WSSecurity/XML/wst/KeySizeTest.php
@@ -5,6 +5,7 @@
 namespace SimpleSAML\Test\WSSecurity\XML\wst;
 
 use PHPUnit\Framework\Attributes\CoversClass;
+use PHPUnit\Framework\Attributes\Group;
 use PHPUnit\Framework\TestCase;
 use SimpleSAML\WSSecurity\XML\wst\AbstractWstElement;
 use SimpleSAML\WSSecurity\XML\wst\KeySize;
@@ -19,6 +20,7 @@
  *
  * @package simplesamlphp/ws-security
  */
+#[Group('wst')]
 #[CoversClass(KeySize::class)]
 #[CoversClass(AbstractWstElement::class)]
 final class KeySizeTest extends TestCase
diff --git a/tests/WSSecurity/XML/wst/KeyTypeTest.php b/tests/WSSecurity/XML/wst/KeyTypeTest.php
index 16b61365..7b4a31b3 100644
--- a/tests/WSSecurity/XML/wst/KeyTypeTest.php
+++ b/tests/WSSecurity/XML/wst/KeyTypeTest.php
@@ -5,6 +5,7 @@
 namespace SimpleSAML\Test\WSSecurity\XML\wst;
 
 use PHPUnit\Framework\Attributes\CoversClass;
+use PHPUnit\Framework\Attributes\Group;
 use PHPUnit\Framework\TestCase;
 use SimpleSAML\WSSecurity\XML\wst\AbstractKeyTypeOpenEnum;
 use SimpleSAML\WSSecurity\XML\wst\AbstractWstElement;
@@ -21,6 +22,7 @@
  *
  * @package simplesamlphp/ws-security
  */
+#[Group('wst')]
 #[CoversClass(KeyType::class)]
 #[CoversClass(AbstractKeyTypeOpenEnum::class)]
 #[CoversClass(AbstractWstElement::class)]
diff --git a/tests/WSSecurity/XML/wst/KeyWrapAlgorithmTest.php b/tests/WSSecurity/XML/wst/KeyWrapAlgorithmTest.php
index 8c942fc2..2fef90e1 100644
--- a/tests/WSSecurity/XML/wst/KeyWrapAlgorithmTest.php
+++ b/tests/WSSecurity/XML/wst/KeyWrapAlgorithmTest.php
@@ -5,6 +5,7 @@
 namespace SimpleSAML\Test\WSSecurity\XML\wst;
 
 use PHPUnit\Framework\Attributes\CoversClass;
+use PHPUnit\Framework\Attributes\Group;
 use PHPUnit\Framework\TestCase;
 use SimpleSAML\Test\WSSecurity\Constants as C;
 use SimpleSAML\WSSecurity\XML\wst\AbstractWstElement;
@@ -20,6 +21,7 @@
  *
  * @package simplesamlphp/ws-security
  */
+#[Group('wst')]
 #[CoversClass(KeyWrapAlgorithm::class)]
 #[CoversClass(AbstractWstElement::class)]
 final class KeyWrapAlgorithmTest extends TestCase
diff --git a/tests/WSSecurity/XML/wst/LifetimeTest.php b/tests/WSSecurity/XML/wst/LifetimeTest.php
index 2a27a859..e24d984d 100644
--- a/tests/WSSecurity/XML/wst/LifetimeTest.php
+++ b/tests/WSSecurity/XML/wst/LifetimeTest.php
@@ -6,6 +6,7 @@
 
 use DateTimeImmutable;
 use PHPUnit\Framework\Attributes\CoversClass;
+use PHPUnit\Framework\Attributes\Group;
 use PHPUnit\Framework\TestCase;
 use SimpleSAML\WSSecurity\XML\wst\AbstractLifetimeType;
 use SimpleSAML\WSSecurity\XML\wst\AbstractWstElement;
@@ -23,6 +24,7 @@
  *
  * @package simplesamlphp/ws-security
  */
+#[Group('wst')]
 #[CoversClass(Lifetime::class)]
 #[CoversClass(AbstractLifetimeType::class)]
 #[CoversClass(AbstractWstElement::class)]
diff --git a/tests/WSSecurity/XML/wst/OnBehalfOfTest.php b/tests/WSSecurity/XML/wst/OnBehalfOfTest.php
index e29afa66..61c4471a 100644
--- a/tests/WSSecurity/XML/wst/OnBehalfOfTest.php
+++ b/tests/WSSecurity/XML/wst/OnBehalfOfTest.php
@@ -5,6 +5,7 @@
 namespace SimpleSAML\Test\WSSecurity\XML\wst;
 
 use PHPUnit\Framework\Attributes\CoversClass;
+use PHPUnit\Framework\Attributes\Group;
 use PHPUnit\Framework\TestCase;
 use SimpleSAML\SOAP\Constants as SOAP;
 use SimpleSAML\WSSecurity\XML\wsa\MessageID;
@@ -23,6 +24,7 @@
  *
  * @package simplesamlphp/ws-security
  */
+#[Group('wst')]
 #[CoversClass(OnBehalfOf::class)]
 #[CoversClass(AbstractOnBehalfOfType::class)]
 #[CoversClass(AbstractWstElement::class)]
diff --git a/tests/WSSecurity/XML/wst/ParticipantTest.php b/tests/WSSecurity/XML/wst/ParticipantTest.php
index 56146aff..f16a5e46 100644
--- a/tests/WSSecurity/XML/wst/ParticipantTest.php
+++ b/tests/WSSecurity/XML/wst/ParticipantTest.php
@@ -5,6 +5,7 @@
 namespace SimpleSAML\Test\WSSecurity\XML\wst;
 
 use PHPUnit\Framework\Attributes\CoversClass;
+use PHPUnit\Framework\Attributes\Group;
 use PHPUnit\Framework\TestCase;
 use SimpleSAML\SOAP\Constants as SOAP;
 use SimpleSAML\WSSecurity\XML\wsa\MessageID;
@@ -22,6 +23,7 @@
  *
  * @package simplesamlphp/ws-security
  */
+#[Group('wst')]
 #[CoversClass(Participant::class)]
 #[CoversClass(AbstractParticipantType::class)]
 #[CoversClass(AbstractWstElement::class)]
diff --git a/tests/WSSecurity/XML/wst/ParticipantsTest.php b/tests/WSSecurity/XML/wst/ParticipantsTest.php
index 3bc011b0..cd8ca40a 100644
--- a/tests/WSSecurity/XML/wst/ParticipantsTest.php
+++ b/tests/WSSecurity/XML/wst/ParticipantsTest.php
@@ -5,6 +5,7 @@
 namespace SimpleSAML\Test\WSSecurity\XML\wst;
 
 use PHPUnit\Framework\Attributes\CoversClass;
+use PHPUnit\Framework\Attributes\Group;
 use PHPUnit\Framework\TestCase;
 use SimpleSAML\SOAP\Constants as SOAP;
 use SimpleSAML\WSSecurity\Constants as C;
@@ -26,6 +27,7 @@
  *
  * @package simplesamlphp/ws-security
  */
+#[Group('wst')]
 #[CoversClass(Participants::class)]
 #[CoversClass(AbstractParticipantsType::class)]
 #[CoversClass(AbstractWstElement::class)]
diff --git a/tests/WSSecurity/XML/wst/PrimaryTest.php b/tests/WSSecurity/XML/wst/PrimaryTest.php
index ab70a232..15cc0d7f 100644
--- a/tests/WSSecurity/XML/wst/PrimaryTest.php
+++ b/tests/WSSecurity/XML/wst/PrimaryTest.php
@@ -5,6 +5,7 @@
 namespace SimpleSAML\Test\WSSecurity\XML\wst;
 
 use PHPUnit\Framework\Attributes\CoversClass;
+use PHPUnit\Framework\Attributes\Group;
 use PHPUnit\Framework\TestCase;
 use SimpleSAML\SOAP\Constants as SOAP;
 use SimpleSAML\WSSecurity\XML\wsa\MessageID;
@@ -22,6 +23,7 @@
  *
  * @package simplesamlphp/ws-security
  */
+#[Group('wst')]
 #[CoversClass(Primary::class)]
 #[CoversClass(AbstractParticipantType::class)]
 #[CoversClass(AbstractWstElement::class)]
diff --git a/tests/WSSecurity/XML/wst/ProofEncryptionTest.php b/tests/WSSecurity/XML/wst/ProofEncryptionTest.php
index c97b98b3..feff5b47 100644
--- a/tests/WSSecurity/XML/wst/ProofEncryptionTest.php
+++ b/tests/WSSecurity/XML/wst/ProofEncryptionTest.php
@@ -5,6 +5,7 @@
 namespace SimpleSAML\Test\WSSecurity\XML\wst;
 
 use PHPUnit\Framework\Attributes\CoversClass;
+use PHPUnit\Framework\Attributes\Group;
 use PHPUnit\Framework\TestCase;
 use SimpleSAML\SOAP\Constants as SOAP;
 use SimpleSAML\WSSecurity\XML\wsa\MessageID;
@@ -23,6 +24,7 @@
  *
  * @package simplesamlphp/ws-security
  */
+#[Group('wst')]
 #[CoversClass(ProofEncryption::class)]
 #[CoversClass(AbstractProofEncryptionType::class)]
 #[CoversClass(AbstractWstElement::class)]
diff --git a/tests/WSSecurity/XML/wst/ReasonTest.php b/tests/WSSecurity/XML/wst/ReasonTest.php
index 5017321e..b08231a6 100644
--- a/tests/WSSecurity/XML/wst/ReasonTest.php
+++ b/tests/WSSecurity/XML/wst/ReasonTest.php
@@ -5,6 +5,7 @@
 namespace SimpleSAML\Test\WSSecurity\XML\wst;
 
 use PHPUnit\Framework\Attributes\CoversClass;
+use PHPUnit\Framework\Attributes\Group;
 use PHPUnit\Framework\TestCase;
 use SimpleSAML\WSSecurity\XML\wst\AbstractWstElement;
 use SimpleSAML\WSSecurity\XML\wst\Reason;
@@ -18,6 +19,7 @@
  *
  * @package simplesamlphp/ws-security
  */
+#[Group('wst')]
 #[CoversClass(Reason::class)]
 #[CoversClass(AbstractWstElement::class)]
 final class ReasonTest extends TestCase
diff --git a/tests/WSSecurity/XML/wst/RenewTargetTest.php b/tests/WSSecurity/XML/wst/RenewTargetTest.php
index ef9b1994..e5d02a75 100644
--- a/tests/WSSecurity/XML/wst/RenewTargetTest.php
+++ b/tests/WSSecurity/XML/wst/RenewTargetTest.php
@@ -5,6 +5,7 @@
 namespace SimpleSAML\Test\WSSecurity\XML\wst;
 
 use PHPUnit\Framework\Attributes\CoversClass;
+use PHPUnit\Framework\Attributes\Group;
 use PHPUnit\Framework\TestCase;
 use SimpleSAML\SOAP\Constants as SOAP;
 use SimpleSAML\WSSecurity\XML\wsa\MessageID;
@@ -23,6 +24,7 @@
  *
  * @package simplesamlphp/ws-security
  */
+#[Group('wst')]
 #[CoversClass(RenewTarget::class)]
 #[CoversClass(AbstractRenewTargetType::class)]
 #[CoversClass(AbstractWstElement::class)]
diff --git a/tests/WSSecurity/XML/wst/RenewingTest.php b/tests/WSSecurity/XML/wst/RenewingTest.php
index a03503de..0e978de9 100644
--- a/tests/WSSecurity/XML/wst/RenewingTest.php
+++ b/tests/WSSecurity/XML/wst/RenewingTest.php
@@ -5,6 +5,7 @@
 namespace SimpleSAML\Test\WSSecurity\XML\wst;
 
 use PHPUnit\Framework\Attributes\CoversClass;
+use PHPUnit\Framework\Attributes\Group;
 use PHPUnit\Framework\TestCase;
 use SimpleSAML\WSSecurity\XML\wst\AbstractRenewingType;
 use SimpleSAML\WSSecurity\XML\wst\AbstractWstElement;
@@ -20,6 +21,7 @@
  *
  * @package simplesamlphp/ws-security
  */
+#[Group('wst')]
 #[CoversClass(Renewing::class)]
 #[CoversClass(AbstractRenewingType::class)]
 #[CoversClass(AbstractWstElement::class)]
diff --git a/tests/WSSecurity/XML/wst/RequestKETTest.php b/tests/WSSecurity/XML/wst/RequestKETTest.php
index a51748e2..81e7f0d1 100644
--- a/tests/WSSecurity/XML/wst/RequestKETTest.php
+++ b/tests/WSSecurity/XML/wst/RequestKETTest.php
@@ -5,6 +5,7 @@
 namespace SimpleSAML\Test\WSSecurity\XML\wst;
 
 use PHPUnit\Framework\Attributes\CoversClass;
+use PHPUnit\Framework\Attributes\Group;
 use PHPUnit\Framework\TestCase;
 use SimpleSAML\WSSecurity\XML\wst\AbstractWstElement;
 use SimpleSAML\WSSecurity\XML\wst\RequestKET;
@@ -19,6 +20,7 @@
  *
  * @package simplesamlphp/ws-security
  */
+#[Group('wst')]
 #[CoversClass(RequestKET::class)]
 #[CoversClass(AbstractWstElement::class)]
 final class RequestKETTest extends TestCase
diff --git a/tests/WSSecurity/XML/wst/RequestSecurityTokenCollectionTest.php b/tests/WSSecurity/XML/wst/RequestSecurityTokenCollectionTest.php
index 5e51d838..b205df4f 100644
--- a/tests/WSSecurity/XML/wst/RequestSecurityTokenCollectionTest.php
+++ b/tests/WSSecurity/XML/wst/RequestSecurityTokenCollectionTest.php
@@ -5,6 +5,7 @@
 namespace SimpleSAML\Test\WSSecurity\XML\wst;
 
 use PHPUnit\Framework\Attributes\CoversClass;
+use PHPUnit\Framework\Attributes\Group;
 use PHPUnit\Framework\TestCase;
 use SimpleSAML\SOAP\Constants as SOAP;
 use SimpleSAML\Test\WSSecurity\Constants as C;
@@ -25,6 +26,7 @@
  *
  * @package simplesamlphp/ws-security
  */
+#[Group('wst')]
 #[CoversClass(RequestSecurityTokenCollection::class)]
 #[CoversClass(AbstractRequestSecurityTokenCollectionType::class)]
 #[CoversClass(AbstractWstElement::class)]
diff --git a/tests/WSSecurity/XML/wst/RequestSecurityTokenResponseCollectionTest.php b/tests/WSSecurity/XML/wst/RequestSecurityTokenResponseCollectionTest.php
index a32430f1..c1bb62e6 100644
--- a/tests/WSSecurity/XML/wst/RequestSecurityTokenResponseCollectionTest.php
+++ b/tests/WSSecurity/XML/wst/RequestSecurityTokenResponseCollectionTest.php
@@ -5,6 +5,7 @@
 namespace SimpleSAML\Test\WSSecurity\XML\wst;
 
 use PHPUnit\Framework\Attributes\CoversClass;
+use PHPUnit\Framework\Attributes\Group;
 use PHPUnit\Framework\TestCase;
 use SimpleSAML\SOAP\Constants as SOAP;
 use SimpleSAML\Test\WSSecurity\Constants as C;
@@ -25,6 +26,7 @@
  *
  * @package simplesamlphp/ws-security
  */
+#[Group('wst')]
 #[CoversClass(RequestSecurityTokenResponseCollection::class)]
 #[CoversClass(AbstractRequestSecurityTokenResponseCollectionType::class)]
 #[CoversClass(AbstractWstElement::class)]
diff --git a/tests/WSSecurity/XML/wst/RequestSecurityTokenResponseTest.php b/tests/WSSecurity/XML/wst/RequestSecurityTokenResponseTest.php
index 2d47271a..d9be8101 100644
--- a/tests/WSSecurity/XML/wst/RequestSecurityTokenResponseTest.php
+++ b/tests/WSSecurity/XML/wst/RequestSecurityTokenResponseTest.php
@@ -5,6 +5,7 @@
 namespace SimpleSAML\Test\WSSecurity\XML\wst;
 
 use PHPUnit\Framework\Attributes\CoversClass;
+use PHPUnit\Framework\Attributes\Group;
 use PHPUnit\Framework\TestCase;
 use SimpleSAML\SOAP\Constants as SOAP;
 use SimpleSAML\Test\WSSecurity\Constants as C;
@@ -24,6 +25,7 @@
  *
  * @package simplesamlphp/ws-security
  */
+#[Group('wst')]
 #[CoversClass(RequestSecurityTokenResponse::class)]
 #[CoversClass(AbstractRequestSecurityTokenResponseType::class)]
 #[CoversClass(AbstractWstElement::class)]
diff --git a/tests/WSSecurity/XML/wst/RequestSecurityTokenTest.php b/tests/WSSecurity/XML/wst/RequestSecurityTokenTest.php
index 8f5dfbba..0bc18646 100644
--- a/tests/WSSecurity/XML/wst/RequestSecurityTokenTest.php
+++ b/tests/WSSecurity/XML/wst/RequestSecurityTokenTest.php
@@ -5,6 +5,7 @@
 namespace SimpleSAML\Test\WSSecurity\XML\wst;
 
 use PHPUnit\Framework\Attributes\CoversClass;
+use PHPUnit\Framework\Attributes\Group;
 use PHPUnit\Framework\TestCase;
 use SimpleSAML\SOAP\Constants as SOAP;
 use SimpleSAML\Test\WSSecurity\Constants as C;
@@ -24,6 +25,7 @@
  *
  * @package simplesamlphp/ws-security
  */
+#[Group('wst')]
 #[CoversClass(RequestSecurityToken::class)]
 #[CoversClass(AbstractRequestSecurityTokenType::class)]
 #[CoversClass(AbstractWstElement::class)]
diff --git a/tests/WSSecurity/XML/wst/RequestTypeTest.php b/tests/WSSecurity/XML/wst/RequestTypeTest.php
index 64bcc4db..3dcdd66e 100644
--- a/tests/WSSecurity/XML/wst/RequestTypeTest.php
+++ b/tests/WSSecurity/XML/wst/RequestTypeTest.php
@@ -5,6 +5,7 @@
 namespace SimpleSAML\Test\WSSecurity\XML\wst;
 
 use PHPUnit\Framework\Attributes\CoversClass;
+use PHPUnit\Framework\Attributes\Group;
 use PHPUnit\Framework\TestCase;
 use SimpleSAML\WSSecurity\XML\wst\AbstractRequestTypeOpenEnum;
 use SimpleSAML\WSSecurity\XML\wst\AbstractWstElement;
@@ -21,6 +22,7 @@
  *
  * @package simplesamlphp/ws-security
  */
+#[Group('wst')]
 #[CoversClass(RequestType::class)]
 #[CoversClass(AbstractRequestTypeOpenEnum::class)]
 #[CoversClass(AbstractWstElement::class)]
diff --git a/tests/WSSecurity/XML/wst/RequestedAttachedReferenceTest.php b/tests/WSSecurity/XML/wst/RequestedAttachedReferenceTest.php
index 6fa917d1..9a105f3b 100644
--- a/tests/WSSecurity/XML/wst/RequestedAttachedReferenceTest.php
+++ b/tests/WSSecurity/XML/wst/RequestedAttachedReferenceTest.php
@@ -5,6 +5,7 @@
 namespace SimpleSAML\Test\WSSecurity\XML\wst;
 
 use PHPUnit\Framework\Attributes\CoversClass;
+use PHPUnit\Framework\Attributes\Group;
 use PHPUnit\Framework\TestCase;
 use SimpleSAML\WSSecurity\XML\wsse\SecurityTokenReference;
 use SimpleSAML\WSSecurity\XML\wst\AbstractRequestedReferenceType;
@@ -23,6 +24,7 @@
  *
  * @package simplesamlphp/ws-security
  */
+#[Group('wst')]
 #[CoversClass(RequestedAttachedReference::class)]
 #[CoversClass(AbstractRequestedReferenceType::class)]
 #[CoversClass(AbstractWstElement::class)]
diff --git a/tests/WSSecurity/XML/wst/RequestedProofTokenTest.php b/tests/WSSecurity/XML/wst/RequestedProofTokenTest.php
index cf6f6f55..9d6ba6be 100644
--- a/tests/WSSecurity/XML/wst/RequestedProofTokenTest.php
+++ b/tests/WSSecurity/XML/wst/RequestedProofTokenTest.php
@@ -5,6 +5,7 @@
 namespace SimpleSAML\Test\WSSecurity\XML\wst;
 
 use PHPUnit\Framework\Attributes\CoversClass;
+use PHPUnit\Framework\Attributes\Group;
 use PHPUnit\Framework\TestCase;
 use SimpleSAML\SOAP\Constants as SOAP;
 use SimpleSAML\WSSecurity\XML\wsa\MessageID;
@@ -23,6 +24,7 @@
  *
  * @package simplesamlphp/ws-security
  */
+#[Group('wst')]
 #[CoversClass(RequestedProofToken::class)]
 #[CoversClass(AbstractRequestedProofTokenType::class)]
 #[CoversClass(AbstractWstElement::class)]
diff --git a/tests/WSSecurity/XML/wst/RequestedSecurityTokenTest.php b/tests/WSSecurity/XML/wst/RequestedSecurityTokenTest.php
index 5299c7f4..562d61a3 100644
--- a/tests/WSSecurity/XML/wst/RequestedSecurityTokenTest.php
+++ b/tests/WSSecurity/XML/wst/RequestedSecurityTokenTest.php
@@ -5,6 +5,7 @@
 namespace SimpleSAML\Test\WSSecurity\XML\wst;
 
 use PHPUnit\Framework\Attributes\CoversClass;
+use PHPUnit\Framework\Attributes\Group;
 use PHPUnit\Framework\TestCase;
 use SimpleSAML\SOAP\Constants as SOAP;
 use SimpleSAML\WSSecurity\XML\wsa\MessageID;
@@ -23,6 +24,7 @@
  *
  * @package simplesamlphp/ws-security
  */
+#[Group('wst')]
 #[CoversClass(RequestedSecurityToken::class)]
 #[CoversClass(AbstractRequestedSecurityTokenType::class)]
 #[CoversClass(AbstractWstElement::class)]
diff --git a/tests/WSSecurity/XML/wst/RequestedTokenCancelledTest.php b/tests/WSSecurity/XML/wst/RequestedTokenCancelledTest.php
index 5f705817..78f8303d 100644
--- a/tests/WSSecurity/XML/wst/RequestedTokenCancelledTest.php
+++ b/tests/WSSecurity/XML/wst/RequestedTokenCancelledTest.php
@@ -5,6 +5,7 @@
 namespace SimpleSAML\Test\WSSecurity\XML\wst;
 
 use PHPUnit\Framework\Attributes\CoversClass;
+use PHPUnit\Framework\Attributes\Group;
 use PHPUnit\Framework\TestCase;
 use SimpleSAML\WSSecurity\XML\wst\AbstractWstElement;
 use SimpleSAML\WSSecurity\XML\wst\RequestedTokenCancelled;
@@ -19,6 +20,7 @@
  *
  * @package simplesamlphp/ws-security
  */
+#[Group('wst')]
 #[CoversClass(RequestedTokenCancelled::class)]
 #[CoversClass(AbstractWstElement::class)]
 final class RequestedTokenCancelledTest extends TestCase
diff --git a/tests/WSSecurity/XML/wst/RequestedUnattachedReferenceTest.php b/tests/WSSecurity/XML/wst/RequestedUnattachedReferenceTest.php
index 52bf3254..e9476daa 100644
--- a/tests/WSSecurity/XML/wst/RequestedUnattachedReferenceTest.php
+++ b/tests/WSSecurity/XML/wst/RequestedUnattachedReferenceTest.php
@@ -5,6 +5,7 @@
 namespace SimpleSAML\Test\WSSecurity\XML\wst;
 
 use PHPUnit\Framework\Attributes\CoversClass;
+use PHPUnit\Framework\Attributes\Group;
 use PHPUnit\Framework\TestCase;
 use SimpleSAML\WSSecurity\XML\wsse\SecurityTokenReference;
 use SimpleSAML\WSSecurity\XML\wst\AbstractRequestedReferenceType;
@@ -23,6 +24,7 @@
  *
  * @package simplesamlphp/ws-security
  */
+#[Group('wst')]
 #[CoversClass(RequestedUnattachedReference::class)]
 #[CoversClass(AbstractRequestedReferenceType::class)]
 #[CoversClass(AbstractWstElement::class)]
diff --git a/tests/WSSecurity/XML/wst/SignChallengeResponseTest.php b/tests/WSSecurity/XML/wst/SignChallengeResponseTest.php
index 32222fe7..fcd939c0 100644
--- a/tests/WSSecurity/XML/wst/SignChallengeResponseTest.php
+++ b/tests/WSSecurity/XML/wst/SignChallengeResponseTest.php
@@ -5,6 +5,7 @@
 namespace SimpleSAML\Test\WSSecurity\XML\wst;
 
 use PHPUnit\Framework\Attributes\CoversClass;
+use PHPUnit\Framework\Attributes\Group;
 use PHPUnit\Framework\TestCase;
 use SimpleSAML\SOAP\Constants as SOAP;
 use SimpleSAML\Test\WSSecurity\Constants as C;
@@ -25,6 +26,7 @@
  *
  * @package simplesamlphp/ws-security
  */
+#[Group('wst')]
 #[CoversClass(SignChallengeResponse::class)]
 #[CoversClass(AbstractSignChallengeType::class)]
 #[CoversClass(AbstractWstElement::class)]
diff --git a/tests/WSSecurity/XML/wst/SignChallengeTest.php b/tests/WSSecurity/XML/wst/SignChallengeTest.php
index 113c1c44..e01822d0 100644
--- a/tests/WSSecurity/XML/wst/SignChallengeTest.php
+++ b/tests/WSSecurity/XML/wst/SignChallengeTest.php
@@ -5,6 +5,7 @@
 namespace SimpleSAML\Test\WSSecurity\XML\wst;
 
 use PHPUnit\Framework\Attributes\CoversClass;
+use PHPUnit\Framework\Attributes\Group;
 use PHPUnit\Framework\TestCase;
 use SimpleSAML\SOAP\Constants as SOAP;
 use SimpleSAML\Test\WSSecurity\Constants as C;
@@ -25,6 +26,7 @@
  *
  * @package simplesamlphp/ws-security
  */
+#[Group('wst')]
 #[CoversClass(SignChallenge::class)]
 #[CoversClass(AbstractSignChallengeType::class)]
 #[CoversClass(AbstractWstElement::class)]
diff --git a/tests/WSSecurity/XML/wst/SignWithTest.php b/tests/WSSecurity/XML/wst/SignWithTest.php
index 74676c39..5a211af4 100644
--- a/tests/WSSecurity/XML/wst/SignWithTest.php
+++ b/tests/WSSecurity/XML/wst/SignWithTest.php
@@ -5,6 +5,7 @@
 namespace SimpleSAML\Test\WSSecurity\XML\wst;
 
 use PHPUnit\Framework\Attributes\CoversClass;
+use PHPUnit\Framework\Attributes\Group;
 use PHPUnit\Framework\TestCase;
 use SimpleSAML\Test\WSSecurity\Constants as C;
 use SimpleSAML\WSSecurity\XML\wst\AbstractWstElement;
@@ -20,6 +21,7 @@
  *
  * @package simplesamlphp/ws-security
  */
+#[Group('wst')]
 #[CoversClass(SignWith::class)]
 #[CoversClass(AbstractWstElement::class)]
 final class SignWithTest extends TestCase
diff --git a/tests/WSSecurity/XML/wst/SignatureAlgorithmTest.php b/tests/WSSecurity/XML/wst/SignatureAlgorithmTest.php
index 20f49ca0..0f36ced3 100644
--- a/tests/WSSecurity/XML/wst/SignatureAlgorithmTest.php
+++ b/tests/WSSecurity/XML/wst/SignatureAlgorithmTest.php
@@ -5,6 +5,7 @@
 namespace SimpleSAML\Test\WSSecurity\XML\wst;
 
 use PHPUnit\Framework\Attributes\CoversClass;
+use PHPUnit\Framework\Attributes\Group;
 use PHPUnit\Framework\TestCase;
 use SimpleSAML\Test\WSSecurity\Constants as C;
 use SimpleSAML\WSSecurity\XML\wst\AbstractWstElement;
@@ -20,6 +21,7 @@
  *
  * @package simplesamlphp/ws-security
  */
+#[Group('wst')]
 #[CoversClass(SignatureAlgorithm::class)]
 #[CoversClass(AbstractWstElement::class)]
 final class SignatureAlgorithmTest extends TestCase
diff --git a/tests/WSSecurity/XML/wst/StatusTest.php b/tests/WSSecurity/XML/wst/StatusTest.php
index cc472e99..00de174d 100644
--- a/tests/WSSecurity/XML/wst/StatusTest.php
+++ b/tests/WSSecurity/XML/wst/StatusTest.php
@@ -5,6 +5,7 @@
 namespace SimpleSAML\Test\WSSecurity\XML\wst;
 
 use PHPUnit\Framework\Attributes\CoversClass;
+use PHPUnit\Framework\Attributes\Group;
 use PHPUnit\Framework\TestCase;
 use SimpleSAML\WSSecurity\XML\wst\AbstractStatusType;
 use SimpleSAML\WSSecurity\XML\wst\AbstractWstElement;
@@ -23,6 +24,7 @@
  *
  * @package simplesamlphp/ws-security
  */
+#[Group('wst')]
 #[CoversClass(Status::class)]
 #[CoversClass(AbstractStatusType::class)]
 #[CoversClass(AbstractWstElement::class)]
diff --git a/tests/WSSecurity/XML/wst/TokenTypeTest.php b/tests/WSSecurity/XML/wst/TokenTypeTest.php
index 56778ae2..620942f8 100644
--- a/tests/WSSecurity/XML/wst/TokenTypeTest.php
+++ b/tests/WSSecurity/XML/wst/TokenTypeTest.php
@@ -5,6 +5,7 @@
 namespace SimpleSAML\Test\WSSecurity\XML\wst;
 
 use PHPUnit\Framework\Attributes\CoversClass;
+use PHPUnit\Framework\Attributes\Group;
 use PHPUnit\Framework\TestCase;
 use SimpleSAML\Test\WSSecurity\Constants as C;
 use SimpleSAML\WSSecurity\XML\wst\AbstractWstElement;
@@ -20,6 +21,7 @@
  *
  * @package simplesamlphp/ws-security
  */
+#[Group('wst')]
 #[CoversClass(TokenType::class)]
 #[CoversClass(AbstractWstElement::class)]
 final class TokenTypeTest extends TestCase
diff --git a/tests/WSSecurity/XML/wst/UseKeyTest.php b/tests/WSSecurity/XML/wst/UseKeyTest.php
index affadef2..2a595938 100644
--- a/tests/WSSecurity/XML/wst/UseKeyTest.php
+++ b/tests/WSSecurity/XML/wst/UseKeyTest.php
@@ -5,6 +5,7 @@
 namespace SimpleSAML\Test\WSSecurity\XML\wst;
 
 use PHPUnit\Framework\Attributes\CoversClass;
+use PHPUnit\Framework\Attributes\Group;
 use PHPUnit\Framework\TestCase;
 use SimpleSAML\SOAP\Constants as SOAP;
 use SimpleSAML\Test\WSSecurity\Constants as C;
@@ -24,6 +25,7 @@
  *
  * @package simplesamlphp/ws-security
  */
+#[Group('wst')]
 #[CoversClass(UseKey::class)]
 #[CoversClass(AbstractUseKeyType::class)]
 #[CoversClass(AbstractWstElement::class)]
diff --git a/tests/WSSecurity/XML/wst/ValidateTargetTest.php b/tests/WSSecurity/XML/wst/ValidateTargetTest.php
index 8b4cc8ce..cbff7458 100644
--- a/tests/WSSecurity/XML/wst/ValidateTargetTest.php
+++ b/tests/WSSecurity/XML/wst/ValidateTargetTest.php
@@ -5,6 +5,7 @@
 namespace SimpleSAML\Test\WSSecurity\XML\wst;
 
 use PHPUnit\Framework\Attributes\CoversClass;
+use PHPUnit\Framework\Attributes\Group;
 use PHPUnit\Framework\TestCase;
 use SimpleSAML\SOAP\Constants as SOAP;
 use SimpleSAML\WSSecurity\XML\wsa\MessageID;
@@ -23,6 +24,7 @@
  *
  * @package simplesamlphp/ws-security
  */
+#[Group('wst')]
 #[CoversClass(ValidateTarget::class)]
 #[CoversClass(AbstractValidateTargetType::class)]
 #[CoversClass(AbstractWstElement::class)]
diff --git a/tests/WSSecurity/XML/wsu/CreatedTest.php b/tests/WSSecurity/XML/wsu/CreatedTest.php
index 57aee600..0b416786 100644
--- a/tests/WSSecurity/XML/wsu/CreatedTest.php
+++ b/tests/WSSecurity/XML/wsu/CreatedTest.php
@@ -6,6 +6,7 @@
 
 use DateTimeImmutable;
 use PHPUnit\Framework\Attributes\CoversClass;
+use PHPUnit\Framework\Attributes\Group;
 use PHPUnit\Framework\TestCase;
 use SimpleSAML\WSSecurity\XML\wsu\AbstractAttributedDateTime;
 use SimpleSAML\WSSecurity\XML\wsu\AbstractWsuElement;
@@ -22,6 +23,7 @@
  *
  * @package simplesamlphp/ws-security
  */
+#[Group('wsu')]
 #[CoversClass(Created::class)]
 #[CoversClass(AbstractAttributedDateTime::class)]
 #[CoversClass(AbstractWsuElement::class)]
diff --git a/tests/WSSecurity/XML/wsu/ExpiresTest.php b/tests/WSSecurity/XML/wsu/ExpiresTest.php
index 47b5f8a3..37d3ffb4 100644
--- a/tests/WSSecurity/XML/wsu/ExpiresTest.php
+++ b/tests/WSSecurity/XML/wsu/ExpiresTest.php
@@ -6,6 +6,7 @@
 
 use DateTimeImmutable;
 use PHPUnit\Framework\Attributes\CoversClass;
+use PHPUnit\Framework\Attributes\Group;
 use PHPUnit\Framework\TestCase;
 use SimpleSAML\WSSecurity\XML\wsu\AbstractAttributedDateTime;
 use SimpleSAML\WSSecurity\XML\wsu\AbstractWsuElement;
@@ -22,6 +23,7 @@
  *
  * @package simplesamlphp/ws-security
  */
+#[Group('wsu')]
 #[CoversClass(Expires::class)]
 #[CoversClass(AbstractAttributedDateTime::class)]
 #[CoversClass(AbstractWsuElement::class)]
diff --git a/tests/WSSecurity/XML/wsu/TimestampTest.php b/tests/WSSecurity/XML/wsu/TimestampTest.php
index 62f95f06..88f99018 100644
--- a/tests/WSSecurity/XML/wsu/TimestampTest.php
+++ b/tests/WSSecurity/XML/wsu/TimestampTest.php
@@ -6,6 +6,7 @@
 
 use DateTimeImmutable;
 use PHPUnit\Framework\Attributes\CoversClass;
+use PHPUnit\Framework\Attributes\Group;
 use PHPUnit\Framework\TestCase;
 use SimpleSAML\WSSecurity\XML\wsu\AbstractTimestamp;
 use SimpleSAML\WSSecurity\XML\wsu\AbstractWsuElement;
@@ -24,6 +25,7 @@
  *
  * @package simplesamlphp/ws-security
  */
+#[Group('wsu')]
 #[CoversClass(Timestamp::class)]
 #[CoversClass(AbstractTimestamp::class)]
 #[CoversClass(AbstractWsuElement::class)]
diff --git a/tests/WSSecurity/XML/wsx/DialectTest.php b/tests/WSSecurity/XML/wsx/DialectTest.php
index 1376cadd..8911c7b0 100644
--- a/tests/WSSecurity/XML/wsx/DialectTest.php
+++ b/tests/WSSecurity/XML/wsx/DialectTest.php
@@ -5,6 +5,7 @@
 namespace SimpleSAML\Test\WSSecurity\XML\wsx;
 
 use PHPUnit\Framework\Attributes\CoversClass;
+use PHPUnit\Framework\Attributes\Group;
 use PHPUnit\Framework\TestCase;
 use SimpleSAML\Test\WSSecurity\Constants as C;
 use SimpleSAML\WSSecurity\XML\wsx\AbstractWsxElement;
@@ -20,6 +21,7 @@
  *
  * @package simplesamlphp/ws-security
  */
+#[Group('wsx')]
 #[CoversClass(Dialect::class)]
 #[CoversClass(AbstractWsxElement::class)]
 final class DialectTest extends TestCase
diff --git a/tests/WSSecurity/XML/wsx/GetMetadataTest.php b/tests/WSSecurity/XML/wsx/GetMetadataTest.php
index 18a51748..00866719 100644
--- a/tests/WSSecurity/XML/wsx/GetMetadataTest.php
+++ b/tests/WSSecurity/XML/wsx/GetMetadataTest.php
@@ -5,6 +5,7 @@
 namespace SimpleSAML\Test\WSSecurity\XML\wsx;
 
 use PHPUnit\Framework\Attributes\CoversClass;
+use PHPUnit\Framework\Attributes\Group;
 use PHPUnit\Framework\TestCase;
 use SimpleSAML\WSSecurity\XML\wsx\AbstractWsxElement;
 use SimpleSAML\WSSecurity\XML\wsx\Dialect;
@@ -23,6 +24,7 @@
  *
  * @package simplesamlphp/ws-security
  */
+#[Group('wsx')]
 #[CoversClass(GetMetadata::class)]
 #[CoversClass(AbstractWsxElement::class)]
 final class GetMetadataTest extends TestCase
diff --git a/tests/WSSecurity/XML/wsx/IdentifierTest.php b/tests/WSSecurity/XML/wsx/IdentifierTest.php
index 837e94bf..78c8413d 100644
--- a/tests/WSSecurity/XML/wsx/IdentifierTest.php
+++ b/tests/WSSecurity/XML/wsx/IdentifierTest.php
@@ -5,6 +5,7 @@
 namespace SimpleSAML\Test\WSSecurity\XML\wsx;
 
 use PHPUnit\Framework\Attributes\CoversClass;
+use PHPUnit\Framework\Attributes\Group;
 use PHPUnit\Framework\TestCase;
 use SimpleSAML\Test\WSSecurity\Constants as C;
 use SimpleSAML\WSSecurity\XML\wsx\AbstractWsxElement;
@@ -20,6 +21,7 @@
  *
  * @package simplesamlphp/ws-security
  */
+#[Group('wsx')]
 #[CoversClass(Identifier::class)]
 #[CoversClass(AbstractWsxElement::class)]
 final class IdentifierTest extends TestCase
diff --git a/tests/WSSecurity/XML/wsx/LocationTest.php b/tests/WSSecurity/XML/wsx/LocationTest.php
index 7952c1f1..6a36430f 100644
--- a/tests/WSSecurity/XML/wsx/LocationTest.php
+++ b/tests/WSSecurity/XML/wsx/LocationTest.php
@@ -5,6 +5,7 @@
 namespace SimpleSAML\Test\WSSecurity\XML\wsx;
 
 use PHPUnit\Framework\Attributes\CoversClass;
+use PHPUnit\Framework\Attributes\Group;
 use PHPUnit\Framework\TestCase;
 use SimpleSAML\Test\WSSecurity\Constants as C;
 use SimpleSAML\WSSecurity\XML\wsx\AbstractWsxElement;
@@ -20,6 +21,7 @@
  *
  * @package simplesamlphp/ws-security
  */
+#[Group('wsx')]
 #[CoversClass(Location::class)]
 #[CoversClass(AbstractWsxElement::class)]
 final class LocationTest extends TestCase
diff --git a/tests/WSSecurity/XML/wsx/MetadataReferenceTest.php b/tests/WSSecurity/XML/wsx/MetadataReferenceTest.php
index eda704e0..a12f0082 100644
--- a/tests/WSSecurity/XML/wsx/MetadataReferenceTest.php
+++ b/tests/WSSecurity/XML/wsx/MetadataReferenceTest.php
@@ -6,6 +6,7 @@
 
 use DOMElement;
 use PHPUnit\Framework\Attributes\CoversClass;
+use PHPUnit\Framework\Attributes\Group;
 use PHPUnit\Framework\TestCase;
 use SimpleSAML\WSSecurity\XML\wsa\Address;
 use SimpleSAML\WSSecurity\XML\wsa\EndpointReference;
@@ -25,6 +26,7 @@
  *
  * @package simplesamlphp/ws-security
  */
+#[Group('wsx')]
 #[CoversClass(MetadataReference::class)]
 #[CoversClass(AbstractWsxElement::class)]
 final class MetadataReferenceTest extends TestCase
diff --git a/tests/WSSecurity/XML/wsx/MetadataSectionTest.php b/tests/WSSecurity/XML/wsx/MetadataSectionTest.php
index 212f558e..ad730954 100644
--- a/tests/WSSecurity/XML/wsx/MetadataSectionTest.php
+++ b/tests/WSSecurity/XML/wsx/MetadataSectionTest.php
@@ -5,6 +5,7 @@
 namespace SimpleSAML\Test\WSSecurity\XML\wsx;
 
 use PHPUnit\Framework\Attributes\CoversClass;
+use PHPUnit\Framework\Attributes\Group;
 use PHPUnit\Framework\TestCase;
 use SimpleSAML\WSSecurity\XML\wsx\AbstractWsxElement;
 use SimpleSAML\WSSecurity\XML\wsx\Location;
@@ -22,6 +23,7 @@
  *
  * @package simplesamlphp/ws-security
  */
+#[Group('wsx')]
 #[CoversClass(MetadataSection::class)]
 #[CoversClass(AbstractWsxElement::class)]
 final class MetadataSectionTest extends TestCase
diff --git a/tests/WSSecurity/XML/wsx/MetadataTest.php b/tests/WSSecurity/XML/wsx/MetadataTest.php
index b83358d2..e3bb9d85 100644
--- a/tests/WSSecurity/XML/wsx/MetadataTest.php
+++ b/tests/WSSecurity/XML/wsx/MetadataTest.php
@@ -5,6 +5,7 @@
 namespace SimpleSAML\Test\WSSecurity\XML\wsx;
 
 use PHPUnit\Framework\Attributes\CoversClass;
+use PHPUnit\Framework\Attributes\Group;
 use PHPUnit\Framework\TestCase;
 use SimpleSAML\WSSecurity\XML\wsx\AbstractWsxElement;
 use SimpleSAML\WSSecurity\XML\wsx\Location;
@@ -24,6 +25,7 @@
  *
  * @package simplesamlphp/ws-security
  */
+#[Group('wsx')]
 #[CoversClass(Metadata::class)]
 #[CoversClass(AbstractWsxElement::class)]
 final class MetadataTest extends TestCase