diff --git a/core/profiles/demo_umami/modules/demo_umami_content/default_content/article_body/.htaccess b/core/profiles/demo_umami/modules/demo_umami_content/default_content/.htaccess
similarity index 100%
rename from core/profiles/demo_umami/modules/demo_umami_content/default_content/article_body/.htaccess
rename to core/profiles/demo_umami/modules/demo_umami_content/default_content/.htaccess
diff --git a/core/profiles/demo_umami/modules/demo_umami_content/default_content/images/.htaccess b/core/profiles/demo_umami/modules/demo_umami_content/default_content/images/.htaccess
deleted file mode 100644
index ae4e251c81..0000000000
--- a/core/profiles/demo_umami/modules/demo_umami_content/default_content/images/.htaccess
+++ /dev/null
@@ -1,12 +0,0 @@
-# Deny all requests from Apache 2.4+.
-<IfModule mod_authz_core.c>
-  Require all denied
-</IfModule>
-
-# Deny all requests from Apache 2.0-2.2.
-<IfModule !mod_authz_core.c>
-  Deny from all
-</IfModule>
-# Turn off all options we don't need.
-Options None
-Options +FollowSymLinks
diff --git a/core/profiles/demo_umami/modules/demo_umami_content/default_content/recipe_instructions/.htaccess b/core/profiles/demo_umami/modules/demo_umami_content/default_content/recipe_instructions/.htaccess
deleted file mode 100644
index bdcdd2f5c8..0000000000
--- a/core/profiles/demo_umami/modules/demo_umami_content/default_content/recipe_instructions/.htaccess
+++ /dev/null
@@ -1,11 +0,0 @@
-# Deny all requests from Apache 2.4+.
-<IfModule mod_authz_core.c>
-  Require all denied
-</IfModule>
-
-# Deny all requests from Apache 2.0-2.2.
-<IfModule !mod_authz_core.c>
-  Deny from all
-</IfModule>
-# Turn off all options we don't need.
-Options -Indexes -ExecCGI -Includes -MultiViews
diff --git a/core/profiles/demo_umami/modules/demo_umami_content/tests/src/Functional/DefaultContentFilesAccessTest.php b/core/profiles/demo_umami/modules/demo_umami_content/tests/src/Functional/DefaultContentFilesAccessTest.php
new file mode 100644
index 0000000000..646ad3bcfc
--- /dev/null
+++ b/core/profiles/demo_umami/modules/demo_umami_content/tests/src/Functional/DefaultContentFilesAccessTest.php
@@ -0,0 +1,36 @@
+<?php
+
+namespace Drupal\Tests\demo_umami_content\Functional;
+
+use Drupal\Tests\BrowserTestBase;
+
+/**
+ * Tests that files provided by demo_umami_content are not accessible.
+ *
+ * @group demo_umami_content
+ */
+class DefaultContentFilesAccessTest extends BrowserTestBase {
+
+  /**
+   * Tests that sample images, recipes and articles are not accessible.
+   *
+   * Note the demo_umami profile is not used because we want to ensure that if
+   * you install another profile these files are not available.
+   */
+  public function testAccessDeniedToFiles() {
+    // Hard code the path sonce the demo_umami profile is not installed.
+    $default_content_path = 'core/profiles/demo_umami/modules/demo_umami_content/default_content/';
+    $files_to_test = [
+      $default_content_path . 'images/chocolate-brownie-umami.jpg',
+      $default_content_path . 'recipe_instructions/chocolate-brownie-umami.html',
+      $default_content_path . 'article_body/lets-hear-it-for-carrots.html',
+      $default_content_path . 'articles.csv',
+    ];
+    foreach ($files_to_test as $file) {
+      $this->assertFileExists(str_replace('/', DIRECTORY_SEPARATOR, $this->root . '/' . $file));
+      $this->drupalGet($file);
+      $this->assertSession()->statusCodeEquals(403);
+    }
+  }
+
+}
diff --git a/core/profiles/demo_umami/tests/src/Functional/DemoUmamiProfileTest.php b/core/profiles/demo_umami/tests/src/Functional/DemoUmamiProfileTest.php
index bfa1de25c7..f6025fd603 100644
--- a/core/profiles/demo_umami/tests/src/Functional/DemoUmamiProfileTest.php
+++ b/core/profiles/demo_umami/tests/src/Functional/DemoUmamiProfileTest.php
@@ -163,37 +163,4 @@ public function testDemonstrationWarningMessage() {
     $web_assert->pageTextNotContains('This site is intended for demonstration purposes.');
   }
 
-  /**
-   * Tests that sample images are not accessible to the webserver.
-   */
-  public function testAccessDeniedToSampleImages() {
-    $file_name = 'chocolate-brownie-umami.jpg';
-    $file_path = '/' . drupal_get_path('module', 'demo_umami_content') . '/default_content/images/' . $file_name;
-    $this->assertTrue(file_exists(DRUPAL_ROOT . $file_path));
-    $this->drupalGet($file_path);
-    $this->assertSession()->statusCodeEquals(403);
-  }
-
-  /**
-   * Tests that sample recipes are not accessible to the webserver.
-   */
-  public function testAccessDeniedToSampleRecipes() {
-    $file_name = 'chocolate-brownie-umami.html';
-    $file_path = '/' . drupal_get_path('module', 'demo_umami_content') . '/default_content/recipe_instructions/' . $file_name;
-    $this->assertTrue(file_exists(DRUPAL_ROOT . $file_path));
-    $this->drupalGet($file_path);
-    $this->assertSession()->statusCodeEquals(403);
-  }
-
-  /**
-   * Tests that sample articles are not accessible to the webserver.
-   */
-  public function testAccessDeniedToSampleArticles() {
-    $file_name = 'lets-hear-it-for-carrots.html';
-    $file_path = '/' . drupal_get_path('module', 'demo_umami_content') . '/default_content/article_body/' . $file_name;
-    $this->assertTrue(file_exists(DRUPAL_ROOT . $file_path));
-    $this->drupalGet($file_path);
-    $this->assertSession()->statusCodeEquals(403);
-  }
-
 }