diff --git a/core/modules/system/src/Tests/Theme/EngineNyanCatSubThemeTest.php b/core/modules/system/src/Tests/Theme/EngineNyanCatSubThemeTest.php
new file mode 100644
index 0000000..af2f3b6
--- /dev/null
+++ b/core/modules/system/src/Tests/Theme/EngineNyanCatSubThemeTest.php
@@ -0,0 +1,54 @@
+<?php
+
+namespace Drupal\system\Tests\Theme;
+
+use Drupal\Core\Extension\ThemeHandler;
+use Drupal\simpletest\WebTestBase;
+
+/**
+ * Tests the multi theme engine support with a subtheme.
+ *
+ * @group Theme
+ */
+class EngineNyanCatSubThemeTest extends WebTestBase {
+
+  /**
+   * Modules to enable.
+   *
+   * @var array
+   */
+  public static $modules = array('theme_test');
+
+  protected function setUp() {
+    parent::setUp();
+    \Drupal::service('theme_handler')->install(array('test_subtheme_nyan_cat_engine'));
+  }
+
+  /**
+   * Ensures a theme's template is overridable based on the 'template' filename.
+   */
+  function testTemplateOverride() {
+    $this->config('system.theme')
+      ->set('default', 'test_subtheme_nyan_cat_engine')
+      ->save();
+    $this->drupalGet('theme-test/template-test');
+    $this->assertText('Success: Template overridden with Nyan Cat theme. All of them', 'Template overridden by Nyan Cat file.');
+  }
+
+  /**
+   * Ensure the subtheme has inherited of the theme engine of it's base theme.
+   */
+  function testEngineIsCorrectlyInherited() {
+    /** @var ThemeHandler $theme_handler */
+    $infos = \Drupal::service('theme_handler')->listInfo();
+
+    // Get the base theme name from the theme 'test_subtheme_nyan_cat_engine'
+    $base_theme_name = $infos['test_subtheme_nyan_cat_engine']->info['base theme'];
+    // Get the base theme
+    $base_theme = $infos[$base_theme_name];
+
+    // Compare their theme engine.
+    $this->assertEqual($infos['test_subtheme_nyan_cat_engine']->info['engine'], $base_theme->info['engine']);
+  }
+
+}
diff --git a/core/modules/system/tests/themes/test_subtheme_nyan_cat_engine/test_subtheme_nyan_cat_engine.info.yml b/core/modules/system/tests/themes/test_subtheme_nyan_cat_engine/test_subtheme_nyan_cat_engine.info.yml
new file mode 100644
index 0000000..db8ab17
--- /dev/null
+++ b/core/modules/system/tests/themes/test_subtheme_nyan_cat_engine/test_subtheme_nyan_cat_engine.info.yml
@@ -0,0 +1,6 @@
+name: 'Test subtheme with base theme and another theme engine'
+type: theme
+description: 'Test subtheme with base theme and another theme engine.'
+version: VERSION
+core: 8.x
+base theme: test_theme_nyan_cat_engine
\ No newline at end of file
diff --git a/core/modules/system/tests/themes/test_subtheme_nyan_cat_engine/theme_test.template_test.nyan-cat.html b/core/modules/system/tests/themes/test_subtheme_nyan_cat_engine/theme_test.template_test.nyan-cat.html
new file mode 100644
index 0000000..cb21cb5
--- /dev/null
+++ b/core/modules/system/tests/themes/test_subtheme_nyan_cat_engine/theme_test.template_test.nyan-cat.html
@@ -0,0 +1 @@
+Success: Template overridden with Nyan Cat theme. 9kittens