diff --git a/platform/platform-tests/testSrc/com/intellij/openapi/fileEditor/HeavyFileEditorManagerTestCase.java b/platform/platform-tests/testSrc/com/intellij/openapi/fileEditor/HeavyFileEditorManagerTestCase.java
index d98805939615..a8bb1d6b3df6 100644
--- a/platform/platform-tests/testSrc/com/intellij/openapi/fileEditor/HeavyFileEditorManagerTestCase.java
+++ b/platform/platform-tests/testSrc/com/intellij/openapi/fileEditor/HeavyFileEditorManagerTestCase.java
@@ -16,10 +16,8 @@
 package com.intellij.openapi.fileEditor;
 
 import com.intellij.openapi.components.impl.ComponentManagerImpl;
-import com.intellij.openapi.fileEditor.ex.IdeDocumentHistory;
 import com.intellij.openapi.fileEditor.impl.EditorHistoryManager;
 import com.intellij.openapi.fileEditor.impl.FileEditorManagerImpl;
-import com.intellij.openapi.fileEditor.impl.IdeDocumentHistoryImpl;
 import com.intellij.openapi.vfs.LocalFileSystem;
 import com.intellij.openapi.vfs.VirtualFile;
 import com.intellij.testFramework.PlatformTestUtil;
@@ -45,8 +43,6 @@ public abstract class HeavyFileEditorManagerTestCase extends CodeInsightFixtureT
     super.setUp();
     myManager = new FileEditorManagerImpl(getProject(), DockManager.getInstance(getProject()), EditorHistoryManager.getInstance(getProject()));
     ((ComponentManagerImpl)getProject()).registerComponentInstance(FileEditorManager.class, myManager);
-    ((IdeDocumentHistoryImpl)IdeDocumentHistory.getInstance(getProject())).projectOpened();
-    EditorHistoryManager.getInstance(getProject()).projectOpened();
   }
 
   @Override
diff --git a/platform/vcs-impl/testSrc/com/intellij/testFramework/vcs/AbstractVcsTestCase.java b/platform/vcs-impl/testSrc/com/intellij/testFramework/vcs/AbstractVcsTestCase.java
index 6643acfd3803..c4468ae8cb14 100644
--- a/platform/vcs-impl/testSrc/com/intellij/testFramework/vcs/AbstractVcsTestCase.java
+++ b/platform/vcs-impl/testSrc/com/intellij/testFramework/vcs/AbstractVcsTestCase.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2000-2014 JetBrains s.r.o.
+ * Copyright 2000-2015 JetBrains s.r.o.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -19,7 +19,6 @@ import com.intellij.execution.process.ProcessOutput;
 import com.intellij.openapi.Disposable;
 import com.intellij.openapi.application.ApplicationManager;
 import com.intellij.openapi.command.WriteCommandAction;
-import com.intellij.openapi.components.ProjectComponent;
 import com.intellij.openapi.diff.LineTokenizer;
 import com.intellij.openapi.project.Project;
 import com.intellij.openapi.util.Disposer;
@@ -96,11 +95,6 @@ public abstract class AbstractVcsTestCase {
 
     projectCreated();
 
-    if (myInitChangeListManager) {
-      ((ProjectComponent) ChangeListManager.getInstance(myProject)).projectOpened();
-    }
-    ((ProjectComponent) VcsDirtyScopeManager.getInstance(myProject)).projectOpened();
-
     ApplicationManager.getApplication().runWriteAction(new Runnable() {
       @Override
       public void run() {
@@ -165,10 +159,7 @@ public abstract class AbstractVcsTestCase {
 
   protected void tearDownProject() throws Exception {
     if (myProject != null) {
-      ((ProjectComponent) VcsDirtyScopeManager.getInstance(myProject)).projectClosed();
-      ((ProjectComponent) ChangeListManager.getInstance(myProject)).projectClosed();
       ((ChangeListManagerImpl)ChangeListManager.getInstance(myProject)).stopEveryThingIfInTestMode();
-      ((ProjectComponent)ProjectLevelVcsManager.getInstance(myProject)).projectClosed();
       myProject = null;
     }
     if (myProjectFixture != null) {
diff --git a/plugins/svn4idea/testSource/org/jetbrains/idea/svn/IgnoredFilesTest.java b/plugins/svn4idea/testSource/org/jetbrains/idea/svn/IgnoredFilesTest.java
index bded7affdf2c..a58ff1d3910e 100644
--- a/plugins/svn4idea/testSource/org/jetbrains/idea/svn/IgnoredFilesTest.java
+++ b/plugins/svn4idea/testSource/org/jetbrains/idea/svn/IgnoredFilesTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2000-2012 JetBrains s.r.o.
+ * Copyright 2000-2015 JetBrains s.r.o.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -16,7 +16,6 @@
 package org.jetbrains.idea.svn;
 
 import com.intellij.ide.startup.impl.StartupManagerImpl;
-import com.intellij.openapi.components.ProjectComponent;
 import com.intellij.openapi.startup.StartupManager;
 import com.intellij.openapi.util.io.FileUtil;
 import com.intellij.openapi.vcs.FileStatus;
@@ -96,9 +95,6 @@ public class IgnoredFilesTest extends Svn17TestCase {
           myVcsManager = null;
           myVcs = null;
 
-          ((ProjectComponent)myChangeListManager).projectClosed();
-          ((ProjectComponent)myVcsDirtyScopeManager).projectClosed();
-
           tearDownProject();
           if (myTempDirFixture != null) {
             myTempDirFixture.tearDown();
diff --git a/plugins/tasks/tasks-tests/test/com/intellij/tasks/vcs/TaskBranchesTest.java b/plugins/tasks/tasks-tests/test/com/intellij/tasks/vcs/TaskBranchesTest.java
index 38475d68f943..01a59685fa24 100644
--- a/plugins/tasks/tasks-tests/test/com/intellij/tasks/vcs/TaskBranchesTest.java
+++ b/plugins/tasks/tasks-tests/test/com/intellij/tasks/vcs/TaskBranchesTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2000-2014 JetBrains s.r.o.
+ * Copyright 2000-2015 JetBrains s.r.o.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -238,9 +238,7 @@ public abstract class TaskBranchesTest extends PlatformTestCase {
     super.setUp();
     myTaskManager = (TaskManagerImpl)TaskManager.getManager(getProject());
     myChangeListManager = (ChangeListManagerImpl)ChangeListManager.getInstance(getProject());
-    myChangeListManager.projectOpened();
     myDirtyScopeManager = ((VcsDirtyScopeManagerImpl)VcsDirtyScopeManager.getInstance(getProject()));
-    myDirtyScopeManager.projectOpened();
   }
 
   @NotNull