diff --git a/core/modules/block/src/Tests/Views/DisplayBlockTest.php b/core/modules/block/src/Tests/Views/DisplayBlockTest.php
index 3d35845..af4a534 100644
--- a/core/modules/block/src/Tests/Views/DisplayBlockTest.php
+++ b/core/modules/block/src/Tests/Views/DisplayBlockTest.php
@@ -3,6 +3,7 @@
 namespace Drupal\block\Tests\Views;
 
 use Drupal\Component\Serialization\Json;
+use Drupal\Core\Block\BlockPluginInterface;
 use Drupal\Core\Url;
 use Drupal\system\Tests\Cache\AssertPageCacheContextsAndTagsTrait;
 use Drupal\views\Entity\View;
@@ -255,7 +256,7 @@ public function testBlockRendering() {
     $this->assertEqual((string) $result[0], 'test_view_block');
 
     // Hide the title.
-    $block->getPlugin()->setConfigurationValue('label_display', FALSE);
+    $block->getPlugin()->setConfigurationValue('label_display', BlockPluginInterface::BLOCK_LABEL_HIDDEN);
     $block->save();
 
     $this->drupalGet('');
diff --git a/core/modules/block/tests/modules/block_test/config/install/block.block.test_block.yml b/core/modules/block/tests/modules/block_test/config/install/block.block.test_block.yml
index be7e06c..f3f149f 100644
--- a/core/modules/block/tests/modules/block_test/config/install/block.block.test_block.yml
+++ b/core/modules/block/tests/modules/block_test/config/install/block.block.test_block.yml
@@ -8,7 +8,7 @@ plugin: test_html
 settings:
   label: 'Test HTML block'
   provider: block_test
-  label_display: 'hidden'
+  label_display: '0'
 dependencies:
   module:
     - block_test
diff --git a/core/modules/outside_in/tests/src/FunctionalJavascript/OutsideInBlockFormTest.php b/core/modules/outside_in/tests/src/FunctionalJavascript/OutsideInBlockFormTest.php
index 15223db..f8e1a63 100644
--- a/core/modules/outside_in/tests/src/FunctionalJavascript/OutsideInBlockFormTest.php
+++ b/core/modules/outside_in/tests/src/FunctionalJavascript/OutsideInBlockFormTest.php
@@ -2,6 +2,7 @@
 
 namespace Drupal\Tests\outside_in\FunctionalJavascript;
 
+use Drupal\Core\Block\BlockPluginInterface;
 use Drupal\user\Entity\Role;
 
 /**
@@ -84,12 +85,13 @@ public function testBlocks($block_id, $new_page_text, $element_selector, $label_
       case 'block-powered':
         // Fill out form, save the form.
         $page->fillField('settings[label]', $new_page_text);
-        $page->checkField('settings[label_display]');
+        $page->selectFieldOption('settings[label_display]', BlockPluginInterface::BLOCK_LABEL_VISIBLE);
         break;
 
       case 'block-branding':
         // Fill out form, save the form.
         $page->fillField('settings[site_information][site_name]', $new_page_text);
+        $page->selectFieldOption('settings[label_display]', BlockPluginInterface::BLOCK_LABEL_HIDDEN);
         break;
     }