diff --git a/core/modules/block/src/Tests/BlockSystemBrandingTest.php b/core/modules/block/src/Tests/BlockSystemBrandingTest.php
index 82cff41..679bb12 100644
--- a/core/modules/block/src/Tests/BlockSystemBrandingTest.php
+++ b/core/modules/block/src/Tests/BlockSystemBrandingTest.php
@@ -31,16 +31,16 @@ protected function setUp() {
       ->set('slogan', 'Community plumbing')
       ->save();
     // Add the system branding block to the page.
-    $this->drupalPlaceBlock('system_branding_block', array('region' => 'header', 'id' => 'site-branding'));
+    $this->drupalPlaceBlock('system_branding_block', array('region' => 'header'));
   }
 
   /**
    * Tests system branding block configuration.
    */
   public function testSystemBrandingSettings() {
-    $site_logo_xpath = '//div[@id="block-site-branding"]//a[@class="site-logo"]';
-    $site_name_xpath = '//div[@id="block-site-branding"]//div[@class="site-name"]';
-    $site_slogan_xpath = '//div[@id="block-site-branding"]//div[@class="site-slogan"]';
+    $site_logo_xpath = '//div//a[@class="site-logo"]';
+    $site_name_xpath = '//div//div[@class="site-name"]';
+    $site_slogan_xpath = '//div//div[@class="site-slogan"]';
 
     // Set default block settings.
     $this->drupalGet('');
diff --git a/core/modules/block/src/Tests/BlockViewBuilderTest.php b/core/modules/block/src/Tests/BlockViewBuilderTest.php
index bd2a986..79be90d 100644
--- a/core/modules/block/src/Tests/BlockViewBuilderTest.php
+++ b/core/modules/block/src/Tests/BlockViewBuilderTest.php
@@ -58,7 +58,7 @@ protected function setUp() {
     // Create a block with only required values.
     $this->block = $this->controller->create(array(
       'id' => 'test_block',
-      'theme' => 'stark',
+      'theme' => 'classy',
       'plugin' => 'test_cache',
     ));
     $this->block->save();
@@ -74,7 +74,7 @@ public function testBasicRendering() {
 
     $entity = $this->controller->create(array(
       'id' => 'test_block1',
-      'theme' => 'stark',
+      'theme' => 'classy',
       'plugin' => 'test_html',
     ));
     $entity->save();
@@ -83,7 +83,7 @@ public function testBasicRendering() {
     $entity = Block::load('test_block1');
     $output = entity_view($entity, 'block');
     $expected = array();
-    $expected[] = '<div id="block-test-block1" class="block block-block-test">';
+    $expected[] = '<div>';
     $expected[] = '  ';
     $expected[] = '    ';
     $expected[] = '      ';
@@ -98,7 +98,7 @@ public function testBasicRendering() {
     // Test the rendering of a block with a given title.
     $entity = $this->controller->create(array(
       'id' => 'test_block2',
-      'theme' => 'stark',
+      'theme' => 'classy',
       'plugin' => 'test_html',
       'settings' => array(
         'label' => 'Powered by Bananas',
@@ -107,7 +107,7 @@ public function testBasicRendering() {
     $entity->save();
     $output = entity_view($entity, 'block');
     $expected = array();
-    $expected[] = '<div id="block-test-block2" class="block block-block-test">';
+    $expected[] = '<div>';
     $expected[] = '  ';
     $expected[] = '      <h2>Powered by Bananas</h2>';
     $expected[] = '    ';
@@ -128,7 +128,7 @@ public function testBlockViewBuilderCache() {
     // Create an empty block.
     $this->block = $this->controller->create(array(
       'id' => 'test_block',
-      'theme' => 'stark',
+      'theme' => 'classy',
       'plugin' => 'test_cache',
     ));
     $this->block->save();
diff --git a/core/modules/block/templates/block.html.twig b/core/modules/block/templates/block.html.twig
index aa750cb..b7a3ff7 100644
--- a/core/modules/block/templates/block.html.twig
+++ b/core/modules/block/templates/block.html.twig
@@ -34,13 +34,7 @@
  * @ingroup themeable
  */
 #}
-{%
-  set classes = [
-    'block',
-    'block-' ~ configuration.provider|clean_class,
-  ]
-%}
-<div{{ attributes.addClass(classes) }}>
+<div>
   {{ title_prefix }}
   {% if label %}
     <h2{{ title_attributes }}>{{ label }}</h2>
diff --git a/core/modules/block_content/templates/block-content-add-list.html.twig b/core/modules/block_content/templates/block-content-add-list.html.twig
index e5a5d97..0810461 100644
--- a/core/modules/block_content/templates/block-content-add-list.html.twig
+++ b/core/modules/block_content/templates/block-content-add-list.html.twig
@@ -15,7 +15,7 @@
  */
 #}
 {% spaceless %}
-  <dl class="node-type-list">
+  <dl>
     {% for type in types %}
       <dt>{{ type.link }}</dt>
       <dd>{{ type.description }}</dd>
diff --git a/core/themes/classy/templates/block-list.html.twig b/core/themes/classy/templates/block-list.html.twig
new file mode 100644
index 0000000..7550689
--- /dev/null
+++ b/core/themes/classy/templates/block-list.html.twig
@@ -0,0 +1,17 @@
+{#
+/**
+ * @file
+ * Two column template for the block add/edit form.
+ *
+ * This template will be used when a block edit form specifies 'block_edit_form'
+ * as its #theme callback.  Otherwise, by default, block add/edit forms will be
+ * themed by form.html.twig.
+ *
+ * Available variables:
+ * - form: The block add/edit form.
+ *
+ * @ingroup themeable
+ */
+#}
+<div>
+  {{ form }}
diff --git a/core/themes/classy/templates/block.html.twig b/core/themes/classy/templates/block.html.twig
new file mode 100644
index 0000000..b7a3ff7
--- /dev/null
+++ b/core/themes/classy/templates/block.html.twig
@@ -0,0 +1,46 @@
+{#
+/**
+ * @file
+ * Default theme implementation to display a block.
+ *
+ * Available variables:
+ * - plugin_id: The ID of the block implementation.
+ * - label: The configured label of the block if visible.
+ * - configuration: A list of the block's configuration values.
+ *   - label: The configured label for the block.
+ *   - label_display: The display settings for the label.
+ *   - module: The module that provided this block plugin.
+ *   - cache: The cache settings.
+ *   - Block plugin specific settings will also be stored here.
+ * - block - The full block entity.
+ *   - label_hidden: The hidden block title value if the block was
+ *     configured to hide the title ('label' is empty in this case).
+ *   - module: The module that generated the block.
+ *   - delta: An ID for the block, unique within each module.
+ *   - region: The block region embedding the current block.
+ * - content: The content of this block.
+ * - attributes: array of HTML attributes populated by modules, intended to
+ *   be added to the main container tag of this template.
+ *   - id: A valid HTML ID and guaranteed unique.
+ * - title_attributes: Same as attributes, except applied to the main title
+ *   tag that appears in the template.
+ * - title_prefix: Additional output populated by modules, intended to be
+ *   displayed in front of the main title tag that appears in the template.
+ * - title_suffix: Additional output populated by modules, intended to be
+ *   displayed after the main title tag that appears in the template.
+ *
+ * @see template_preprocess_block()
+ *
+ * @ingroup themeable
+ */
+#}
+<div>
+  {{ title_prefix }}
+  {% if label %}
+    <h2{{ title_attributes }}>{{ label }}</h2>
+  {% endif %}
+  {{ title_suffix }}
+  {% block content %}
+    {{ content }}
+  {% endblock %}
+</div>