diff --git a/compiler/tests-common/tests/org/jetbrains/kotlin/test/KotlinTestUtils.java.173 b/compiler/tests-common/tests/org/jetbrains/kotlin/test/KotlinTestUtils.java.173
index 2e95577877a..c6d5f1b4edc 100644
--- a/compiler/tests-common/tests/org/jetbrains/kotlin/test/KotlinTestUtils.java.173
+++ b/compiler/tests-common/tests/org/jetbrains/kotlin/test/KotlinTestUtils.java.173
@@ -406,12 +406,17 @@ public class KotlinTestUtils {
     }
 
     @NotNull
-    public static File tmpDirForTest(TestCase test) throws IOException {
-        File answer = normalizeFile(FileUtil.createTempDirectory(test.getClass().getSimpleName(), test.getName()));
+    public static File tmpDirForTest(@NotNull String testClassName, @NotNull String testName) throws IOException {
+        File answer = normalizeFile(FileUtil.createTempDirectory(testClassName, testName));
         deleteOnShutdown(answer);
         return answer;
     }
 
+    @NotNull
+    public static File tmpDirForTest(TestCase test) throws IOException {
+        return tmpDirForTest(test.getClass().getSimpleName(), test.getName());
+    }
+
     @NotNull
     public static File tmpDir(String name) throws IOException {
         // We should use this form. otherwise directory will be deleted on each test.
diff --git a/compiler/tests-common/tests/org/jetbrains/kotlin/test/KotlinTestUtils.java.as31 b/compiler/tests-common/tests/org/jetbrains/kotlin/test/KotlinTestUtils.java.as31
index fb68d356d53..519dc51dd80 100644
--- a/compiler/tests-common/tests/org/jetbrains/kotlin/test/KotlinTestUtils.java.as31
+++ b/compiler/tests-common/tests/org/jetbrains/kotlin/test/KotlinTestUtils.java.as31
@@ -406,12 +406,17 @@ public class KotlinTestUtils {
     }
 
     @NotNull
-    public static File tmpDirForTest(TestCase test) throws IOException {
-        File answer = normalizeFile(FileUtil.createTempDirectory(test.getClass().getSimpleName(), test.getName()));
+    public static File tmpDirForTest(@NotNull String testClassName, @NotNull String testName) throws IOException {
+        File answer = normalizeFile(FileUtil.createTempDirectory(testClassName, testName));
         deleteOnShutdown(answer);
         return answer;
     }
 
+    @NotNull
+    public static File tmpDirForTest(TestCase test) throws IOException {
+        return tmpDirForTest(test.getClass().getSimpleName(), test.getName());
+    }
+
     @NotNull
     public static File tmpDir(String name) throws IOException {
         // We should use this form. otherwise directory will be deleted on each test.
diff --git a/compiler/tests-common/tests/org/jetbrains/kotlin/test/KotlinTestUtils.java.as32 b/compiler/tests-common/tests/org/jetbrains/kotlin/test/KotlinTestUtils.java.as32
index 0ee6a12ff24..56752f08643 100644
--- a/compiler/tests-common/tests/org/jetbrains/kotlin/test/KotlinTestUtils.java.as32
+++ b/compiler/tests-common/tests/org/jetbrains/kotlin/test/KotlinTestUtils.java.as32
@@ -406,12 +406,17 @@ public class KotlinTestUtils {
     }
 
     @NotNull
-    public static File tmpDirForTest(TestCase test) throws IOException {
-        File answer = normalizeFile(FileUtil.createTempDirectory(test.getClass().getSimpleName(), test.getName()));
+    public static File tmpDirForTest(@NotNull String testClassName, @NotNull String testName) throws IOException {
+        File answer = normalizeFile(FileUtil.createTempDirectory(testClassName, testName));
         deleteOnShutdown(answer);
         return answer;
     }
 
+    @NotNull
+    public static File tmpDirForTest(TestCase test) throws IOException {
+        return tmpDirForTest(test.getClass().getSimpleName(), test.getName());
+    }
+
     @NotNull
     public static File tmpDir(String name) throws IOException {
         // We should use this form. otherwise directory will be deleted on each test.