diff --git a/java/java-tests/testSrc/com/intellij/ide/fileTemplates/FileTemplatesTest.java b/java/java-tests/testSrc/com/intellij/ide/fileTemplates/FileTemplatesTest.java
index 71e38ce271c7..b23241f18256 100644
--- a/java/java-tests/testSrc/com/intellij/ide/fileTemplates/FileTemplatesTest.java
+++ b/java/java-tests/testSrc/com/intellij/ide/fileTemplates/FileTemplatesTest.java
@@ -26,8 +26,9 @@ import java.util.Properties;
 public class FileTemplatesTest extends IdeaTestCase {
   public void testAllTemplates() throws Exception {
     File testsDir = new File(PathManagerEx.getTestDataPath()+"/ide/fileTemplates");
-    final String txt = ".txt";
+    FileTemplateUtil.addResourcesDir(testsDir);
 
+    final String txt = ".txt";
     File[] children = testsDir.listFiles(new FilenameFilter() {
       @Override
       public boolean accept(File dir, String name) {
diff --git a/platform/lang-impl/src/com/intellij/ide/fileTemplates/FileTemplateUtil.java b/platform/lang-impl/src/com/intellij/ide/fileTemplates/FileTemplateUtil.java
index de5be856f649..77a277ac7546 100644
--- a/platform/lang-impl/src/com/intellij/ide/fileTemplates/FileTemplateUtil.java
+++ b/platform/lang-impl/src/com/intellij/ide/fileTemplates/FileTemplateUtil.java
@@ -20,7 +20,6 @@ import com.intellij.ide.IdeBundle;
 import com.intellij.ide.fileTemplates.impl.FileTemplateImpl;
 import com.intellij.openapi.application.ApplicationManager;
 import com.intellij.openapi.application.PathManager;
-import com.intellij.openapi.application.ex.PathManagerEx;
 import com.intellij.openapi.command.CommandProcessor;
 import com.intellij.openapi.diagnostic.Logger;
 import com.intellij.openapi.extensions.Extensions;
@@ -36,7 +35,6 @@ import com.intellij.psi.PsiDirectory;
 import com.intellij.psi.PsiElement;
 import com.intellij.psi.codeStyle.CodeStyleSettingsManager;
 import com.intellij.util.ArrayUtil;
-import org.apache.commons.collections.ExtendedProperties;
 import org.apache.velocity.VelocityContext;
 import org.apache.velocity.app.Velocity;
 import org.apache.velocity.exception.ResourceNotFoundException;
@@ -55,18 +53,18 @@ import org.apache.velocity.runtime.resource.loader.FileResourceLoader;
 import org.jetbrains.annotations.NonNls;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
+import org.jetbrains.annotations.TestOnly;
 
 import java.io.*;
 import java.lang.reflect.Field;
 import java.util.*;
 
-import static com.intellij.util.containers.CollectionFactory.ar;
-
 /**
  * @author MYakovlev
  */
 public class FileTemplateUtil{
   private static final Logger LOG = Logger.getInstance("#com.intellij.ide.fileTemplates.FileTemplateUtil");
+  @NonNls private static final String FILE_RESOURCE_LOADER_INSTANCE = "file.resource.loader.instance";
   private static boolean ourVelocityInitialized = false;
   private static final CreateFromTemplateHandler ourDefaultCreateFromTemplateHandler = new DefaultCreateFromTemplateHandler();
 
@@ -234,7 +232,7 @@ public class FileTemplateUtil{
       Velocity.setProperty(RuntimeConstants.RUNTIME_LOG_LOGSYSTEM, emptyLogSystem);
       Velocity.setProperty(RuntimeConstants.RESOURCE_LOADER, "file,class");
       //todo[myakovlev] implement my own Loader, with ability to load templates from classpath
-      Velocity.setProperty("file.resource.loader.class", MyFileResourceLoader.class.getName());
+      Velocity.setProperty(FILE_RESOURCE_LOADER_INSTANCE, new FileResourceLoader());
       Velocity.setProperty("class.resource.loader.class", MyClasspathResourceLoader.class.getName());
       Velocity.setProperty(RuntimeConstants.FILE_RESOURCE_LOADER_PATH, modifiedPatternsPath.getAbsolutePath());
       Velocity.setProperty(RuntimeConstants.INPUT_ENCODING, FileTemplate.ourEncoding);
@@ -247,6 +245,21 @@ public class FileTemplateUtil{
     }
   }
 
+  @TestOnly
+  public static void addResourcesDir(File dir) {
+    initVelocity();
+    final FileResourceLoader loader = (FileResourceLoader)Velocity.getProperty(FILE_RESOURCE_LOADER_INSTANCE);
+    try {
+      Field pathsField = FileResourceLoader.class.getDeclaredField("paths");
+      pathsField.setAccessible(true);
+      Collection<String> paths = (Collection)pathsField.get(loader);
+      paths.add(dir.getAbsolutePath());
+    }
+    catch (Exception e) {
+      LOG.error(e);
+    }
+  }
+
   public static PsiElement createFromTemplate(@NotNull final FileTemplate template,
                                               @NonNls @Nullable final String fileName,
                                               @Nullable Properties props,
@@ -351,35 +364,6 @@ public class FileTemplateUtil{
     }
   }
 
-  public static class MyFileResourceLoader extends FileResourceLoader{
-    public void init(ExtendedProperties configuration){
-      super.init(configuration);
-
-      File modifiedPatternsPath = new File(PathManager.getConfigPath());
-      modifiedPatternsPath = new File(modifiedPatternsPath, INCLUDES_PATH);
-
-      try {
-        Field pathsField = FileResourceLoader.class.getDeclaredField("paths");
-        pathsField.setAccessible(true);
-        Collection<String> paths = (Collection)pathsField.get(this);
-        paths.clear();
-        paths.add(modifiedPatternsPath.getAbsolutePath());
-        if(ApplicationManager.getApplication().isUnitTestMode()){
-          // todo this is for FileTemplatesTest
-          // todo it should register its own loader and not depend on in what kind of test velocity is first needed
-          for (PathManagerEx.TestDataLookupStrategy strategy : ar(PathManagerEx.TestDataLookupStrategy.COMMUNITY_FROM_ULTIMATE, PathManagerEx.TestDataLookupStrategy.COMMUNITY)) {
-            File testsDir = new File(new File(PathManagerEx.getTestDataPath(strategy), "ide"), "fileTemplates");
-            paths.add(testsDir.getAbsolutePath());
-          }
-        }
-      }
-      catch (Exception e) {
-        LOG.error(e);
-        throw new RuntimeException(e);
-      }
-    }
-  }
-
   public static boolean canCreateFromTemplate (PsiDirectory[] dirs, FileTemplate template) {
     FileType fileType = FileTypeManagerEx.getInstanceEx().getFileTypeByExtension(template.getExtension());
     if (fileType.equals(FileTypes.UNKNOWN)) return false;