diff --git a/uuid.test b/uuid.test
index 6c1481a..26f3c83 100644
--- a/uuid.test
+++ b/uuid.test
@@ -6,11 +6,9 @@
  */
 
 /**
- * UUID test helper trait.
- *
- * Contains methods that assist with running UUID tests.
+ * Base class with some helper methods.
  */
-trait UUIDTestHelper {
+abstract class UUIDTestCase extends DrupalWebTestCase {
 
   /**
    * Helper function that asserts a UUID.
@@ -22,15 +20,6 @@ trait UUIDTestHelper {
 }
 
 /**
- * Base class with some helper methods.
- */
-abstract class UUIDTestCase extends DrupalWebTestCase {
-
-  use UUIDTestHelper;
-
-}
-
-/**
  * Tests the UUID API functions.
  */
 class UUIDAPITestCase extends UUIDTestCase {
@@ -488,8 +477,6 @@ class UUIDNodeTestCase extends UUIDTestCase {
  */
 class UUIDCommentTestCase extends CommentHelperCase {
 
-  use UUIDTestHelper;
-
   /**
    * {@inheritdoc}
    */
@@ -502,6 +489,13 @@ class UUIDCommentTestCase extends CommentHelperCase {
   }
 
   /**
+   * Helper function that asserts a UUID.
+   */
+  protected function assertUuid($uuid, $message = NULL) {
+    $this->assertTrue(uuid_is_valid($uuid), $message);
+  }
+
+  /**
    * Test CRUD on comments with UUID functions.
    */
   public function testCommentCrud() {
@@ -559,8 +553,6 @@ class UUIDCommentTestCase extends CommentHelperCase {
  */
 class UUIDTaxonomyTestCase extends TaxonomyWebTestCase {
 
-  use UUIDTestHelper;
-
   /**
    * {@inheritdoc}
    */
@@ -589,6 +581,13 @@ class UUIDTaxonomyTestCase extends TaxonomyWebTestCase {
   }
 
   /**
+   * Helper function that asserts a UUID.
+   */
+  protected function assertUuid($uuid, $message = NULL) {
+    $this->assertTrue(uuid_is_valid($uuid), $message);
+  }
+
+  /**
    * Test CRUD on comments with UUID functions.
    */
   public function testTaxonomyCrud() {