diff --git a/idea/tests/org/jetbrains/kotlin/idea/codeInsight/generate/AbstractCodeInsightActionTest.kt b/idea/tests/org/jetbrains/kotlin/idea/codeInsight/generate/AbstractCodeInsightActionTest.kt
index 08ce7d224b8..c5f900c06b0 100644
--- a/idea/tests/org/jetbrains/kotlin/idea/codeInsight/generate/AbstractCodeInsightActionTest.kt
+++ b/idea/tests/org/jetbrains/kotlin/idea/codeInsight/generate/AbstractCodeInsightActionTest.kt
@@ -10,6 +10,7 @@ import com.intellij.openapi.actionSystem.AnAction
 import com.intellij.openapi.actionSystem.Presentation
 import com.intellij.openapi.util.io.FileUtil
 import com.intellij.refactoring.util.CommonRefactoringUtil
+import com.intellij.testFramework.LightProjectDescriptor
 import com.intellij.testFramework.PlatformTestUtil
 import com.intellij.testFramework.TestActionEvent
 import junit.framework.ComparisonFailure
@@ -113,5 +114,5 @@ abstract class AbstractCodeInsightActionTest : KotlinLightCodeInsightFixtureTest
         }
     }
 
-    override fun getProjectDescriptor() = KotlinWithJdkAndRuntimeLightProjectDescriptor.INSTANCE
+    override fun getProjectDescriptor(): LightProjectDescriptor = KotlinWithJdkAndRuntimeLightProjectDescriptor.INSTANCE
 }
diff --git a/idea/tests/org/jetbrains/kotlin/idea/codeInsight/generate/AbstractGenerateTestSupportMethodActionTest.kt b/idea/tests/org/jetbrains/kotlin/idea/codeInsight/generate/AbstractGenerateTestSupportMethodActionTest.kt
index 5efaae03728..5afc4ebfc85 100644
--- a/idea/tests/org/jetbrains/kotlin/idea/codeInsight/generate/AbstractGenerateTestSupportMethodActionTest.kt
+++ b/idea/tests/org/jetbrains/kotlin/idea/codeInsight/generate/AbstractGenerateTestSupportMethodActionTest.kt
@@ -5,30 +5,27 @@
 
 package org.jetbrains.kotlin.idea.codeInsight.generate
 
-import com.intellij.openapi.roots.ModuleRootManager
+import com.intellij.openapi.module.ModuleTypeId
+import com.intellij.openapi.projectRoots.Sdk
+import com.intellij.testFramework.LightProjectDescriptor
+import org.jetbrains.jps.model.java.JavaSourceRootType
+import org.jetbrains.jps.model.module.JpsModuleSourceRootType
 import org.jetbrains.kotlin.idea.actions.generate.KotlinGenerateTestSupportActionBase
-import org.jetbrains.kotlin.idea.util.application.runWriteAction
+import org.jetbrains.kotlin.idea.test.PluginTestCaseBase
 import org.jetbrains.kotlin.test.InTextDirectivesUtils
 
 abstract class AbstractGenerateTestSupportMethodActionTest : AbstractCodeInsightActionTest() {
-    private fun setUpTestSourceRoot() {
-        val model = ModuleRootManager.getInstance(module).modifiableModel
-        val entry = model.contentEntries.single()
-        val sourceFolderFile = entry.sourceFolderFiles.single()
-        entry.removeSourceFolder(entry.sourceFolders.single())
-        entry.addSourceFolder(sourceFolderFile, true)
-        runWriteAction {
-            model.commit()
-            module.project.save()
-        }
-    }
-
     override fun createAction(fileText: String) = (super.createAction(fileText) as KotlinGenerateTestSupportActionBase).apply {
         testFrameworkToUse = InTextDirectivesUtils.findStringWithPrefixes(fileText, "// TEST_FRAMEWORK:")
     }
 
-    override fun doTest(path: String) {
-        setUpTestSourceRoot()
-        super.doTest(path)
+    override fun getProjectDescriptor(): LightProjectDescriptor = TEST_ROOT_PROJECT_DESCRIPTOR
+
+    companion object {
+        val TEST_ROOT_PROJECT_DESCRIPTOR = object : LightProjectDescriptor() {
+            override fun getModuleTypeId(): String = ModuleTypeId.JAVA_MODULE
+            override fun getSdk(): Sdk = PluginTestCaseBase.mockJdk()
+            override fun getSourceRootType(): JpsModuleSourceRootType<*> = JavaSourceRootType.TEST_SOURCE
+        }
     }
 }
\ No newline at end of file