diff --git a/core/modules/system/lib/Drupal/system/Tests/Theme/TwigSettingsTest.php b/core/modules/system/lib/Drupal/system/Tests/Theme/TwigSettingsTest.php
new file mode 100644
index 0000000..df12f30
--- /dev/null
+++ b/core/modules/system/lib/Drupal/system/Tests/Theme/TwigSettingsTest.php
@@ -0,0 +1,56 @@
+<?php
+
+/**
+ * @file
+ * Contains \Drupal\system\Tests\Theme\TwigSettingsTest.
+ */
+
+namespace Drupal\system\Tests\Theme;
+
+use Drupal\simpletest\WebTestBase;
+
+/**
+ * Tests Twig engine configuration via settings.php.
+ */
+class TwigSettingsTest extends WebTestBase {
+
+  /**
+   * Modules to enable.
+   *
+   * @var array
+   */
+  public static $modules = array('theme_test');
+
+  public static function getInfo() {
+    return array(
+      'name' => 'Twig Settings',
+      'description' => 'Tests overriding Twig engine settings via settings.php.',
+      'group' => 'Theme',
+    );
+  }
+
+  protected function setUp() {
+    parent::setUp();
+    theme_enable(array('test_theme_twig'));
+  }
+
+  /**
+   * Ensures Twig template auto reloading can be overridden.
+   */
+  function testTwigAutoReloadOverride() {
+    $this->settingsSet('twig_auto_reload', TRUE);
+    $this->assertTrue(drupal_container()->get('twig')->isAutoReload(), 'Automatic reloading of Twig templates can be overridden.');
+  }
+
+  /**
+   * Ensures Twig engine debugging can be overridden.
+   */
+  function testTwigDebugOverride() {
+    $this->settingsSet('twig_debug', TRUE);
+    variable_set('theme_default', 'test_theme_twig');
+
+    $this->drupalGet('theme-test/template-test');
+    $this->assertRaw('<!-- THEME DEBUG -->', 'Twig debug can be overridden.');
+  }
+
+}