diff --git a/idea/idea-gradle/tests/org/jetbrains/kotlin/gradle/GradleMultiplatformWizardTest.kt b/idea/idea-gradle/tests/org/jetbrains/kotlin/gradle/GradleMultiplatformWizardTest.kt
index d58022552a8..b682720aaf9 100644
--- a/idea/idea-gradle/tests/org/jetbrains/kotlin/gradle/GradleMultiplatformWizardTest.kt
+++ b/idea/idea-gradle/tests/org/jetbrains/kotlin/gradle/GradleMultiplatformWizardTest.kt
@@ -10,6 +10,7 @@ import org.jetbrains.kotlin.idea.configuration.KotlinGradleMobileMultiplatformMo
 import org.jetbrains.kotlin.idea.configuration.KotlinGradleMobileSharedMultiplatformModuleBuilder
 import org.jetbrains.kotlin.idea.configuration.KotlinGradleSharedMultiplatformModuleBuilder
 import org.jetbrains.kotlin.idea.configuration.KotlinGradleWebMultiplatformModuleBuilder
+import org.jetbrains.kotlin.idea.test.KotlinSdkCreationChecker
 import org.jetbrains.kotlin.konan.target.HostManager
 import org.junit.Test
 
diff --git a/idea/idea-gradle/tests/org/jetbrains/kotlin/idea/codeInsight/gradle/GradleImportingTestCase.kt b/idea/idea-gradle/tests/org/jetbrains/kotlin/idea/codeInsight/gradle/GradleImportingTestCase.kt
index 95954f57f3d..e0d6252414f 100644
--- a/idea/idea-gradle/tests/org/jetbrains/kotlin/idea/codeInsight/gradle/GradleImportingTestCase.kt
+++ b/idea/idea-gradle/tests/org/jetbrains/kotlin/idea/codeInsight/gradle/GradleImportingTestCase.kt
@@ -43,7 +43,7 @@ import org.gradle.util.GradleVersion
 import org.gradle.wrapper.GradleWrapperMain
 import org.intellij.lang.annotations.Language
 import org.jetbrains.annotations.NonNls
-import org.jetbrains.kotlin.gradle.KotlinSdkCreationChecker
+import org.jetbrains.kotlin.idea.test.KotlinSdkCreationChecker
 import org.jetbrains.kotlin.idea.test.PluginTestCaseBase
 import org.jetbrains.kotlin.test.KotlinTestUtils
 import org.jetbrains.plugins.gradle.settings.DistributionType
diff --git a/idea/idea-maven/test/org/jetbrains/kotlin/idea/maven/MavenImportingTestCase.java b/idea/idea-maven/test/org/jetbrains/kotlin/idea/maven/MavenImportingTestCase.java
index e105741e24d..9e97503c81e 100644
--- a/idea/idea-maven/test/org/jetbrains/kotlin/idea/maven/MavenImportingTestCase.java
+++ b/idea/idea-maven/test/org/jetbrains/kotlin/idea/maven/MavenImportingTestCase.java
@@ -50,6 +50,7 @@ import org.jetbrains.jps.model.java.JavaResourceRootType;
 import org.jetbrains.jps.model.java.JavaSourceRootProperties;
 import org.jetbrains.jps.model.java.JavaSourceRootType;
 import org.jetbrains.jps.model.module.JpsModuleSourceRootType;
+import org.jetbrains.kotlin.idea.test.KotlinSdkCreationChecker;
 
 import java.io.File;
 import java.io.IOException;
@@ -60,6 +61,7 @@ public abstract class MavenImportingTestCase extends MavenTestCase {
     protected MavenProjectsTree myProjectsTree;
     protected MavenProjectsManager myProjectsManager;
     private File myGlobalSettingsFile;
+    protected KotlinSdkCreationChecker sdkCreationChecker;
 
     @Override
     protected void setUp() throws Exception {
@@ -70,6 +72,7 @@ public abstract class MavenImportingTestCase extends MavenTestCase {
         if (myGlobalSettingsFile != null) {
             VfsRootAccess.allowRootAccess(myGlobalSettingsFile.getAbsolutePath());
         }
+        sdkCreationChecker = new KotlinSdkCreationChecker();
     }
 
     @Override
@@ -89,6 +92,7 @@ public abstract class MavenImportingTestCase extends MavenTestCase {
             Messages.setTestDialog(TestDialog.DEFAULT);
             removeFromLocalRepository("test");
             FileUtil.delete(BuildManager.getInstance().getBuildSystemDirectory().toFile());
+            sdkCreationChecker.removeNewKotlinSdk();
         }
         finally {
             super.tearDown();
diff --git a/idea/idea-maven/test/org/jetbrains/kotlin/idea/maven/MavenImportingTestCase.java.182 b/idea/idea-maven/test/org/jetbrains/kotlin/idea/maven/MavenImportingTestCase.java.182
index 6debfc30aa9..7e094f1475a 100644
--- a/idea/idea-maven/test/org/jetbrains/kotlin/idea/maven/MavenImportingTestCase.java.182
+++ b/idea/idea-maven/test/org/jetbrains/kotlin/idea/maven/MavenImportingTestCase.java.182
@@ -51,6 +51,7 @@ import org.jetbrains.jps.model.java.JavaResourceRootType;
 import org.jetbrains.jps.model.java.JavaSourceRootProperties;
 import org.jetbrains.jps.model.java.JavaSourceRootType;
 import org.jetbrains.jps.model.module.JpsModuleSourceRootType;
+import org.jetbrains.kotlin.idea.test.KotlinSdkCreationChecker;
 
 import java.io.File;
 import java.io.IOException;
@@ -61,6 +62,7 @@ public abstract class MavenImportingTestCase extends MavenTestCase {
     protected MavenProjectsTree myProjectsTree;
     protected MavenProjectsManager myProjectsManager;
     private File myGlobalSettingsFile;
+    protected KotlinSdkCreationChecker sdkCreationChecker;
 
     @Override
     protected void setUp() throws Exception {
@@ -71,6 +73,7 @@ public abstract class MavenImportingTestCase extends MavenTestCase {
         if (myGlobalSettingsFile != null) {
             VfsRootAccess.allowRootAccess(myGlobalSettingsFile.getAbsolutePath());
         }
+        sdkCreationChecker = new KotlinSdkCreationChecker();
     }
 
     @Override
@@ -90,6 +93,7 @@ public abstract class MavenImportingTestCase extends MavenTestCase {
             Messages.setTestDialog(TestDialog.DEFAULT);
             removeFromLocalRepository("test");
             FileUtil.delete(BuildManager.getInstance().getBuildSystemDirectory().toFile());
+            sdkCreationChecker.removeNewKotlinSdk();
         }
         finally {
             super.tearDown();
diff --git a/idea/idea-test-framework/test/org/jetbrains/kotlin/idea/test/KotlinSdkCreationChecker.kt b/idea/idea-test-framework/test/org/jetbrains/kotlin/idea/test/KotlinSdkCreationChecker.kt
index 62d264de927..7da435792c0 100644
--- a/idea/idea-test-framework/test/org/jetbrains/kotlin/idea/test/KotlinSdkCreationChecker.kt
+++ b/idea/idea-test-framework/test/org/jetbrains/kotlin/idea/test/KotlinSdkCreationChecker.kt
@@ -3,7 +3,7 @@
  * that can be found in the license/LICENSE.txt file.
  */
 
-package org.jetbrains.kotlin.gradle
+package org.jetbrains.kotlin.idea.test
 
 import com.intellij.openapi.application.ApplicationManager
 import com.intellij.openapi.application.runWriteAction