diff --git a/platform/external-system-impl/testSrc/com/intellij/openapi/externalSystem/test/ExternalSystemImportingTestCase.java b/platform/external-system-impl/testSrc/com/intellij/openapi/externalSystem/test/ExternalSystemImportingTestCase.java
index a0c230106cf3..100736de2888 100644
--- a/platform/external-system-impl/testSrc/com/intellij/openapi/externalSystem/test/ExternalSystemImportingTestCase.java
+++ b/platform/external-system-impl/testSrc/com/intellij/openapi/externalSystem/test/ExternalSystemImportingTestCase.java
@@ -17,6 +17,7 @@ package com.intellij.openapi.externalSystem.test;
 
 import com.intellij.openapi.application.AccessToken;
 import com.intellij.openapi.application.ApplicationManager;
+import com.intellij.openapi.compiler.ex.CompilerPathsEx;
 import com.intellij.openapi.components.ServiceManager;
 import com.intellij.openapi.externalSystem.importing.ImportSpecBuilder;
 import com.intellij.openapi.externalSystem.model.DataNode;
@@ -194,6 +195,17 @@ public abstract class ExternalSystemImportingTestCase extends ExternalSystemTest
     assertOrderedElementsAreEqual(actual, Arrays.asList(expected));
   }
 
+  protected void assertModuleOutputs(String moduleName, String... outputs) {
+    String[] outputPaths = ContainerUtil.map2Array(CompilerPathsEx.getOutputPaths(new Module[]{getModule(moduleName)}), String.class,
+                                                   new Function<String, String>() {
+                                                     @Override
+                                                     public String fun(String s) {
+                                                       return getAbsolutePath(s);
+                                                     }
+                                                   });
+    assertUnorderedElementsAreEqual(outputPaths, outputs);
+  }
+
   protected void assertModuleOutput(String moduleName, String output, String testOutput) {
     CompilerModuleExtension e = getCompilerExtension(moduleName);
 
diff --git a/plugins/gradle/src/org/jetbrains/plugins/gradle/execution/GradleOrderEnumeratorHandler.java b/plugins/gradle/src/org/jetbrains/plugins/gradle/execution/GradleOrderEnumeratorHandler.java
index 96af1900b7aa..3025ed342a4f 100644
--- a/plugins/gradle/src/org/jetbrains/plugins/gradle/execution/GradleOrderEnumeratorHandler.java
+++ b/plugins/gradle/src/org/jetbrains/plugins/gradle/execution/GradleOrderEnumeratorHandler.java
@@ -123,16 +123,6 @@ public class GradleOrderEnumeratorHandler extends OrderEnumerationHandler {
 
     if (directorySet.isCompilerOutputPathInherited()) return;
     final String path = directorySet.getOutputDir().getAbsolutePath();
-    VirtualFile virtualFile = VirtualFileManager.getInstance().findFileByUrl(path);
-    if (virtualFile == null) {
-      if(!directorySet.getOutputDir().exists()){
-        FileUtil.createDirectory(directorySet.getOutputDir());
-      }
-      ApplicationEx app = (ApplicationEx)ApplicationManager.getApplication();
-      if (app.isDispatchThread() || !app.holdsReadLock()) {
-        LocalFileSystem.getInstance().refreshAndFindFileByIoFile(directorySet.getOutputDir());
-      }
-    }
     result.add(VfsUtilCore.pathToUrl(path));
   }
 }
diff --git a/plugins/gradle/testSources/org/jetbrains/plugins/gradle/importing/GradleFoldersImportingTest.java b/plugins/gradle/testSources/org/jetbrains/plugins/gradle/importing/GradleFoldersImportingTest.java
index 1830602d1b94..5a11188e56f5 100644
--- a/plugins/gradle/testSources/org/jetbrains/plugins/gradle/importing/GradleFoldersImportingTest.java
+++ b/plugins/gradle/testSources/org/jetbrains/plugins/gradle/importing/GradleFoldersImportingTest.java
@@ -38,6 +38,13 @@ public class GradleFoldersImportingTest extends GradleImportingTestCase {
 
     assertDefaultGradleJavaProjectFolders("project");
 
+    assertModuleOutputs("project_main",
+                        getProjectPath() + "/build/classes/main",
+                        getProjectPath() + "/build/resources/main");
+    assertModuleOutputs("project_test",
+                        getProjectPath() + "/build/classes/test",
+                        getProjectPath() + "/build/resources/test");
+
     assertModuleOutput("project_main", getProjectPath() + "/build/classes/main", "");
     assertModuleOutput("project_test", "", getProjectPath() + "/build/classes/test");
   }