diff --git a/compiler/android-tests/tests/org/jetbrains/kotlin/android/tests/CodegenTestsOnAndroidGenerator.java b/compiler/android-tests/tests/org/jetbrains/kotlin/android/tests/CodegenTestsOnAndroidGenerator.java
index 8071b92f117..b95115f0b0b 100644
--- a/compiler/android-tests/tests/org/jetbrains/kotlin/android/tests/CodegenTestsOnAndroidGenerator.java
+++ b/compiler/android-tests/tests/org/jetbrains/kotlin/android/tests/CodegenTestsOnAndroidGenerator.java
@@ -211,7 +211,7 @@ public class CodegenTestsOnAndroidGenerator extends UsefulTestCase {
                     String packageName = file.getPath().replaceAll("\\\\|-|\\.|/", "_");
                     text = changePackage(packageName, text);
 
-                    if (SpecialFiles.getFilesCompiledWithoutStdLib().contains(file.getName())) {
+                    if (!file.getCanonicalPath().contains("boxWithStdlib")) {
                         CodegenTestFiles codegenFile = CodegenTestFiles.create(file.getName(), text, holderMock.environment.getProject());
                         holderMock.files.add(codegenFile.getPsiFile());
                     }
diff --git a/compiler/android-tests/tests/org/jetbrains/kotlin/android/tests/SpecialFiles.java b/compiler/android-tests/tests/org/jetbrains/kotlin/android/tests/SpecialFiles.java
index e6b25bcd82d..d6bba2ff947 100644
--- a/compiler/android-tests/tests/org/jetbrains/kotlin/android/tests/SpecialFiles.java
+++ b/compiler/android-tests/tests/org/jetbrains/kotlin/android/tests/SpecialFiles.java
@@ -26,7 +26,6 @@ public class SpecialFiles {
 
     static {
         fillExcludedFiles();
-        fillFilesCompiledWithoutStdLib();
     }
 
 
@@ -34,29 +33,6 @@ public class SpecialFiles {
         return excludedFiles;
     }
 
-    public static Set<String> getFilesCompiledWithoutStdLib() {
-        return filesCompiledWithoutStdLib;
-    }
-
-    private static void fillFilesCompiledWithoutStdLib() {
-        filesCompiledWithoutStdLib.add("kt1980.kt");
-        filesCompiledWithoutStdLib.add("kt1953_class.kt"); // Exception in code
-        filesCompiledWithoutStdLib.add("basicmethodSuperClass.kt"); // Exception in code
-        filesCompiledWithoutStdLib.add("kt503.kt"); // OVERLOAD_RESOLUTION_AMBIGUITY
-        filesCompiledWithoutStdLib.add("kt504.kt"); // OVERLOAD_RESOLUTION_AMBIGUITY
-        filesCompiledWithoutStdLib.add("kt772.kt"); // OVERLOAD_RESOLUTION_AMBIGUITY
-        filesCompiledWithoutStdLib.add("kt773.kt"); // OVERLOAD_RESOLUTION_AMBIGUITY
-        filesCompiledWithoutStdLib.add("kt796_797.kt"); // OVERLOAD_RESOLUTION_AMBIGUITY
-        filesCompiledWithoutStdLib.add("kt950.kt"); // OVERLOAD_RESOLUTION_AMBIGUITY
-        filesCompiledWithoutStdLib.add("kt3190.kt"); // OVERLOAD_RESOLUTION_AMBIGUITY
-        filesCompiledWithoutStdLib.add("kt4265.kt"); // OVERLOAD_RESOLUTION_AMBIGUITY
-        filesCompiledWithoutStdLib.add("realStringRepeat.kt"); // OVERLOAD_RESOLUTION_AMBIGUITY
-        filesCompiledWithoutStdLib.add("kt2395.kt"); // With MOCK_JDK
-        filesCompiledWithoutStdLib.add("useAnonymousObjectAsIterator.kt"); // OVERLOAD_RESOLUTION_AMBIGUITY
-        filesCompiledWithoutStdLib.add("kt581.kt"); // OVERLOAD_RESOLUTION_AMBIGUITY
-        filesCompiledWithoutStdLib.add("kt4172.kt"); // CANNOT_COMPLETE_RESOLVE
-    }
-
     private static void fillExcludedFiles() {
         excludedFiles.add("native"); // Reflection is used to check full class name