diff --git a/java/execution/impl/src/com/intellij/execution/junit/JUnitUtil.java b/java/execution/impl/src/com/intellij/execution/junit/JUnitUtil.java
index 692c1c3ce7a5..f2d11a1ad09a 100644
--- a/java/execution/impl/src/com/intellij/execution/junit/JUnitUtil.java
+++ b/java/execution/impl/src/com/intellij/execution/junit/JUnitUtil.java
@@ -47,6 +47,7 @@ public class JUnitUtil {
   @NonNls private static final String TESTSUITE_CLASS = "junit.framework.TestSuite";
   @NonNls private static final String TEST_ANNOTATION = "org.junit.Test";
   @NonNls public static final String RUN_WITH = "org.junit.runner.RunWith";
+  @NonNls public static final String SUITE_METHOD_NAME = "suite";
 
   public static boolean isSuiteMethod(final PsiMethod psiMethod) {
     if (psiMethod == null) return false;
@@ -194,7 +195,7 @@ public class JUnitUtil {
     if (getTestMethod(psiMethod) != null) return true;
     final String name = psiMethod.getName();
     if (psiMethod.hasModifierProperty(PsiModifier.PUBLIC) && !psiMethod.hasModifierProperty(PsiModifier.ABSTRACT)) {
-      if ("suite".equals(name) || "setUp".equals(name) || "tearDown".equals(name)) {
+      if (SUITE_METHOD_NAME.equals(name) || "setUp".equals(name) || "tearDown".equals(name)) {
         return true;
       }
       if (psiMethod.hasModifierProperty(PsiModifier.STATIC)) {
diff --git a/plugins/junit/src/com/intellij/execution/ConfigurationUtil.java b/plugins/junit/src/com/intellij/execution/ConfigurationUtil.java
index e29ba3ee7336..b2da9f1c85fb 100644
--- a/plugins/junit/src/com/intellij/execution/ConfigurationUtil.java
+++ b/plugins/junit/src/com/intellij/execution/ConfigurationUtil.java
@@ -29,7 +29,6 @@ import com.intellij.psi.search.searches.AnnotatedMembersSearch;
 import com.intellij.psi.search.searches.ClassInheritorsSearch;
 import com.intellij.psi.util.PsiUtilBase;
 import com.intellij.util.Processor;
-import junit.runner.BaseTestRunner;
 import org.jetbrains.annotations.Nullable;
 
 import java.util.Set;
@@ -52,7 +51,7 @@ public class ConfigurationUtil {
     final PsiMethod[] suiteMethods = ApplicationManager.getApplication().runReadAction(
         new Computable<PsiMethod[]>() {
           public PsiMethod[] compute() {
-            return JavaPsiFacade.getInstance(manager.getProject()).getShortNamesCache().getMethodsByName(BaseTestRunner.SUITE_METHODNAME, scope);
+            return JavaPsiFacade.getInstance(manager.getProject()).getShortNamesCache().getMethodsByName(JUnitUtil.SUITE_METHOD_NAME, scope);
           }
         }
     );
diff --git a/plugins/junit/src/com/intellij/execution/junit/AllInPackageConfigurationProducer.java b/plugins/junit/src/com/intellij/execution/junit/AllInPackageConfigurationProducer.java
index 739682cca397..ecea5c658ea8 100644
--- a/plugins/junit/src/com/intellij/execution/junit/AllInPackageConfigurationProducer.java
+++ b/plugins/junit/src/com/intellij/execution/junit/AllInPackageConfigurationProducer.java
@@ -28,8 +28,7 @@ import com.intellij.psi.PsiDirectory;
 import com.intellij.psi.PsiElement;
 import com.intellij.psi.PsiPackage;
 import com.intellij.psi.search.GlobalSearchScope;
-import junit.framework.Test;
-import junit.framework.TestCase;
+
 
 public class AllInPackageConfigurationProducer extends JUnitConfigurationProducer {
   private PsiPackage myPackage = null;