diff --git a/platform/testFramework/testSrc/com/intellij/testFramework/vcs/AbstractVcsTestCase.java b/platform/testFramework/testSrc/com/intellij/testFramework/vcs/AbstractVcsTestCase.java
index 781201316933..906304d3ada0 100644
--- a/platform/testFramework/testSrc/com/intellij/testFramework/vcs/AbstractVcsTestCase.java
+++ b/platform/testFramework/testSrc/com/intellij/testFramework/vcs/AbstractVcsTestCase.java
@@ -73,6 +73,7 @@ public abstract class AbstractVcsTestCase {
     ProjectLevelVcsManager vcsManager = ProjectLevelVcsManager.getInstance(myProject);
     vcsManager.setDirectoryMappings(mappings);
     vcsManager.updateActiveVcss();
+    ChangeListManagerImpl.getInstanceImpl(myProject).waitUntilRefreshed();
   }
 
   protected static void refreshVfs() {
diff --git a/platform/vcs-impl/src/com/intellij/openapi/vcs/impl/projectlevelman/NewMappings.java b/platform/vcs-impl/src/com/intellij/openapi/vcs/impl/projectlevelman/NewMappings.java
index 3f4c9b881f2f..a97aae7069d5 100644
--- a/platform/vcs-impl/src/com/intellij/openapi/vcs/impl/projectlevelman/NewMappings.java
+++ b/platform/vcs-impl/src/com/intellij/openapi/vcs/impl/projectlevelman/NewMappings.java
@@ -19,6 +19,7 @@ import com.intellij.openapi.application.ApplicationManager;
 import com.intellij.openapi.diagnostic.Logger;
 import com.intellij.openapi.project.DumbAwareRunnable;
 import com.intellij.openapi.project.Project;
+import com.intellij.openapi.roots.ProjectRootManager;
 import com.intellij.openapi.ui.MessageType;
 import com.intellij.openapi.util.EmptyRunnable;
 import com.intellij.openapi.util.Pair;
@@ -252,7 +253,8 @@ public class NewMappings {
     if (mapping.getDirectory().length() == 0) {
       return myDefaultVcsRootPolicy.matchesDefaultMapping(file, matchContext);
     }
-    return FileUtil.startsWith(systemIndependPath, mapping.systemIndependentPath());
+    return FileUtil.startsWith(systemIndependPath, mapping.systemIndependentPath()) &&
+           !ProjectRootManager.getInstance(myProject).getFileIndex().isIgnored(file);
   }
 
   public List<VirtualFile> getMappingsAsFilesUnderVcs(final AbstractVcs vcs) {