diff --git a/core/lib/Drupal/Core/Template/TwigNodeTrans.php b/core/lib/Drupal/Core/Template/TwigNodeTrans.php
index 59fab8f..c428638 100644
--- a/core/lib/Drupal/Core/Template/TwigNodeTrans.php
+++ b/core/lib/Drupal/Core/Template/TwigNodeTrans.php
@@ -103,7 +103,6 @@ public function compile(\Twig_Compiler $compiler)
       $compiler->raw(");\n");
     }

-    // dpm($compiler->getSource());
   }

   protected function compileString(\Twig_NodeInterface $body)
diff --git a/core/modules/system/lib/Drupal/system/Tests/Theme/TwigTransFormatPluralTest.php b/core/modules/system/lib/Drupal/system/Tests/Theme/TwigTransFormatPluralTest.php
index 2017ade..86d08c6 100644
--- a/core/modules/system/lib/Drupal/system/Tests/Theme/TwigTransFormatPluralTest.php
+++ b/core/modules/system/lib/Drupal/system/Tests/Theme/TwigTransFormatPluralTest.php
@@ -91,15 +91,6 @@ public function testTwigTransBlocks() {
   }

   /**
-   * Test invalid Twig "trans" blocks.
-   *
-   * @todo We need to figure out if this is testable, currently it just returns a 500 error on line 14 of twig_theme_test.trans_invalid.html.twig.
-   */
-//  public function testTwigTransBlocksInvalid() {
-//    $this->drupalGet('twig-theme-test/trans-invalid', array('language' => language_load('xx')));
-//  }
-
-  /**
    * Test valid Twig "format_plural" blocks.
    */
   public function testTwigFormatPluralBlocks() {
diff --git a/core/modules/system/tests/modules/twig_theme_test/lib/Drupal/twig_theme_test/TwigThemeTestController.php b/core/modules/system/tests/modules/twig_theme_test/lib/Drupal/twig_theme_test/TwigThemeTestController.php
index 7f6438d..4796319 100644
--- a/core/modules/system/tests/modules/twig_theme_test/lib/Drupal/twig_theme_test/TwigThemeTestController.php
+++ b/core/modules/system/tests/modules/twig_theme_test/lib/Drupal/twig_theme_test/TwigThemeTestController.php
@@ -39,15 +39,6 @@ public function transBlockRender() {
   }

   /**
-   * Menu callback for testing invalid translation blocks in a Twig template.
-   */
-  public function transInvalidBlockRender() {
-    return array(
-      '#theme' => 'twig_theme_test_trans_invalid',
-    );
-  }
-
-  /**
    * Menu callback for testing format_plural blocks in a Twig template.
    */
   public function formatPluralBlockRender() {
@@ -56,13 +47,4 @@ public function formatPluralBlockRender() {
     );
   }

-  /**
-   * Menu callback for testing invalid format_plural blocks in a Twig template.
-   */
-  public function formatPluralInvalidBlockRender() {
-    return array(
-      '#theme' => 'twig_theme_test_format_plural_invalid',
-    );
-  }
-
 }
diff --git a/core/modules/system/tests/modules/twig_theme_test/templates/twig_theme_test.format_plural_invalid.html.twig b/core/modules/system/tests/modules/twig_theme_test/templates/twig_theme_test.format_plural_invalid.html.twig
deleted file mode 100644
index 4c52caf..0000000
--- a/core/modules/system/tests/modules/twig_theme_test/templates/twig_theme_test.format_plural_invalid.html.twig
+++ /dev/null
@@ -1,16 +0,0 @@
-{# Output for the invalid Twig format_plural block test. #}
-<div>
-{% set planet_number = 1 %}
-{% format_plural %}
-    Hello planet.
-{% endformat_plural %}
-</div>
-
-<div>
-{% set planets_number = 2 %}
-{% format_plural %}
-    Hello planet.
-{% plural %}
-    Hello {{ count }} planets.
-{% endformat_plural %}
-</div>
diff --git a/core/modules/system/tests/modules/twig_theme_test/templates/twig_theme_test.trans_invalid.html.twig b/core/modules/system/tests/modules/twig_theme_test/templates/twig_theme_test.trans_invalid.html.twig
deleted file mode 100644
index 65e59a7..0000000
--- a/core/modules/system/tests/modules/twig_theme_test/templates/twig_theme_test.trans_invalid.html.twig
+++ /dev/null
@@ -1,24 +0,0 @@
-{# Output for the invalid Twig trans block test. #}
-<div>
-  {% trans %}
-</div>
-
-<div>
-  {% trans %}{% endtrans %}
-</div>
-
-<div>
-  {% set star_number = 1 %}
-  {% trans %}
-    Hello star.
-  {% plural %}
-    Hello {{ count }} stars.
-  {% endtrans %}
-</div>
-
-<div>
-  {% set star_numbers = 2 %}
-  {% trans %}
-    Hello star.
-  {% plural star_numbers %}{% endtrans %}
-</div>
diff --git a/core/modules/system/tests/modules/twig_theme_test/twig_theme_test.module b/core/modules/system/tests/modules/twig_theme_test/twig_theme_test.module
index df61bdc..8fd7693 100644
--- a/core/modules/system/tests/modules/twig_theme_test/twig_theme_test.module
+++ b/core/modules/system/tests/modules/twig_theme_test/twig_theme_test.module
@@ -11,18 +11,10 @@ function twig_theme_test_theme($existing, $type, $theme, $path) {
     'variables' => array(),
     'template' => 'twig_theme_test.trans',
   );
-  $items['twig_theme_test_trans_invalid'] = array(
-    'variables' => array(),
-    'template' => 'twig_theme_test.trans_invalid',
-  );
   $items['twig_theme_test_format_plural'] = array(
     'variables' => array(),
     'template' => 'twig_theme_test.format_plural',
   );
-  $items['twig_theme_test_format_plural_invalid'] = array(
-    'variables' => array(),
-    'template' => 'twig_theme_test.format_plural_invalid',
-  );
   return $items;
 }

diff --git a/core/modules/system/tests/modules/twig_theme_test/twig_theme_test.routing.yml b/core/modules/system/tests/modules/twig_theme_test/twig_theme_test.routing.yml
index 22d0ddf..51e21e7 100644
--- a/core/modules/system/tests/modules/twig_theme_test/twig_theme_test.routing.yml
+++ b/core/modules/system/tests/modules/twig_theme_test/twig_theme_test.routing.yml
@@ -10,21 +10,9 @@ twig_theme_test_trans:
     _content: '\Drupal\twig_theme_test\TwigThemeTestController::transBlockRender'
   requirements:
     _permission: 'access content'
-twig_theme_test_trans_invalid:
-  pattern: '/twig-theme-test/trans-invalid'
-  defaults:
-    _content: '\Drupal\twig_theme_test\TwigThemeTestController::transInvalidBlockRender'
-  requirements:
-    _permission: 'access content'
 twig_theme_test_format_plural:
   pattern: '/twig-theme-test/format-plural'
   defaults:
     _content: '\Drupal\twig_theme_test\TwigThemeTestController::formatPluralBlockRender'
   requirements:
     _permission: 'access content'
-twig_theme_test_format_plural_invalid:
-  pattern: '/twig-theme-test/format-plural-invalid'
-  defaults:
-    _content: '\Drupal\twig_theme_test\TwigThemeTestController::formatPluralInvalidBlockRender'
-  requirements:
-    _permission: 'access content'