diff --git a/modules/gnode/tests/src/Functional/EntityOperationsTest.php b/modules/gnode/tests/src/Functional/EntityOperationsTest.php
index f43c5fac5940fe60196e398cde9ccd6acabd6582..78b748ce5e0501b298199813c7e55a4490ff4554 100644
--- a/modules/gnode/tests/src/Functional/EntityOperationsTest.php
+++ b/modules/gnode/tests/src/Functional/EntityOperationsTest.php
@@ -16,7 +16,7 @@ class EntityOperationsTest extends GroupEntityOperationsTest {
   /**
    * {@inheritdoc}
    */
-  public static $modules = ['gnode'];
+  protected static $modules = ['gnode'];
 
   /**
    * {@inheritdoc}
diff --git a/modules/gnode/tests/src/Kernel/GroupNodeConfigTest.php b/modules/gnode/tests/src/Kernel/GroupNodeConfigTest.php
index 56e1af7e74b195f1e8f03e85a75d738f7952f879..3506f2a802b760d1a71cd3f3e3a41f4d9490999a 100644
--- a/modules/gnode/tests/src/Kernel/GroupNodeConfigTest.php
+++ b/modules/gnode/tests/src/Kernel/GroupNodeConfigTest.php
@@ -16,7 +16,7 @@ class GroupNodeConfigTest extends EntityKernelTestBase {
    *
    * @var array
    */
-  public static $modules = [
+  protected static $modules = [
     'entity',
     'flexible_permissions',
     'gnode',
diff --git a/tests/src/Functional/GroupBrowserTestBase.php b/tests/src/Functional/GroupBrowserTestBase.php
index 71c5abb21e362340879433ba1772e3fd937792e3..efa7784ac33591b7edff7dc553a1cd5e76ace7f3 100644
--- a/tests/src/Functional/GroupBrowserTestBase.php
+++ b/tests/src/Functional/GroupBrowserTestBase.php
@@ -12,7 +12,7 @@ abstract class GroupBrowserTestBase extends BrowserTestBase {
   /**
    * {@inheritdoc}
    */
-  public static $modules = ['group'];
+  protected static $modules = ['group'];
 
   /**
    * The entity type manager service.
@@ -36,7 +36,7 @@ abstract class GroupBrowserTestBase extends BrowserTestBase {
   /**
    * {@inheritdoc}
    */
-  protected function setUp() {
+  protected function setUp(): void {
     parent::setUp();
     $this->entityTypeManager = $this->container->get('entity_type.manager');
 
diff --git a/tests/src/Functional/GroupRoleFormTest.php b/tests/src/Functional/GroupRoleFormTest.php
index 69af8ef81bb90ba0fa11791353bfd8d924ab24be..094e535e337ecc9b8abc2d9d07f37cb20e5abdb2 100644
--- a/tests/src/Functional/GroupRoleFormTest.php
+++ b/tests/src/Functional/GroupRoleFormTest.php
@@ -29,7 +29,7 @@ class GroupRoleFormTest extends GroupBrowserTestBase {
   /**
    * {@inheritdoc}
    */
-  protected function setUp() {
+  protected function setUp(): void {
     parent::setUp();
 
     $this->groupRoleStorage = $this->entityTypeManager->getStorage('group_role');
diff --git a/tests/src/Functional/GroupTypeFormTest.php b/tests/src/Functional/GroupTypeFormTest.php
index 472c46e4cbce25a1d57bedce18c64db9472438b5..7e5a143bb5a973a1fc7ec01ddce447897a43b57f 100644
--- a/tests/src/Functional/GroupTypeFormTest.php
+++ b/tests/src/Functional/GroupTypeFormTest.php
@@ -19,7 +19,7 @@ class GroupTypeFormTest extends GroupBrowserTestBase {
   /**
    * {@inheritdoc}
    */
-  protected function setUp() {
+  protected function setUp(): void {
     parent::setUp();
     $this->entityFieldManager = $this->container->get('entity_field.manager');
   }
diff --git a/tests/src/Functional/PageCacheTest.php b/tests/src/Functional/PageCacheTest.php
index 0d6912a5dedcb2f04ef33c8644372362bdd8c182..83305a44571944e5e1181b9d210075e442a9428f 100644
--- a/tests/src/Functional/PageCacheTest.php
+++ b/tests/src/Functional/PageCacheTest.php
@@ -32,7 +32,7 @@ class PageCacheTest extends GroupBrowserTestBase {
   /**
    * {@inheritdoc}
    */
-  protected function setUp() {
+  protected function setUp(): void {
     parent::setUp();
     $this->drupalLogout();
 
diff --git a/tests/src/Kernel/ConfigEntityAccessTest.php b/tests/src/Kernel/ConfigEntityAccessTest.php
index 4833558f3b83161f7286ecbb419b96ff79f80361..ce0ce4b9ee0bd42a923cb3fc0a8899f54a3ba88c 100644
--- a/tests/src/Kernel/ConfigEntityAccessTest.php
+++ b/tests/src/Kernel/ConfigEntityAccessTest.php
@@ -19,7 +19,7 @@ class ConfigEntityAccessTest extends GroupKernelTestBase {
   /**
    * {@inheritdoc}
    */
-  public static $modules = ['group_test_plugin', 'node'];
+  protected static $modules = ['group_test_plugin', 'node'];
 
   /**
    * The test entity storage to use in testing.
@@ -61,7 +61,7 @@ class ConfigEntityAccessTest extends GroupKernelTestBase {
   /**
    * {@inheritdoc}
    */
-  protected function setUp() {
+  protected function setUp(): void {
     parent::setUp();
 
     $this->installEntitySchema('node_type');
diff --git a/tests/src/Kernel/ConfigWrapperAccessControlHandlerTest.php b/tests/src/Kernel/ConfigWrapperAccessControlHandlerTest.php
index 381cb64044844eb05186415540606202e195785d..98853c54b40cfa6e4d534041fd916fbd27ec3686 100644
--- a/tests/src/Kernel/ConfigWrapperAccessControlHandlerTest.php
+++ b/tests/src/Kernel/ConfigWrapperAccessControlHandlerTest.php
@@ -18,12 +18,12 @@ class ConfigWrapperAccessControlHandlerTest extends GroupKernelTestBase {
   /**
    * {@inheritdoc}
    */
-  public static $modules = ['group_test_plugin', 'node'];
+  protected static $modules = ['group_test_plugin', 'node'];
 
   /**
    * {@inheritdoc}
    */
-  protected function setUp() {
+  protected function setUp(): void {
     parent::setUp();
     $this->installEntitySchema('node');
 
diff --git a/tests/src/Kernel/ConfigWrapperStorageTest.php b/tests/src/Kernel/ConfigWrapperStorageTest.php
index 1fd726638dceec040eaaa96e20d312978c3a9540..12d487d1b242fec2eb078d9dbff3ecd6aa1bc4e7 100644
--- a/tests/src/Kernel/ConfigWrapperStorageTest.php
+++ b/tests/src/Kernel/ConfigWrapperStorageTest.php
@@ -19,7 +19,7 @@ class ConfigWrapperStorageTest extends GroupKernelTestBase {
   /**
    * {@inheritdoc}
    */
-  public static $modules = ['group_test_plugin', 'node'];
+  protected static $modules = ['group_test_plugin', 'node'];
 
   /**
    * The group config wrapper storage handler.
@@ -31,7 +31,7 @@ class ConfigWrapperStorageTest extends GroupKernelTestBase {
   /**
    * {@inheritdoc}
    */
-  protected function setUp() {
+  protected function setUp(): void {
     parent::setUp();
     $this->installEntitySchema('node');
     $this->storage = $this->entityTypeManager->getStorage('group_config_wrapper');
diff --git a/tests/src/Kernel/ConfigWrapperTest.php b/tests/src/Kernel/ConfigWrapperTest.php
index 2597d87a0b4f531ca227eeefeb9e8cbb8f29feee..e66ff3f1de8ecc4c99020667b419676974ea2ed5 100644
--- a/tests/src/Kernel/ConfigWrapperTest.php
+++ b/tests/src/Kernel/ConfigWrapperTest.php
@@ -19,7 +19,7 @@ class ConfigWrapperTest extends GroupKernelTestBase {
   /**
    * {@inheritdoc}
    */
-  public static $modules = ['group_test_plugin', 'node'];
+  protected static $modules = ['group_test_plugin', 'node'];
 
   /**
    * The config wrapper storage.
@@ -31,7 +31,7 @@ class ConfigWrapperTest extends GroupKernelTestBase {
   /**
    * {@inheritdoc}
    */
-  protected function setUp() {
+  protected function setUp(): void {
     parent::setUp();
     $this->installEntitySchema('node');
     $this->storage = $this->entityTypeManager->getStorage('group_config_wrapper');
diff --git a/tests/src/Kernel/ContentEntityAccessComplexTest.php b/tests/src/Kernel/ContentEntityAccessComplexTest.php
index 0dd342f6bd8c9776126836acb81e4bc6f77eecbe..ab2683091cbadcd91673634ed09db237d403e060 100644
--- a/tests/src/Kernel/ContentEntityAccessComplexTest.php
+++ b/tests/src/Kernel/ContentEntityAccessComplexTest.php
@@ -23,7 +23,7 @@ class ContentEntityAccessComplexTest extends GroupKernelTestBase {
   /**
    * {@inheritdoc}
    */
-  public static $modules = ['group_test_plugin', 'node'];
+  protected static $modules = ['group_test_plugin', 'node'];
 
   /**
    * The node storage to use in testing.
@@ -70,7 +70,7 @@ class ContentEntityAccessComplexTest extends GroupKernelTestBase {
   /**
    * {@inheritdoc}
    */
-  protected function setUp() {
+  protected function setUp(): void {
     parent::setUp();
 
     $this->installConfig(['user', 'group_test_plugin']);
diff --git a/tests/src/Kernel/ContentEntityAccessTest.php b/tests/src/Kernel/ContentEntityAccessTest.php
index 8c9f4d526bcfe1579efb95f504a37eb2fde30f30..a01be0dd3955c62d9209d2e039da084f8c7c2f3d 100644
--- a/tests/src/Kernel/ContentEntityAccessTest.php
+++ b/tests/src/Kernel/ContentEntityAccessTest.php
@@ -16,7 +16,7 @@ class ContentEntityAccessTest extends GroupKernelTestBase {
   /**
    * {@inheritdoc}
    */
-  public static $modules = ['group_test_plugin', 'node'];
+  protected static $modules = ['group_test_plugin', 'node'];
 
   /**
    * The test entity storage to use in testing.
@@ -49,7 +49,7 @@ class ContentEntityAccessTest extends GroupKernelTestBase {
   /**
    * {@inheritdoc}
    */
-  protected function setUp() {
+  protected function setUp(): void {
     parent::setUp();
 
     $this->installEntitySchema('entity_test_with_owner');
diff --git a/tests/src/Kernel/GroupAccessControlHandlerTest.php b/tests/src/Kernel/GroupAccessControlHandlerTest.php
index 084e87352a39ea25a654c59b86a87025cb1451a6..6514f0d47f906c5d8a231c340b254613d2b7cb42 100644
--- a/tests/src/Kernel/GroupAccessControlHandlerTest.php
+++ b/tests/src/Kernel/GroupAccessControlHandlerTest.php
@@ -30,7 +30,7 @@ class GroupAccessControlHandlerTest extends GroupKernelTestBase {
   /**
    * {@inheritdoc}
    */
-  protected function setUp() {
+  protected function setUp(): void {
     parent::setUp();
     $this->installConfig(['user']);
     $this->groupType = $this->createGroupType(['id' => 'foo', 'creator_membership' => FALSE]);
diff --git a/tests/src/Kernel/GroupConfigTest.php b/tests/src/Kernel/GroupConfigTest.php
index 4bcd7709a1a58075042e1f1cb9a9131e3d911283..dcd60bb6d5bd9888ce13555355cad6195a8c8cd3 100644
--- a/tests/src/Kernel/GroupConfigTest.php
+++ b/tests/src/Kernel/GroupConfigTest.php
@@ -16,7 +16,7 @@ class GroupConfigTest extends EntityKernelTestBase {
    *
    * @var array
    */
-  public static $modules = [
+  protected static $modules = [
     'block',
     'entity',
     'flexible_permissions',
diff --git a/tests/src/Kernel/GroupKernelTestBase.php b/tests/src/Kernel/GroupKernelTestBase.php
index 6a93393f3e4934d1fe88715ecf6384c1575af2c1..225c1e37bd7c11290a7abf2431b0f3fa9fb2acc2 100644
--- a/tests/src/Kernel/GroupKernelTestBase.php
+++ b/tests/src/Kernel/GroupKernelTestBase.php
@@ -13,7 +13,7 @@ abstract class GroupKernelTestBase extends EntityKernelTestBase {
   /**
    * {@inheritdoc}
    */
-  public static $modules = ['entity', 'flexible_permissions', 'group', 'options', 'variationcache'];
+  protected static $modules = ['entity', 'flexible_permissions', 'group', 'options', 'variationcache'];
 
   /**
    * The group relation type manager.
@@ -25,7 +25,7 @@ abstract class GroupKernelTestBase extends EntityKernelTestBase {
   /**
    * {@inheritdoc}
    */
-  protected function setUp() {
+  protected function setUp(): void {
     parent::setUp();
 
     $this->pluginManager = $this->container->get('group_relation_type.manager');
diff --git a/tests/src/Kernel/GroupPermissionHandlerTest.php b/tests/src/Kernel/GroupPermissionHandlerTest.php
index 1bb5ff22c6dd63a0fd35df1e55a4193366bf3c19..c86807a9a8c7f026113ec9c732635ec2b6ffa30b 100644
--- a/tests/src/Kernel/GroupPermissionHandlerTest.php
+++ b/tests/src/Kernel/GroupPermissionHandlerTest.php
@@ -17,7 +17,7 @@ class GroupPermissionHandlerTest extends GroupKernelTestBase {
   /**
    * {@inheritdoc}
    */
-  public static $modules = ['group_test', 'group_test_plugin', 'node'];
+  protected static $modules = ['group_test', 'group_test_plugin', 'node'];
 
   /**
    * The group permission handler service.
@@ -36,7 +36,7 @@ class GroupPermissionHandlerTest extends GroupKernelTestBase {
   /**
    * {@inheritdoc}
    */
-  protected function setUp() {
+  protected function setUp(): void {
     parent::setUp();
     $this->installConfig(['user', 'group_test_plugin']);
     $this->installSchema('node', ['node_access']);
diff --git a/tests/src/Kernel/GroupRelationshipCardinalityTest.php b/tests/src/Kernel/GroupRelationshipCardinalityTest.php
index 1c81def6d8644166272cee3d7965e70bcea58b27..8100a65bc2248d056f64b9ec34e4af91f76f1468 100644
--- a/tests/src/Kernel/GroupRelationshipCardinalityTest.php
+++ b/tests/src/Kernel/GroupRelationshipCardinalityTest.php
@@ -18,7 +18,7 @@ class GroupRelationshipCardinalityTest extends GroupKernelTestBase {
   /**
    * {@inheritdoc}
    */
-  public static $modules = ['group_test_plugin', 'node'];
+  protected static $modules = ['group_test_plugin', 'node'];
 
   /**
    * The group type to use in testing.
@@ -44,7 +44,7 @@ class GroupRelationshipCardinalityTest extends GroupKernelTestBase {
   /**
    * {@inheritdoc}
    */
-  protected function setUp() {
+  protected function setUp(): void {
     parent::setUp();
 
     $this->installConfig(['user', 'group_test_plugin']);
diff --git a/tests/src/Kernel/GroupRelationshipCreateAccessTest.php b/tests/src/Kernel/GroupRelationshipCreateAccessTest.php
index 45825ccecb810c9775469f63443ea941cf6770f8..8ddcc48b692a900284cfc819bf90a1cb54958f72 100644
--- a/tests/src/Kernel/GroupRelationshipCreateAccessTest.php
+++ b/tests/src/Kernel/GroupRelationshipCreateAccessTest.php
@@ -24,7 +24,7 @@ class GroupRelationshipCreateAccessTest extends GroupKernelTestBase {
   /**
    * {@inheritdoc}
    */
-  public static $modules = ['group_test_plugin', 'node'];
+  protected static $modules = ['group_test_plugin', 'node'];
 
   /**
    * The access manager.
@@ -57,7 +57,7 @@ class GroupRelationshipCreateAccessTest extends GroupKernelTestBase {
   /**
    * {@inheritdoc}
    */
-  protected function setUp() {
+  protected function setUp(): void {
     parent::setUp();
 
     $this->installSchema('node', ['node_access']);
diff --git a/tests/src/Kernel/GroupRelationshipCrudHookTest.php b/tests/src/Kernel/GroupRelationshipCrudHookTest.php
index 4736080bd1dc82d714870e79a27c9080f13744ce..cea4cb524305a8adbcb6cc0e12aa4cda5ca0d9c6 100644
--- a/tests/src/Kernel/GroupRelationshipCrudHookTest.php
+++ b/tests/src/Kernel/GroupRelationshipCrudHookTest.php
@@ -12,7 +12,7 @@ class GroupRelationshipCrudHookTest extends GroupKernelTestBase {
   /**
    * {@inheritdoc}
    */
-  protected function setUp() {
+  protected function setUp(): void {
     parent::setUp();
 
     // Required to be able to delete accounts. See User::postDelete().
diff --git a/tests/src/Kernel/GroupRelationshipStorageTest.php b/tests/src/Kernel/GroupRelationshipStorageTest.php
index a0c8070f2e524c9fef1103a08981af625f9797c1..265335505b33e623f45704ce615b16ac1f540312 100644
--- a/tests/src/Kernel/GroupRelationshipStorageTest.php
+++ b/tests/src/Kernel/GroupRelationshipStorageTest.php
@@ -20,7 +20,7 @@ class GroupRelationshipStorageTest extends GroupKernelTestBase {
   /**
    * {@inheritdoc}
    */
-  public static $modules = ['group_test_plugin', 'node'];
+  protected static $modules = ['group_test_plugin', 'node'];
 
   /**
    * The relationship storage handler.
@@ -39,7 +39,7 @@ class GroupRelationshipStorageTest extends GroupKernelTestBase {
   /**
    * {@inheritdoc}
    */
-  protected function setUp() {
+  protected function setUp(): void {
     parent::setUp();
 
     $this->storage = $this->entityTypeManager->getStorage('group_relationship');
diff --git a/tests/src/Kernel/GroupRelationshipTest.php b/tests/src/Kernel/GroupRelationshipTest.php
index 329ef4c45b397852ac02710c6a43cd8291c1e4be..ecd248c36e80d44536a539eb11ab956c080f589a 100644
--- a/tests/src/Kernel/GroupRelationshipTest.php
+++ b/tests/src/Kernel/GroupRelationshipTest.php
@@ -21,7 +21,7 @@ class GroupRelationshipTest extends GroupKernelTestBase {
   /**
    * {@inheritdoc}
    */
-  public static $modules = ['group_test', 'group_test_plugin', 'node'];
+  protected static $modules = ['group_test', 'group_test_plugin', 'node'];
 
   /**
    * Tests that entity url templates are functional.
diff --git a/tests/src/Kernel/GroupRelationshipTypeTest.php b/tests/src/Kernel/GroupRelationshipTypeTest.php
index d5da714985efe0acfa09679c96f25250ac72a567..a7c8db500aa3a7f9555232a1caff614f4e64c532 100644
--- a/tests/src/Kernel/GroupRelationshipTypeTest.php
+++ b/tests/src/Kernel/GroupRelationshipTypeTest.php
@@ -17,12 +17,12 @@ class GroupRelationshipTypeTest extends GroupKernelTestBase {
   /**
    * {@inheritdoc}
    */
-  public static $modules = ['group_test_plugin', 'node'];
+  protected static $modules = ['group_test_plugin', 'node'];
 
   /**
    * {@inheritdoc}
    */
-  protected function setUp() {
+  protected function setUp(): void {
     parent::setUp();
     $this->installEntitySchema('node');
   }
diff --git a/tests/src/Kernel/GroupRoleStorageTest.php b/tests/src/Kernel/GroupRoleStorageTest.php
index fd88210939ca753367a04759977a96cd7c004844..4cf9f8e64c1e66165a985fcfe6a7f49616fb45ed 100644
--- a/tests/src/Kernel/GroupRoleStorageTest.php
+++ b/tests/src/Kernel/GroupRoleStorageTest.php
@@ -30,7 +30,7 @@ class GroupRoleStorageTest extends GroupKernelTestBase {
   /**
    * {@inheritdoc}
    */
-  protected function setUp() {
+  protected function setUp(): void {
     parent::setUp();
     $this->group = $this->createGroup(['type' => $this->createGroupType()->id()]);
     $this->account = $this->createUser();
diff --git a/tests/src/Kernel/GroupRoleTest.php b/tests/src/Kernel/GroupRoleTest.php
index 4f6a15f94906a5fa3382160bd03be9c57f497f86..6fefb870db9c4223c13c1610fde2d586122a71f5 100644
--- a/tests/src/Kernel/GroupRoleTest.php
+++ b/tests/src/Kernel/GroupRoleTest.php
@@ -23,7 +23,7 @@ class GroupRoleTest extends GroupKernelTestBase {
   /**
    * {@inheritdoc}
    */
-  protected function setUp() {
+  protected function setUp(): void {
     parent::setUp();
     $this->createGroupType(['id' => 'foo']);
 
diff --git a/tests/src/Kernel/GroupTest.php b/tests/src/Kernel/GroupTest.php
index 2f8d020b46112e1b1e7978d6c9a9c5c8a4b2be09..e5d6d554977807be5da0de72657de9b888ed38cc 100644
--- a/tests/src/Kernel/GroupTest.php
+++ b/tests/src/Kernel/GroupTest.php
@@ -23,7 +23,7 @@ class GroupTest extends GroupKernelTestBase {
   /**
    * {@inheritdoc}
    */
-  protected function setUp() {
+  protected function setUp(): void {
     parent::setUp();
     $this->group = $this->createGroup(['type' => $this->createGroupType()->id()]);
   }
diff --git a/tests/src/Kernel/GroupTokenReplaceKernelTestBase.php b/tests/src/Kernel/GroupTokenReplaceKernelTestBase.php
index d88c753b09edfaced2dfcd092988d2b3ce8d92be..7ec2db7ed3d0c71996969364f63aacd0129cacad 100644
--- a/tests/src/Kernel/GroupTokenReplaceKernelTestBase.php
+++ b/tests/src/Kernel/GroupTokenReplaceKernelTestBase.php
@@ -21,7 +21,7 @@ abstract class GroupTokenReplaceKernelTestBase extends GroupKernelTestBase {
    */
   protected $tokenService;
 
-  protected function setUp() {
+  protected function setUp(): void {
     parent::setUp();
     $this->interfaceLanguage = \Drupal::languageManager()->getCurrentLanguage();
     $this->tokenService = \Drupal::token();
diff --git a/tests/src/Kernel/GroupTypeImportTest.php b/tests/src/Kernel/GroupTypeImportTest.php
index 179760c354c325a986f95e02736afd549f64ebb6..d306fb0e639516526b19528f5d3d5342c4c8aae5 100644
--- a/tests/src/Kernel/GroupTypeImportTest.php
+++ b/tests/src/Kernel/GroupTypeImportTest.php
@@ -18,7 +18,7 @@ class GroupTypeImportTest extends GroupKernelTestBase {
   /**
    * {@inheritdoc}
    */
-  protected function setUp() {
+  protected function setUp(): void {
     parent::setUp();
 
     // The system.site key is required for import validation.
diff --git a/tests/src/Kernel/GroupTypeInstallTest.php b/tests/src/Kernel/GroupTypeInstallTest.php
index e97cad9a740e26acaea00f2372cb378a782a65f2..55c1daae364b9d7f6df874d64124bb67e4bb2303 100644
--- a/tests/src/Kernel/GroupTypeInstallTest.php
+++ b/tests/src/Kernel/GroupTypeInstallTest.php
@@ -15,12 +15,12 @@ class GroupTypeInstallTest extends GroupKernelTestBase {
   /**
    * {@inheritdoc}
    */
-  public static $modules = ['group_test_config'];
+  protected static $modules = ['group_test_config'];
 
   /**
    * {@inheritdoc}
    */
-  public function setUp() {
+  public function setUp(): void {
     parent::setUp();
     $this->installConfig('group_test_config');
   }
diff --git a/tests/src/Kernel/IndividualGroupPermissionCalculatorTest.php b/tests/src/Kernel/IndividualGroupPermissionCalculatorTest.php
index 8ed0c0fd954d320c7698e7786eb2d1ae42ae944b..a10e43d94003a49041e17a28d8fa2f75be141dc2 100644
--- a/tests/src/Kernel/IndividualGroupPermissionCalculatorTest.php
+++ b/tests/src/Kernel/IndividualGroupPermissionCalculatorTest.php
@@ -24,7 +24,7 @@ class IndividualGroupPermissionCalculatorTest extends GroupKernelTestBase {
   /**
    * {@inheritdoc}
    */
-  protected function setUp() {
+  protected function setUp(): void {
     parent::setUp();
     $this->permissionCalculator = $this->container->get('flexible_permissions.chain_calculator');
   }
diff --git a/tests/src/Kernel/LatestRevisionAccessTest.php b/tests/src/Kernel/LatestRevisionAccessTest.php
index 6dc4c9fe2f56a281045c78d6703b979d06c6e6d0..9403f2413f16050ccf230cfc066b9eb7c6b6c76a 100644
--- a/tests/src/Kernel/LatestRevisionAccessTest.php
+++ b/tests/src/Kernel/LatestRevisionAccessTest.php
@@ -22,7 +22,7 @@ class LatestRevisionAccessTest extends GroupKernelTestBase {
   /**
    * {@inheritdoc}
    */
-  public static $modules = ['workflows', 'content_moderation'];
+  protected static $modules = ['workflows', 'content_moderation'];
 
   /**
    * The access manager.
@@ -48,7 +48,7 @@ class LatestRevisionAccessTest extends GroupKernelTestBase {
   /**
    * {@inheritdoc}
    */
-  protected function setUp() {
+  protected function setUp(): void {
     parent::setUp();
 
     $this->installConfig(['content_moderation', 'workflows']);
diff --git a/tests/src/Kernel/QueryAlter/EntityQueryAlterCacheabilityTest.php b/tests/src/Kernel/QueryAlter/EntityQueryAlterCacheabilityTest.php
index 2206c7feba7a31e65240dd27bec4b0b3cccb43c3..c4ff2172447eb7700cd2e71302390d43c1abf973 100644
--- a/tests/src/Kernel/QueryAlter/EntityQueryAlterCacheabilityTest.php
+++ b/tests/src/Kernel/QueryAlter/EntityQueryAlterCacheabilityTest.php
@@ -20,7 +20,7 @@ class EntityQueryAlterCacheabilityTest extends GroupKernelTestBase {
   /**
    * {@inheritdoc}
    */
-  public static $modules = ['node'];
+  protected static $modules = ['node'];
 
   /**
    * The grouped entity storage to use in testing.
@@ -39,7 +39,7 @@ class EntityQueryAlterCacheabilityTest extends GroupKernelTestBase {
   /**
    * {@inheritdoc}
    */
-  protected function setUp() {
+  protected function setUp(): void {
     parent::setUp();
 
     $this->installSchema('node', ['node_access']);
diff --git a/tests/src/Kernel/QueryAlter/EntityQueryAlterComplexTest.php b/tests/src/Kernel/QueryAlter/EntityQueryAlterComplexTest.php
index b87afe52bdfe240b9cb743d50f185e9884922100..e506d76a090149addd0ca1242e6b368968712b38 100644
--- a/tests/src/Kernel/QueryAlter/EntityQueryAlterComplexTest.php
+++ b/tests/src/Kernel/QueryAlter/EntityQueryAlterComplexTest.php
@@ -37,12 +37,12 @@ class EntityQueryAlterComplexTest extends EntityQueryAlterTestBase {
   /**
    * {@inheritdoc}
    */
-  public static $modules = ['node'];
+  protected static $modules = ['node'];
 
   /**
    * {@inheritdoc}
    */
-  protected function setUp() {
+  protected function setUp(): void {
     parent::setUp();
     $this->installSchema('node', ['node_access']);
     $this->installEntitySchema('node');
diff --git a/tests/src/Kernel/QueryAlter/EntityQueryAlterTest.php b/tests/src/Kernel/QueryAlter/EntityQueryAlterTest.php
index dca68b151f06960d62232de12408f88f14c23946..1b232a8071e56df4363fde7eb66cddcfb183f402 100644
--- a/tests/src/Kernel/QueryAlter/EntityQueryAlterTest.php
+++ b/tests/src/Kernel/QueryAlter/EntityQueryAlterTest.php
@@ -25,7 +25,7 @@ class EntityQueryAlterTest extends EntityQueryAlterTestBase {
   /**
    * {@inheritdoc}
    */
-  protected function setUp() {
+  protected function setUp(): void {
     parent::setUp();
     $this->installConfig('group_test_plugin');
     $this->installEntitySchema('entity_test_with_owner');
diff --git a/tests/src/Kernel/QueryAlter/GroupRelationshipQueryAlterTest.php b/tests/src/Kernel/QueryAlter/GroupRelationshipQueryAlterTest.php
index 53edb90de4dc42bc2830afc924f494d4d757f08a..4c7a325e7e3838cff928114e6ec8a7930deb8cfa 100644
--- a/tests/src/Kernel/QueryAlter/GroupRelationshipQueryAlterTest.php
+++ b/tests/src/Kernel/QueryAlter/GroupRelationshipQueryAlterTest.php
@@ -36,12 +36,12 @@ class GroupRelationshipQueryAlterTest extends QueryAlterTestBase {
   /**
    * {@inheritdoc}
    */
-  public static $modules = ['node'];
+  protected static $modules = ['node'];
 
   /**
    * {@inheritdoc}
    */
-  protected function setUp() {
+  protected function setUp(): void {
     parent::setUp();
     $this->installEntitySchema('node');
   }
diff --git a/tests/src/Kernel/QueryAlter/QueryAlterTestBase.php b/tests/src/Kernel/QueryAlter/QueryAlterTestBase.php
index b42658493cc93ac20792358ada0443145ea7c4f1..14880a011f3c12c6f2588efb07fcafa573e8d852 100644
--- a/tests/src/Kernel/QueryAlter/QueryAlterTestBase.php
+++ b/tests/src/Kernel/QueryAlter/QueryAlterTestBase.php
@@ -17,7 +17,7 @@ abstract class QueryAlterTestBase extends GroupKernelTestBase {
   /**
    * {@inheritdoc}
    */
-  public static $modules = ['group_test_plugin', 'node'];
+  protected static $modules = ['group_test_plugin', 'node'];
 
   /**
    * The entity type ID to use in testing.
@@ -837,7 +837,6 @@ abstract class QueryAlterTestBase extends GroupKernelTestBase {
             $cases["mixed-insider-individualadmin-own-mixpub-" . $operation]['individual_is_admin'] = TRUE;
             $cases["mixed-insider-individualadmin-own-mixpub-" . $operation]['individual_simple_check'] = TRUE;
 
-
             if ($admin_permission) {
               // Add in regular permissions to prove they aren't checked.
               $admin_permissions = array_merge([$admin_permission], $own_mixpub_permissions);
diff --git a/tests/src/Kernel/RelationHandlerTest.php b/tests/src/Kernel/RelationHandlerTest.php
index de6394ebce4370c23b457f7ef52b3fdbb88cbc69..676ab6eec06c6cfb7fb1739da9a89f2c80871a1d 100644
--- a/tests/src/Kernel/RelationHandlerTest.php
+++ b/tests/src/Kernel/RelationHandlerTest.php
@@ -20,12 +20,12 @@ class RelationHandlerTest extends GroupKernelTestBase {
   /**
    * {@inheritdoc}
    */
-  public static $modules = ['group_test_plugin', 'group_test_plugin_alter', 'node'];
+  protected static $modules = ['group_test_plugin', 'group_test_plugin_alter', 'node'];
 
   /**
    * {@inheritdoc}
    */
-  protected function setUp() {
+  protected function setUp(): void {
     parent::setUp();
     $this->installConfig(['user', 'group_test_plugin']);
     $this->installSchema('node', ['node_access']);
diff --git a/tests/src/Kernel/RevisionUiAccessTest.php b/tests/src/Kernel/RevisionUiAccessTest.php
index 41540454e2bfc75d12c3ed6b1682f2894fa5f525..db71c6f20f6a3f7d3386a3da21c2bda31393726c 100644
--- a/tests/src/Kernel/RevisionUiAccessTest.php
+++ b/tests/src/Kernel/RevisionUiAccessTest.php
@@ -55,7 +55,7 @@ class RevisionUiAccessTest extends GroupKernelTestBase {
   /**
    * {@inheritdoc}
    */
-  protected function setUp() {
+  protected function setUp(): void {
     parent::setUp();
 
     $this->accessManager = $this->container->get('access_manager');
diff --git a/tests/src/Kernel/SynchronizedGroupPermissionCalculatorTest.php b/tests/src/Kernel/SynchronizedGroupPermissionCalculatorTest.php
index 65fc8b1b231818a1ee576eea9fdc6ac5210471c0..1bc674a0826cacf69e4e756f465e452fe6883695 100644
--- a/tests/src/Kernel/SynchronizedGroupPermissionCalculatorTest.php
+++ b/tests/src/Kernel/SynchronizedGroupPermissionCalculatorTest.php
@@ -24,7 +24,7 @@ class SynchronizedGroupPermissionCalculatorTest extends GroupKernelTestBase {
   /**
    * {@inheritdoc}
    */
-  protected function setUp() {
+  protected function setUp(): void {
     parent::setUp();
     $this->permissionCalculator = $this->container->get('flexible_permissions.chain_calculator');
   }
diff --git a/tests/src/Kernel/Views/GroupRelationshipToEntityRelationshipTest.php b/tests/src/Kernel/Views/GroupRelationshipToEntityRelationshipTest.php
index d25de27f6db4f2f3e278167f791dcb9ead9c70bc..144171363d20c149b30e52bc68f6cf04ec008880 100644
--- a/tests/src/Kernel/Views/GroupRelationshipToEntityRelationshipTest.php
+++ b/tests/src/Kernel/Views/GroupRelationshipToEntityRelationshipTest.php
@@ -16,7 +16,7 @@ class GroupRelationshipToEntityRelationshipTest extends GroupViewsKernelTestBase
   /**
    * {@inheritdoc}
    */
-  public static $modules = ['group_test_plugin', 'node'];
+  protected static $modules = ['group_test_plugin', 'node'];
 
   /**
    * Views used by this test.
@@ -28,7 +28,7 @@ class GroupRelationshipToEntityRelationshipTest extends GroupViewsKernelTestBase
   /**
    * {@inheritdoc}
    */
-  protected function setUp($import_test_views = TRUE) {
+  protected function setUp($import_test_views = TRUE): void {
     parent::setUp($import_test_views);
     $this->installEntitySchema('node');
 
diff --git a/tests/src/Kernel/Views/GroupToGroupRelationshipRelationshipTest.php b/tests/src/Kernel/Views/GroupToGroupRelationshipRelationshipTest.php
index fb6fbc9942e967a6ecb02ed6a3e092a81ed330c3..3888106878cc8f8d468563c00298d7ac13f0824b 100644
--- a/tests/src/Kernel/Views/GroupToGroupRelationshipRelationshipTest.php
+++ b/tests/src/Kernel/Views/GroupToGroupRelationshipRelationshipTest.php
@@ -16,7 +16,7 @@ class GroupToGroupRelationshipRelationshipTest extends GroupViewsKernelTestBase
   /**
    * {@inheritdoc}
    */
-  public static $modules = ['group_test_plugin', 'node'];
+  protected static $modules = ['group_test_plugin', 'node'];
 
   /**
    * Views used by this test.
@@ -28,7 +28,7 @@ class GroupToGroupRelationshipRelationshipTest extends GroupViewsKernelTestBase
   /**
    * {@inheritdoc}
    */
-  protected function setUp($import_test_views = TRUE) {
+  protected function setUp($import_test_views = TRUE): void {
     parent::setUp($import_test_views);
     $this->installEntitySchema('node');
 
diff --git a/tests/src/Kernel/Views/GroupViewsKernelTestBase.php b/tests/src/Kernel/Views/GroupViewsKernelTestBase.php
index f953899330b15ead6360d328b37a741c154defe9..141da01a9530dc6b0e05e5343b239707644d810c 100644
--- a/tests/src/Kernel/Views/GroupViewsKernelTestBase.php
+++ b/tests/src/Kernel/Views/GroupViewsKernelTestBase.php
@@ -16,7 +16,7 @@ abstract class GroupViewsKernelTestBase extends ViewsKernelTestBase {
   /**
    * {@inheritdoc}
    */
-  public static $modules = [
+  protected static $modules = [
     'entity',
     'field',
     'flexible_permissions',
@@ -44,7 +44,7 @@ abstract class GroupViewsKernelTestBase extends ViewsKernelTestBase {
   /**
    * {@inheritdoc}
    */
-  protected function setUp($import_test_views = TRUE) {
+  protected function setUp($import_test_views = TRUE): void {
     parent::setUp($import_test_views);
 
     $this->installEntitySchema('user');
diff --git a/tests/src/Unit/AccessControlTest.php b/tests/src/Unit/AccessControlTest.php
index aa70dd9399c37266ecae438faae2806240cc010b..d39fd41350f9b267b45c74c293ca0b84317f92cc 100644
--- a/tests/src/Unit/AccessControlTest.php
+++ b/tests/src/Unit/AccessControlTest.php
@@ -22,6 +22,7 @@ use Drupal\group\Plugin\Group\Relation\GroupRelationTypeManagerInterface;
 use Drupal\Tests\UnitTestCase;
 use Drupal\user\EntityOwnerInterface;
 use Prophecy\Argument;
+use Prophecy\PhpUnit\ProphecyTrait;
 use Symfony\Component\DependencyInjection\ContainerInterface;
 
 /**
@@ -32,10 +33,12 @@ use Symfony\Component\DependencyInjection\ContainerInterface;
  */
 class AccessControlTest extends UnitTestCase {
 
+  use ProphecyTrait;
+
   /**
    * {@inheritdoc}
    */
-  public function setUp() {
+  public function setUp(): void {
     parent::setUp();
 
     $cache_context_manager = $this->prophesize(CacheContextsManager::class);
diff --git a/tests/src/Unit/EntityReferenceTest.php b/tests/src/Unit/EntityReferenceTest.php
index e3bee86bc7df67a6c7065e140bd09b37ab27394d..5d0fa69ec12be737a9acaa1ed2f48faf9029d299 100644
--- a/tests/src/Unit/EntityReferenceTest.php
+++ b/tests/src/Unit/EntityReferenceTest.php
@@ -7,6 +7,7 @@ use Drupal\Core\Field\FieldTypePluginManager;
 use Drupal\group\Plugin\Group\Relation\GroupRelationType;
 use Drupal\group\Plugin\Group\RelationHandlerDefault\EntityReference;
 use Drupal\Tests\UnitTestCase;
+use Prophecy\PhpUnit\ProphecyTrait;
 use Symfony\Component\DependencyInjection\ContainerInterface;
 
 /**
@@ -17,10 +18,12 @@ use Symfony\Component\DependencyInjection\ContainerInterface;
  */
 class EntityReferenceTest extends UnitTestCase {
 
+  use ProphecyTrait;
+
   /**
    * {@inheritdoc}
    */
-  public function setUp() {
+  public function setUp(): void {
     parent::setUp();
 
     $field_type_manager = $this->prophesize(FieldTypePluginManager::class);
diff --git a/tests/src/Unit/GroupPermissionCheckerTest.php b/tests/src/Unit/GroupPermissionCheckerTest.php
index 4530662a187e8c30ad9c481bb57cf88b97edcc3e..9cdedd5f6f0ac61010ee99047b1ea082dbc32835 100644
--- a/tests/src/Unit/GroupPermissionCheckerTest.php
+++ b/tests/src/Unit/GroupPermissionCheckerTest.php
@@ -11,6 +11,7 @@ use Drupal\group\Entity\GroupInterface;
 use Drupal\group\GroupMembershipLoaderInterface;
 use Drupal\group\PermissionScopeInterface;
 use Drupal\Tests\UnitTestCase;
+use Prophecy\PhpUnit\ProphecyTrait;
 
 /**
  * Tests the group permission checker service.
@@ -20,6 +21,7 @@ use Drupal\Tests\UnitTestCase;
  */
 class GroupPermissionCheckerTest extends UnitTestCase {
 
+  use ProphecyTrait;
   /**
    * The group permission calculator.
    *
@@ -44,7 +46,7 @@ class GroupPermissionCheckerTest extends UnitTestCase {
   /**
    * {@inheritdoc}
    */
-  public function setUp() {
+  public function setUp(): void {
     parent::setUp();
     $this->permissionCalculator = $this->prophesize(GroupPermissionCalculatorInterface::class);
     $this->membershipLoader = $this->prophesize(GroupMembershipLoaderInterface::class);
diff --git a/tests/src/Unit/GroupPermissionHashGeneratorTest.php b/tests/src/Unit/GroupPermissionHashGeneratorTest.php
index 4213c6a10cf5491177a94b8cace75999476c3215..6b3777ed8795247ff1aa722da1526a1c3fd0a6cf 100644
--- a/tests/src/Unit/GroupPermissionHashGeneratorTest.php
+++ b/tests/src/Unit/GroupPermissionHashGeneratorTest.php
@@ -14,6 +14,7 @@ use Drupal\flexible_permissions\RefinableCalculatedPermissions;
 use Drupal\group\Access\GroupPermissionCalculatorInterface;
 use Drupal\group\Access\GroupPermissionsHashGenerator;
 use Drupal\Tests\UnitTestCase;
+use Prophecy\PhpUnit\ProphecyTrait;
 
 /**
  * Tests the group permission hash generator service.
@@ -23,6 +24,8 @@ use Drupal\Tests\UnitTestCase;
  */
 class GroupPermissionHashGeneratorTest extends UnitTestCase {
 
+  use ProphecyTrait;
+
   /**
    * The group permissions hash generator service.
    *
@@ -54,7 +57,7 @@ class GroupPermissionHashGeneratorTest extends UnitTestCase {
   /**
    * {@inheritdoc}
    */
-  public function setUp() {
+  public function setUp(): void {
     parent::setUp();
     new Settings(['hash_salt' => 'SALT']);
     $private_key = $this->prophesize(PrivateKey::class);
diff --git a/tests/src/Unit/GroupPermissionsCacheContextTest.php b/tests/src/Unit/GroupPermissionsCacheContextTest.php
index 784ed9b1ac7b0a23ac899acc5615275aa49ea7e9..f8f674826e603a06ee072d562b7296f71f43ce2c 100644
--- a/tests/src/Unit/GroupPermissionsCacheContextTest.php
+++ b/tests/src/Unit/GroupPermissionsCacheContextTest.php
@@ -7,6 +7,7 @@ use Drupal\Core\Session\AccountProxyInterface;
 use Drupal\group\Access\GroupPermissionsHashGeneratorInterface;
 use Drupal\group\Cache\Context\GroupPermissionsCacheContext;
 use Drupal\Tests\UnitTestCase;
+use Prophecy\PhpUnit\ProphecyTrait;
 
 /**
  * Tests the user.group_permissions cache context.
@@ -16,6 +17,8 @@ use Drupal\Tests\UnitTestCase;
  */
 class GroupPermissionsCacheContextTest extends UnitTestCase {
 
+  use ProphecyTrait;
+
   /**
    * The current user.
    *
@@ -33,7 +36,7 @@ class GroupPermissionsCacheContextTest extends UnitTestCase {
   /**
    * {@inheritdoc}
    */
-  public function setUp() {
+  public function setUp(): void {
     parent::setUp();
     $this->currentUser = $this->prophesize(AccountProxyInterface::class);
     $this->permissionsHashGenerator = $this->prophesize(GroupPermissionsHashGeneratorInterface::class);
diff --git a/tests/src/Unit/GroupRelationTypeManagerTest.php b/tests/src/Unit/GroupRelationTypeManagerTest.php
index 5c6bb27c4060bb18bab482c94affa2bd45bd87e8..2b2551a936a8ae6ac9c45973c991127d2f3813b8 100644
--- a/tests/src/Unit/GroupRelationTypeManagerTest.php
+++ b/tests/src/Unit/GroupRelationTypeManagerTest.php
@@ -19,6 +19,7 @@ use Drupal\group\Plugin\Group\RelationHandler\RelationHandlerInterface;
 use Drupal\group\Plugin\Group\RelationHandler\RelationHandlerTrait;
 use Drupal\Tests\UnitTestCase;
 use Prophecy\Argument;
+use Prophecy\PhpUnit\ProphecyTrait;
 use Symfony\Component\DependencyInjection\ContainerInterface;
 
 /**
@@ -29,6 +30,8 @@ use Symfony\Component\DependencyInjection\ContainerInterface;
  */
 class GroupRelationTypeManagerTest extends UnitTestCase {
 
+  use ProphecyTrait;
+
   /**
    * The group relation type manager under test.
    *
@@ -74,7 +77,7 @@ class GroupRelationTypeManagerTest extends UnitTestCase {
   /**
    * {@inheritdoc}
    */
-  protected function setUp() {
+  protected function setUp(): void {
     parent::setUp();
 
     $this->cacheBackend = $this->prophesize(CacheBackendInterface::class);
diff --git a/tests/src/Unit/GroupRelationshipAccessControlHandlerTest.php b/tests/src/Unit/GroupRelationshipAccessControlHandlerTest.php
index 1f7d4d02cc00ae6ce68eecdc246b54abd7e2231f..78daae67f9d58251819733cc5a117e89a541cce1 100644
--- a/tests/src/Unit/GroupRelationshipAccessControlHandlerTest.php
+++ b/tests/src/Unit/GroupRelationshipAccessControlHandlerTest.php
@@ -17,6 +17,7 @@ use Drupal\group\Plugin\Group\Relation\GroupRelationTypeManagerInterface;
 use Drupal\group\Plugin\Group\RelationHandler\AccessControlInterface;
 use Drupal\Tests\UnitTestCase;
 use Prophecy\Argument;
+use Prophecy\PhpUnit\ProphecyTrait;
 use Symfony\Component\DependencyInjection\ContainerInterface;
 
 /**
@@ -27,6 +28,8 @@ use Symfony\Component\DependencyInjection\ContainerInterface;
  */
 class GroupRelationshipAccessControlHandlerTest extends UnitTestCase {
 
+  use ProphecyTrait;
+
   /**
    * The account to test with.
    *
@@ -58,7 +61,7 @@ class GroupRelationshipAccessControlHandlerTest extends UnitTestCase {
   /**
    * {@inheritdoc}
    */
-  protected function setUp() {
+  protected function setUp(): void {
     parent::setUp();
 
     $this->account = $this->prophesize(AccountInterface::class);
diff --git a/tests/src/Unit/IsGroupMemberCacheContextTest.php b/tests/src/Unit/IsGroupMemberCacheContextTest.php
index 411ad9509b779e81f53994fa36c60960dd99519f..3772b7c04dc59fea45851204054ac54d5b90de97 100644
--- a/tests/src/Unit/IsGroupMemberCacheContextTest.php
+++ b/tests/src/Unit/IsGroupMemberCacheContextTest.php
@@ -13,6 +13,7 @@ use Drupal\group\GroupMembershipLoaderInterface;
 use Drupal\Tests\UnitTestCase;
 use Drupal\user\UserInterface;
 use Prophecy\Argument;
+use Prophecy\PhpUnit\ProphecyTrait;
 
 /**
  * Tests the user.is_group_member:%group_id cache context.
@@ -22,6 +23,8 @@ use Prophecy\Argument;
  */
 class IsGroupMemberCacheContextTest extends UnitTestCase {
 
+  use ProphecyTrait;
+
   /**
    * The current user.
    *
@@ -39,7 +42,7 @@ class IsGroupMemberCacheContextTest extends UnitTestCase {
   /**
    * {@inheritdoc}
    */
-  public function setUp() {
+  public function setUp(): void {
     parent::setUp();
     $this->currentUser = $this->prophesize(AccountProxyInterface::class)->reveal();
     $this->group = $this->prophesize(GroupInterface::class)->reveal();
diff --git a/tests/src/Unit/OperationProviderTest.php b/tests/src/Unit/OperationProviderTest.php
index 883fe4ed4d7e20f679b53e0c3846640b11a76240..40183ae20192569992e4a94e3caff536feaa1b87 100644
--- a/tests/src/Unit/OperationProviderTest.php
+++ b/tests/src/Unit/OperationProviderTest.php
@@ -18,6 +18,7 @@ namespace Drupal\Tests\group\Unit {
   use Drupal\group\Plugin\Group\RelationHandlerDefault\OperationProvider;
   use Drupal\Tests\UnitTestCase;
   use Prophecy\Argument;
+  use Prophecy\PhpUnit\ProphecyTrait;
 
   /**
    * Tests the default group relation operation_provider handler.
@@ -27,6 +28,8 @@ namespace Drupal\Tests\group\Unit {
    */
   class OperationProviderTest extends UnitTestCase {
 
+    use ProphecyTrait;
+
     /**
      * Tests the retrieval of operations.
      *
diff --git a/tests/src/Unit/PermissionProviderTest.php b/tests/src/Unit/PermissionProviderTest.php
index bfc9246b8a7e8920e2f4b920d9f7018f633e0371..1b226aa1098a450427368adc8d0d7895958c04d9 100644
--- a/tests/src/Unit/PermissionProviderTest.php
+++ b/tests/src/Unit/PermissionProviderTest.php
@@ -12,6 +12,7 @@ use Drupal\group\Plugin\Group\RelationHandlerDefault\PermissionProvider;
 use Drupal\group_test_plugin\Plugin\Group\RelationHandler\FullEntityPermissionProvider;
 use Drupal\Tests\UnitTestCase;
 use Drupal\user\EntityOwnerInterface;
+use Prophecy\PhpUnit\ProphecyTrait;
 
 /**
  * Tests the default group relation permission_provider handler.
@@ -21,6 +22,8 @@ use Drupal\user\EntityOwnerInterface;
  */
 class PermissionProviderTest extends UnitTestCase {
 
+  use ProphecyTrait;
+
   /**
    * Tests the admin permission name.
    *
diff --git a/tests/src/Unit/RouteGroupCacheContextTest.php b/tests/src/Unit/RouteGroupCacheContextTest.php
index 0877e3879ebb77172dedad0a1b5e90941af1c7b2..7c705d31c034ccae97b5ac4bf7df05d5710fead0 100644
--- a/tests/src/Unit/RouteGroupCacheContextTest.php
+++ b/tests/src/Unit/RouteGroupCacheContextTest.php
@@ -10,6 +10,7 @@ use Drupal\group\Cache\Context\RouteGroupCacheContext;
 use Drupal\group\Entity\GroupInterface;
 use Drupal\group\Entity\GroupTypeInterface;
 use Drupal\Tests\UnitTestCase;
+use Prophecy\PhpUnit\ProphecyTrait;
 
 /**
  * Tests the route.group cache context.
@@ -19,6 +20,8 @@ use Drupal\Tests\UnitTestCase;
  */
 class RouteGroupCacheContextTest extends UnitTestCase {
 
+  use ProphecyTrait;
+
   /**
    * The current route match object.
    *
@@ -36,7 +39,7 @@ class RouteGroupCacheContextTest extends UnitTestCase {
   /**
    * {@inheritdoc}
    */
-  public function setUp() {
+  public function setUp(): void {
     parent::setUp();
     $this->currentRouteMatch = $this->prophesize(RouteMatchInterface::class);
     $this->entityTypeManager = $this->prophesize(EntityTypeManagerInterface::class);
diff --git a/tests/src/Unit/UiTextProviderTest.php b/tests/src/Unit/UiTextProviderTest.php
index b1deeca9ea11f9bbc27d922ed020b72002af3212..9cdd9b0078a85131352fc2b6c2cbd45a6e62cdef 100644
--- a/tests/src/Unit/UiTextProviderTest.php
+++ b/tests/src/Unit/UiTextProviderTest.php
@@ -13,6 +13,7 @@ use Drupal\group\Entity\GroupRelationshipInterface;
 use Drupal\group\Plugin\Group\Relation\GroupRelationType;
 use Drupal\group\Plugin\Group\RelationHandlerDefault\UiTextProvider;
 use Drupal\Tests\UnitTestCase;
+use Prophecy\PhpUnit\ProphecyTrait;
 
 /**
  * Tests the default group relation ui_text_provider handler.
@@ -22,6 +23,7 @@ use Drupal\Tests\UnitTestCase;
  */
 class UiTextProviderTest extends UnitTestCase {
 
+  use ProphecyTrait;
   use StringTranslationTrait;
 
   /**
@@ -55,7 +57,7 @@ class UiTextProviderTest extends UnitTestCase {
   /**
    * {@inheritdoc}
    */
-  public function setUp() {
+  public function setUp(): void {
     parent::setUp();
 
     $this->entityType = $this->prophesize(EntityTypeInterface::class);