diff --git a/plugins/maven/src/main/java/org/jetbrains/idea/maven/importing/MavenRootModelAdapter.java b/plugins/maven/src/main/java/org/jetbrains/idea/maven/importing/MavenRootModelAdapter.java
index 3a90b371c682..a3232b71538a 100644
--- a/plugins/maven/src/main/java/org/jetbrains/idea/maven/importing/MavenRootModelAdapter.java
+++ b/plugins/maven/src/main/java/org/jetbrains/idea/maven/importing/MavenRootModelAdapter.java
@@ -142,6 +142,7 @@ public class MavenRootModelAdapter {
     Url url = toUrl(path);
     ContentEntry e = getContentRootFor(url);
     if (e == null) return;
+    if (e.getUrl().equals(url.getUrl())) return;
     e.addExcludeFolder(url.getUrl());
   }
 
diff --git a/plugins/maven/src/test/java/org/jetbrains/idea/maven/execution/JavaClasspathConfigurationTest.java b/plugins/maven/src/test/java/org/jetbrains/idea/maven/execution/MavenClasspathConfigurationTest.java
similarity index 99%
rename from plugins/maven/src/test/java/org/jetbrains/idea/maven/execution/JavaClasspathConfigurationTest.java
rename to plugins/maven/src/test/java/org/jetbrains/idea/maven/execution/MavenClasspathConfigurationTest.java
index 3d86fb3cfd3f..eb587e3123b8 100644
--- a/plugins/maven/src/test/java/org/jetbrains/idea/maven/execution/JavaClasspathConfigurationTest.java
+++ b/plugins/maven/src/test/java/org/jetbrains/idea/maven/execution/MavenClasspathConfigurationTest.java
@@ -37,9 +37,9 @@ import java.io.IOException;
 import java.util.ArrayList;
 import java.util.List;
 
-public class JavaClasspathConfigurationTest extends MavenImportingTestCase {
+public class MavenClasspathConfigurationTest extends MavenImportingTestCase {
   public static Test suite() {
-    return new TestSuite(JavaClasspathConfigurationTest.class, "testConfiguringModuleDependencies");
+    return new TestSuite(MavenClasspathConfigurationTest.class, "testConfiguringModuleDependencies");
   }
 
 
diff --git a/plugins/maven/src/test/java/org/jetbrains/idea/maven/importing/FoldersImportingTest.java b/plugins/maven/src/test/java/org/jetbrains/idea/maven/importing/FoldersImportingTest.java
index 928927e39375..4dd3da9d2562 100644
--- a/plugins/maven/src/test/java/org/jetbrains/idea/maven/importing/FoldersImportingTest.java
+++ b/plugins/maven/src/test/java/org/jetbrains/idea/maven/importing/FoldersImportingTest.java
@@ -645,6 +645,25 @@ public class FoldersImportingTest extends MavenImportingTestCase {
                        getProjectPath() + "/target/testCustom");
   }
 
+  public void testDoNotExcludeExcludeOutputDirectoryWhenItPointstoRoot() throws Exception {
+    importProject("<groupId>test</groupId>" +
+                  "<artifactId>project</artifactId>" +
+                  "<version>1</version>" +
+
+                  "<build>" +
+                  "  <outputDirectory>.</outputDirectory>" +
+                  "  <testOutputDirectory>.</testOutputDirectory>" +
+                  "</build>");
+
+    assertModules("project");
+
+    assertExcludes("project",
+                   "target");
+    assertModuleOutput("project",
+                       getProjectPath(),
+                       getProjectPath());
+  }
+
   public void testOutputDirsOutsideOfContentRoot() throws Exception {
     importProject("<groupId>test</groupId>" +
                   "<artifactId>project</artifactId>" +