diff --git a/Dart/src/com/jetbrains/lang/dart/ide/index/DartInputFilter.java b/Dart/src/com/jetbrains/lang/dart/ide/index/DartInputFilter.java
index 3709bc1fab9..431cf1e6bda 100644
--- a/Dart/src/com/jetbrains/lang/dart/ide/index/DartInputFilter.java
+++ b/Dart/src/com/jetbrains/lang/dart/ide/index/DartInputFilter.java
@@ -1,17 +1,13 @@
 package com.jetbrains.lang.dart.ide.index;
 
-import com.intellij.openapi.fileTypes.FileType;
 import com.intellij.openapi.fileTypes.StdFileTypes;
-import com.intellij.openapi.vfs.VirtualFile;
-import com.intellij.util.indexing.FileBasedIndex;
+import com.intellij.util.indexing.DefaultFileTypeSpecificInputFilter;
 import com.jetbrains.lang.dart.DartFileType;
 
-public class DartInputFilter implements FileBasedIndex.InputFilter {
+public class DartInputFilter extends DefaultFileTypeSpecificInputFilter {
   public static DartInputFilter INSTANCE = new DartInputFilter();
 
-  @Override
-  public boolean acceptInput(VirtualFile file) {
-    FileType type = file.getFileType();
-    return type == DartFileType.INSTANCE || type == StdFileTypes.HTML;
+  public DartInputFilter() {
+    super(DartFileType.INSTANCE, StdFileTypes.HTML);
   }
 }
diff --git a/JsTestDriver/src/com/google/jstestdriver/idea/config/JstdTestFilePathIndex.java b/JsTestDriver/src/com/google/jstestdriver/idea/config/JstdTestFilePathIndex.java
index bce5d73e887..c6771a43580 100644
--- a/JsTestDriver/src/com/google/jstestdriver/idea/config/JstdTestFilePathIndex.java
+++ b/JsTestDriver/src/com/google/jstestdriver/idea/config/JstdTestFilePathIndex.java
@@ -31,13 +31,6 @@ public class JstdTestFilePathIndex extends FileBasedIndexExtension<String, Void>
 
   private static final ID<String, Void> KEY = ID.create("jstd.jsFile.path");
 
-  private static final FileBasedIndex.InputFilter JSTD_CONFIG_FILE_INPUT_FILTER = new FileBasedIndex.InputFilter() {
-    @Override
-    public boolean acceptInput(final VirtualFile file) {
-      return JstdConfigFileType.INSTANCE == file.getFileType();
-    }
-  };
-
   private final KeyDescriptor<String> myKeyDescriptor = new EnumeratorStringDescriptor();
 
   @NotNull
@@ -90,7 +83,7 @@ public DataExternalizer<Void> getValueExternalizer() {
 
   @Override
   public FileBasedIndex.InputFilter getInputFilter() {
-    return JSTD_CONFIG_FILE_INPUT_FILTER;
+    return new DefaultFileTypeSpecificInputFilter(JstdConfigFileType.INSTANCE);
   }
 
   @Override