diff --git a/compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/PsiClassFinderForJvm.java b/compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/PsiClassFinderForJvm.java
index 2075ba86b46..d6cc338fa7b 100644
--- a/compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/PsiClassFinderForJvm.java
+++ b/compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/PsiClassFinderForJvm.java
@@ -24,12 +24,12 @@ import com.intellij.psi.PsiPackage;
 import com.intellij.psi.impl.compiled.ClsClassImpl;
 import com.intellij.psi.search.DelegatingGlobalSearchScope;
 import com.intellij.psi.search.GlobalSearchScope;
-import com.intellij.psi.search.SearchScope;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
 import org.jetbrains.jet.lang.resolve.FqName;
 import org.jetbrains.jet.lang.resolve.java.alt.AltClassFinder;
 import org.jetbrains.jet.plugin.JetFileType;
+import org.jetbrains.jet.utils.PathUtil;
 
 import javax.annotation.PostConstruct;
 import javax.inject.Inject;
@@ -51,7 +51,7 @@ public class PsiClassFinderForJvm implements PsiClassFinder {
 
     @PostConstruct
     public void initialize() {
-        this.altClassFinder = new AltClassFinder(project);
+        this.altClassFinder = new AltClassFinder(project, PathUtil.getAltHeadersRoots());
         this.javaSearchScope = new DelegatingGlobalSearchScope(GlobalSearchScope.allScope(project)) {
             @Override
             public boolean contains(VirtualFile file) {
diff --git a/compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/alt/AltClassFinder.java b/compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/alt/AltClassFinder.java
index bf66e2f6384..0bd6dc9ea7c 100644
--- a/compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/alt/AltClassFinder.java
+++ b/compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/alt/AltClassFinder.java
@@ -26,18 +26,18 @@ import com.intellij.psi.PsiClass;
 import com.intellij.psi.PsiManager;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.jet.lang.resolve.FqName;
-import org.jetbrains.jet.utils.PathUtil;
 
 import java.util.List;
 
+// TODO: rename
 public class AltClassFinder {
     private final PsiManager psiManager;
     private final List<VirtualFile> roots;
     
 
-    public AltClassFinder(Project project) {
+    public AltClassFinder(Project project, @NotNull List<VirtualFile> roots) {
         psiManager = PsiManager.getInstance(project);
-        this.roots = PathUtil.getAltHeadersRoots();
+        this.roots = roots;
     }
 
     public PsiClass findClass(@NotNull FqName qualifiedName) {