diff --git a/compiler/tests/org/jetbrains/jet/CompileBuiltinsTest.java b/compiler/tests/org/jetbrains/jet/CompileBuiltinsTest.java
index 020322e39d0..9f903aac58e 100644
--- a/compiler/tests/org/jetbrains/jet/CompileBuiltinsTest.java
+++ b/compiler/tests/org/jetbrains/jet/CompileBuiltinsTest.java
@@ -22,7 +22,7 @@ import org.junit.Test;
 /**
  * @author Stepan Koltsov
  */
-public class CompileBuiltinsTest extends AnotherTestCaseWithTmpdir {
+public class CompileBuiltinsTest extends TestCaseWithTmpdirIndependentFromIdea {
 
     @Test
     public void compile() {
diff --git a/compiler/tests/org/jetbrains/jet/CompileJdkHeadersTest.java b/compiler/tests/org/jetbrains/jet/CompileJdkHeadersTest.java
index 2e9ff0dfdeb..ac0379464a7 100644
--- a/compiler/tests/org/jetbrains/jet/CompileJdkHeadersTest.java
+++ b/compiler/tests/org/jetbrains/jet/CompileJdkHeadersTest.java
@@ -16,18 +16,13 @@
 
 package org.jetbrains.jet;
 
-import com.intellij.openapi.util.io.FileUtil;
 import org.jetbrains.jet.cli.KotlinCompiler;
-import org.junit.After;
-import org.junit.Before;
 import org.junit.Test;
 
-import java.io.File;
-
 /**
  * @author Stepan Koltsov
  */
-public class CompileJdkHeadersTest extends AnotherTestCaseWithTmpdir {
+public class CompileJdkHeadersTest extends TestCaseWithTmpdirIndependentFromIdea {
 
     @Test
     public void compile() {
diff --git a/compiler/tests/org/jetbrains/jet/AnotherTestCaseWithTmpdir.java b/compiler/tests/org/jetbrains/jet/TestCaseWithTmpdirIndependentFromIdea.java
similarity index 94%
rename from compiler/tests/org/jetbrains/jet/AnotherTestCaseWithTmpdir.java
rename to compiler/tests/org/jetbrains/jet/TestCaseWithTmpdirIndependentFromIdea.java
index 901ac27b2a2..8693fb52c7b 100644
--- a/compiler/tests/org/jetbrains/jet/AnotherTestCaseWithTmpdir.java
+++ b/compiler/tests/org/jetbrains/jet/TestCaseWithTmpdirIndependentFromIdea.java
@@ -25,7 +25,7 @@ import java.io.File;
 /**
  * @author Stepan Koltsov
  */
-public abstract class AnotherTestCaseWithTmpdir {
+public abstract class TestCaseWithTmpdirIndependentFromIdea {
     protected File tmpdir;
 
     @Before