diff --git a/idea/idea-analysis/src/org/jetbrains/jet/plugin/stubindex/JetSourceFilterScope.java b/idea/idea-analysis/src/org/jetbrains/jet/plugin/stubindex/JetSourceFilterScope.java
index ee48b5fb045..c17a72a863d 100644
--- a/idea/idea-analysis/src/org/jetbrains/jet/plugin/stubindex/JetSourceFilterScope.java
+++ b/idea/idea-analysis/src/org/jetbrains/jet/plugin/stubindex/JetSourceFilterScope.java
@@ -59,6 +59,6 @@ public class JetSourceFilterScope extends DelegatingGlobalSearchScope {
             return false;
         }
 
-        return ProjectRootsUtil.isInSources(project, file, /* includeTestSources */ false, includeLibraries, /* withLibraryClassesRoots */ true, index);
+        return ProjectRootsUtil.isInSources(project, file, /* includeTestSources */  includeLibraries, /* withLibraryClassesRoots */ true, index);
     }
 }
diff --git a/idea/idea-analysis/src/org/jetbrains/jet/plugin/util/ProjectRootsUtil.kt b/idea/idea-analysis/src/org/jetbrains/jet/plugin/util/ProjectRootsUtil.kt
index 6267e127afd..ce8b2423ac3 100644
--- a/idea/idea-analysis/src/org/jetbrains/jet/plugin/util/ProjectRootsUtil.kt
+++ b/idea/idea-analysis/src/org/jetbrains/jet/plugin/util/ProjectRootsUtil.kt
@@ -20,7 +20,6 @@ import com.intellij.openapi.roots.ProjectFileIndex
 import com.intellij.psi.PsiElement
 import kotlin.platform.platformStatic
 import org.jetbrains.jet.plugin.util.application.runReadAction
-import org.jetbrains.jet.plugin.stubindex.JetSourceFilterScope
 import org.jetbrains.jet.plugin.configuration.JetModuleTypeManager
 import com.intellij.openapi.project.Project
 import com.intellij.openapi.vfs.VirtualFile
@@ -28,10 +27,12 @@ import com.intellij.psi.PsiDirectory
 
 public object ProjectRootsUtil {
     platformStatic
-    public fun isInSources(project: Project, file: VirtualFile,
-                           includeTestSources: Boolean, includeLibrarySources: Boolean, withLibraryClassesRoots: Boolean,
+    public fun isInSources(project: Project,
+                           file: VirtualFile,
+                           includeLibrarySources: Boolean,
+                           withLibraryClassesRoots: Boolean,
                            fileIndex: ProjectFileIndex = ProjectFileIndex.SERVICE.getInstance(project)): Boolean {
-        if (fileIndex.isInSourceContent(file) || (includeTestSources && fileIndex.isInTestSourceContent(file))) {
+        if (fileIndex.isInSourceContent(file)) {
             return !JetModuleTypeManager.getInstance()!!.isKtFileInGradleProjectInWrongFolder(file, project)
         }
 
@@ -44,7 +45,6 @@ public object ProjectRootsUtil {
     public fun isInSource(
             element: PsiElement,
             includeLibrarySources: Boolean,
-            includeTestSources: Boolean = false,
             withLibraryClassesRoots: Boolean = false
     ): Boolean {
         return runReadAction { (): Boolean ->
@@ -54,7 +54,7 @@ public object ProjectRootsUtil {
                               } ?: return@runReadAction false
 
             val project = element.getProject()
-            return@runReadAction isInSources(project, virtualFile, includeTestSources, includeLibrarySources, withLibraryClassesRoots)
+            return@runReadAction isInSources(project, virtualFile, includeLibrarySources, withLibraryClassesRoots)
         }
     }
 
diff --git a/idea/src/org/jetbrains/jet/plugin/quickfix/createFromUsage/createClass/createClassUtils.kt b/idea/src/org/jetbrains/jet/plugin/quickfix/createFromUsage/createClass/createClassUtils.kt
index 92ba8106b28..de2a21cd05d 100644
--- a/idea/src/org/jetbrains/jet/plugin/quickfix/createFromUsage/createClass/createClassUtils.kt
+++ b/idea/src/org/jetbrains/jet/plugin/quickfix/createFromUsage/createClass/createClassUtils.kt
@@ -100,7 +100,7 @@ private fun PsiElement.canRefactor(): Boolean {
         is PsiPackage ->
             getDirectories().any { it.canRefactor() }
         is JetElement, is PsiDirectory ->
-            isWritable() && ProjectRootsUtil.isInSource(element = this, includeLibrarySources = false, includeTestSources = true)
+            isWritable() && ProjectRootsUtil.isInSource(element = this, includeLibrarySources = false)
         else ->
             false
     }