diff --git a/core/modules/block/lib/Drupal/block/Tests/BlockViewBuilderTest.php b/core/modules/block/lib/Drupal/block/Tests/BlockViewBuilderTest.php
index aa7dd2e..9086566 100644
--- a/core/modules/block/lib/Drupal/block/Tests/BlockViewBuilderTest.php
+++ b/core/modules/block/lib/Drupal/block/Tests/BlockViewBuilderTest.php
@@ -92,10 +92,6 @@ public function testBasicRendering() {
$expected[] = '
';
$expected[] = ' ';
$expected[] = ' ';
- $expected[] = '';
- $expected[] = '
';
- $expected[] = ' ';
- $expected[] = '
';
$expected[] = '
';
$expected[] = '';
$expected_output = implode("\n", $expected);
@@ -120,10 +116,6 @@ public function testBasicRendering() {
$expected[] = ' ';
$expected[] = ' Powered by Bananas
';
$expected[] = ' ';
- $expected[] = '';
- $expected[] = ' ';
- $expected[] = ' ';
- $expected[] = '
';
$expected[] = '';
$expected[] = '';
$expected_output = implode("\n", $expected);
diff --git a/core/modules/block/templates/block.html.twig b/core/modules/block/templates/block.html.twig
index 3c51d46..d9e7805 100644
--- a/core/modules/block/templates/block.html.twig
+++ b/core/modules/block/templates/block.html.twig
@@ -39,7 +39,6 @@
*
* @ingroup themeable
*/
- @todo Remove the div around content as per http://drupal.org/node/1972122.
#}
{{ title_prefix }}
@@ -47,10 +46,7 @@
{{ label }}
{% endif %}
{{ title_suffix }}
-
-
- {% block content %}
- {{ content }}
- {% endblock %}
-
+ {% block content %}
+ {{ content }}
+ {% endblock %}
diff --git a/core/modules/language/lib/Drupal/language/Tests/LanguageSwitchingTest.php b/core/modules/language/lib/Drupal/language/Tests/LanguageSwitchingTest.php
index b4c4616..2464502 100644
--- a/core/modules/language/lib/Drupal/language/Tests/LanguageSwitchingTest.php
+++ b/core/modules/language/lib/Drupal/language/Tests/LanguageSwitchingTest.php
@@ -78,7 +78,7 @@ protected function doTestLanguageBlockAuthenticated($block_label) {
// Assert that each list item and anchor element has the appropriate data-
// attributes.
- list($language_switcher) = $this->xpath('//div[@id=:id]/div[contains(@class, "content")]', array(':id' => 'block-test-language-block'));
+ list($language_switcher) = $this->xpath('//div[@id=:id]', array(':id' => 'block-test-language-block')); $list_items = array();
$list_items = array();
$anchors = array();
foreach ($language_switcher->ul->li as $list_item) {
@@ -125,7 +125,7 @@ protected function doTestLanguageBlockAnonymous($block_label) {
$this->assertText($block_label, 'Language switcher block found.');
// Assert that only the current language is marked as active.
- list($language_switcher) = $this->xpath('//div[@id=:id]/div[contains(@class, "content")]', array(':id' => 'block-test-language-block'));
+ list($language_switcher) = $this->xpath('//div[@id=:id]', array(':id' => 'block-test-language-block'));
$links = array(
'active' => array(),
'inactive' => array(),