diff --git a/core/modules/media/src/Tests/MediaCacheTagsTest.php b/core/modules/media/src/Tests/MediaCacheTagsTest.php
index 226c3f0..45f1080 100644
--- a/core/modules/media/src/Tests/MediaCacheTagsTest.php
+++ b/core/modules/media/src/Tests/MediaCacheTagsTest.php
@@ -6,6 +6,7 @@
 use Drupal\media\Entity\Media;
 use Drupal\media\Entity\MediaType;
 use Drupal\system\Tests\Entity\EntityWithUriCacheTagsTestBase;
+use Drupal\Tests\media\Functional\MediaFunctionalTestTrait;
 use Drupal\user\Entity\Role;
 use Drupal\user\RoleInterface;
 
@@ -16,6 +17,8 @@
  */
 class MediaCacheTagsTest extends EntityWithUriCacheTagsTestBase {
 
+  use MediaFunctionalTestTrait;
+
   /**
    * {@inheritdoc}
    */
@@ -42,19 +45,11 @@ protected function setUp() {
    */
   protected function createEntity() {
     // Create a media type.
-    $id = strtolower($this->randomMachineName());
-    MediaType::create([
-      'id' => $id,
-      'label' => $id,
-      'source' => 'test',
-      'source_configuration' => [],
-      'field_map' => [],
-      'new_revision' => FALSE,
-    ])->save();
+    $mediaType = $this->createMediaType();
 
     // Create a media item.
     $media = Media::create([
-      'bundle' => $id,
+      'bundle' => $mediaType->id(),
       'name' => 'Unnamed',
     ]);
     $media->save();
diff --git a/core/modules/media/tests/src/Functional/MediaFunctionalTestTrait.php b/core/modules/media/tests/src/Functional/MediaFunctionalTestTrait.php
index 7531b9f..78bf0a4 100644
--- a/core/modules/media/tests/src/Functional/MediaFunctionalTestTrait.php
+++ b/core/modules/media/tests/src/Functional/MediaFunctionalTestTrait.php
@@ -40,7 +40,7 @@ protected function createMediaType(array $values = [], $source = 'test') {
     $media_type = MediaType::create($values);
     $status = $media_type->save();
 
-    $this->assertEquals(SAVED_NEW, $status, 'Media type was created successfully.');
+    $this->assertEqual(SAVED_NEW, $status, 'Media type was created successfully.');
 
     // Ensure that the source field exists.
     $source = $media_type->getSource();