diff --git a/compiler/tests/org/jetbrains/jet/test/generator/SimpleTestMethodModel.java b/compiler/tests/org/jetbrains/jet/test/generator/SimpleTestMethodModel.java
index 1fa3ea2d2e6..298db910aea 100644
--- a/compiler/tests/org/jetbrains/jet/test/generator/SimpleTestMethodModel.java
+++ b/compiler/tests/org/jetbrains/jet/test/generator/SimpleTestMethodModel.java
@@ -53,22 +53,6 @@ public class SimpleTestMethodModel implements TestMethodModel {
             String relativePath = FileUtil.getRelativePath(rootDir, file.getParentFile());
             unescapedName = relativePath + "-" + StringUtil.capitalize(fileName);
         }
-        return "test" + escapeForMethodName(StringUtil.capitalize(unescapedName));
-    }
-
-    private static String escapeForMethodName(String fileName) {
-        // A file name may contain characters (like ".") that can't be a part of method name
-        StringBuilder result = new StringBuilder();
-        for (int i = 0; i < fileName.length(); i++) {
-            char c = fileName.charAt(i);
-
-            if (Character.isJavaIdentifierPart(c)) {
-                result.append(c);
-            }
-            else {
-                result.append("_");
-            }
-        }
-        return result.toString();
+        return "test" + TestGeneratorUtil.escapeForJavaIdentifier(StringUtil.capitalize(unescapedName));
     }
 }
diff --git a/compiler/tests/org/jetbrains/jet/test/generator/TestGeneratorUtil.java b/compiler/tests/org/jetbrains/jet/test/generator/TestGeneratorUtil.java
new file mode 100644
index 00000000000..d49665e2078
--- /dev/null
+++ b/compiler/tests/org/jetbrains/jet/test/generator/TestGeneratorUtil.java
@@ -0,0 +1,38 @@
+/*
+ * Copyright 2010-2012 JetBrains s.r.o.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.jetbrains.jet.test.generator;
+
+/**
+ * @author abreslav
+ */
+public class TestGeneratorUtil {
+    public static String escapeForJavaIdentifier(String fileName) {
+        // A file name may contain characters (like ".") that can't be a part of method name
+        StringBuilder result = new StringBuilder();
+        for (int i = 0; i < fileName.length(); i++) {
+            char c = fileName.charAt(i);
+
+            if (Character.isJavaIdentifierPart(c)) {
+                result.append(c);
+            }
+            else {
+                result.append("_");
+            }
+        }
+        return result.toString();
+    }
+}