diff --git a/core/modules/system/src/Tests/Installer/SingleVisibleProfileTest.php b/core/modules/system/src/Tests/Installer/SingleVisibleProfileTest.php
index 91af34a2d1..3e93a0b4fc 100644
--- a/core/modules/system/src/Tests/Installer/SingleVisibleProfileTest.php
+++ b/core/modules/system/src/Tests/Installer/SingleVisibleProfileTest.php
@@ -21,25 +21,20 @@ class SingleVisibleProfileTest extends InstallerTestBase {
    */
   protected $profile = NULL;
 
-  /**
-   * The install profile info.
-   *
-   * @var array
-   */
-  protected $info;
-
   protected function setUp() {
-    $this->info = [
-      'type' => 'profile',
-      'core' => \Drupal::CORE_COMPATIBILITY,
-      'name' => 'Override standard',
-      'hidden' => TRUE,
-    ];
-    // File API functions are not available yet.
-    $path = $this->siteDirectory . '/profiles/standard';
-    mkdir($path, 0777, TRUE);
-    file_put_contents("$path/standard.info.yml", Yaml::encode($this->info));
-
+    $profiles = ['standard', 'demo_umami'];
+    foreach ($profiles as $profile) {
+      $info = [
+        'type' => 'profile',
+        'core' => \Drupal::CORE_COMPATIBILITY,
+        'name' => 'Override ' . $profile,
+        'hidden' => TRUE,
+      ];
+      // File API functions are not available yet.
+      $path = $this->siteDirectory . '/profiles/' . $profile;
+      mkdir($path, 0777, TRUE);
+      file_put_contents("$path/$profile.info.yml", Yaml::encode($info));
+    }
     parent::setUp();
   }
 
diff --git a/core/profiles/demo_umami/modules/demo_umami_content/demo_umami_content.info.yml b/core/profiles/demo_umami/modules/demo_umami_content/demo_umami_content.info.yml
index fe55170c37..32f0038884 100644
--- a/core/profiles/demo_umami/modules/demo_umami_content/demo_umami_content.info.yml
+++ b/core/profiles/demo_umami/modules/demo_umami_content/demo_umami_content.info.yml
@@ -2,6 +2,7 @@ name: 'Umami demo: Content'
 description: Imports the content for the Umami demo.
 type: module
 core: 8.x
+package: 'Core (Experimental)'
 dependencies:
   - field
   - file
diff --git a/core/tests/Drupal/KernelTests/Core/Asset/ResolvedLibraryDefinitionsFilesMatchTest.php b/core/tests/Drupal/KernelTests/Core/Asset/ResolvedLibraryDefinitionsFilesMatchTest.php
index 4836e16f3a..2131a35ad0 100644
--- a/core/tests/Drupal/KernelTests/Core/Asset/ResolvedLibraryDefinitionsFilesMatchTest.php
+++ b/core/tests/Drupal/KernelTests/Core/Asset/ResolvedLibraryDefinitionsFilesMatchTest.php
@@ -108,6 +108,10 @@ protected function setUp() {
       }
       return TRUE;
     });
+    // Remove demo_umami_content module as its install hook creates content
+    // that relies on the presence of entity tables and various other elements
+    // not present in a kernel test.
+    unset($all_modules['demo_umami_content']);
     $this->allModules = array_keys($all_modules);
     $this->allModules[] = 'system';
     sort($this->allModules);