diff --git a/plugins/kapt3/test/org/jetbrains/kotlin/kapt3/test/AbstractKotlinKapt3Test.kt b/plugins/kapt3/test/org/jetbrains/kotlin/kapt3/test/AbstractKotlinKapt3Test.kt
index 303c5e6b949..25f1fe384c6 100644
--- a/plugins/kapt3/test/org/jetbrains/kotlin/kapt3/test/AbstractKotlinKapt3Test.kt
+++ b/plugins/kapt3/test/org/jetbrains/kotlin/kapt3/test/AbstractKotlinKapt3Test.kt
@@ -83,7 +83,7 @@ abstract class AbstractClassFileToSourceStubConverterTest : AbstractKotlinKapt3T
         val javaFiles = convert(kaptRunner, typeMapper, generateNonExistentClass)
         kaptRunner.compiler.enterTrees(javaFiles)
 
-        val actualRaw = javaFiles.joinToString (FILE_SEPARATOR)
+        val actualRaw = javaFiles.sortedBy { it.sourceFile.name }.joinToString (FILE_SEPARATOR)
         val actual = StringUtil.convertLineSeparators(actualRaw.trim({ it <= ' ' })).trimTrailingWhitespacesAndAddNewlineAtEOF()
 
         if (kaptRunner.compiler.shouldStop(CompileStates.CompileState.ENTER)) {
diff --git a/plugins/kapt3/testData/converter/annotations.txt b/plugins/kapt3/testData/converter/annotations.txt
index dcf0af76847..a4f0f43f1a7 100644
--- a/plugins/kapt3/testData/converter/annotations.txt
+++ b/plugins/kapt3/testData/converter/annotations.txt
@@ -4,17 +4,6 @@ public abstract @interface Anno1 {
 ////////////////////
 
 
-public enum Colors {
-    /*public static final*/ WHITE /* = null */,
-    /*public static final*/ BLACK /* = null */;
-
-    Colors() {
-    }
-}
-
-////////////////////
-
-
 public abstract @interface Anno2 {
 
     public abstract int i() default 5;
@@ -47,6 +36,17 @@ public abstract @interface Anno3 {
 ////////////////////
 
 
+public enum Colors {
+    /*public static final*/ WHITE /* = null */,
+    /*public static final*/ BLACK /* = null */;
+
+    Colors() {
+    }
+}
+
+////////////////////
+
+
 @Anno3(value = "value")
 @Anno2(a = @Anno1(), clazz = TestAnno.class, classes = {TestAnno.class, Anno1.class})
 @Anno1()
diff --git a/plugins/kapt3/testData/converter/annotations2.txt b/plugins/kapt3/testData/converter/annotations2.txt
index ebce7a85339..6cd3079f44b 100644
--- a/plugins/kapt3/testData/converter/annotations2.txt
+++ b/plugins/kapt3/testData/converter/annotations2.txt
@@ -10,6 +10,51 @@ public abstract @interface Anno {
 
 package test;
 
+public final class AnnotationsTest {
+
+    public AnnotationsTest() {
+        super();
+    }
+
+    @Anno(value = "top-level-fun")
+    public static final void topLevelFun(@Anno(value = "top-level-fun-receiver")
+    java.lang.String $receiver) {
+    }
+
+    @Anno(value = "top-level-val")
+    private static void topLevelVal$annotations(int p0) {
+    }
+
+    public static final java.lang.String getTopLevelVal(@Anno(value = "top-level-val-receiver")
+    int $receiver) {
+        return null;
+    }
+}
+
+////////////////////
+
+package test;
+
+@Anno(value = "enum")
+public enum Enum {
+    /*public static final*/ WHITE /* = null */,
+    /*public static final*/ BLACK /* = null */;
+    private final int x = 0;
+
+    public final int getX() {
+        return 0;
+    }
+
+    @Anno(value = "enum-constructor")
+    Enum(@Anno(value = "x")
+    int x) {
+    }
+}
+
+////////////////////
+
+package test;
+
 @Anno(value = "clazz")
 public abstract class Test {
     private java.lang.String v;
@@ -43,48 +88,3 @@ public abstract class Test {
         super();
     }
 }
-
-////////////////////
-
-package test;
-
-@Anno(value = "enum")
-public enum Enum {
-    /*public static final*/ WHITE /* = null */,
-    /*public static final*/ BLACK /* = null */;
-    private final int x = 0;
-
-    public final int getX() {
-        return 0;
-    }
-
-    @Anno(value = "enum-constructor")
-    Enum(@Anno(value = "x")
-    int x) {
-    }
-}
-
-////////////////////
-
-package test;
-
-public final class AnnotationsTest {
-
-    public AnnotationsTest() {
-        super();
-    }
-
-    @Anno(value = "top-level-fun")
-    public static final void topLevelFun(@Anno(value = "top-level-fun-receiver")
-    java.lang.String $receiver) {
-    }
-
-    @Anno(value = "top-level-val")
-    private static void topLevelVal$annotations(int p0) {
-    }
-
-    public static final java.lang.String getTopLevelVal(@Anno(value = "top-level-val-receiver")
-    int $receiver) {
-        return null;
-    }
-}
diff --git a/plugins/kapt3/testData/converter/defaultImpls.txt b/plugins/kapt3/testData/converter/defaultImpls.txt
index 0d58ca3818c..f9753fef214 100644
--- a/plugins/kapt3/testData/converter/defaultImpls.txt
+++ b/plugins/kapt3/testData/converter/defaultImpls.txt
@@ -1,27 +1,3 @@
-public abstract interface IntfWithoutDefaultImpls {
-}
-
-////////////////////
-
-
-public abstract interface IntfWithDefaultImpls {
-
-    public abstract void a();
-
-    public static final class DefaultImpls {
-
-        public DefaultImpls() {
-            super();
-        }
-
-        public static void a(IntfWithDefaultImpls $this) {
-        }
-    }
-}
-
-////////////////////
-
-
 public abstract interface Intf {
     public static final Intf.Companion Companion = null;
     public static final int WHITE = 2;
@@ -52,3 +28,27 @@ public abstract interface Intf {
         }
     }
 }
+
+////////////////////
+
+
+public abstract interface IntfWithDefaultImpls {
+
+    public abstract void a();
+
+    public static final class DefaultImpls {
+
+        public DefaultImpls() {
+            super();
+        }
+
+        public static void a(IntfWithDefaultImpls $this) {
+        }
+    }
+}
+
+////////////////////
+
+
+public abstract interface IntfWithoutDefaultImpls {
+}
diff --git a/plugins/kapt3/testData/converter/enums.txt b/plugins/kapt3/testData/converter/enums.txt
index 94bc81c4864..c90b8c22607 100644
--- a/plugins/kapt3/testData/converter/enums.txt
+++ b/plugins/kapt3/testData/converter/enums.txt
@@ -1,3 +1,11 @@
+public abstract @interface Anno1 {
+
+    public abstract java.lang.String value();
+}
+
+////////////////////
+
+
 public enum Enum1 {
     /*public static final*/ BLACK /* = null */,
     /*public static final*/ WHITE /* = null */;
@@ -9,14 +17,6 @@ public enum Enum1 {
 ////////////////////
 
 
-public abstract @interface Anno1 {
-
-    public abstract java.lang.String value();
-}
-
-////////////////////
-
-
 public enum Enum2 {
     /*public static final*/ RED /* = null */,
     /*public static final*/ WHITE /* = null */;
diff --git a/plugins/kapt3/testData/converter/genericSimple.txt b/plugins/kapt3/testData/converter/genericSimple.txt
index 7a913a9ee5e..7bf5c879092 100644
--- a/plugins/kapt3/testData/converter/genericSimple.txt
+++ b/plugins/kapt3/testData/converter/genericSimple.txt
@@ -1,16 +1,8 @@
-public abstract interface Intf<I1 extends java.lang.Object, I2 extends java.io.Serializable> {
-}
+public abstract interface ABC {
 
-////////////////////
+    public abstract <T extends java.lang.CharSequence>java.util.List<T> abc(T p0, java.util.List<? extends T> p1, T... p2);
 
-
-public abstract interface Intf2<T extends java.util.List<? extends java.lang.String>, M extends T> {
-}
-
-////////////////////
-
-
-public abstract interface OtherIntf<O extends java.lang.CharSequence> {
+    public abstract <X extends java.lang.Object>int bcd(char... p0);
 }
 
 ////////////////////
@@ -26,6 +18,18 @@ public class BaseClass<B extends java.lang.Object> {
 ////////////////////
 
 
+public abstract interface Intf<I1 extends java.lang.Object, I2 extends java.io.Serializable> {
+}
+
+////////////////////
+
+
+public abstract interface Intf2<T extends java.util.List<? extends java.lang.String>, M extends T> {
+}
+
+////////////////////
+
+
 public final class MyClass<M1 extends java.lang.Object, M2 extends java.lang.Object> extends BaseClass<java.lang.RuntimeException> implements Intf<java.lang.Object, java.util.Date>, OtherIntf<java.lang.String> {
     private final java.util.List<java.util.Map<java.lang.String, M1>> fld = null;
 
@@ -41,9 +45,5 @@ public final class MyClass<M1 extends java.lang.Object, M2 extends java.lang.Obj
 ////////////////////
 
 
-public abstract interface ABC {
-
-    public abstract <T extends java.lang.CharSequence>java.util.List<T> abc(T p0, java.util.List<? extends T> p1, T... p2);
-
-    public abstract <X extends java.lang.Object>int bcd(char... p0);
+public abstract interface OtherIntf<O extends java.lang.CharSequence> {
 }
diff --git a/plugins/kapt3/testData/converter/inheritanceSimple.txt b/plugins/kapt3/testData/converter/inheritanceSimple.txt
index 9139c8026c7..41cfbec19c0 100644
--- a/plugins/kapt3/testData/converter/inheritanceSimple.txt
+++ b/plugins/kapt3/testData/converter/inheritanceSimple.txt
@@ -1,20 +1,3 @@
-public abstract interface Context {
-}
-
-////////////////////
-
-
-public enum Result {
-    /*public static final*/ SUCCESS /* = null */,
-    /*public static final*/ ERROR /* = null */;
-
-    Result() {
-    }
-}
-
-////////////////////
-
-
 public abstract class BaseClass {
 
     public abstract Result doJob();
@@ -27,6 +10,12 @@ public abstract class BaseClass {
 ////////////////////
 
 
+public abstract interface Context {
+}
+
+////////////////////
+
+
 public final class Inheritor extends BaseClass {
 
     @java.lang.Override()
@@ -38,3 +27,14 @@ public final class Inheritor extends BaseClass {
         super(null, 0, false);
     }
 }
+
+////////////////////
+
+
+public enum Result {
+    /*public static final*/ SUCCESS /* = null */,
+    /*public static final*/ ERROR /* = null */;
+
+    Result() {
+    }
+}
diff --git a/plugins/kapt3/testData/converter/modifiers.txt b/plugins/kapt3/testData/converter/modifiers.txt
index 602963a8c49..1dfacaafda6 100644
--- a/plugins/kapt3/testData/converter/modifiers.txt
+++ b/plugins/kapt3/testData/converter/modifiers.txt
@@ -1,44 +1,5 @@
 package modifiers;
 
-public final class PublicClass {
-
-    public PublicClass() {
-        super();
-    }
-}
-
-////////////////////
-
-package modifiers;
-
-public class PublicClassProtectedConstructor {
-
-    protected PublicClassProtectedConstructor() {
-        super();
-    }
-
-    protected static abstract interface ProtectedInterface {
-    }
-
-    private static abstract interface PrivateInterface {
-    }
-}
-
-////////////////////
-
-package modifiers;
-
-public abstract class PublicClassPrivateConstructor {
-
-    private PublicClassPrivateConstructor() {
-        super();
-    }
-}
-
-////////////////////
-
-package modifiers;
-
 public final class InternalClass {
 
     public InternalClass() {
@@ -50,24 +11,6 @@ public final class InternalClass {
 
 package modifiers;
 
-final class PrivateClass {
-
-    public PrivateClass() {
-        super();
-    }
-}
-
-////////////////////
-
-package modifiers;
-
-public abstract interface PublicInterface {
-}
-
-////////////////////
-
-package modifiers;
-
 public abstract interface InternalInterface {
 }
 
@@ -75,52 +18,6 @@ public abstract interface InternalInterface {
 
 package modifiers;
 
-abstract interface PrivateInterface {
-}
-
-////////////////////
-
-package modifiers;
-
-public abstract class SealedClass {
-
-    private SealedClass() {
-        super();
-    }
-
-    public static final class One extends modifiers.SealedClass {
-
-        public One() {
-            super();
-        }
-    }
-
-    public static class Two extends modifiers.SealedClass {
-
-        public Two() {
-            super();
-        }
-    }
-
-    public static abstract class Three extends modifiers.SealedClass.Two {
-
-        public Three() {
-            super();
-        }
-    }
-
-    public static final class Four extends modifiers.SealedClass.Three {
-
-        public Four() {
-            super();
-        }
-    }
-}
-
-////////////////////
-
-package modifiers;
-
 public final class Modifiers {
     private final transient java.lang.String transientField = "";
     private volatile java.lang.String volatileField;
@@ -155,3 +52,106 @@ public final class Modifiers {
         super();
     }
 }
+
+////////////////////
+
+package modifiers;
+
+final class PrivateClass {
+
+    public PrivateClass() {
+        super();
+    }
+}
+
+////////////////////
+
+package modifiers;
+
+abstract interface PrivateInterface {
+}
+
+////////////////////
+
+package modifiers;
+
+public final class PublicClass {
+
+    public PublicClass() {
+        super();
+    }
+}
+
+////////////////////
+
+package modifiers;
+
+public abstract class PublicClassPrivateConstructor {
+
+    private PublicClassPrivateConstructor() {
+        super();
+    }
+}
+
+////////////////////
+
+package modifiers;
+
+public class PublicClassProtectedConstructor {
+
+    protected PublicClassProtectedConstructor() {
+        super();
+    }
+
+    protected static abstract interface ProtectedInterface {
+    }
+
+    private static abstract interface PrivateInterface {
+    }
+}
+
+////////////////////
+
+package modifiers;
+
+public abstract interface PublicInterface {
+}
+
+////////////////////
+
+package modifiers;
+
+public abstract class SealedClass {
+
+    private SealedClass() {
+        super();
+    }
+
+    public static final class One extends modifiers.SealedClass {
+
+        public One() {
+            super();
+        }
+    }
+
+    public static class Two extends modifiers.SealedClass {
+
+        public Two() {
+            super();
+        }
+    }
+
+    public static abstract class Three extends modifiers.SealedClass.Two {
+
+        public Three() {
+            super();
+        }
+    }
+
+    public static final class Four extends modifiers.SealedClass.Three {
+
+        public Four() {
+            super();
+        }
+    }
+}