diff --git a/core/modules/media/tests/src/FunctionalJavascript/MediaDisplayTest.php b/core/modules/media/tests/src/FunctionalJavascript/MediaDisplayTest.php
index 6287954..5282270 100644
--- a/core/modules/media/tests/src/FunctionalJavascript/MediaDisplayTest.php
+++ b/core/modules/media/tests/src/FunctionalJavascript/MediaDisplayTest.php
@@ -28,10 +28,8 @@ protected function setUp() {
     // Instal the optional configs from the standard profile.
     $extension_path = drupal_get_path('profile', 'standard');
     $optional_install_path = $extension_path . '/' . InstallStorage::CONFIG_OPTIONAL_DIRECTORY;
-    if (is_dir($optional_install_path)) {
-      $storage = new FileStorage($optional_install_path, StorageInterface::DEFAULT_COLLECTION);
-      $this->container->get('config.installer')->installOptionalConfig($storage, '');
-    }
+    $storage = new FileStorage($optional_install_path);
+    $this->container->get('config.installer')->installOptionalConfig($storage, '');
     // Reset all the static caches and list caches.
     $this->container->get('config.factory')->reset();
   }
@@ -114,13 +112,6 @@ public function testMediaDisplay() {
       'name' => 'Page',
     ]);
     $node_type->save();
-    $node_view_display = EntityViewDisplay::create([
-      'targetEntityType' => 'node',
-      'bundle' => $node_type->id(),
-      'mode' => 'default',
-      'status' => TRUE,
-    ]);
-    $node_view_display->save();
 
     // Reference the created media using an entity_refernce field and make sure
     // the output is what we expect.
@@ -148,7 +139,7 @@ public function testMediaDisplay() {
       ],
     ])->save();
 
-    EntityViewDisplay::load("node.{$node_type->id()}.default")
+    entity_get_display('node', $node_type->id(), 'default')
       ->setComponent('field_related_media', [
         'type' => 'entity_reference_entity_view',
         'label' => 'hidden',