diff --git a/core/modules/help_topics/help_topics/config-basic.html.twig b/core/modules/help_topics/help_topics/core.config_basic.html.twig
similarity index 95%
rename from core/modules/help_topics/help_topics/config-basic.html.twig
rename to core/modules/help_topics/help_topics/core.config_basic.html.twig
index 82a0884487..09fcb5b9d0 100644
--- a/core/modules/help_topics/help_topics/config-basic.html.twig
+++ b/core/modules/help_topics/help_topics/core.config_basic.html.twig
@@ -1,6 +1,6 @@
 <meta name="help_topic:label" content="Changing basic site settings"/>
 <meta name="help_topic:top_level"/>
-<meta name="help_topic:related" content="security-account-settings"/>
+<meta name="help_topic:related" content="user.security_account_settings"/>
 {% set regional_url = render_var(url('system.regional_settings')) %}
 {% set information_url = render_var(url('system.site_information_settings')) %}
 {% set datetime_url = render_var(url('entity.date_format.collection')) %}
diff --git a/core/modules/help_topics/help_topics/config-error.html.twig b/core/modules/help_topics/help_topics/core.config_error.html.twig
similarity index 96%
rename from core/modules/help_topics/help_topics/config-error.html.twig
rename to core/modules/help_topics/help_topics/core.config_error.html.twig
index bf303babb6..f91fc2a64e 100644
--- a/core/modules/help_topics/help_topics/config-error.html.twig
+++ b/core/modules/help_topics/help_topics/core.config_error.html.twig
@@ -1,5 +1,5 @@
 <meta name="help_topic:label" content="Configuring error responses, including 403/404 pages"/>
-<meta name="help_topic:related" content="config-basic,maintenance"/>
+<meta name="help_topic:related" content="core.config_basic,core.maintenance"/>
 {% set log_settings_url = render_var(url('system.logging_settings')) %}
 {% set site_settings_url = render_var(url('system.site_information_settings')) %}
 <h2>{% trans %}Configuring 403/404 pages{% endtrans %}</h2>
diff --git a/core/modules/help_topics/help_topics/maintenance.html.twig b/core/modules/help_topics/help_topics/core.maintenance.html.twig
similarity index 100%
rename from core/modules/help_topics/help_topics/maintenance.html.twig
rename to core/modules/help_topics/help_topics/core.maintenance.html.twig
diff --git a/core/modules/help_topics/help_topics/menu-overview.html.twig b/core/modules/help_topics/help_topics/core.menu_overview.html.twig
similarity index 100%
rename from core/modules/help_topics/help_topics/menu-overview.html.twig
rename to core/modules/help_topics/help_topics/core.menu_overview.html.twig
diff --git a/core/modules/help_topics/help_topics/security.html.twig b/core/modules/help_topics/help_topics/core.security.html.twig
similarity index 75%
rename from core/modules/help_topics/help_topics/security.html.twig
rename to core/modules/help_topics/help_topics/core.security.html.twig
index 4c9b8a7b83..63b12c4937 100644
--- a/core/modules/help_topics/help_topics/security.html.twig
+++ b/core/modules/help_topics/help_topics/core.security.html.twig
@@ -1,4 +1,4 @@
 <meta name="help_topic:label" content="Making your site secure"/>
 <meta name="help_topic:top_level"/>
-<meta name="help_topic:related" content="menu-overview"/>
+<meta name="help_topic:related" content="menu_ui.menu_overview"/>
 <p>{% trans %}The topics listed here will help you make and keep your site secure.{% endtrans %}</p>
diff --git a/core/modules/help_topics/help_topics/ui-accessibility.html.twig b/core/modules/help_topics/help_topics/core.ui_accessibility.html.twig
similarity index 92%
rename from core/modules/help_topics/help_topics/ui-accessibility.html.twig
rename to core/modules/help_topics/help_topics/core.ui_accessibility.html.twig
index 80c5f3d994..f93aa4d580 100644
--- a/core/modules/help_topics/help_topics/ui-accessibility.html.twig
+++ b/core/modules/help_topics/help_topics/core.ui_accessibility.html.twig
@@ -1,5 +1,5 @@
 <meta name="help_topic:label" content="Accessibility features"/>
