diff --git a/tests/src/Kernel/GroupKernelTestBase.php b/tests/src/Kernel/GroupKernelTestBase.php
index e226b0b..75d5fb6 100644
--- a/tests/src/Kernel/GroupKernelTestBase.php
+++ b/tests/src/Kernel/GroupKernelTestBase.php
@@ -4,12 +4,15 @@ namespace Drupal\Tests\group\Kernel;
 
 use Drupal\Core\Session\AccountInterface;
 use Drupal\KernelTests\Core\Entity\EntityKernelTestBase;
+use Drupal\Tests\group\Traits\GroupTestTrait;
 
 /**
  * Defines an abstract test base for group kernel tests.
  */
 abstract class GroupKernelTestBase extends EntityKernelTestBase {
 
+  use GroupTestTrait;
+
   /**
    * {@inheritdoc}
    *
@@ -52,43 +55,4 @@ abstract class GroupKernelTestBase extends EntityKernelTestBase {
     return $this->container->get('current_user')->getAccount();
   }
 
-  /**
-   * Creates a group.
-   *
-   * @param array $values
-   *   (optional) The values used to create the entity.
-   *
-   * @return \Drupal\group\Entity\Group
-   *   The created group entity.
-   */
-  protected function createGroup(array $values = []) {
-    $storage = $this->entityTypeManager->getStorage('group');
-    $group = $storage->create($values + [
-      'type' => 'default',
-      'label' => $this->randomString(),
-    ]);
-    $group->enforceIsNew();
-    $storage->save($group);
-    return $group;
-  }
-
-  /**
-   * Creates a group type.
-   *
-   * @param array $values
-   *   (optional) The values used to create the entity.
-   *
-   * @return \Drupal\group\Entity\GroupType
-   *   The created group type entity.
-   */
-  protected function createGroupType(array $values = []) {
-    $storage = $this->entityTypeManager->getStorage('group_type');
-    $group_type = $storage->create($values + [
-      'id' => $this->randomMachineName(),
-      'label' => $this->randomString(),
-    ]);
-    $storage->save($group_type);
-    return $group_type;
-  }
-
 }
diff --git a/tests/src/Traits/GroupTestTrait.php b/tests/src/Traits/GroupTestTrait.php
new file mode 100644
index 0000000..1a924f1
--- /dev/null
+++ b/tests/src/Traits/GroupTestTrait.php
@@ -0,0 +1,49 @@
+<?php
+
+namespace Drupal\Tests\group\Traits;
+
+/**
+ * Provides common helper methods for Group module tests.
+ */
+trait GroupTestTrait {
+
+  /**
+   * Creates a group.
+   *
+   * @param array $values
+   *   (optional) The values used to create the entity.
+   *
+   * @return \Drupal\group\Entity\Group
+   *   The created group entity.
+   */
+  protected function createGroup(array $values = []) {
+    $storage = \Drupal::entityTypeManager()->getStorage('group');
+    $group = $storage->create($values + [
+        'type' => 'default',
+        'label' => $this->randomString(),
+      ]);
+    $group->enforceIsNew();
+    $storage->save($group);
+    return $group;
+  }
+
+  /**
+   * Creates a group type.
+   *
+   * @param array $values
+   *   (optional) The values used to create the entity.
+   *
+   * @return \Drupal\group\Entity\GroupType
+   *   The created group type entity.
+   */
+  protected function createGroupType(array $values = []) {
+    $storage = \Drupal::entityTypeManager()->getStorage('group_type');
+    $group_type = $storage->create($values + [
+        'id' => $this->randomMachineName(),
+        'label' => $this->randomString(),
+      ]);
+    $storage->save($group_type);
+    return $group_type;
+  }
+
+}