diff --git a/java/java-tests/testSrc/com/intellij/codeInsight/template/MacroParserTest.java b/java/java-tests/testSrc/com/intellij/codeInsight/template/MacroParserTest.java
index cb68af469114..16856971d0a7 100644
--- a/java/java-tests/testSrc/com/intellij/codeInsight/template/MacroParserTest.java
+++ b/java/java-tests/testSrc/com/intellij/codeInsight/template/MacroParserTest.java
@@ -10,13 +10,13 @@ import com.intellij.testFramework.LightIdeaTestCase;
 public class MacroParserTest extends LightIdeaTestCase {
 
   public void testEmpty() {
-    Expression e = TemplateImplUtil.parseTemplate("");
+    Expression e = MacroParser.parse("");
     assertTrue(e instanceof ConstantNode);
     assertEquals("", e.calculateResult(null).toString());
   }
 
   public void testFunction() {
-    Expression e = TemplateImplUtil.parseTemplate("  variableOfType(  \"java.util.Collection\"  )   ");
+    Expression e = MacroParser.parse("  variableOfType(  \"java.util.Collection\"  )   ");
     assertTrue(e instanceof MacroCallNode);
     MacroCallNode n = (MacroCallNode) e;
     assertTrue(n.getMacro() instanceof VariableOfTypeMacro);
@@ -28,7 +28,7 @@ public class MacroParserTest extends LightIdeaTestCase {
   }
 
   public void testVariable() {
-    Expression e = TemplateImplUtil.parseTemplate("variableOfType(E=\"t\")");
+    Expression e = MacroParser.parse("variableOfType(E=\"t\")");
     Expression[] parameters = ((MacroCallNode) e).getParameters();
     assertEquals(1, parameters.length);
     assertTrue(parameters [0] instanceof VariableNode);
@@ -38,12 +38,12 @@ public class MacroParserTest extends LightIdeaTestCase {
   }
 
   public void testEnd() {
-    Expression e = TemplateImplUtil.parseTemplate("END");
+    Expression e = MacroParser.parse("END");
     assertTrue(e instanceof EmptyNode);
   }
 
   public void testMultipleParams() {
-    Expression e = TemplateImplUtil.parseTemplate("variableOfType(\"A\", \"B\")");
+    Expression e = MacroParser.parse("variableOfType(\"A\", \"B\")");
     assertTrue(e instanceof MacroCallNode);
     MacroCallNode n = (MacroCallNode) e;
     assertTrue(n.getMacro() instanceof VariableOfTypeMacro);
diff --git a/platform/lang-impl/src/com/intellij/codeInsight/template/impl/MacroParser.java b/platform/lang-impl/src/com/intellij/codeInsight/template/impl/MacroParser.java
index 3728cb6e8787..f204e4817c1d 100644
--- a/platform/lang-impl/src/com/intellij/codeInsight/template/impl/MacroParser.java
+++ b/platform/lang-impl/src/com/intellij/codeInsight/template/impl/MacroParser.java
@@ -16,15 +16,15 @@
 
 package com.intellij.codeInsight.template.impl;
 
+import com.google.common.annotations.VisibleForTesting;
 import com.intellij.codeInsight.template.Expression;
 import com.intellij.codeInsight.template.Macro;
 import com.intellij.codeInsight.template.macro.MacroFactory;
 import com.intellij.lexer.Lexer;
 import com.intellij.psi.tree.IElementType;
 
-class MacroParser {
-  private MacroParser() {
-  }
+@VisibleForTesting
+public class MacroParser {
 
   //-----------------------------------------------------------------------------------
   public static Expression parse(String expression) {
diff --git a/platform/lang-impl/src/com/intellij/codeInsight/template/impl/TemplateImplUtil.java b/platform/lang-impl/src/com/intellij/codeInsight/template/impl/TemplateImplUtil.java
index 822541023bfd..fa429ba39911 100644
--- a/platform/lang-impl/src/com/intellij/codeInsight/template/impl/TemplateImplUtil.java
+++ b/platform/lang-impl/src/com/intellij/codeInsight/template/impl/TemplateImplUtil.java
@@ -16,10 +16,8 @@
 
 package com.intellij.codeInsight.template.impl;
 
-import com.intellij.codeInsight.template.Expression;
 import com.intellij.psi.tree.IElementType;
 import com.intellij.util.containers.hash.LinkedHashMap;
-import org.jetbrains.annotations.NonNls;
 
 /**
  * @author Maxim.Mossienko
@@ -47,8 +45,4 @@ public class TemplateImplUtil {
     }
     return variables;
   }
-
-  public static Expression parseTemplate(@NonNls String text) {
-    return MacroParser.parse(text);
-  }
 }