-<meta name="help_topic:related" content="ui-components"/>
+<meta name="help_topic:related" content="core.ui_components"/>
 <p>{% trans %}The following features of the administrative user interface may help administrative users with disabilities access your site:{% endtrans %}</p>
 <dl>
   <dt>{% trans %}Disabling drag-and-drop functionality{% endtrans %}</dt>
diff --git a/core/modules/help_topics/help_topics/ui-components.html.twig b/core/modules/help_topics/help_topics/core.ui_components.html.twig
similarity index 100%
rename from core/modules/help_topics/help_topics/ui-components.html.twig
rename to core/modules/help_topics/help_topics/core.ui_components.html.twig
diff --git a/core/modules/help_topics/help_topics/ui-contextual.html.twig b/core/modules/help_topics/help_topics/core.ui_contextual.html.twig
similarity index 97%
rename from core/modules/help_topics/help_topics/ui-contextual.html.twig
rename to core/modules/help_topics/help_topics/core.ui_contextual.html.twig
index 8835c298c6..202a285404 100644
--- a/core/modules/help_topics/help_topics/ui-contextual.html.twig
+++ b/core/modules/help_topics/help_topics/core.ui_contextual.html.twig
@@ -1,5 +1,5 @@
 <meta name="help_topic:label" content="Contextual links"/>
-<meta name="help_topic:related" content="ui-components"/>
+<meta name="help_topic:related" content="core.ui_components"/>
 <h2>{% trans %}What are contextual links?{% endtrans %}</h2>
 <p>{% trans %}<em>Contextual links</em> give users with the <em>Use contextual links</em> permission quick access to administrative tasks related to areas of non-administrative pages. For example, if a page on your site displays a block, the block would have a contextual link that would allow users with permission to configure the block. If the block contains a menu or a view, it would also have a contextual link for editing the menu links or the view. Clicking a contextual link takes you to the related administrative page directly, without needing to navigate through the administrative menu system.{% endtrans %}</p>
 <h2>{% trans %}Displaying and using contextual links{% endtrans %}</h2>
diff --git a/core/modules/help_topics/help_topics/ui-tours.html.twig b/core/modules/help_topics/help_topics/core.ui_tours.html.twig
similarity index 93%
rename from core/modules/help_topics/help_topics/ui-tours.html.twig
rename to core/modules/help_topics/help_topics/core.ui_tours.html.twig
index 16530c50dc..7edf84283b 100644
--- a/core/modules/help_topics/help_topics/ui-tours.html.twig
+++ b/core/modules/help_topics/help_topics/core.ui_tours.html.twig
@@ -1,5 +1,5 @@
 <meta name="help_topic:label" content="Tours"/>
-<meta name="help_topic:related" content="ui-components"/>
+<meta name="help_topic:related" content="core.ui_components"/>
 <h2>{% trans %}What are tours?{% endtrans %}</h2>
 <p>{% trans %}The core Tour module provides users with <em>tours</em>, which are guided tours of the administrative interface. Each tour starts on a particular administrative page, and consists of one or more <em>tips</em> that highlight elements of the page, guide you through a workflow, or explain key concepts. Users need <em>Access tour</em> permission to view tours, and JavaScript must be enabled in their browsers.{% endtrans %}</p>
 <h2>{% trans %}Viewing tours{% endtrans %}</h2>
