diff --git a/plugins/junit/src/com/intellij/execution/junit/codeInsight/JUnit5MalformedRepeatedTestInspection.kt b/plugins/junit/src/com/intellij/execution/junit/codeInsight/JUnit5MalformedRepeatedTestInspection.kt
index 4de7ccef6424..4db28d730022 100644
--- a/plugins/junit/src/com/intellij/execution/junit/codeInsight/JUnit5MalformedRepeatedTestInspection.kt
+++ b/plugins/junit/src/com/intellij/execution/junit/codeInsight/JUnit5MalformedRepeatedTestInspection.kt
@@ -70,7 +70,7 @@ class JUnit5MalformedRepeatedTestInspection : AbstractBaseJavaLocalInspectionToo
                                        "RepetitionInfo is injected for @BeforeEach/@AfterEach only, but not for " + StringUtil.getShortName(qName!!))
               }
               else {
-                if (MetaAnnotationUtil.isMetaAnnotated(method, JUnitUtil.TEST5_CONFIG_METHODS) && method.containingClass?.methods?.find { MetaAnnotationUtil.isMetaAnnotated(it, JUnitUtil.TEST5_ANNOTATIONS)} != null) {
+                if (MetaAnnotationUtil.isMetaAnnotated(method, JUnitUtil.TEST5_CONFIG_METHODS) && method.containingClass?.methods?.find { MetaAnnotationUtil.isMetaAnnotated(it, Annotations.NON_REPEATED_ANNOTATIONS)} != null) {
                   holder.registerProblem(repetitionInfoParam.nameIdentifier ?: repetitionInfoParam,
                                          "RepetitionInfo won't be injected for @Test methods")
                 }
diff --git a/plugins/junit/test/com/intellij/execution/junit/codeInsight/JUnit5MalformedParameterizedTest.java b/plugins/junit/test/com/intellij/execution/junit/codeInsight/JUnit5MalformedParameterizedTest.java
index 0df5c8e75aa5..9187f6e2ecec 100644
--- a/plugins/junit/test/com/intellij/execution/junit/codeInsight/JUnit5MalformedParameterizedTest.java
+++ b/plugins/junit/test/com/intellij/execution/junit/codeInsight/JUnit5MalformedParameterizedTest.java
@@ -31,9 +31,13 @@ public class JUnit5MalformedParameterizedTest extends LightInspectionTestCase {
   @Override
   protected void setUp() throws Exception {
     super.setUp();
+    addEnvironmentClass("package org.junit.platform.commons.annotation;\n" +
+                        "public @interface Testable {}");
     addEnvironmentClass("package org.junit.jupiter.params;\n" +
+                        "@org.junit.platform.commons.annotation.Testable\n" +
                         "public @interface ParameterizedTest {}");
     addEnvironmentClass("package org.junit.jupiter.api;\n" +
+                        "@org.junit.platform.commons.annotation.Testable\n" +
                         "public @interface Test {}");
     addEnvironmentClass("package org.junit.jupiter.api;\n" +
                         "public interface TestInfo {}");
diff --git a/plugins/junit/test/com/intellij/execution/junit/codeInsight/JUnit5MalformedRepeatedTest.java b/plugins/junit/test/com/intellij/execution/junit/codeInsight/JUnit5MalformedRepeatedTest.java
index bcb6a4ea03bf..7817e4069ab6 100644
--- a/plugins/junit/test/com/intellij/execution/junit/codeInsight/JUnit5MalformedRepeatedTest.java
+++ b/plugins/junit/test/com/intellij/execution/junit/codeInsight/JUnit5MalformedRepeatedTest.java
@@ -31,9 +31,13 @@ public class JUnit5MalformedRepeatedTest extends LightInspectionTestCase {
   @Override
   protected void setUp() throws Exception {
     super.setUp();
+    addEnvironmentClass("package org.junit.platform.commons.annotation;\n" +
+                        "public @interface Testable {}");
     addEnvironmentClass("package org.junit.jupiter.api;\n" +
+                        "@org.junit.platform.commons.annotation.Testable\n" +
                         "public @interface RepeatedTest {int value(); String name() default \"\";}");
     addEnvironmentClass("package org.junit.jupiter.api;\n" +
+                        "@org.junit.platform.commons.annotation.Testable\n" +
                         "public @interface Test {}");
     addEnvironmentClass("package org.junit.jupiter.api;\n" +
                         "public @interface AfterEach {}");
@@ -48,6 +52,7 @@ public class JUnit5MalformedRepeatedTest extends LightInspectionTestCase {
     addEnvironmentClass("package org.junit.jupiter.api;\n" +
                         "public interface TestReporter {}");
     addEnvironmentClass("package org.junit.jupiter.api;\n" +
+                        "@org.junit.platform.commons.annotation.Testable\n" +
                         "public @interface ParameterizedTest {}");
   }