diff --git a/java/java-analysis-api/resources/messages/JavaAnalysisBundle.properties b/java/java-analysis-api/resources/messages/JavaAnalysisBundle.properties
index 17993cb7f7ff..b10f0518c8f7 100644
--- a/java/java-analysis-api/resources/messages/JavaAnalysisBundle.properties
+++ b/java/java-analysis-api/resources/messages/JavaAnalysisBundle.properties
@@ -365,7 +365,7 @@ parameter.can.be.null=Parameter can be null
 parameter.is.always.not.null=Parameter is always not-null
 possible.heap.pollution.from.parameterized.vararg.type.loc=Possible heap pollution from parameterized vararg type #loc
 redundant.block.marker=Redundant block marker
-remove.block.marker.comments=Remove block marker comments
+remove.block.marker.comments=Remove block marker comment
 remove.dependency=Remove dependency
 remove.switch.branch.0=Remove switch branch ''{0}''
 remove.switch.label.0=Remove switch label ''{0}''
diff --git a/java/java-tests/testSrc/com/intellij/java/codeInspection/BlockMarkerCommentsTest.java b/java/java-tests/testSrc/com/intellij/java/codeInspection/BlockMarkerCommentsTest.java
index 715350ac3724..473d611a7377 100644
--- a/java/java-tests/testSrc/com/intellij/java/codeInspection/BlockMarkerCommentsTest.java
+++ b/java/java-tests/testSrc/com/intellij/java/codeInspection/BlockMarkerCommentsTest.java
@@ -1,18 +1,4 @@
-/*
- * Copyright 2000-2018 JetBrains s.r.o.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
+// Copyright 2000-2022 JetBrains s.r.o. and contributors. Use of this source code is governed by the Apache 2.0 license.
 package com.intellij.java.codeInspection;
 
 import com.intellij.JavaTestUtil;
@@ -61,7 +47,7 @@ public class BlockMarkerCommentsTest extends LightJavaCodeInsightFixtureTestCase
     final String testFileName = getTestName(false);
     myFixture.enableInspections(new BlockMarkerCommentsInspection());
     myFixture.configureByFile(testFileName + ".java");
-    final IntentionAction intentionAction = myFixture.findSingleIntention("Remove block marker comments");
+    final IntentionAction intentionAction = myFixture.findSingleIntention("Remove block marker comment");
     assertNotNull(intentionAction);
     myFixture.launchAction(intentionAction);
     myFixture.checkResultByFile(testFileName + "_after.java", true);
diff --git a/java/java-tests/testSrc/com/intellij/java/propertyBased/JavaIntentionPolicy.java b/java/java-tests/testSrc/com/intellij/java/propertyBased/JavaIntentionPolicy.java
index 3f04c7226e13..731c5b4200c5 100644
--- a/java/java-tests/testSrc/com/intellij/java/propertyBased/JavaIntentionPolicy.java
+++ b/java/java-tests/testSrc/com/intellij/java/propertyBased/JavaIntentionPolicy.java
@@ -100,7 +100,7 @@ class JavaCommentingStrategy extends JavaIntentionPolicy {
                                       intentionText.startsWith("Remove redundant arguments to call") ||//removes arg with all comments inside
                                       intentionText.startsWith("Convert to 'enum'") ||//removes constructor with javadoc?
                                       intentionText.startsWith("Remove redundant constructor") ||
-                                      intentionText.startsWith("Remove block marker comments") ||
+                                      intentionText.startsWith("Remove block marker comment") ||
                                       intentionText.startsWith("Remove redundant method") ||
                                       intentionText.startsWith("Delete unnecessary import") ||
                                       intentionText.startsWith("Delete empty class initializer") ||