diff --git a/core/modules/help_topics/help_topics/help-topic-writing.html.twig b/core/modules/help_topics/help_topics/help_topics.help_topic_writing.html.twig
similarity index 100%
rename from core/modules/help_topics/help_topics/help-topic-writing.html.twig
rename to core/modules/help_topics/help_topics/help_topics.help_topic_writing.html.twig
diff --git a/core/modules/help_topics/help_topics/ui-shortcuts.html.twig b/core/modules/help_topics/help_topics/shortcut.ui_shortcuts.html.twig
similarity index 96%
rename from core/modules/help_topics/help_topics/ui-shortcuts.html.twig
rename to core/modules/help_topics/help_topics/shortcut.ui_shortcuts.html.twig
index 21d8a40ee8..0228a37acf 100644
--- a/core/modules/help_topics/help_topics/ui-shortcuts.html.twig
+++ b/core/modules/help_topics/help_topics/shortcut.ui_shortcuts.html.twig
@@ -1,5 +1,5 @@
 <meta name="help_topic:label" content="Shortcuts"/>
-<meta name="help_topic:related" content="ui-components"/>
+<meta name="help_topic:related" content="core.ui_components"/>
 <h2>{% trans %}What are shortcuts?{% endtrans %}</h2>
 <p>{% trans %}<em>Shortcuts</em> are quick links to administrative pages; they are managed by the core Shortcut module. A site can have one or more <em>shortcut sets</em>, which can be shared by one or more users; each set contains one or more shortcuts. Users need <em>Use shortcuts</em> permission to view shortcuts; <em>Edit current shortcut set</em> permission to add, delete, or edit the shortcuts in the set assigned to them; and <em>Select any shortcut set</em> permission to select a different shortcut set when editing their user profile. There is also an <em>Administer shortcuts</em> permission, which allows an administrator to do any of these actions, and also permits assigning shortcut sets to other users.{% endtrans %}</p>
 <h2>{% trans %}Creating and deleting shortcuts{% endtrans %}</h2>
diff --git a/core/modules/help_topics/help_topics/security-account-settings.html.twig b/core/modules/help_topics/help_topics/user.security_account_settings.html.twig
similarity index 95%
rename from core/modules/help_topics/help_topics/security-account-settings.html.twig
rename to core/modules/help_topics/help_topics/user.security_account_settings.html.twig
index d8f1c3b6f0..ef2d25a757 100644
--- a/core/modules/help_topics/help_topics/security-account-settings.html.twig
+++ b/core/modules/help_topics/help_topics/user.security_account_settings.html.twig
@@ -1,5 +1,5 @@
 <meta name="help_topic:label" content="Defining how user accounts are created"/>
-<meta name="help_topic:related" content="security"/>
+<meta name="help_topic:related" content="core.security"/>
 {% set account_settings_url = render_var(url('entity.user.admin_form')) %}
 <p>{% trans %}On the <a href="{{ account_settings_url }}"><em>Account settings</em></a> page, which you can reach from the <em>Manage</em> administrative menu, by navigating to <em>Configuration</em> &gt; <em>People</em> &gt; <em>Account settings</em> (requires the <em>Administer account settings</em> permission), you can configure several settings related to how user accounts are created:{% endtrans %}</p>
 <ul>
