diff --git a/compiler/tests/org/jetbrains/kotlin/checkers/KotlinMultiFileTestWithJava.java b/compiler/tests/org/jetbrains/kotlin/checkers/KotlinMultiFileTestWithJava.java
index ce03708e236..6e62d34fa9c 100644
--- a/compiler/tests/org/jetbrains/kotlin/checkers/KotlinMultiFileTestWithJava.java
+++ b/compiler/tests/org/jetbrains/kotlin/checkers/KotlinMultiFileTestWithJava.java
@@ -16,6 +16,7 @@
 
 package org.jetbrains.kotlin.checkers;
 
+import com.intellij.openapi.util.io.FileUtil;
 import kotlin.collections.CollectionsKt;
 import kotlin.io.FilesKt;
 import kotlin.text.Charsets;
@@ -70,6 +71,12 @@ public abstract class KotlinMultiFileTestWithJava<M, F> extends KotlinTestWithEn
         return KotlinCoreEnvironment.createForTests(getTestRootDisposable(), configuration, getEnvironmentConfigFiles());
     }
 
+    @Override
+    protected void removeEnvironment() throws Exception {
+        if (javaFilesDir != null) FileUtil.delete(javaFilesDir);
+        if (kotlinSourceRoot != null) FileUtil.delete(kotlinSourceRoot);
+    }
+
     @NotNull
     protected ConfigurationKind getConfigurationKind() {
         return ConfigurationKind.MOCK_RUNTIME;
diff --git a/compiler/tests/org/jetbrains/kotlin/test/KotlinTestWithEnvironment.java b/compiler/tests/org/jetbrains/kotlin/test/KotlinTestWithEnvironment.java
index 11b78ae94fe..c36bbcd6913 100644
--- a/compiler/tests/org/jetbrains/kotlin/test/KotlinTestWithEnvironment.java
+++ b/compiler/tests/org/jetbrains/kotlin/test/KotlinTestWithEnvironment.java
@@ -31,11 +31,13 @@ public abstract class KotlinTestWithEnvironment extends KotlinTestWithEnvironmen
 
     @Override
     protected void tearDown() throws Exception {
+        removeEnvironment();
         environment = null;
         super.tearDown();
     }
 
     protected abstract KotlinCoreEnvironment createEnvironment() throws Exception;
+    protected void removeEnvironment() throws Exception {}
 
     @NotNull
     public KotlinCoreEnvironment getEnvironment() {