diff --git a/core/modules/block/src/Tests/Update/BlockContextMappingUpdateTest.php b/core/modules/block/src/Tests/Update/BlockContextMappingUpdateTest.php
index 0362390679e9164fa1ff7790c316f09e0ac1e4d0..5116084b5e44bbf6a1aec22c2b015614789d9597 100644
--- a/core/modules/block/src/Tests/Update/BlockContextMappingUpdateTest.php
+++ b/core/modules/block/src/Tests/Update/BlockContextMappingUpdateTest.php
@@ -96,7 +96,7 @@ public function testUpdateHookN() {
     $disabled_block = Block::load('thirdtestfor2354889');
     $this->assertFalse($disabled_block->status(), 'Block with invalid context is disabled');
 
-    $this->assertEqual(['thirdtestfor2354889' => ['missing_context_ids' => ['baloney.spam' => ['node_type']], 'status' => TRUE]], \Drupal::keyValue('update_backup')->get('block_update_8001'));
+    $this->assertEqual(['thirdtestfor2354889' => ['missing_context_ids' => ['baloney_spam' => ['node_type']], 'status' => TRUE]], \Drupal::keyValue('update_backup')->get('block_update_8001'));
 
     $disabled_block_visibility = $disabled_block->get('visibility');
     $this->assertTrue(!isset($disabled_block_visibility['node_type']), 'The problematic visibility condition has been removed.');
diff --git a/core/modules/block/tests/modules/block_test/config/schema/block_test.schema.yml b/core/modules/block/tests/modules/block_test/config/schema/block_test.schema.yml
index e0b13cb425baf30163b1fa5591cbf4f5ea9871c3..166ce8da3ad4c8a0ff1572060c6e1661ad454841 100644
--- a/core/modules/block/tests/modules/block_test/config/schema/block_test.schema.yml
+++ b/core/modules/block/tests/modules/block_test/config/schema/block_test.schema.yml
@@ -5,3 +5,6 @@ block.settings.test_block_instantiation:
     display_message:
       type: string
       label: 'Message text'
+
+condition.plugin.baloney_spam:
+  type: condition.plugin
diff --git a/core/modules/block/tests/modules/block_test/src/Plugin/Condition/BaloneySpam.php b/core/modules/block/tests/modules/block_test/src/Plugin/Condition/BaloneySpam.php
index 55e12abaaef0fa4ca422617d40e964da3187ad9d..6aebcbf84843bf47110e9b7cc4a3be6c88b0c2f1 100644
--- a/core/modules/block/tests/modules/block_test/src/Plugin/Condition/BaloneySpam.php
+++ b/core/modules/block/tests/modules/block_test/src/Plugin/Condition/BaloneySpam.php
@@ -10,10 +10,10 @@
 use Drupal\Core\Condition\ConditionPluginBase;
 
 /**
- * Provides a 'baloney.spam' condition.
+ * Provides a 'baloney_spam' condition.
  *
  * @Condition(
- *   id = "baloney.spam",
+ *   id = "baloney_spam",
  *   label = @Translation("Baloney spam"),
  * )
  *
diff --git a/core/modules/system/tests/fixtures/update/block.block.thirdtestfor2354889.yml b/core/modules/system/tests/fixtures/update/block.block.thirdtestfor2354889.yml
index 472e1317e510a43bde202e46ae8d5602933dd395..03498b83e9588911109acd922502cf14c7939b7d 100644
--- a/core/modules/system/tests/fixtures/update/block.block.thirdtestfor2354889.yml
+++ b/core/modules/system/tests/fixtures/update/block.block.thirdtestfor2354889.yml
@@ -27,4 +27,4 @@ visibility:
       page: page
     negate: false
     context_mapping:
-      baloney: baloney.spam
+      baloney: baloney_spam