diff --git a/java/java-impl/src/com/intellij/ide/projectView/impl/PackageViewPane.java b/java/java-impl/src/com/intellij/ide/projectView/impl/PackageViewPane.java
index 1a0e2c16bda5..9edaa1061777 100644
--- a/java/java-impl/src/com/intellij/ide/projectView/impl/PackageViewPane.java
+++ b/java/java-impl/src/com/intellij/ide/projectView/impl/PackageViewPane.java
@@ -23,6 +23,7 @@ import com.intellij.ide.DeleteProvider;
 import com.intellij.ide.IdeBundle;
 import com.intellij.ide.SelectInTarget;
 import com.intellij.ide.impl.PackagesPaneSelectInTarget;
+import com.intellij.ide.projectView.BaseProjectTreeBuilder;
 import com.intellij.ide.projectView.ProjectView;
 import com.intellij.ide.projectView.ViewSettings;
 import com.intellij.ide.projectView.impl.nodes.PackageElement;
@@ -58,6 +59,8 @@ import javax.swing.tree.DefaultMutableTreeNode;
 import javax.swing.tree.DefaultTreeModel;
 import java.util.*;
 
+import static com.intellij.openapi.application.Experiments.isFeatureEnabled;
+
 public final class PackageViewPane extends AbstractProjectViewPSIPane {
   @NonNls public static final String ID = "PackagesPane";
   private final MyDeletePSIElementProvider myDeletePSIElementProvider = new MyDeletePSIElementProvider();
@@ -354,4 +357,9 @@ public final class PackageViewPane extends AbstractProjectViewPSIPane {
       }
     }
   }
+
+  @Override
+  protected BaseProjectTreeBuilder createBuilder(DefaultTreeModel model) {
+    return isFeatureEnabled("package.view.async.tree.model") ? null : super.createBuilder(model);
+  }
 }
diff --git a/platform/lang-impl/src/com/intellij/ide/projectView/impl/ProjectViewPane.java b/platform/lang-impl/src/com/intellij/ide/projectView/impl/ProjectViewPane.java
index 34b3f064d9ad..a7a8e499bea4 100644
--- a/platform/lang-impl/src/com/intellij/ide/projectView/impl/ProjectViewPane.java
+++ b/platform/lang-impl/src/com/intellij/ide/projectView/impl/ProjectViewPane.java
@@ -33,7 +33,6 @@ import com.intellij.openapi.actionSystem.AnActionEvent;
 import com.intellij.openapi.actionSystem.DefaultActionGroup;
 import com.intellij.openapi.actionSystem.Presentation;
 import com.intellij.openapi.actionSystem.ToggleAction;
-import com.intellij.openapi.application.Experiments;
 import com.intellij.openapi.project.DumbAware;
 import com.intellij.openapi.project.DumbAwareAction;
 import com.intellij.openapi.project.DumbService;
@@ -51,6 +50,8 @@ import javax.swing.*;
 import javax.swing.tree.DefaultTreeModel;
 import java.awt.*;
 
+import static com.intellij.openapi.application.Experiments.isFeatureEnabled;
+
 public class ProjectViewPane extends AbstractProjectViewPSIPane {
   @NonNls public static final String ID = "ProjectPane";
   public static final String SHOW_EXCLUDED_FILES_OPTION = "show-excluded-files";
@@ -265,6 +266,6 @@ public class ProjectViewPane extends AbstractProjectViewPSIPane {
 
   @Override
   protected BaseProjectTreeBuilder createBuilder(DefaultTreeModel model) {
-    return Experiments.isFeatureEnabled("project.view.async.tree.model") ? null : super.createBuilder(model);
+    return isFeatureEnabled("project.view.async.tree.model") ? null : super.createBuilder(model);
   }
 }
diff --git a/resources/src/idea/RichPlatformPlugin.xml b/resources/src/idea/RichPlatformPlugin.xml
index 158e97e7e5e1..b1ebad9dffd8 100644
--- a/resources/src/idea/RichPlatformPlugin.xml
+++ b/resources/src/idea/RichPlatformPlugin.xml
@@ -386,8 +386,11 @@
     <projectStructure.sourceRootEditHandler implementation="com.intellij.openapi.roots.ui.configuration.JavaTestResourceRootEditHandler"/>
 
     <buildProcess.parametersProvider implementation="com.intellij.compiler.CompilerReferenceIndexBuildParametersProvider"/>
-    <experimentalFeature id="project.view.async.tree.model" internalFeature="true" percentOfUsers="10" requireRestart="true">
-      <description>New implementation based on AsyncTreeModel + StructureTreeModel</description>
+    <experimentalFeature id="package.view.async.tree.model" internalFeature="false" percentOfUsers="100" requireRestart="true">
+      <description>New implementation of Package View based on AsyncTreeModel + StructureTreeModel</description>
+    </experimentalFeature>
+    <experimentalFeature id="project.view.async.tree.model" internalFeature="false" percentOfUsers="100" requireRestart="true">
+      <description>New implementation of Project View based on AsyncTreeModel + StructureTreeModel</description>
     </experimentalFeature>
     <experimentalFeature id="structure.view.async.tree.model" internalFeature="false" percentOfUsers="100" requireRestart="false">
       <description>New implementation based on AsyncTreeModel + StructureTreeModel</description>