diff --git a/compiler/android-tests/tests/org/jetbrains/jet/compiler/android/SpecialFiles.java b/compiler/android-tests/tests/org/jetbrains/jet/compiler/android/SpecialFiles.java
index c6cd3a861fe..c2cfb870baa 100644
--- a/compiler/android-tests/tests/org/jetbrains/jet/compiler/android/SpecialFiles.java
+++ b/compiler/android-tests/tests/org/jetbrains/jet/compiler/android/SpecialFiles.java
@@ -71,8 +71,6 @@ public class SpecialFiles {
         excludedFiles.add("kt529.kt");  // Bug
         excludedFiles.add("kt344.kt");  // Bug
 
-        excludedFiles.add("filenameFilter.kt");  // Work with FileSystem
-
         excludedFiles.add("comparisonWithNullCallsFun.kt"); // java.lang.NoClassDefFoundError: jet.Nothing
     }
 
diff --git a/compiler/testData/codegen/box/sam/filenameFilter.kt b/compiler/testData/codegen/box/sam/filenameFilter.kt
index ed4fb3047fa..33f2b8bd474 100644
--- a/compiler/testData/codegen/box/sam/filenameFilter.kt
+++ b/compiler/testData/codegen/box/sam/filenameFilter.kt
@@ -1,9 +1,13 @@
 import java.io.*
 
 fun box(): String {
-    val filter = FilenameFilter { dir, name -> if (name == null) false else (name as java.lang.String).endsWith(".md") }
-    val listFiles = File(".").listFiles(filter)!!
-    if (listFiles.size != 1) return "Wrong size: $listFiles.size"
-    val name = listFiles[0].getName()
-    return if (name == "ReadMe.md") "OK" else "Wrong name: $name"
+    val ACCEPT_NAME = "test"
+    val WRONG_NAME = "wrong"
+
+    val filter = FileFilter { file -> ACCEPT_NAME == file?.getName() }
+
+    if (!filter.accept(File(ACCEPT_NAME))) return "Wrong answer for $ACCEPT_NAME"
+    if (filter.accept(File(WRONG_NAME))) return "Wrong answer for $WRONG_NAME"
+
+    return "OK"
 }
diff --git a/compiler/testData/codegen/box/sam/nonLiteralFilenameFilter.kt b/compiler/testData/codegen/box/sam/nonLiteralFilenameFilter.kt
index b53eb885331..590655f2181 100644
--- a/compiler/testData/codegen/box/sam/nonLiteralFilenameFilter.kt
+++ b/compiler/testData/codegen/box/sam/nonLiteralFilenameFilter.kt
@@ -1,10 +1,14 @@
 import java.io.*
 
 fun box(): String {
-    val f : (File?, String?) -> Boolean = { dir, name -> if (name == null) false else (name as java.lang.String).endsWith(".md") }
-    val filter = FilenameFilter(f)
-    val listFiles = File(".").listFiles(filter)!!
-    if (listFiles.size != 1) return "Wrong size: $listFiles.size"
-    val name = listFiles[0].getName()
-    return if (name == "ReadMe.md") "OK" else "Wrong name: $name"
+    val ACCEPT_NAME = "test"
+    val WRONG_NAME = "wrong"
+
+    val f : (File?) -> Boolean = { file -> ACCEPT_NAME == file?.getName() }
+    val filter = FileFilter(f)
+
+    if (!filter.accept(File(ACCEPT_NAME))) return "Wrong answer for $ACCEPT_NAME"
+    if (filter.accept(File(WRONG_NAME))) return "Wrong answer for $WRONG_NAME"
+
+    return "OK"
 }