diff --git a/compiler/tests/org/jetbrains/jet/checkers/JetDiagnosticsTestGenerated.java b/compiler/tests/org/jetbrains/jet/checkers/JetDiagnosticsTestGenerated.java
index 2ea4a2cca6e..07e3965ceb6 100644
--- a/compiler/tests/org/jetbrains/jet/checkers/JetDiagnosticsTestGenerated.java
+++ b/compiler/tests/org/jetbrains/jet/checkers/JetDiagnosticsTestGenerated.java
@@ -15,24 +15,17 @@
  */
 package org.jetbrains.jet.checkers;
 
-import junit.framework.Assert;
 import junit.framework.Test;
 import junit.framework.TestSuite;
-
-import java.io.File;
 import org.jetbrains.jet.JetTestUtils;
 import org.jetbrains.jet.test.TestMetadata;
 
-import org.jetbrains.jet.checkers.AbstractJetDiagnosticsTest;
+import java.io.File;
 
 /** This class is generated by {@link org.jetbrains.jet.checkers.AbstractJetDiagnosticsTest}. DO NOT MODIFY MANUALLY */
 public class JetDiagnosticsTestGenerated extends AbstractJetDiagnosticsTest {
     @TestMetadata("compiler/testData/diagnostics/tests")
     public static class Tests extends AbstractJetDiagnosticsTest {
-        public void testAllFilesPresentInTests() throws Exception {
-            JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), "org.jetbrains.jet.checkers.AbstractJetDiagnosticsTest", new File("compiler/testData/diagnostics/tests"), "kt", false);
-        }
-        
         @TestMetadata("Abstract.kt")
         public void testAbstract() throws Exception {
             doTest("compiler/testData/diagnostics/tests/Abstract.kt");
@@ -63,9 +56,8 @@ public class JetDiagnosticsTestGenerated extends AbstractJetDiagnosticsTest {
             doTest("compiler/testData/diagnostics/tests/AbstractInTrait.kt");
         }
         
-        @TestMetadata("AnonymousInitializers.kt")
-        public void testAnonymousInitializers() throws Exception {
-            doTest("compiler/testData/diagnostics/tests/AnonymousInitializers.kt");
+        public void testAllFilesPresentInTests() throws Exception {
+            JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), "org.jetbrains.jet.checkers.AbstractJetDiagnosticsTest", new File("compiler/testData/diagnostics/tests"), "kt", false);
         }
         
         @TestMetadata("AnonymousInitializerVarAndConstructor.kt")
@@ -73,6 +65,16 @@ public class JetDiagnosticsTestGenerated extends AbstractJetDiagnosticsTest {
             doTest("compiler/testData/diagnostics/tests/AnonymousInitializerVarAndConstructor.kt");
         }
         
