diff --git a/java/java-impl/src/com/intellij/testIntegration/TestIntegrationUtils.java b/java/java-impl/src/com/intellij/testIntegration/TestIntegrationUtils.java
index ca551b923d5b..20ad32e3e368 100644
--- a/java/java-impl/src/com/intellij/testIntegration/TestIntegrationUtils.java
+++ b/java/java-impl/src/com/intellij/testIntegration/TestIntegrationUtils.java
@@ -139,7 +139,7 @@ public class TestIntegrationUtils {
     return result;
   }
 
-  public static void runTestMethodTemplate(MethodKind methodKind,
+  public static void runTestMethodTemplate(@NotNull MethodKind methodKind,
                                            TestFramework framework,
                                            final Editor editor,
                                            final PsiClass targetClass,
@@ -149,15 +149,15 @@ public class TestIntegrationUtils {
     runTestMethodTemplate(methodKind, framework, editor, targetClass, null, method, name, automatic, existingNames);
   }
 
-  public static void runTestMethodTemplate(MethodKind methodKind,
+  public static void runTestMethodTemplate(@NotNull MethodKind methodKind,
                                            TestFramework framework,
                                            final Editor editor,
                                            final PsiClass targetClass,
                                            @Nullable PsiClass sourceClass,
                                            final PsiMethod method,
                                            @Nullable String name,
-    boolean automatic,
-    Set<String> existingNames) {
+                                           boolean automatic,
+                                           Set<String> existingNames) {
     runTestMethodTemplate(editor, targetClass, method, automatic,
                           createTestMethodTemplate(methodKind, framework, targetClass, sourceClass, name, automatic, existingNames));
   }
@@ -204,18 +204,18 @@ public class TestIntegrationUtils {
     TemplateManager.getInstance(project).startTemplate(editor, template, adapter);
   }
 
-  public static Template createTestMethodTemplate(MethodKind methodKind,
+  public static Template createTestMethodTemplate(@NotNull MethodKind methodKind,
                                                   TestFramework descriptor,
-                                                  PsiClass targetClass,
+                                                  @NotNull PsiClass targetClass,
                                                   @Nullable String name,
                                                   boolean automatic,
                                                   Set<String> existingNames) {
     return createTestMethodTemplate(methodKind, descriptor, targetClass, null, name, automatic, existingNames);
   }
 
-  public static Template createTestMethodTemplate(MethodKind methodKind,
+  public static Template createTestMethodTemplate(@NotNull MethodKind methodKind,
                                                   TestFramework descriptor,
-                                                  @NotNull PsiClass targetClass, 
+                                                  @NotNull PsiClass targetClass,
                                                   @Nullable PsiClass sourceClass,
                                                   @Nullable String name,
                                                   boolean automatic,
diff --git a/java/java-impl/src/com/intellij/testIntegration/createTest/JavaTestGenerator.java b/java/java-impl/src/com/intellij/testIntegration/createTest/JavaTestGenerator.java
index 66ee2a6b6cf1..6603e9b542a6 100644
--- a/java/java-impl/src/com/intellij/testIntegration/createTest/JavaTestGenerator.java
+++ b/java/java-impl/src/com/intellij/testIntegration/createTest/JavaTestGenerator.java
@@ -41,6 +41,7 @@ import com.intellij.testIntegration.TestIntegrationUtils;
 import com.intellij.util.Function;
 import com.intellij.util.IncorrectOperationException;
 import com.intellij.util.containers.ContainerUtil;
+import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
 
 import java.util.Collection;
@@ -223,7 +224,7 @@ public class JavaTestGenerator implements TestGenerator {
     });
   }
 
-  private static PsiMethod generateMethod(TestIntegrationUtils.MethodKind methodKind,
+  private static PsiMethod generateMethod(@NotNull TestIntegrationUtils.MethodKind methodKind,
                                           TestFramework descriptor,
                                           PsiClass targetClass,
                                           @Nullable PsiClass sourceClass,
diff --git a/plugins/groovy/src/org/jetbrains/plugins/groovy/testIntegration/GroovyTestGenerator.java b/plugins/groovy/src/org/jetbrains/plugins/groovy/testIntegration/GroovyTestGenerator.java
index ada69ea3187e..17827730cbcc 100644
--- a/plugins/groovy/src/org/jetbrains/plugins/groovy/testIntegration/GroovyTestGenerator.java
+++ b/plugins/groovy/src/org/jetbrains/plugins/groovy/testIntegration/GroovyTestGenerator.java
@@ -164,7 +164,7 @@ public class GroovyTestGenerator implements TestGenerator {
     });
   }
 
-  private static void generateMethod(TestIntegrationUtils.MethodKind methodKind,
+  private static void generateMethod(@NotNull TestIntegrationUtils.MethodKind methodKind,
                                      TestFramework descriptor,
                                      PsiClass targetClass,
                                      Editor editor,