diff --git a/core/modules/hal/tests/src/Functional/EntityResource/Media/MediaHalJsonAnonTest.php b/core/modules/hal/tests/src/Functional/EntityResource/Media/MediaHalJsonAnonTest.php
index afa9465..c71b54e 100644
--- a/core/modules/hal/tests/src/Functional/EntityResource/Media/MediaHalJsonAnonTest.php
+++ b/core/modules/hal/tests/src/Functional/EntityResource/Media/MediaHalJsonAnonTest.php
@@ -50,7 +50,7 @@ protected function getExpectedNormalizedEntity() {
         'type' => [
           'href' => $this->baseUrl . '/rest/type/media/camelids',
         ],
-        $this->baseUrl . '/rest/relation/media/camelids/field_media_file_1' => [
+        $this->baseUrl . '/rest/relation/media/camelids/field_media_file' => [
           [
             'href' => $file->url(),
             'lang' => 'en',
@@ -75,7 +75,7 @@ protected function getExpectedNormalizedEntity() {
         ],
       ],
       '_embedded' => [
-        $this->baseUrl . '/rest/relation/media/camelids/field_media_file_1' => [
+        $this->baseUrl . '/rest/relation/media/camelids/field_media_file' => [
           [
             '_links' => [
               'self' => [
diff --git a/core/modules/media/tests/modules/media_test_type/media_test_type.info.yml b/core/modules/media/tests/modules/media_test_type/media_test_type.info.yml
index 7eec4e3..349aa21 100644
--- a/core/modules/media/tests/modules/media_test_type/media_test_type.info.yml
+++ b/core/modules/media/tests/modules/media_test_type/media_test_type.info.yml
@@ -5,4 +5,5 @@ core: 8.x
 package: Testing
 version: VERSION
 dependencies:
+  - media
   - media_test_source
diff --git a/core/modules/media/tests/src/Functional/MediaFunctionalTestCreateMediaTypeTrait.php b/core/modules/media/tests/src/Functional/MediaFunctionalTestCreateMediaTypeTrait.php
index 4197caa..2a72edd 100644
--- a/core/modules/media/tests/src/Functional/MediaFunctionalTestCreateMediaTypeTrait.php
+++ b/core/modules/media/tests/src/Functional/MediaFunctionalTestCreateMediaTypeTrait.php
@@ -45,6 +45,7 @@ protected function createMediaType(array $values = [], $source = 'test') {
     $this->assertIdentical(SAVED_NEW, $status, 'Media type was created successfully.');
 
     // Ensure that the source field exists.
+    /** @var \Drupal\media\MediaSourceInterface $source */
     $source = $media_type->getSource();
     $source_field = $source->getSourceFieldDefinition($media_type);
     if (!$source_field) {
@@ -61,6 +62,11 @@ protected function createMediaType(array $values = [], $source = 'test') {
         ->save();
     }
 
+    // Move source field in form display.
+    entity_get_form_display('media', $id, 'default')
+      ->setComponent($source_field->getName())
+      ->save();
+
     return $media_type;
   }
 
diff --git a/core/modules/media/tests/src/Functional/MediaRevisionTest.php b/core/modules/media/tests/src/Functional/MediaRevisionTest.php
index b8ff7c5..265e50f 100644
--- a/core/modules/media/tests/src/Functional/MediaRevisionTest.php
+++ b/core/modules/media/tests/src/Functional/MediaRevisionTest.php
@@ -80,6 +80,8 @@ public function testFileMediaRevision() {
     $uri = 'temporary://foo.txt';
     file_put_contents($uri, $this->randomString(128));
 
+    $this->createMediaType(['bundle' => 'file', 'new_revision' => TRUE], 'file');
+
     // Create a media item.
     $this->drupalGet('/media/add/file');
     $page = $this->getSession()->getPage();
@@ -117,6 +119,8 @@ public function testFileMediaRevision() {
   public function testImageMediaRevision() {
     $assert = $this->assertSession();
 
+    $this->createMediaType(['bundle' => 'image', 'new_revision' => TRUE], 'image');
+
     /** @var \Drupal\field\FieldConfigInterface $field */
     // Disable the alt text field, because this is not a JavaScript test and
     // the alt text field will therefore not appear without a full page refresh.
diff --git a/core/modules/media/tests/src/Functional/MediaSourceFileTest.php b/core/modules/media/tests/src/Functional/MediaSourceFileTest.php
index b2e4f50..1c3d023 100644
--- a/core/modules/media/tests/src/Functional/MediaSourceFileTest.php
+++ b/core/modules/media/tests/src/Functional/MediaSourceFileTest.php
@@ -13,17 +13,6 @@
 class MediaSourceFileTest extends MediaFunctionalTestBase {
 
   /**
-   * {@inheritdoc}
-   */
-  protected function setUp() {
-    parent::setUp();
-
-    // We need to test without any default configuration in place.
-    // @TODO: Remove this as part of https://www.drupal.org/node/2883813.
-    MediaType::load('file')->delete();
-  }
-
-  /**
    * Test that it's possible to change the allowed file extensions.
    */
   public function testSourceFieldSettingsEditing() {
diff --git a/core/modules/media/tests/src/Functional/MediaUiFunctionalTest.php b/core/modules/media/tests/src/Functional/MediaUiFunctionalTest.php
index 74ac67c..3841fc8 100644
--- a/core/modules/media/tests/src/Functional/MediaUiFunctionalTest.php
+++ b/core/modules/media/tests/src/Functional/MediaUiFunctionalTest.php
@@ -29,11 +29,6 @@ protected function setUp() {
     parent::setUp();
     $this->drupalPlaceBlock('local_actions_block');
     $this->drupalPlaceBlock('local_tasks_block');
-
-    // We need to test without any default configuration in place.
-    // @TODO: Remove this when https://www.drupal.org/node/2883813 lands.
-    MediaType::load('file')->delete();
-    MediaType::load('image')->delete();
   }
 
   /**
@@ -59,6 +54,8 @@ public function testMediaWithOnlyOneMediaType() {
     $page->fillField('name[0][value]', $media_name);
     $revision_log_message = $this->randomString();
     $page->fillField('revision_log_message[0][value]', $revision_log_message);
+    $source_field = $this->randomString();
+    $page->fillField('field_media_test[0][value]', $source_field);
     $page->pressButton('Save');
     $media_id = $this->container->get('entity.query')->get('media')->execute();
     $media_id = reset($media_id);
diff --git a/core/modules/media/tests/src/FunctionalJavascript/MediaSourceFileTest.php b/core/modules/media/tests/src/FunctionalJavascript/MediaSourceFileTest.php
index e32627d..da500ee 100644
--- a/core/modules/media/tests/src/FunctionalJavascript/MediaSourceFileTest.php
+++ b/core/modules/media/tests/src/FunctionalJavascript/MediaSourceFileTest.php
@@ -13,17 +13,6 @@
 class MediaSourceFileTest extends MediaSourceTestBase {
 
   /**
-   * {@inheritdoc}
-   */
-  protected function setUp() {
-    parent::setUp();
-
-    // We need to test without any default configuration in place.
-    // @TODO: Remove this as part of https://www.drupal.org/node/2883813.
-    MediaType::load('file')->delete();
-  }
-
-  /**
    * Tests the file media source.
    */
   public function testMediaFileSource() {
diff --git a/core/modules/media/tests/src/FunctionalJavascript/MediaSourceImageTest.php b/core/modules/media/tests/src/FunctionalJavascript/MediaSourceImageTest.php
index dd99442..f89ae5e 100644
--- a/core/modules/media/tests/src/FunctionalJavascript/MediaSourceImageTest.php
+++ b/core/modules/media/tests/src/FunctionalJavascript/MediaSourceImageTest.php
@@ -14,18 +14,6 @@
 class MediaSourceImageTest extends MediaSourceTestBase {
 
   /**
-   * {@inheritdoc}
-   */
-  protected function setUp() {
-    parent::setUp();
-
-    // We need to test without any default configuration in place.
-    // @TODO: Remove this as part of https://www.drupal.org/node/2883813.
-    MediaType::load('file')->delete();
-    MediaType::load('image')->delete();
-  }
-
-  /**
    * Tests the image media source.
    */
   public function testMediaImageSource() {
diff --git a/core/modules/media/tests/src/FunctionalJavascript/MediaUiJavascriptTest.php b/core/modules/media/tests/src/FunctionalJavascript/MediaUiJavascriptTest.php
index 981da61..4854a5f 100644
--- a/core/modules/media/tests/src/FunctionalJavascript/MediaUiJavascriptTest.php
+++ b/core/modules/media/tests/src/FunctionalJavascript/MediaUiJavascriptTest.php
@@ -38,11 +38,6 @@ protected function setUp() {
     parent::setUp();
     $this->drupalPlaceBlock('local_actions_block');
     $this->drupalPlaceBlock('local_tasks_block');
-
-    // We need to test without any default configuration in place.
-    // @TODO: Remove this as part of https://www.drupal.org/node/2883813.
-    MediaType::load('file')->delete();
-    MediaType::load('image')->delete();
   }
 
   /**
diff --git a/core/modules/media/tests/src/FunctionalJavascript/MediaViewsWizardTest.php b/core/modules/media/tests/src/FunctionalJavascript/MediaViewsWizardTest.php
index 94e89c6..df71943 100644
--- a/core/modules/media/tests/src/FunctionalJavascript/MediaViewsWizardTest.php
+++ b/core/modules/media/tests/src/FunctionalJavascript/MediaViewsWizardTest.php
@@ -22,6 +22,8 @@ public function testMediaWizard() {
     $page = $session->getPage();
     $assert_session = $this->assertSession();
 
+    $this->createMediaType();
+
     $view_id = strtolower($this->randomMachineName(16));
     $this->drupalGet('admin/structure/views/add');
     $page->fillField('label', $view_id);
diff --git a/core/modules/media/tests/src/Kernel/MediaSourceFileTest.php b/core/modules/media/tests/src/Kernel/MediaSourceFileTest.php
index d716e15..884cd03 100644
--- a/core/modules/media/tests/src/Kernel/MediaSourceFileTest.php
+++ b/core/modules/media/tests/src/Kernel/MediaSourceFileTest.php
@@ -12,18 +12,6 @@
 class MediaSourceFileTest extends MediaKernelTestBase {
 
   /**
-   * {@inheritdoc}
-   */
-  protected function setUp() {
-    parent::setUp();
-
-    // We need to test without any default configuration in place.
-    // @TODO: Remove this as part of https://www.drupal.org/node/2883813.
-    MediaType::load('file')->delete();
-    MediaType::load('image')->delete();
-  }
-
-  /**
    * Tests the file extension constraint.
    */
   public function testFileExtensionConstraint() {
diff --git a/core/modules/rest/tests/src/Functional/EntityResource/Media/MediaResourceTestBase.php b/core/modules/rest/tests/src/Functional/EntityResource/Media/MediaResourceTestBase.php
index f5bfa14..475a1ca 100644
--- a/core/modules/rest/tests/src/Functional/EntityResource/Media/MediaResourceTestBase.php
+++ b/core/modules/rest/tests/src/Functional/EntityResource/Media/MediaResourceTestBase.php
@@ -92,7 +92,7 @@ protected function createEntity() {
     // Create a "Llama" media item.
     $media = Media::create([
       'bundle' => 'camelids',
-      'field_media_file_1' => [
+      'field_media_file' => [
         'target_id' => $file->id(),
       ],
     ]);
@@ -147,7 +147,7 @@ protected function getExpectedNormalizedEntity() {
           'value' => 'Llama',
         ],
       ],
-      'field_media_file_1' => [
+      'field_media_file' => [
         [
           'description' => NULL,
           'display' => NULL,
diff --git a/core/modules/media/config/install/core.entity_form_display.media.file.default.yml b/core/profiles/standard/config/optional/core.entity_form_display.media.file.default.yml
similarity index 100%
rename from core/modules/media/config/install/core.entity_form_display.media.file.default.yml
rename to core/profiles/standard/config/optional/core.entity_form_display.media.file.default.yml
diff --git a/core/modules/media/config/install/core.entity_form_display.media.image.default.yml b/core/profiles/standard/config/optional/core.entity_form_display.media.image.default.yml
similarity index 100%
rename from core/modules/media/config/install/core.entity_form_display.media.image.default.yml
rename to core/profiles/standard/config/optional/core.entity_form_display.media.image.default.yml
diff --git a/core/modules/media/config/install/core.entity_view_display.media.file.default.yml b/core/profiles/standard/config/optional/core.entity_view_display.media.file.default.yml
similarity index 100%
rename from core/modules/media/config/install/core.entity_view_display.media.file.default.yml
rename to core/profiles/standard/config/optional/core.entity_view_display.media.file.default.yml
diff --git a/core/modules/media/config/install/core.entity_view_display.media.image.default.yml b/core/profiles/standard/config/optional/core.entity_view_display.media.image.default.yml
similarity index 100%
rename from core/modules/media/config/install/core.entity_view_display.media.image.default.yml
rename to core/profiles/standard/config/optional/core.entity_view_display.media.image.default.yml
diff --git a/core/modules/media/config/install/field.field.media.file.field_media_file.yml b/core/profiles/standard/config/optional/field.field.media.file.field_media_file.yml
similarity index 100%
rename from core/modules/media/config/install/field.field.media.file.field_media_file.yml
rename to core/profiles/standard/config/optional/field.field.media.file.field_media_file.yml
diff --git a/core/modules/media/config/install/field.field.media.image.field_media_image.yml b/core/profiles/standard/config/optional/field.field.media.image.field_media_image.yml
similarity index 100%
rename from core/modules/media/config/install/field.field.media.image.field_media_image.yml
rename to core/profiles/standard/config/optional/field.field.media.image.field_media_image.yml
diff --git a/core/modules/media/config/install/field.storage.media.field_media_file.yml b/core/profiles/standard/config/optional/field.storage.media.field_media_file.yml
similarity index 100%
rename from core/modules/media/config/install/field.storage.media.field_media_file.yml
rename to core/profiles/standard/config/optional/field.storage.media.field_media_file.yml
diff --git a/core/modules/media/config/install/field.storage.media.field_media_image.yml b/core/profiles/standard/config/optional/field.storage.media.field_media_image.yml
similarity index 100%
rename from core/modules/media/config/install/field.storage.media.field_media_image.yml
rename to core/profiles/standard/config/optional/field.storage.media.field_media_image.yml
diff --git a/core/modules/media/config/install/media.type.file.yml b/core/profiles/standard/config/optional/media.type.file.yml
similarity index 100%
rename from core/modules/media/config/install/media.type.file.yml
rename to core/profiles/standard/config/optional/media.type.file.yml
diff --git a/core/modules/media/config/install/media.type.image.yml b/core/profiles/standard/config/optional/media.type.image.yml
similarity index 100%
rename from core/modules/media/config/install/media.type.image.yml
rename to core/profiles/standard/config/optional/media.type.image.yml