+        @TestMetadata("AnonymousInitializers.kt")
+        public void testAnonymousInitializers() throws Exception {
+            doTest("compiler/testData/diagnostics/tests/AnonymousInitializers.kt");
+        }
+        
+        @TestMetadata("AutoCreatedIt.kt")
+        public void testAutoCreatedIt() throws Exception {
+            doTest("compiler/testData/diagnostics/tests/AutoCreatedIt.kt");
+        }
+        
         @TestMetadata("AutocastAmbiguitites.kt")
         public void testAutocastAmbiguitites() throws Exception {
             doTest("compiler/testData/diagnostics/tests/AutocastAmbiguitites.kt");
@@ -83,11 +85,6 @@ public class JetDiagnosticsTestGenerated extends AbstractJetDiagnosticsTest {
             doTest("compiler/testData/diagnostics/tests/AutocastsForStableIdentifiers.kt");
         }
         
-        @TestMetadata("AutoCreatedIt.kt")
-        public void testAutoCreatedIt() throws Exception {
-            doTest("compiler/testData/diagnostics/tests/AutoCreatedIt.kt");
-        }
-        
         @TestMetadata("Basic.kt")
         public void testBasic() throws Exception {
             doTest("compiler/testData/diagnostics/tests/Basic.kt");
@@ -128,16 +125,16 @@ public class JetDiagnosticsTestGenerated extends AbstractJetDiagnosticsTest {
             doTest("compiler/testData/diagnostics/tests/ClassObjectCannotAccessClassFields.kt");
         }
         
-        @TestMetadata("ClassObjects.kt")
-        public void testClassObjects() throws Exception {
-            doTest("compiler/testData/diagnostics/tests/ClassObjects.kt");
-        }
-        
         @TestMetadata("ClassObjectVisibility.kt")
         public void testClassObjectVisibility() throws Exception {
             doTest("compiler/testData/diagnostics/tests/ClassObjectVisibility.kt");
         }
         
+        @TestMetadata("ClassObjects.kt")
+        public void testClassObjects() throws Exception {
+            doTest("compiler/testData/diagnostics/tests/ClassObjects.kt");
+        }
+        
         @TestMetadata("Constants.kt")
         public void testConstants() throws Exception {
             doTest("compiler/testData/diagnostics/tests/Constants.kt");
@@ -468,16 +465,16 @@ public class JetDiagnosticsTestGenerated extends AbstractJetDiagnosticsTest {
             doTest("compiler/testData/diagnostics/tests/ValAndFunOverrideCompatibilityClash.kt");
         }
         
-        @TestMetadata("Varargs.kt")
-        public void testVarargs() throws Exception {
-            doTest("compiler/testData/diagnostics/tests/Varargs.kt");
-        }
-        
         @TestMetadata("VarargTypes.kt")
         public void testVarargTypes() throws Exception {
             doTest("compiler/testData/diagnostics/tests/VarargTypes.kt");
         }
         
+        @TestMetadata("Varargs.kt")
+        public void testVarargs() throws Exception {
+            doTest("compiler/testData/diagnostics/tests/Varargs.kt");
+        }
+        
         @TestMetadata("Variance.kt")
         public void testVariance() throws Exception {
             doTest("compiler/testData/diagnostics/tests/Variance.kt");
@@ -1612,10 +1609,6 @@ public class JetDiagnosticsTestGenerated extends AbstractJetDiagnosticsTest {
         
         @TestMetadata("compiler/testData/diagnostics/tests/override")
         public static class Override extends AbstractJetDiagnosticsTest {
-            public void testAllFilesPresentInOverride() throws Exception {
-                JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), "org.jetbrains.jet.checkers.AbstractJetDiagnosticsTest", new File("compiler/testData/diagnostics/tests/override"), "kt", false);
-            }
-            
             @TestMetadata("AbstractFunImplemented.kt")
             public void testAbstractFunImplemented() throws Exception {
                 doTest("compiler/testData/diagnostics/tests/override/AbstractFunImplemented.kt");
@@ -1646,6 +1639,10 @@ public class JetDiagnosticsTestGenerated extends AbstractJetDiagnosticsTest {
                 doTest("compiler/testData/diagnostics/tests/override/AbstractVarNotImplemented.kt");
             }
             
+            public void testAllFilesPresentInOverride() throws Exception {
+                JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), "org.jetbrains.jet.checkers.AbstractJetDiagnosticsTest", new File("compiler/testData/diagnostics/tests/override"), "kt", false);
+            }
+            
             @TestMetadata("ComplexValRedeclaration.kt")
             public void testComplexValRedeclaration() throws Exception {
                 doTest("compiler/testData/diagnostics/tests/override/ComplexValRedeclaration.kt");
@@ -1656,16 +1653,16 @@ public class JetDiagnosticsTestGenerated extends AbstractJetDiagnosticsTest {
                 doTest("compiler/testData/diagnostics/tests/override/ConflictingFunctionSignatureFromSuperclass.kt");
             }
             
-            @TestMetadata("ConflictingParameterNames-MultipleSupertypes.kt")
-            public void testConflictingParameterNames_MultipleSupertypes() throws Exception {
-                doTest("compiler/testData/diagnostics/tests/override/ConflictingParameterNames-MultipleSupertypes.kt");
-            }
-            
             @TestMetadata("ConflictingParameterNames.kt")
             public void testConflictingParameterNames() throws Exception {
                 doTest("compiler/testData/diagnostics/tests/override/ConflictingParameterNames.kt");
             }
             
+            @TestMetadata("ConflictingParameterNames-MultipleSupertypes.kt")
+            public void testConflictingParameterNames_MultipleSupertypes() throws Exception {
+                doTest("compiler/testData/diagnostics/tests/override/ConflictingParameterNames-MultipleSupertypes.kt");
+            }
+            
             @TestMetadata("ConflictingPropertySignatureFromSuperclass.kt")
             public void testConflictingPropertySignatureFromSuperclass() throws Exception {
                 doTest("compiler/testData/diagnostics/tests/override/ConflictingPropertySignatureFromSuperclass.kt");
@@ -1837,16 +1834,16 @@ public class JetDiagnosticsTestGenerated extends AbstractJetDiagnosticsTest {
                 doTest("compiler/testData/diagnostics/tests/regressions/Jet17.kt");
             }
             
-            @TestMetadata("Jet183-1.kt")
-            public void testJet183_1() throws Exception {
-                doTest("compiler/testData/diagnostics/tests/regressions/Jet183-1.kt");
-            }
-            
             @TestMetadata("Jet183.kt")
             public void testJet183() throws Exception {
                 doTest("compiler/testData/diagnostics/tests/regressions/Jet183.kt");
             }
             
+            @TestMetadata("Jet183-1.kt")
+            public void testJet183_1() throws Exception {
+                doTest("compiler/testData/diagnostics/tests/regressions/Jet183-1.kt");
+            }
+            
             @TestMetadata("Jet53.kt")
             public void testJet53() throws Exception {
                 doTest("compiler/testData/diagnostics/tests/regressions/Jet53.kt");
@@ -1937,16 +1934,16 @@ public class JetDiagnosticsTestGenerated extends AbstractJetDiagnosticsTest {
                 doTest("compiler/testData/diagnostics/tests/regressions/kt258.kt");
             }
             
-            @TestMetadata("kt26-1.kt")
-            public void testKt26_1() throws Exception {
-                doTest("compiler/testData/diagnostics/tests/regressions/kt26-1.kt");
-            }
-            
             @TestMetadata("kt26.kt")
             public void testKt26() throws Exception {
                 doTest("compiler/testData/diagnostics/tests/regressions/kt26.kt");
             }
             
+            @TestMetadata("kt26-1.kt")
+            public void testKt26_1() throws Exception {
+                doTest("compiler/testData/diagnostics/tests/regressions/kt26-1.kt");
+            }
+            
             @TestMetadata("kt282.kt")
             public void testKt282() throws Exception {
                 doTest("compiler/testData/diagnostics/tests/regressions/kt282.kt");
@@ -2280,9 +2277,14 @@ public class JetDiagnosticsTestGenerated extends AbstractJetDiagnosticsTest {
                 doTest("compiler/testData/diagnostics/tests/scopes/ImportObjectHidesCurrentPackage.kt");
             }
             
-            @TestMetadata("Imports-hidden.kt")
-            public void testImports_hidden() throws Exception {
-                doTest("compiler/testData/diagnostics/tests/scopes/Imports-hidden.kt");
+            @TestMetadata("ImportTwoTimes.kt")
+            public void testImportTwoTimes() throws Exception {
+                doTest("compiler/testData/diagnostics/tests/scopes/ImportTwoTimes.kt");
+            }
+            
+            @TestMetadata("ImportTwoTimesStar.kt")
+            public void testImportTwoTimesStar() throws Exception {
+                doTest("compiler/testData/diagnostics/tests/scopes/ImportTwoTimesStar.kt");
             }
             
             @TestMetadata("Imports.kt")
@@ -2305,14 +2307,9 @@ public class JetDiagnosticsTestGenerated extends AbstractJetDiagnosticsTest {
                 doTest("compiler/testData/diagnostics/tests/scopes/ImportsUselessSimpleImport2.kt");
             }
             
-            @TestMetadata("ImportTwoTimes.kt")
-            public void testImportTwoTimes() throws Exception {
-                doTest("compiler/testData/diagnostics/tests/scopes/ImportTwoTimes.kt");
-            }
-            
-            @TestMetadata("ImportTwoTimesStar.kt")
-            public void testImportTwoTimesStar() throws Exception {
-                doTest("compiler/testData/diagnostics/tests/scopes/ImportTwoTimesStar.kt");
+            @TestMetadata("Imports-hidden.kt")
+            public void testImports_hidden() throws Exception {
+                doTest("compiler/testData/diagnostics/tests/scopes/Imports-hidden.kt");
             }
             
             @TestMetadata("initializerScopeOfExtensionProperty.kt")
@@ -2420,6 +2417,11 @@ public class JetDiagnosticsTestGenerated extends AbstractJetDiagnosticsTest {
                 doTest("compiler/testData/diagnostics/tests/scopes/kt587.kt");
             }
             
+            @TestMetadata("kt900.kt")
+            public void testKt900() throws Exception {
+                doTest("compiler/testData/diagnostics/tests/scopes/kt900.kt");
+            }
+            
             @TestMetadata("kt900-1.kt")
             public void testKt900_1() throws Exception {
                 doTest("compiler/testData/diagnostics/tests/scopes/kt900-1.kt");
@@ -2430,11 +2432,6 @@ public class JetDiagnosticsTestGenerated extends AbstractJetDiagnosticsTest {
                 doTest("compiler/testData/diagnostics/tests/scopes/kt900-2.kt");
             }
             
-            @TestMetadata("kt900.kt")
-            public void testKt900() throws Exception {
-                doTest("compiler/testData/diagnostics/tests/scopes/kt900.kt");
-            }
-            
             @TestMetadata("kt939.kt")
             public void testKt939() throws Exception {
                 doTest("compiler/testData/diagnostics/tests/scopes/kt939.kt");
@@ -2539,16 +2536,16 @@ public class JetDiagnosticsTestGenerated extends AbstractJetDiagnosticsTest {
                 JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), "org.jetbrains.jet.checkers.AbstractJetDiagnosticsTest", new File("compiler/testData/diagnostics/tests/subtyping"), "kt", false);
             }
             
-            @TestMetadata("kt-1457.kt")
-            public void testKt_1457() throws Exception {
-                doTest("compiler/testData/diagnostics/tests/subtyping/kt-1457.kt");
-            }
-            
             @TestMetadata("kt2069.kt")
             public void testKt2069() throws Exception {
                 doTest("compiler/testData/diagnostics/tests/subtyping/kt2069.kt");
             }
             
+            @TestMetadata("kt-1457.kt")
+            public void testKt_1457() throws Exception {
+                doTest("compiler/testData/diagnostics/tests/subtyping/kt-1457.kt");
+            }
+            
         }
         
         @TestMetadata("compiler/testData/diagnostics/tests/tuples")
@@ -2656,15 +2653,15 @@ public class JetDiagnosticsTestGenerated extends AbstractJetDiagnosticsTest {
     
     @TestMetadata("compiler/testData/diagnostics/tests/script")
     public static class Script extends AbstractJetDiagnosticsTest {
-        public void testAllFilesPresentInScript() throws Exception {
-            JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), "org.jetbrains.jet.checkers.AbstractJetDiagnosticsTest", new File("compiler/testData/diagnostics/tests/script"), "ktscript", false);
-        }
-        
         @TestMetadata("AccessForwardDeclarationInScript.ktscript")
         public void testAccessForwardDeclarationInScript() throws Exception {
             doTest("compiler/testData/diagnostics/tests/script/AccessForwardDeclarationInScript.ktscript");
         }
         
+        public void testAllFilesPresentInScript() throws Exception {
+            JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), "org.jetbrains.jet.checkers.AbstractJetDiagnosticsTest", new File("compiler/testData/diagnostics/tests/script"), "ktscript", false);
+        }
+        
         @TestMetadata("ComplexScript.ktscript")
         public void testComplexScript() throws Exception {
             doTest("compiler/testData/diagnostics/tests/script/ComplexScript.ktscript");
diff --git a/compiler/tests/org/jetbrains/jet/jvm/compiler/ReadJavaBinaryClassTestGenerated.java b/compiler/tests/org/jetbrains/jet/jvm/compiler/ReadJavaBinaryClassTestGenerated.java
index fa37312e131..8678007f7ae 100644
--- a/compiler/tests/org/jetbrains/jet/jvm/compiler/ReadJavaBinaryClassTestGenerated.java
+++ b/compiler/tests/org/jetbrains/jet/jvm/compiler/ReadJavaBinaryClassTestGenerated.java
@@ -15,12 +15,15 @@
  */
 package org.jetbrains.jet.jvm.compiler;
 
+import junit.framework.Assert;
 import junit.framework.Test;
 import junit.framework.TestSuite;
+
+import java.io.File;
 import org.jetbrains.jet.JetTestUtils;
 import org.jetbrains.jet.test.TestMetadata;
 
-import java.io.File;
+import org.jetbrains.jet.jvm.compiler.AbstractReadJavaBinaryClassTest;
 
 /** This class is generated by {@link org.jetbrains.jet.jvm.compiler.AbstractReadJavaBinaryClassTest}. DO NOT MODIFY MANUALLY */
 @TestMetadata("compiler/testData/readJavaBinaryClass")
@@ -79,16 +82,16 @@ public class ReadJavaBinaryClassTestGenerated extends AbstractReadJavaBinaryClas
         doTest("compiler/testData/readJavaBinaryClass/InnerClass.java");
     }
     
-    @TestMetadata("InnerClassesInGeneric.java")
-    public void testInnerClassesInGeneric() throws Exception {
-        doTest("compiler/testData/readJavaBinaryClass/InnerClassesInGeneric.java");
-    }
-    
     @TestMetadata("InnerClassReferencesOuterTP.java")
     public void testInnerClassReferencesOuterTP() throws Exception {
         doTest("compiler/testData/readJavaBinaryClass/InnerClassReferencesOuterTP.java");
     }
     
+    @TestMetadata("InnerClassesInGeneric.java")
+    public void testInnerClassesInGeneric() throws Exception {
+        doTest("compiler/testData/readJavaBinaryClass/InnerClassesInGeneric.java");
+    }
+    
     @TestMetadata("MethodReferencesOuterClassTP.java")
     public void testMethodReferencesOuterClassTP() throws Exception {
         doTest("compiler/testData/readJavaBinaryClass/MethodReferencesOuterClassTP.java");
@@ -256,15 +259,15 @@ public class ReadJavaBinaryClassTestGenerated extends AbstractReadJavaBinaryClas
         
         @TestMetadata("compiler/testData/readJavaBinaryClass/kotlinSignature/error")
         public static class Error extends AbstractReadJavaBinaryClassTest {
-            public void testAllFilesPresentInError() throws Exception {
-                JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), "org.jetbrains.jet.jvm.compiler.AbstractReadJavaBinaryClassTest", new File("compiler/testData/readJavaBinaryClass/kotlinSignature/error"), "java", false);
-            }
-            
             @TestMetadata("AddingNullability.java")
             public void testAddingNullability() throws Exception {
                 doTest("compiler/testData/readJavaBinaryClass/kotlinSignature/error/AddingNullability.java");
             }
             
+            public void testAllFilesPresentInError() throws Exception {
+                JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), "org.jetbrains.jet.jvm.compiler.AbstractReadJavaBinaryClassTest", new File("compiler/testData/readJavaBinaryClass/kotlinSignature/error"), "java", false);
+            }
+            
             @TestMetadata("ExtraUpperBound.java")
             public void testExtraUpperBound() throws Exception {
                 doTest("compiler/testData/readJavaBinaryClass/kotlinSignature/error/ExtraUpperBound.java");
@@ -340,11 +343,6 @@ public class ReadJavaBinaryClassTestGenerated extends AbstractReadJavaBinaryClas
                 doTest("compiler/testData/readJavaBinaryClass/kotlinSignature/error/WrongTypeVariance.java");
             }
             
-            @TestMetadata("WrongValueParametersCount.java")
-            public void testWrongValueParametersCount() throws Exception {
-                doTest("compiler/testData/readJavaBinaryClass/kotlinSignature/error/WrongValueParametersCount.java");
-            }
-            
             @TestMetadata("WrongValueParameterStructure1.java")
             public void testWrongValueParameterStructure1() throws Exception {
                 doTest("compiler/testData/readJavaBinaryClass/kotlinSignature/error/WrongValueParameterStructure1.java");
@@ -355,6 +353,11 @@ public class ReadJavaBinaryClassTestGenerated extends AbstractReadJavaBinaryClas
                 doTest("compiler/testData/readJavaBinaryClass/kotlinSignature/error/WrongValueParameterStructure2.java");
             }
             
+            @TestMetadata("WrongValueParametersCount.java")
+            public void testWrongValueParametersCount() throws Exception {
+                doTest("compiler/testData/readJavaBinaryClass/kotlinSignature/error/WrongValueParametersCount.java");
+            }
+            
         }
         
         public static Test suite() {
diff --git a/compiler/tests/org/jetbrains/jet/test/generator/SimpleTestClassModel.java b/compiler/tests/org/jetbrains/jet/test/generator/SimpleTestClassModel.java
index ec9ca12ccd1..c76e8461aa7 100644
--- a/compiler/tests/org/jetbrains/jet/test/generator/SimpleTestClassModel.java
+++ b/compiler/tests/org/jetbrains/jet/test/generator/SimpleTestClassModel.java
@@ -24,12 +24,19 @@ import org.jetbrains.jet.JetTestUtils;
 import java.io.File;
 import java.util.Collection;
 import java.util.Collections;
+import java.util.Comparator;
 import java.util.List;
 
 /**
 * @author abreslav
 */
 public class SimpleTestClassModel implements TestClassModel {
+    private static final Comparator<TestEntityModel> BY_NAME = new Comparator<TestEntityModel>() {
+        @Override
+        public int compare(TestEntityModel o1, TestEntityModel o2) {
+            return o1.getName().compareTo(o2.getName());
+        }
+    };
     private final File rootFile;
     private final boolean recursive;
     private final String extension;
@@ -63,6 +70,7 @@ public class SimpleTestClassModel implements TestClassModel {
                     }
                 }
             }
+            Collections.sort(children, BY_NAME);
             innerTestClasses = children;
         }
         return innerTestClasses;
@@ -88,6 +96,8 @@ public class SimpleTestClassModel implements TestClassModel {
                         }
                     }
                 }
+                Collections.sort(result, BY_NAME);
+
                 testMethods = result;
             }
         }