diff --git a/core/modules/help_topics/src/HelpTopicDiscovery.php b/core/modules/help_topics/src/HelpTopicDiscovery.php
index 934f96ff51..de855ce5e1 100644
--- a/core/modules/help_topics/src/HelpTopicDiscovery.php
+++ b/core/modules/help_topics/src/HelpTopicDiscovery.php
@@ -94,11 +94,20 @@ public function findAll() {
     // parse them now. This list was flipped above and is keyed by filename.
     if ($files) {
       foreach ($files as $file => $provider) {
+        $plugin_id = substr(basename($file), 0, -10);
+        // The plugin ID begins with provider.
+        list($file_name_provider,) = explode('.', $plugin_id, 2);
+        // Only the Help Topics module can provider help for other extensions.
+        // @todo Remove help_topics special case once Help Topics is stable and
+        //   core modules can provide their own help topics.
+        if ($provider !== 'help_topics' && $provider !== $file_name_provider) {
+          throw new DiscoveryException("The $file should begin with '$provider.'");
+        }
         $data = [
           // The plugin ID is derived from the filename. The extension
           // '.html.twig' is removed
-          'id' => substr(basename($file), 0, -10),
-          'provider' => $provider,
+          'id' => $plugin_id,
+          'provider' => $file_name_provider,
           'class' => HelpTopicTwig::class,
           static::FILE_KEY => $file,
         ];
diff --git a/core/modules/help_topics/src/HelpTopicPluginManager.php b/core/modules/help_topics/src/HelpTopicPluginManager.php
index 6d4e0d0a6e..b9de75dd7f 100644
--- a/core/modules/help_topics/src/HelpTopicPluginManager.php
+++ b/core/modules/help_topics/src/HelpTopicPluginManager.php
@@ -11,8 +11,9 @@
  * Provides the default help_topic manager.
  *
  * Modules and themes can provide help topics in .html.twig files called
- * name-of-topic.html.twig inside the module or theme sub-directory
- * help_topics.
+ * provider.name_of_topic.html.twig inside the module or theme sub-directory
+ * help_topics. The provider is validated to be the extension that provides the
+ * help topic.
  *
  * The Twig file must contain a meta tag named 'help_topic:label'. It can also
  * contain meta tags named 'help_topic:top_level' and 'help_topic:related'. For
@@ -21,8 +22,8 @@
  * <!–– The label/title of the topic. -->
  * <meta name="help_topic:label" content="Configuring error responses, including 403/404 pages"/>
  *
- * <!–– Related help topics in a comma separated name-of-topic list. -->
- * <meta name="help_topic:related" content="config-basic,maintenance"/>
+ * <!–– Related help topics in a comma separated help topic ID list. -->
+ * <meta name="help_topic:related" content="core.config_basic,core.maintenance"/>
  *
  * <!–– If present then the help topic will appear on admin/help. -->
  * <meta name="help_topic:top_level"/>
@@ -114,25 +115,30 @@ protected function providerExists($provider) {
   /**
    * {@inheritdoc}
    */
-  public function alterDefinitions(&$definitions) {
-    parent::alterDefinitions($definitions);
+  protected function findDefinitions() {
+    $definitions = parent::findDefinitions();
 
+    // At this point the plugin list only contains valid plugins. Ensure all
+    // related plugins exist and the relationship is bi-directional. This
+    // ensures topics are listed on their related topics.
     foreach ($definitions as $plugin_id => $plugin_definition) {
       foreach ($plugin_definition['related'] as $key => $related_id) {
         // If the related help topic does not exist it might be for a module
-        // that is not installed. Remove it. This silent removal is a bit
-        // worrying but how else do we support optional relations?
+        // that is not installed. Remove it.
+        // @todo Discuss this more as this could cause silent errors but it
+        //   offers useful functionality to relate to help topic provided by
+        //   extensions that are yet to be installed.
         if (!isset($definitions[$related_id])) {
           unset($definitions[$plugin_id]['related'][$key]);
           continue;
         }
-        // Make the Related relationship bi-directional, by making sure this
-        // topic is listed as Related on its related topics.
+        // Make the related relationship bi-directional.
         if (isset($definitions[$related_id]) && !in_array($plugin_id, $definitions[$related_id]['related'], TRUE)) {
           $definitions[$related_id]['related'][] = $plugin_id;
         }
       }
     }
+    return $definitions;
   }
 
 }
diff --git a/core/modules/help_topics/src/HelpTopicTwig.php b/core/modules/help_topics/src/HelpTopicTwig.php
index fca6b20e68..34f3804adb 100644
--- a/core/modules/help_topics/src/HelpTopicTwig.php
+++ b/core/modules/help_topics/src/HelpTopicTwig.php
@@ -2,7 +2,7 @@
 
 namespace Drupal\help_topics;
 
-use Drupal\Core\Cache\UnchangingCacheableDependencyTrait;
+use Drupal\Core\Cache\Cache;
 use Drupal\Core\Plugin\ContainerFactoryPluginInterface;
 use Drupal\Core\Template\TwigEnvironment;
 use Symfony\Component\DependencyInjection\ContainerInterface;
@@ -20,7 +20,6 @@
  *   See https://www.drupal.org/core/experimental for more information.
  */
 class HelpTopicTwig extends HelpTopicPluginBase implements ContainerFactoryPluginInterface {
-  use UnchangingCacheableDependencyTrait;
 
   /**
    * The Twig environment.
@@ -63,8 +62,31 @@ public static function create(ContainerInterface $container, array $configuratio
    */
   public function getBody() {
     return [
+      // Note that #markup elements are automatically XSS admin filtered which
+      // removes the meta tags from the rendered HTML.
       '#markup' => $this->twig->load('@help_topics/' . $this->getPluginId() . '.html.twig')->render(),
     ];
   }
 
+  /**
+   * {@inheritdoc}
+   */
+  public function getCacheContexts() {
+    return [];
+  }
+
+  /**
+   * {@inheritdoc}
+   */
+  public function getCacheTags() {
+    return ['core.extension'];
+  }
+
+  /**
+   * {@inheritdoc}
+   */
+  public function getCacheMaxAge() {
+    return Cache::PERMANENT;
+  }
+
 }
diff --git a/core/modules/help_topics/tests/modules/help_topics_test/help_topics/help-test-additional.html.twig b/core/modules/help_topics/tests/modules/help_topics_test/help_topics/help_topics_test.additional.html.twig
similarity index 70%
rename from core/modules/help_topics/tests/modules/help_topics_test/help_topics/help-test-additional.html.twig
rename to core/modules/help_topics/tests/modules/help_topics_test/help_topics/help_topics_test.additional.html.twig
index 7f08862bf6..3696dad0ce 100644
--- a/core/modules/help_topics/tests/modules/help_topics_test/help_topics/help-test-additional.html.twig
+++ b/core/modules/help_topics/tests/modules/help_topics_test/help_topics/help_topics_test.additional.html.twig
@@ -1,3 +1,3 @@
 <meta name="help_topic:label" content="Additional topic"/>
-<meta name="help_topic:related" content="help-test"/>
+<meta name="help_topic:related" content="help_topics_test.test"/>
 <p>{% trans %}This topic should get listed automatically on the Help test topic.{% endtrans %}</p>
diff --git a/core/modules/help_topics/tests/modules/help_topics_test/help_topics/help-test-linked.html.twig b/core/modules/help_topics/tests/modules/help_topics_test/help_topics/help_topics_test.linked.html.twig
similarity index 100%
rename from core/modules/help_topics/tests/modules/help_topics_test/help_topics/help-test-linked.html.twig
rename to core/modules/help_topics/tests/modules/help_topics_test/help_topics/help_topics_test.linked.html.twig
diff --git a/core/modules/help_topics/tests/modules/help_topics_test/help_topics/help-test.html.twig b/core/modules/help_topics/tests/modules/help_topics_test/help_topics/help_topics_test.test.html.twig
similarity index 67%
rename from core/modules/help_topics/tests/modules/help_topics_test/help_topics/help-test.html.twig
rename to core/modules/help_topics/tests/modules/help_topics_test/help_topics/help_topics_test.test.html.twig
index feaad98fd5..2e76aa0cb3 100644
--- a/core/modules/help_topics/tests/modules/help_topics_test/help_topics/help-test.html.twig
+++ b/core/modules/help_topics/tests/modules/help_topics_test/help_topics/help_topics_test.test.html.twig
@@ -1,5 +1,6 @@
 <meta name="help_topic:label" content="ABC Help Test module"/>
 <meta name="help_topic:top_level"/>
-<meta name="help_topic:related" content="help-test-linked,does-not-exist-and-no-error"/>
-{% set help_topic_url = render_var(url('help_topics.help_topic', {id: 'help-topic-writing'})) %}
+<meta name="help_topic:related" content="help_topics_test.linked,does_not_exist.and_no_error"/>
+{% set help_topic_url = render_var(url('help_topics.help_topic', {id: 'help_topics.help_topic_writing'})) %}
 <p>{% trans %}This is a test. It should <a href="{{ help_topic_url }}">link to the writing good help topic</a>. Also there should be a related topic link below to the Help module topic page and the linked topic.{% endtrans %}</p>
+<p>{% trans %}Test translation.{% endtrans %}</p>
diff --git a/core/modules/help_topics/tests/src/Functional/HelpTopicTest.php b/core/modules/help_topics/tests/src/Functional/HelpTopicTest.php
index 396e62f88e..5b0ff06645 100644
--- a/core/modules/help_topics/tests/src/Functional/HelpTopicTest.php
+++ b/core/modules/help_topics/tests/src/Functional/HelpTopicTest.php
@@ -3,7 +3,6 @@
 namespace Drupal\Tests\help_topics\Functional;
 
 use Drupal\Tests\BrowserTestBase;
-use Drupal\Tests\system\Functional\Cache\AssertPageCacheContextsAndTagsTrait;
 use Drupal\Tests\system\Functional\Menu\AssertBreadcrumbTrait;
 
 /**
@@ -12,8 +11,6 @@
  * @group help_topics
  */
 class HelpTopicTest extends BrowserTestBase {
-
-  use AssertPageCacheContextsAndTagsTrait;
   use AssertBreadcrumbTrait;
 
   /**
@@ -50,7 +47,7 @@ protected function setUp() {
 
     // These tests rely on some markup from the 'Seven' theme and we test theme
     // provided help topics.
-    \Drupal::service('theme_handler')->install(['seven', 'help_topic_test_theme']);
+    \Drupal::service('theme_handler')->install(['seven', 'help_topics_test_theme']);
     \Drupal::service('config.factory')->getEditable('system.theme')->set('admin', 'seven')->save();
 
     // Place various blocks.
@@ -76,6 +73,8 @@ protected function setUp() {
    * Tests the main help page and individual pages for topics.
    */
   public function testHelp() {
+    $session = $this->assertSession();
+
     // Log in the regular user.
     $this->drupalLogin($this->anyUser);
     $this->verifyHelp(403);
@@ -84,11 +83,10 @@ public function testHelp() {
     $this->drupalLogin($this->adminUser);
     $this->verifyHelp();
     $this->verifyHelpLinks();
-    $this->testBreadCrumb();
+    $this->verifyBreadCrumb();
 
     // Verify that help topics text appears on admin/help.
     $this->drupalGet('admin/help');
-    $session = $this->assertSession();
     $session->responseContains('<h2>Topics</h2>');
     $session->pageTextContains('Topics can be provided by modules or themes');
 
@@ -104,7 +102,7 @@ public function testHelp() {
       $pos = $new_pos;
     }
 
-    // Ensue all the expected links are present before uninstalling.
+    // Ensure all the expected links are present before uninstalling.
     $session->linkExists('ABC Help Test module');
     $session->linkExists('ABC Help Test');
     $session->linkExists('XYZ Help Test theme');
@@ -118,9 +116,21 @@ public function testHelp() {
     $session->linkExists('XYZ Help Test theme');
 
     // Uninstall the test theme and verify the topic is gone.
-    $this->container->get('theme_installer')->uninstall(['help_topic_test_theme']);
+    $this->container->get('theme_installer')->uninstall(['help_topics_test_theme']);
     $this->drupalGet('admin/help');
     $session->linkNotExists('XYZ Help Test theme');
+
+    // Verify the Help Topics provided by the Help Topics module for optional
+    // extensions do not exist.
+    $this->drupalGet('admin/help/topic/core.ui_components');
+    $session->linkNotExists('Shortcuts');
+    $session->linkExists('Accessibility features');
+    $this->container->get('module_installer')->install(['shortcut']);
+    $this->drupalGet('admin/help/topic/core.ui_components');
+    $session->linkExists('Shortcuts');
+    $session->linkExists('Accessibility features');
+    $this->clickLink('Shortcuts');
+    $session->pageTextContains('What are shortcuts?');
   }
 
   /**
@@ -154,7 +164,7 @@ protected function verifyHelp($response = 200) {
   protected function verifyHelpLinks() {
     $session = $this->assertSession();
     // Verify links on the test top-level page.
-    $page = 'admin/help/topic/help-test';
+    $page = 'admin/help/topic/help_topics_test.test';
     $links = [
       'link to the writing good help topic' => 'Writing good help',
       'Linked topic' => 'This topic is not supposed to be top-level',
@@ -167,8 +177,14 @@ protected function verifyHelpLinks() {
     }
 
     // Verify theme provided help topics work and can be related.
-    $this->drupalGet('admin/help/topic/help-test-theme');
+    $this->drupalGet('admin/help/topic/help_topics_test_theme.test');
     $session->pageTextContains('This is a theme provided topic.');
+    // Use the article element to provide a positive assertion to improve the
+    // assertion that the help html does not contain meta tags.
+    $this->assertContains('This is a theme provided topic.', $session->elementExists('css', 'article')->getText());
+    // Ensure that meta tags containing plugin information do not appear on
+    // topic pages
+    $session->elementNotExists('css', 'article meta');
     $this->clickLink('Additional topic');
     $session->linkExists('XYZ Help Test theme');
 
@@ -189,10 +205,10 @@ protected function verifyHelpLinks() {
    */
   protected function getTopicList() {
     return [
-      'help-test' => [
+      'help_topics_test.test' => [
         'name' => 'ABC Help Test module',
       ],
-      'help-topic-writing' => [
+      'help_topics.help_topic_writing' => [
         'name' => 'Writing good help',
       ],
     ];
@@ -201,17 +217,14 @@ protected function getTopicList() {
   /**
    * Tests breadcrumb on a help topic page.
    */
-  public function testBreadCrumb() {
-    // Login as a user that can access help topics.
-    $this->drupalLogin($this->adminUser);
-
+  public function verifyBreadCrumb() {
     // Verify Help Topics administration breadcrumbs.
     $trail = [
         '' => 'Home',
         'admin' => t('Administration'),
         'admin/help' => t('Help'),
       ];
-    $this->assertBreadcrumb('admin/help/topic/help-test', $trail);
+    $this->assertBreadcrumb('admin/help/topic/help_topics_test.test', $trail);
     // Ensure we are on the expected help topic page.
     $this->assertSession()->pageTextContains('Also there should be a related topic link below to the Help module topic page and the linked topic.');
   }
diff --git a/core/modules/help_topics/tests/src/Functional/HelpTopicTranslationTest.php b/core/modules/help_topics/tests/src/Functional/HelpTopicTranslationTest.php
new file mode 100644
index 0000000000..323505039a
--- /dev/null
+++ b/core/modules/help_topics/tests/src/Functional/HelpTopicTranslationTest.php
@@ -0,0 +1,97 @@
+<?php
+
+namespace Drupal\Tests\help_topics\Functional;
+
+use Drupal\Tests\BrowserTestBase;
+
+/**
+ * Verifies help topic display and user access to help based on permissions.
+ *
+ * @group help_topics
+ */
+class HelpTopicTranslationTest extends BrowserTestBase {
+
+  /**
+   * Modules to enable.
+   *
+   * @var array
+   */
+  public static $modules = [
+    'help_topics_test',
+    'help',
+    'help_topics',
+    'block',
+  ];
+
+  /**
+   * {@inheritdoc}
+   */
+  protected function setUp() {
+    parent::setUp();
+
+    // These tests rely on some markup from the 'Seven' theme.
+    \Drupal::service('theme_handler')->install(['seven']);
+    \Drupal::service('config.factory')->getEditable('system.theme')->set('admin', 'seven')->save();
+
+    // Place various blocks.
+    $settings = [
+      'theme' => 'seven',
+      'region' => 'help',
+    ];
+    $this->placeBlock('help_block', $settings);
+    $this->placeBlock('local_tasks_block', $settings);
+    $this->placeBlock('local_actions_block', $settings);
+    $this->placeBlock('page_title_block', $settings);
+
+    // Create user.
+    $this->drupalLogin($this->createUser([
+      'access administration pages',
+      'view the administration theme',
+      'administer permissions',
+    ]));
+  }
+
+  /**
+   * Tests help topic translations.
+   */
+  public function testHelpTopicTranslations() {
+    $session = $this->assertSession();
+
+    // Verify that help topic link is translated on admin/help.
+    $this->drupalGet('admin/help');
+    $session->linkExists('ABC-Hilfetestmodul');
+    // Verify that help topic is translated.
+    $this->drupalGet('admin/help/topic/help_topics_test.test');
+    $session->pageTextContains('ABC-Hilfetestmodul');
+    $session->pageTextContains('Übersetzung testen.');
+  }
+
+  /**
+   * {@inheritdoc}
+   */
+  protected function installParameters() {
+    $parameters = parent::installParameters();
+    // Install in German. This will ensure the language and locale modules are
+    // installed.
+    $parameters['parameters']['langcode'] = 'de';
+    // Create a po file so we don't attempt to download one from
+    // localize.drupal.org and to have a test translation that will not change.
+    \Drupal::service('file_system')->mkdir($this->publicFilesDirectory . '/translations', NULL, TRUE);
+    $contents = <<<ENDPO
+msgid ""
+msgstr ""
+
+msgid "ABC Help Test module"
+msgstr "ABC-Hilfetestmodul"
+
+msgid "Test translation."
+msgstr "Übersetzung testen."
+
+ENDPO;
+    include_once $this->root . '/core/includes/install.core.inc';
+    $version = _install_get_version_info(\Drupal::VERSION)['major'] . '.0.0';
+    file_put_contents($this->publicFilesDirectory . "/translations/drupal-{$version}.de.po", $contents);
+    return $parameters;
+  }
+
+}
diff --git a/core/modules/help_topics/tests/themes/help_topic_test_theme/help_topics/help-test-theme.html.twig b/core/modules/help_topics/tests/themes/help_topics_test_theme/help_topics/help_topics_test_theme.test.html.twig
similarity index 69%
rename from core/modules/help_topics/tests/themes/help_topic_test_theme/help_topics/help-test-theme.html.twig
rename to core/modules/help_topics/tests/themes/help_topics_test_theme/help_topics/help_topics_test_theme.test.html.twig
index 885bd7214b..c2893d74bf 100644
--- a/core/modules/help_topics/tests/themes/help_topic_test_theme/help_topics/help-test-theme.html.twig
+++ b/core/modules/help_topics/tests/themes/help_topics_test_theme/help_topics/help_topics_test_theme.test.html.twig
@@ -1,4 +1,4 @@
 <meta name="help_topic:label" content="XYZ Help Test theme"/>
 <meta name="help_topic:top_level"/>
-<meta name="help_topic:related" content="help-test-additional"/>
+<meta name="help_topic:related" content="help_topics_test.additional"/>
 <p>{% trans %}This is a theme provided topic.{% endtrans %}</p>
diff --git a/core/modules/help_topics/tests/themes/help_topic_test_theme/help_topic_test_theme.info.yml b/core/modules/help_topics/tests/themes/help_topics_test_theme/help_topics_test_theme.info.yml
similarity index 100%
rename from core/modules/help_topics/tests/themes/help_topic_test_theme/help_topic_test_theme.info.yml
rename to core/modules/help_topics/tests/themes/help_topics_test_theme/help_topics_test_theme.info.yml