diff --git a/compiler/tests/org/jetbrains/jet/CompileJavaAgainstKotlinTest.java b/compiler/tests/org/jetbrains/jet/CompileJavaAgainstKotlinTest.java
index 8bb9e576bc6..b856970872d 100644
--- a/compiler/tests/org/jetbrains/jet/CompileJavaAgainstKotlinTest.java
+++ b/compiler/tests/org/jetbrains/jet/CompileJavaAgainstKotlinTest.java
@@ -53,7 +53,7 @@ public class CompileJavaAgainstKotlinTest extends UsefulTestCase {
     @Override
     protected void setUp() throws Exception {
         super.setUp();
-        tmpdir = new File("tmp/" + this.getClass().getSimpleName() + "." + this.getName());
+        tmpdir = JetTestUtils.tmpDirForTest(this);
         JetTestUtils.recreateDirectory(tmpdir);
     }
 
diff --git a/compiler/tests/org/jetbrains/jet/JetTestUtils.java b/compiler/tests/org/jetbrains/jet/JetTestUtils.java
index dc777e336fa..468862c1852 100644
--- a/compiler/tests/org/jetbrains/jet/JetTestUtils.java
+++ b/compiler/tests/org/jetbrains/jet/JetTestUtils.java
@@ -2,6 +2,7 @@ package org.jetbrains.jet;
 
 import com.google.common.collect.Lists;
 import com.intellij.openapi.Disposable;
+import junit.framework.TestCase;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.jet.lang.cfg.pseudocode.JetControlFlowDataTraceFactory;
 import org.jetbrains.jet.lang.diagnostics.Diagnostic;
@@ -166,6 +167,10 @@ public class JetTestUtils {
             file.delete();
         }
     }
+    
+    public static File tmpDirForTest(TestCase test) {
+        return new File("tmp/" + test.getClass().getSimpleName() + "/" + test.getName());
+    }
 
     public static void recreateDirectory(File file) throws IOException {
         rmrf(file);
diff --git a/compiler/tests/org/jetbrains/jet/ReadClassDataTest.java b/compiler/tests/org/jetbrains/jet/ReadClassDataTest.java
index d7e988b9052..abc9bab89f8 100644
--- a/compiler/tests/org/jetbrains/jet/ReadClassDataTest.java
+++ b/compiler/tests/org/jetbrains/jet/ReadClassDataTest.java
@@ -62,7 +62,7 @@ public class ReadClassDataTest extends UsefulTestCase {
     @Override
     protected void setUp() throws Exception {
         super.setUp();
-        tmpdir = new File("tmp/" + this.getClass().getSimpleName() + "." + this.getName());
+        tmpdir = JetTestUtils.tmpDirForTest(this);
         JetTestUtils.recreateDirectory(tmpdir);
     }