diff --git a/java/java-tests/testSrc/com/intellij/projectView/PackagesTreeStructureTest.java b/java/java-tests/testSrc/com/intellij/projectView/PackagesTreeStructureTest.java
index 149459caa322..2122fdca1f48 100644
--- a/java/java-tests/testSrc/com/intellij/projectView/PackagesTreeStructureTest.java
+++ b/java/java-tests/testSrc/com/intellij/projectView/PackagesTreeStructureTest.java
@@ -21,7 +21,9 @@ import com.intellij.ide.projectView.impl.ProjectAbstractTreeStructureBase;
 import com.intellij.ide.projectView.impl.ProjectViewImpl;
 import com.intellij.lang.properties.projectView.ResourceBundleGrouper;
 import com.intellij.openapi.application.ApplicationManager;
-import com.intellij.openapi.module.impl.ModuleManagerImpl;
+import com.intellij.openapi.application.WriteAction;
+import com.intellij.openapi.module.ModifiableModuleModel;
+import com.intellij.openapi.module.ModuleManager;
 import com.intellij.openapi.util.Disposer;
 import com.intellij.openapi.vfs.VirtualFile;
 import com.intellij.testFramework.PlatformTestUtil;
@@ -35,7 +37,10 @@ import java.io.IOException;
 
 public class PackagesTreeStructureTest extends TestSourceBasedTestCase {
   public void testPackageView() {
-    ModuleManagerImpl.getInstanceImpl(myProject).setModuleGroupPath(myModule, new String[]{"Group"});
+    ModifiableModuleModel moduleModel = ModuleManager.getInstance(myProject).getModifiableModel();
+    moduleModel.setModuleGroupPath(myModule, new String[]{"Group"});
+    WriteAction.runAndWait(() -> moduleModel.commit());
+
     final VirtualFile srcFile = getSrcDirectory().getVirtualFile();
     if (srcFile.findChild("empty") == null){
       ApplicationManager.getApplication().runWriteAction(new Runnable() {
diff --git a/java/java-tests/testSrc/com/intellij/projectView/ProjectTreeStructureTest.java b/java/java-tests/testSrc/com/intellij/projectView/ProjectTreeStructureTest.java
index 50d5d2cca45d..c50b6f411af4 100644
--- a/java/java-tests/testSrc/com/intellij/projectView/ProjectTreeStructureTest.java
+++ b/java/java-tests/testSrc/com/intellij/projectView/ProjectTreeStructureTest.java
@@ -19,8 +19,10 @@ import com.intellij.ide.projectView.PresentationData;
 import com.intellij.ide.util.treeView.AbstractTreeNode;
 import com.intellij.ide.util.treeView.PresentableNodeDescriptor;
 import com.intellij.module.ModuleGroupTestsKt;
+import com.intellij.openapi.application.WriteAction;
+import com.intellij.openapi.module.ModifiableModuleModel;
 import com.intellij.openapi.module.Module;
-import com.intellij.openapi.module.impl.ModuleManagerImpl;
+import com.intellij.openapi.module.ModuleManager;
 import com.intellij.openapi.roots.ModuleRootManager;
 import com.intellij.openapi.ui.Queryable;
 import com.intellij.openapi.util.text.StringUtil;
@@ -146,7 +148,11 @@ public class ProjectTreeStructureTest extends BaseProjectViewTestCase {
     PsiTestUtil.addExcludedRoot(myModule, mainModuleRoot.findFileByRelativePath("src/com/package1/p2"));
 
     Module module = createModule("nested_module");
-    ModuleManagerImpl.getInstanceImpl(myProject).setModuleGroupPath(module, new String[]{"modules"});
+
+    ModifiableModuleModel moduleModel = ModuleManager.getInstance(myProject).getModifiableModel();
+    moduleModel.setModuleGroupPath(module, new String[]{"modules"});
+    WriteAction.runAndWait(() -> moduleModel.commit());
+
     PsiTestUtil.addContentRoot(module, mainModuleRoot.findFileByRelativePath("src/com/package1/p2/p3"));
 
     myStructure.setShowLibraryContents(false);