diff --git a/tests/src/Functional/EntityReferenceFilterAjaxEndpointTest.php b/tests/src/Functional/EntityReferenceFilterAjaxEndpointTest.php
index 6c31002..39d48c5 100644
--- a/tests/src/Functional/EntityReferenceFilterAjaxEndpointTest.php
+++ b/tests/src/Functional/EntityReferenceFilterAjaxEndpointTest.php
@@ -4,6 +4,7 @@ declare(strict_types=1);
 
 namespace Drupal\Tests\entityreference_filter\Functional;
 
+use PHPUnit\Framework\Attributes\Group;
 use PHPUnit\Framework\Attributes\RunTestsInSeparateProcesses;
 
 /**
@@ -12,6 +13,7 @@ use PHPUnit\Framework\Attributes\RunTestsInSeparateProcesses;
  * @group entityreference_filter
  */
 #[RunTestsInSeparateProcesses]
+#[Group('entityreference_filter')]
 class EntityReferenceFilterAjaxEndpointTest extends EntityReferenceFunctionalTestBase {
 
   /**
diff --git a/tests/src/Functional/EntityReferenceFunctionalTestBase.php b/tests/src/Functional/EntityReferenceFunctionalTestBase.php
index 707eef5..1032e9b 100644
--- a/tests/src/Functional/EntityReferenceFunctionalTestBase.php
+++ b/tests/src/Functional/EntityReferenceFunctionalTestBase.php
@@ -4,6 +4,7 @@ declare(strict_types=1);
 
 namespace Drupal\Tests\entityreference_filter\Functional;
 
+use PHPUnit\Framework\Attributes\Group;
 use Drupal\Tests\BrowserTestBase;
 use Drupal\Tests\entityreference_filter\Traits\ContentSetupTrait;
 use Drupal\Tests\entityreference_filter\Traits\EntityReferenceFilterTrait;
@@ -13,6 +14,7 @@ use Drupal\Tests\entityreference_filter\Traits\EntityReferenceFilterTrait;
  *
  * @group entityreference_filter
  */
+#[Group('entityreference_filter')]
 abstract class EntityReferenceFunctionalTestBase extends BrowserTestBase {
 
   use ContentSetupTrait;
diff --git a/tests/src/Functional/Views/EntityReferenceFilterViewsResultTest.php b/tests/src/Functional/Views/EntityReferenceFilterViewsResultTest.php
index 9ffb73f..bb3575e 100644
--- a/tests/src/Functional/Views/EntityReferenceFilterViewsResultTest.php
+++ b/tests/src/Functional/Views/EntityReferenceFilterViewsResultTest.php
@@ -4,6 +4,7 @@ declare(strict_types=1);
 
 namespace Drupal\Tests\entityreference_filter\Functional\Views;
 
+use PHPUnit\Framework\Attributes\Group;
 use Drupal\Tests\entityreference_filter\Functional\EntityReferenceFunctionalTestBase;
 use PHPUnit\Framework\Attributes\RunTestsInSeparateProcesses;
 
@@ -13,6 +14,7 @@ use PHPUnit\Framework\Attributes\RunTestsInSeparateProcesses;
  * @group entityreference_filter
  */
 #[RunTestsInSeparateProcesses]
+#[Group('entityreference_filter')]
 class EntityReferenceFilterViewsResultTest extends EntityReferenceFunctionalTestBase {
 
   /**
diff --git a/tests/src/FunctionalJavascript/EntityReferenceFunctionalJavascriptTestBase.php b/tests/src/FunctionalJavascript/EntityReferenceFunctionalJavascriptTestBase.php
index c1ffcb4..07f977c 100644
--- a/tests/src/FunctionalJavascript/EntityReferenceFunctionalJavascriptTestBase.php
+++ b/tests/src/FunctionalJavascript/EntityReferenceFunctionalJavascriptTestBase.php
@@ -4,6 +4,7 @@ declare(strict_types=1);
 
 namespace Drupal\Tests\entityreference_filter\FunctionalJavascript;
 
+use PHPUnit\Framework\Attributes\Group;
 use Drupal\FunctionalJavascriptTests\WebDriverTestBase;
 use Drupal\Tests\entityreference_filter\Traits\ContentSetupTrait;
 use Drupal\Tests\entityreference_filter\Traits\EntityReferenceFilterTrait;
@@ -13,6 +14,7 @@ use Drupal\Tests\entityreference_filter\Traits\EntityReferenceFilterTrait;
  *
  * @group entityreference_filter
  */
+#[Group('entityreference_filter')]
 abstract class EntityReferenceFunctionalJavascriptTestBase extends WebDriverTestBase {
 
   use ContentSetupTrait;
diff --git a/tests/src/FunctionalJavascript/View/EntityReferenceFilterCascadeJsTest.php b/tests/src/FunctionalJavascript/View/EntityReferenceFilterCascadeJsTest.php
index 8cd3dd0..b899cf0 100644
--- a/tests/src/FunctionalJavascript/View/EntityReferenceFilterCascadeJsTest.php
+++ b/tests/src/FunctionalJavascript/View/EntityReferenceFilterCascadeJsTest.php
@@ -4,6 +4,7 @@ declare(strict_types=1);
 
 namespace Drupal\Tests\entityreference_filter\FunctionalJavascript\View;
 
+use PHPUnit\Framework\Attributes\Group;
 use Drupal\Tests\entityreference_filter\FunctionalJavascript\EntityReferenceFunctionalJavascriptTestBase;
 use PHPUnit\Framework\Attributes\RunTestsInSeparateProcesses;
 
@@ -18,6 +19,7 @@ use PHPUnit\Framework\Attributes\RunTestsInSeparateProcesses;
  * @group entityreference_filter
  */
 #[RunTestsInSeparateProcesses]
+#[Group('entityreference_filter')]
 class EntityReferenceFilterCascadeJsTest extends EntityReferenceFunctionalJavascriptTestBase {
 
   /**
diff --git a/tests/src/FunctionalJavascript/View/EntityReferenceFilterViewsResultJsTest.php b/tests/src/FunctionalJavascript/View/EntityReferenceFilterViewsResultJsTest.php
index 7a14633..8f51e28 100644
--- a/tests/src/FunctionalJavascript/View/EntityReferenceFilterViewsResultJsTest.php
+++ b/tests/src/FunctionalJavascript/View/EntityReferenceFilterViewsResultJsTest.php
@@ -4,6 +4,7 @@ declare(strict_types=1);
 
 namespace Drupal\Tests\entityreference_filter\FunctionalJavascript\Views;
 
+use PHPUnit\Framework\Attributes\Group;
 use Drupal\Tests\entityreference_filter\FunctionalJavascript\EntityReferenceFunctionalJavascriptTestBase;
 use PHPUnit\Framework\Attributes\RunTestsInSeparateProcesses;
 
@@ -13,6 +14,7 @@ use PHPUnit\Framework\Attributes\RunTestsInSeparateProcesses;
  * @group entityreference_filter
  */
 #[RunTestsInSeparateProcesses]
+#[Group('entityreference_filter')]
 class EntityReferenceFilterViewsResultJsTest extends EntityReferenceFunctionalJavascriptTestBase {
 
   /**
diff --git a/tests/src/Kernel/FilterCacheMetadataTest.php b/tests/src/Kernel/FilterCacheMetadataTest.php
index 4c1b970..f639ca1 100644
--- a/tests/src/Kernel/FilterCacheMetadataTest.php
+++ b/tests/src/Kernel/FilterCacheMetadataTest.php
@@ -4,6 +4,7 @@ declare(strict_types=1);
 
 namespace Drupal\Tests\entityreference_filter\Kernel;
 
+use PHPUnit\Framework\Attributes\Group;
 use Drupal\KernelTests\KernelTestBase;
 use Drupal\Tests\entityreference_filter\Traits\EntityReferenceFilterTrait;
 use Drupal\field\Entity\FieldConfig;
@@ -22,6 +23,7 @@ use PHPUnit\Framework\Attributes\RunTestsInSeparateProcesses;
  * @covers \Drupal\entityreference_filter\Plugin\views\filter\EntityReferenceFilterViewResult::calculateDependencies
  */
 #[RunTestsInSeparateProcesses]
+#[Group('entityreference_filter')]
 class FilterCacheMetadataTest extends KernelTestBase {
 
   use EntityReferenceFilterTrait;
diff --git a/tests/src/Kernel/ViewsDataRelationshipIdTest.php b/tests/src/Kernel/ViewsDataRelationshipIdTest.php
index 858043e..9373a0c 100644
--- a/tests/src/Kernel/ViewsDataRelationshipIdTest.php
+++ b/tests/src/Kernel/ViewsDataRelationshipIdTest.php
@@ -4,6 +4,7 @@ declare(strict_types=1);
 
 namespace Drupal\Tests\entityreference_filter\Kernel;
 
+use PHPUnit\Framework\Attributes\Group;
 use Drupal\KernelTests\KernelTestBase;
 use PHPUnit\Framework\Attributes\RunTestsInSeparateProcesses;
 
@@ -20,6 +21,7 @@ use PHPUnit\Framework\Attributes\RunTestsInSeparateProcesses;
  * @covers \Drupal\entityreference_filter\Hook\EntityReferenceFilterHooks::viewsDataAlter
  */
 #[RunTestsInSeparateProcesses]
+#[Group('entityreference_filter')]
 class ViewsDataRelationshipIdTest extends KernelTestBase {
 
   /**
diff --git a/tests/src/Unit/FilterArgumentsResolverTest.php b/tests/src/Unit/FilterArgumentsResolverTest.php
index 791c944..8972d19 100644
--- a/tests/src/Unit/FilterArgumentsResolverTest.php
+++ b/tests/src/Unit/FilterArgumentsResolverTest.php
@@ -4,6 +4,7 @@ declare(strict_types=1);
 
 namespace Drupal\Tests\entityreference_filter\Unit;
 
+use PHPUnit\Framework\Attributes\Group;
 use Drupal\entityreference_filter\Service\FilterArgumentsResolver;
 use Drupal\Tests\UnitTestCase;
 
@@ -14,6 +15,7 @@ use Drupal\Tests\UnitTestCase;
  *
  * @group entityreference_filter
  */
+#[Group('entityreference_filter')]
 class FilterArgumentsResolverTest extends UnitTestCase {
 
   /**
diff --git a/tests/src/Unit/FilterDependencyResolverTest.php b/tests/src/Unit/FilterDependencyResolverTest.php
index d7ce7fb..fb78d73 100644
--- a/tests/src/Unit/FilterDependencyResolverTest.php
+++ b/tests/src/Unit/FilterDependencyResolverTest.php
@@ -4,6 +4,8 @@ declare(strict_types=1);
 
 namespace Drupal\Tests\entityreference_filter\Unit;
 
+use PHPUnit\Framework\Attributes\Group;
+use PHPUnit\Framework\Attributes\DataProvider;
 use Drupal\Tests\UnitTestCase;
 use Drupal\entityreference_filter\Service\FilterArgumentsResolver;
 use Drupal\entityreference_filter\Service\FilterDependencyResolver;
@@ -15,6 +17,7 @@ use Drupal\entityreference_filter\Service\FilterDependencyResolver;
  *
  * @coversDefaultClass \Drupal\entityreference_filter\Service\FilterDependencyResolver
  */
+#[Group('entityreference_filter')]
 class FilterDependencyResolverTest extends UnitTestCase {
 
   /**
@@ -122,6 +125,7 @@ class FilterDependencyResolverTest extends UnitTestCase {
    * @covers ::computeEffectiveValue
    * @dataProvider effectiveValueProvider
    */
+  #[DataProvider('effectiveValueProvider')]
   public function testComputeEffectiveValue(array $current, array $options, bool $required, bool $multiple, array|string $expected): void {
     $this->assertSame($expected, $this->resolver->computeEffectiveValue($current, $options, $required, $multiple));
   }