diff --git a/core/modules/block/src/Tests/BlockSystemBrandingTest.php b/core/modules/block/src/Tests/BlockSystemBrandingTest.php
index 679bb12..82cff41 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'));
+    $this->drupalPlaceBlock('system_branding_block', array('region' => 'header', 'id' => 'site-branding'));
   }
 
   /**
    * Tests system branding block configuration.
    */
   public function testSystemBrandingSettings() {
-    $site_logo_xpath = '//div//a[@class="site-logo"]';
-    $site_name_xpath = '//div//div[@class="site-name"]';
-    $site_slogan_xpath = '//div//div[@class="site-slogan"]';
+    $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"]';
 
     // Set default block settings.
     $this->drupalGet('');