diff --git a/java/java-tests/testSrc/com/intellij/openapi/roots/impl/DirectoryIndexTest.java b/java/java-tests/testSrc/com/intellij/openapi/roots/impl/DirectoryIndexTest.java
index 7173a2318d5a..0a8a30bc0829 100644
--- a/java/java-tests/testSrc/com/intellij/openapi/roots/impl/DirectoryIndexTest.java
+++ b/java/java-tests/testSrc/com/intellij/openapi/roots/impl/DirectoryIndexTest.java
@@ -489,8 +489,8 @@ public class DirectoryIndexTest extends IdeaTestCase {
     checkInfoNull(module2TestOutput);
     
     assertFalse(myIndex.isProjectExcludeRoot(excluded));
-    assertTrue(myIndex.isProjectExcludeRoot(projectOutput));
-    assertTrue(myIndex.isProjectExcludeRoot(module2Output));
+    assertFalse(myIndex.isProjectExcludeRoot(projectOutput));
+    assertFalse(myIndex.isProjectExcludeRoot(module2Output));
     assertFalse(myIndex.isProjectExcludeRoot(module2TestOutput));
 
     excluded.delete(this);
@@ -508,12 +508,10 @@ public class DirectoryIndexTest extends IdeaTestCase {
         
         String fileName = e.getFileName();
         if (fileName.equals("projectOutput")) {
-          //todo fix and uncomment
-//          assertTrue(myIndex.isProjectExcludeRoot(file));
+          assertFalse(myIndex.isProjectExcludeRoot(file));
         }
         if (fileName.equals("module2Output")) {
-          //todo fix and uncomment
-//          assertTrue(myIndex.isProjectExcludeRoot(file));
+          assertFalse(myIndex.isProjectExcludeRoot(file));
         }
         if (fileName.equals("module2TestOutput")) {
           assertFalse(myIndex.isProjectExcludeRoot(file));
@@ -526,10 +524,10 @@ public class DirectoryIndexTest extends IdeaTestCase {
     assertFalse(myIndex.isProjectExcludeRoot(excluded));
     
     projectOutput = myModule1Dir.createChildDirectory(this, projectOutput.getName());
-    assertTrue(myIndex.isProjectExcludeRoot(projectOutput));
+    assertFalse(myIndex.isProjectExcludeRoot(projectOutput));
     
     module2Output = myModule1Dir.createChildDirectory(this, module2Output.getName());
-    assertTrue(myIndex.isProjectExcludeRoot(module2Output));
+    assertFalse(myIndex.isProjectExcludeRoot(module2Output));
     
     module2TestOutput = myModule2Dir.createChildDirectory(this, module2TestOutput.getName());
     assertFalse(myIndex.isProjectExcludeRoot(module2TestOutput));
@@ -542,8 +540,8 @@ public class DirectoryIndexTest extends IdeaTestCase {
     assertEquals(created.toString(), 4, created.size());
 
     assertFalse(myIndex.isProjectExcludeRoot(excluded));
-    assertTrue(myIndex.isProjectExcludeRoot(projectOutput));
-    assertTrue(myIndex.isProjectExcludeRoot(module2Output));
+    assertFalse(myIndex.isProjectExcludeRoot(projectOutput));
+    assertFalse(myIndex.isProjectExcludeRoot(module2Output));
     assertFalse(myIndex.isProjectExcludeRoot(module2TestOutput));
   }
 
diff --git a/platform/platform-resources-en/src/misc/registry.properties b/platform/platform-resources-en/src/misc/registry.properties
index fcd1e2687a5e..0c172ec2e2f6 100644
--- a/platform/platform-resources-en/src/misc/registry.properties
+++ b/platform/platform-resources-en/src/misc/registry.properties
@@ -256,7 +256,7 @@ dump.threads.on.empty.lookup.description=Whether IDEA should issue a thread dump
 
 file.structure.tree.mode=true
 
-directory.index.use.root.index=false
+directory.index.use.root.index=true
 directory.index.use.root.index.description=Requires restart
 directory.index.compare.implementations=false
 directory.index.compare.implementations.description=Will make the IDE slow. Requires restart