diff --git a/idea/tests/org/jetbrains/jet/plugin/ProjectDescriptorWithStdlibSources.java b/idea/tests/org/jetbrains/jet/plugin/ProjectDescriptorWithStdlibSources.java
new file mode 100644
index 00000000000..b75bc6f56ef
--- /dev/null
+++ b/idea/tests/org/jetbrains/jet/plugin/ProjectDescriptorWithStdlibSources.java
@@ -0,0 +1,43 @@
+/*
+ * Copyright 2010-2013 JetBrains s.r.o.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.jetbrains.jet.plugin;
+
+import com.intellij.openapi.module.Module;
+import com.intellij.openapi.roots.ContentEntry;
+import com.intellij.openapi.roots.ModifiableRootModel;
+import com.intellij.openapi.roots.OrderRootType;
+import com.intellij.openapi.roots.libraries.Library;
+import com.intellij.openapi.vfs.VfsUtil;
+import org.jetbrains.annotations.NotNull;
+import org.jetbrains.annotations.Nullable;
+
+import java.io.File;
+
+public class ProjectDescriptorWithStdlibSources extends JetWithJdkAndRuntimeLightProjectDescriptor {
+    public static final ProjectDescriptorWithStdlibSources INSTANCE = new ProjectDescriptorWithStdlibSources();
+
+    @Override
+    public void configureModule(@NotNull Module module, @NotNull ModifiableRootModel model, @Nullable ContentEntry contentEntry) {
+        super.configureModule(module, model, contentEntry);
+
+        Library library = model.getModuleLibraryTable().getLibraryByName("myLibrary");
+        assert library != null;
+        Library.ModifiableModel modifiableModel = library.getModifiableModel();
+        modifiableModel.addRoot(VfsUtil.getUrlForLibraryRoot(new File("libraries/stdlib/src")), OrderRootType.SOURCES);
+        modifiableModel.commit();
+    }
+}
diff --git a/idea/tests/org/jetbrains/jet/plugin/libraries/NavigateToStdlibSourceRegressionTest.java b/idea/tests/org/jetbrains/jet/plugin/libraries/NavigateToStdlibSourceRegressionTest.java
index 245b2d82e7f..b801a233d2c 100644
--- a/idea/tests/org/jetbrains/jet/plugin/libraries/NavigateToStdlibSourceRegressionTest.java
+++ b/idea/tests/org/jetbrains/jet/plugin/libraries/NavigateToStdlibSourceRegressionTest.java
@@ -17,11 +17,6 @@
 package org.jetbrains.jet.plugin.libraries;
 
 import com.intellij.openapi.application.ApplicationManager;
-import com.intellij.openapi.module.Module;
-import com.intellij.openapi.roots.ContentEntry;
-import com.intellij.openapi.roots.ModifiableRootModel;
-import com.intellij.openapi.roots.OrderRootType;
-import com.intellij.openapi.roots.libraries.Library;
 import com.intellij.openapi.vfs.VfsUtil;
 import com.intellij.openapi.vfs.VirtualFile;
 import com.intellij.psi.PsiClass;
@@ -31,10 +26,10 @@ import com.intellij.psi.PsiReference;
 import com.intellij.testFramework.LightPlatformTestCase;
 import com.intellij.testFramework.LightProjectDescriptor;
 import org.jetbrains.annotations.NotNull;
-import org.jetbrains.annotations.Nullable;
 import org.jetbrains.jet.lang.psi.JetClass;
 import org.jetbrains.jet.lang.psi.JetPsiUtil;
-import org.jetbrains.jet.plugin.JetWithJdkAndRuntimeLightProjectDescriptor;
+import org.jetbrains.jet.lang.resolve.name.FqName;
+import org.jetbrains.jet.plugin.ProjectDescriptorWithStdlibSources;
 
 import java.io.File;
 import java.io.IOException;
@@ -91,12 +86,14 @@ public class NavigateToStdlibSourceRegressionTest extends NavigateToLibraryRegre
         return psiFile;
     }
 
-    private void checkNavigationElement(@NotNull PsiElement element, @NotNull String expectedName) {
+    private static void checkNavigationElement(@NotNull PsiElement element, @NotNull String expectedName) {
         if (element instanceof PsiClass) {
             assertEquals(expectedName, ((PsiClass) element).getQualifiedName());
         }
         else if (element instanceof JetClass) {
-            assertEquals(expectedName, JetPsiUtil.getFQName((JetClass) element).asString());
+            FqName name = JetPsiUtil.getFQName((JetClass) element);
+            assert name != null;
+            assertEquals(expectedName, name.asString());
         }
         else {
             fail("Navigation element should be JetClass or PsiClass: " + element.getClass() + ", " + element.getText());
@@ -122,19 +119,4 @@ public class NavigateToStdlibSourceRegressionTest extends NavigateToLibraryRegre
     protected LightProjectDescriptor getProjectDescriptor() {
         return ProjectDescriptorWithStdlibSources.INSTANCE;
     }
-
-    private static class ProjectDescriptorWithStdlibSources extends JetWithJdkAndRuntimeLightProjectDescriptor {
-        public static final ProjectDescriptorWithStdlibSources INSTANCE = new ProjectDescriptorWithStdlibSources();
-
-        @Override
-        public void configureModule(@NotNull Module module, @NotNull ModifiableRootModel model, @Nullable ContentEntry contentEntry) {
-            super.configureModule(module, model, contentEntry);
-
-            Library library = model.getModuleLibraryTable().getLibraryByName("myLibrary");
-            assert library != null;
-            Library.ModifiableModel modifiableModel = library.getModifiableModel();
-            modifiableModel.addRoot(VfsUtil.getUrlForLibraryRoot(new File("libraries/stdlib/src")), OrderRootType.SOURCES);
-            modifiableModel.commit();
-        }
-    }
 }