diff --git a/plugins/junit/src/com/intellij/execution/junit/JUnitConfiguration.java b/plugins/junit/src/com/intellij/execution/junit/JUnitConfiguration.java
index 0b7ab14a151d..d1edefd03f21 100644
--- a/plugins/junit/src/com/intellij/execution/junit/JUnitConfiguration.java
+++ b/plugins/junit/src/com/intellij/execution/junit/JUnitConfiguration.java
@@ -310,7 +310,7 @@ public class JUnitConfiguration extends ModuleBasedConfiguration<JavaRunConfigur
     EnvironmentVariablesComponent.readExternal(element, getPersistentData().getEnvs());
     final Element patternsElement = element.getChild(PATTERNS_EL_NAME);
     if (patternsElement != null) {
-      final Set<String> tests = new LinkedHashSet<String>();
+      final LinkedHashSet<String> tests = new LinkedHashSet<String>();
       for (Object o : patternsElement.getChildren(PATTERN_EL_NAME)) {
         Element patternElement = (Element)o;
         tests.add(patternElement.getAttributeValue(TEST_CLASS_ATT_NAME));
@@ -403,7 +403,7 @@ public class JUnitConfiguration extends ModuleBasedConfiguration<JavaRunConfigur
 
   public void bePatternConfiguration(List<PsiClass> classes, PsiMethod method) {
     myData.TEST_OBJECT = TEST_PATTERN;
-    final Set<String> patterns = new HashSet<String>();
+    final LinkedHashSet<String> patterns = new LinkedHashSet<String>();
     final String methodSufiix;
     if (method != null) {
       myData.METHOD_NAME = method.getName();
@@ -437,7 +437,7 @@ public class JUnitConfiguration extends ModuleBasedConfiguration<JavaRunConfigur
     public String WORKING_DIRECTORY;
     private String FORK_MODE = "none";
 
-    private Set<String> myPattern = new LinkedHashSet<String>();
+    private LinkedHashSet<String> myPattern = new LinkedHashSet<String>();
     //iws/ipr compatibility
     public String ENV_VARIABLES;
     private Map<String, String> myEnvs = new LinkedHashMap<String, String>();
@@ -581,7 +581,7 @@ public class JUnitConfiguration extends ModuleBasedConfiguration<JavaRunConfigur
       return StringUtil.join(enabledTests, "||");
     }
 
-    public void setPatterns(Set<String> pattern) {
+    public void setPatterns(LinkedHashSet<String> pattern) {
       myPattern = pattern;
     }
 
diff --git a/plugins/junit/src/com/intellij/execution/junit/TestObject.java b/plugins/junit/src/com/intellij/execution/junit/TestObject.java
index e1b74d5452ef..eb9de875c346 100644
--- a/plugins/junit/src/com/intellij/execution/junit/TestObject.java
+++ b/plugins/junit/src/com/intellij/execution/junit/TestObject.java
@@ -509,18 +509,18 @@ public abstract class TestObject implements JavaCommandLine {
           testNames.add(name);
         }
       }
+      final JUnitConfiguration.Data data = myConfiguration.getPersistentData();
       if (perModule != null) {
         for (List<String> perModuleClasses : perModule.values()) {
           Collections.sort(perModuleClasses);
           testNames.addAll(perModuleClasses);
         }
       }
-      else {
+      else if (JUnitConfiguration.TEST_PACKAGE.equals(data.TEST_OBJECT)) {
         Collections.sort(testNames); //sort tests in FQN order
       }
 
-      final JUnitConfiguration.Data data = myConfiguration.getPersistentData();
-      final String category = data.TEST_OBJECT == JUnitConfiguration.TEST_CATEGORY ? data.getCategory() : "";
+      final String category = JUnitConfiguration.TEST_CATEGORY.equals(data.TEST_OBJECT) ? data.getCategory() : "";
       JUnitStarter.printClassesList(testNames, packageName, category, myTempFile);
 
       if (perModule != null && perModule.size() > 1) {
diff --git a/plugins/testng/src/com/theoryinpractice/testng/configuration/SearchingForTestsTask.java b/plugins/testng/src/com/theoryinpractice/testng/configuration/SearchingForTestsTask.java
index 8358fcd253dd..ccc820a83817 100644
--- a/plugins/testng/src/com/theoryinpractice/testng/configuration/SearchingForTestsTask.java
+++ b/plugins/testng/src/com/theoryinpractice/testng/configuration/SearchingForTestsTask.java
@@ -83,7 +83,7 @@ public class SearchingForTestsTask extends Task.Backgroundable {
     myServerSocket = serverSocket;
     myConfig = config;
     myTempFile = tempFile;
-    myClasses = new HashMap<PsiClass, Collection<PsiMethod>>();
+    myClasses = new LinkedHashMap<PsiClass, Collection<PsiMethod>>();
   }
 
   public void run(@NotNull ProgressIndicator indicator) {
@@ -190,13 +190,13 @@ public class SearchingForTestsTask extends Task.Backgroundable {
   }
 
   private void composeTestSuiteFromClasses() {
-    Map<String, Collection<String>> map = new HashMap<String, Collection<String>>();
+    Map<String, Collection<String>> map = new LinkedHashMap<String, Collection<String>>();
 
     final boolean findTestMethodsForClass = shouldSearchForTestMethods();
 
     for (final Map.Entry<PsiClass, Collection<PsiMethod>> entry : myClasses.entrySet()) {
       final Collection<PsiMethod> depMethods = entry.getValue();
-      Collection<String> methods = new HashSet<String>(depMethods.size());
+      Collection<String> methods = new LinkedHashSet<String>(depMethods.size());
       for (PsiMethod method : depMethods) {
         methods.add(method.getName());
       }
@@ -523,7 +523,7 @@ public class SearchingForTestsTask extends Task.Backgroundable {
                                      final Set<PsiMember> alreadyMarkedToBeChecked,
                                      @Nullable final PsiClass... classes) {
     if (classes != null && classes.length > 0) {
-      final Set<String> groupDependencies = new HashSet<String>();
+      final Set<String> groupDependencies = new LinkedHashSet<String>();
       TestNGUtil.collectAnnotationValues(groupDependencies, "dependsOnGroups", methods, classes);
       final Set<PsiMember> membersToCheckNow = new LinkedHashSet<PsiMember>();
       if (!groupDependencies.isEmpty()) {
@@ -574,7 +574,7 @@ public class SearchingForTestsTask extends Task.Backgroundable {
                                               final PsiClass... classes) {
     final PsiClass[] psiClasses;
     if (methods != null && methods.length > 0) {
-      final Set<PsiClass> containingClasses = new HashSet<PsiClass>();
+      final Set<PsiClass> containingClasses = new LinkedHashSet<PsiClass>();
       for (PsiMethod method : methods) {
         containingClasses.add(method.getContainingClass());
       }
@@ -583,7 +583,7 @@ public class SearchingForTestsTask extends Task.Backgroundable {
       psiClasses = classes;
     }
     for (final PsiClass containingClass : psiClasses) {
-      final Set<String> testMethodDependencies = new HashSet<String>();
+      final Set<String> testMethodDependencies = new LinkedHashSet<String>();
       TestNGUtil.collectAnnotationValues(testMethodDependencies, "dependsOnMethods", methods, containingClass);
       if (!testMethodDependencies.isEmpty()) {
         ApplicationManager.getApplication().runReadAction(new Runnable() {
diff --git a/plugins/testng/src/com/theoryinpractice/testng/configuration/TestNGConfiguration.java b/plugins/testng/src/com/theoryinpractice/testng/configuration/TestNGConfiguration.java
index cc87a11d2e3c..70b5693be574 100644
--- a/plugins/testng/src/com/theoryinpractice/testng/configuration/TestNGConfiguration.java
+++ b/plugins/testng/src/com/theoryinpractice/testng/configuration/TestNGConfiguration.java
@@ -269,7 +269,7 @@ public class TestNGConfiguration extends ModuleBasedConfiguration<JavaRunConfigu
     } else {
       suffix = "";
     }
-    Set<String> patterns = new LinkedHashSet<String>();
+    LinkedHashSet<String> patterns = new LinkedHashSet<String>();
     for (PsiClass pattern : classes) {
       patterns.add(JavaExecutionUtil.getRuntimeQualifiedName(pattern) + suffix);
     }
@@ -373,7 +373,7 @@ public class TestNGConfiguration extends ModuleBasedConfiguration<JavaRunConfigu
     }
     final Element patternsElement = element.getChild(PATTERNS_EL_NAME);
     if (patternsElement != null) {
-      final Set<String> tests = new LinkedHashSet<String>();
+      final LinkedHashSet<String> tests = new LinkedHashSet<String>();
       for (Object o : patternsElement.getChildren(PATTERN_EL_NAME)) {
         Element patternElement = (Element)o;
         tests.add(patternElement.getAttributeValue(TEST_CLASS_ATT_NAME));
diff --git a/plugins/testng/src/com/theoryinpractice/testng/model/TestData.java b/plugins/testng/src/com/theoryinpractice/testng/model/TestData.java
index b40ab4c3ef03..2a75977483bb 100644
--- a/plugins/testng/src/com/theoryinpractice/testng/model/TestData.java
+++ b/plugins/testng/src/com/theoryinpractice/testng/model/TestData.java
@@ -57,7 +57,7 @@ public class TestData implements Cloneable
   public List<String> TEST_LISTENERS = new ArrayList<String>();
   public boolean USE_DEFAULT_REPORTERS = false;
   public String PROPERTIES_FILE;
-  private Set<String> myPatterns = new LinkedHashSet<String>();
+  private LinkedHashSet<String> myPatterns = new LinkedHashSet<String>();
 
   public TestData() {
     TEST_OBJECT = TestType.CLASS.getType();
@@ -168,7 +168,7 @@ public class TestData implements Cloneable
 
     data.USE_DEFAULT_REPORTERS = USE_DEFAULT_REPORTERS;
     data.ENVS = new LinkedHashMap<String, String>(ENVS);
-    data.myPatterns = new HashSet<String>();
+    data.myPatterns = new LinkedHashSet<String>();
     data.myPatterns.addAll(myPatterns);
     data.setScope(getScope());
     return data;
@@ -251,7 +251,7 @@ public class TestData implements Cloneable
     return myPatterns;
   }
 
-  public void setPatterns(Set<String> set) {
+  public void setPatterns(LinkedHashSet<String> set) {
     myPatterns = set;
   }
 }