diff --git a/src/Plugin/Condition/ConditionGroup.php b/src/Plugin/Condition/ConditionGroup.php
index de183f1..38e6e95 100644
--- a/src/Plugin/Condition/ConditionGroup.php
+++ b/src/Plugin/Condition/ConditionGroup.php
@@ -18,7 +18,7 @@
  *
  * @Condition(
  *   id = "condition_group",
- *   label = @Translation("Condition Group"),
+ *   label = @Translation("Condition group"),
  * )
  */
 class ConditionGroup extends ConditionPluginBase implements ContainerFactoryPluginInterface {
diff --git a/tests/src/Functional/BlockVisibilityGroupsUiTest.php b/tests/src/Functional/BlockVisibilityGroupsUiTest.php
index 87db02c..6aebd53 100644
--- a/tests/src/Functional/BlockVisibilityGroupsUiTest.php
+++ b/tests/src/Functional/BlockVisibilityGroupsUiTest.php
@@ -167,8 +167,14 @@ public function testBlockOptionsWhenDeleting() {
     $this->drupalGet('admin/structure/block/manage/' . $block->id());
     $tabs = $this->assertSession()->elementExists('css', "div[data-drupal-selector=\"edit-visibility-tabs\"]");
     $items = $tabs->findAll('css', 'summary');
-    self::assertEquals('Condition Group', $items[0]->getText());
-    $this->assertSession()->fieldValueEquals('Block Visibility Groups', '');
+    self::assertEquals('Condition group', $items[0]->getText());
+    // This doesn't work as the field is now a set of checkboxes, not a simple
+    // radio field.
+    // @code
+    // $this->assertSession()->fieldValueEquals('Block Visibility Groups', '');
+    // @endcode
+    // There are no visibility groups to select from now.
+    $this->assertSession()->elementExists('#edit-visibility-condition-group-block-visibility-groups input');
 
     $group = $this->createGroup();
     $block = $this->placeBlockInGroup('system_powered_by_block', $group->id());
@@ -256,7 +262,7 @@ public function testBlockVisibilityTabs() {
     $tabs = $this->assertSession()->elementExists('css', "div[data-drupal-selector=\"edit-visibility-tabs\"]");
     $items = $tabs->findAll('css', 'summary');
     self::assertCount(1, $items);
-    self::assertEquals('Condition Group', $items[0]->getText());
+    self::assertEquals('Condition group', $items[0]->getText());
     $item = $tabs->find('css', '.form-item-visibility-condition-group-block-visibility-group');
     $label = $item->find('css', 'label');
     self::assertEquals('Block Visibility Groups', $label->getText());