diff --git a/plugins/svn4idea/testSource/org/jetbrains/idea/svn17/SvnCommittedViewTest.java b/plugins/svn4idea/testSource/org/jetbrains/idea/svn17/SvnCommittedViewTest.java
index 5042d6f4a18a..ae707d1e2b5f 100644
--- a/plugins/svn4idea/testSource/org/jetbrains/idea/svn17/SvnCommittedViewTest.java
+++ b/plugins/svn4idea/testSource/org/jetbrains/idea/svn17/SvnCommittedViewTest.java
@@ -1,6 +1,7 @@
 package org.jetbrains.idea.svn17;
 
 import com.intellij.openapi.util.Comparing;
+import com.intellij.openapi.util.io.FileUtil;
 import com.intellij.openapi.vcs.CommittedChangesProvider;
 import com.intellij.openapi.vcs.FileStatus;
 import com.intellij.openapi.vcs.VcsConfiguration;
@@ -13,6 +14,7 @@ import org.jetbrains.annotations.Nullable;
 import org.jetbrains.idea.svn17.history.SvnChangeList;
 import org.jetbrains.idea.svn17.history.SvnRepositoryLocation;
 import org.junit.Assert;
+import org.junit.Before;
 import org.junit.Test;
 
 import java.io.File;
@@ -21,6 +23,12 @@ import java.util.Collection;
 import java.util.List;
 
 public class SvnCommittedViewTest extends SvnTestCase {
+  @Override
+  @Before
+  public void setUp() throws Exception {
+    super.setUp();
+    SvnConfiguration17.getInstance(myProject).DETECT_NESTED_COPIES = false;
+  }
 
   @Test
   public void testAdd() throws Exception {
@@ -36,6 +44,7 @@ public class SvnCommittedViewTest extends SvnTestCase {
     checkin();
 
     final SvnVcs17 vcs = SvnVcs17.getInstance(myProject);
+    vcs.invokeRefreshSvnRoots(false);
     final CommittedChangesProvider<SvnChangeList,ChangeBrowserSettings> committedChangesProvider = vcs.getCommittedChangesProvider();
     final List<SvnChangeList> changeListList =
       committedChangesProvider.getCommittedChanges(committedChangesProvider.createDefaultSettings(),
@@ -67,6 +76,7 @@ public class SvnCommittedViewTest extends SvnTestCase {
     checkin();
 
     final SvnVcs17 vcs = SvnVcs17.getInstance(myProject);
+    vcs.invokeRefreshSvnRoots(false);
     final CommittedChangesProvider<SvnChangeList,ChangeBrowserSettings> committedChangesProvider = vcs.getCommittedChangesProvider();
     final List<SvnChangeList> changeListList =
       committedChangesProvider.getCommittedChanges(committedChangesProvider.createDefaultSettings(),
@@ -88,13 +98,17 @@ public class SvnCommittedViewTest extends SvnTestCase {
     // r1, addition without history
     checkin();
 
-    final String d1Path = new File(d1.getPath()).getAbsolutePath();
+    File dir = new File(d1.getPath());
+    final String d1Path = dir.getAbsolutePath();
     verify(runSvn("delete", d1Path));
+    boolean created = dir.mkdir();
+    Assert.assertTrue(created);
     verify(runSvn("add", d1Path));
 
     checkin();
 
     final SvnVcs17 vcs = SvnVcs17.getInstance(myProject);
+    vcs.invokeRefreshSvnRoots(false);
     final CommittedChangesProvider<SvnChangeList,ChangeBrowserSettings> committedChangesProvider = vcs.getCommittedChangesProvider();
     final List<SvnChangeList> changeListList =
       committedChangesProvider.getCommittedChanges(committedChangesProvider.createDefaultSettings(),
@@ -123,6 +137,7 @@ public class SvnCommittedViewTest extends SvnTestCase {
     checkin();
 
     final SvnVcs17 vcs = SvnVcs17.getInstance(myProject);
+    vcs.invokeRefreshSvnRoots(false);
     final CommittedChangesProvider<SvnChangeList,ChangeBrowserSettings> committedChangesProvider = vcs.getCommittedChangesProvider();
     final List<SvnChangeList> changeListList =
       committedChangesProvider.getCommittedChanges(committedChangesProvider.createDefaultSettings(),
@@ -155,6 +170,7 @@ public class SvnCommittedViewTest extends SvnTestCase {
     checkin();
 
     final SvnVcs17 vcs = SvnVcs17.getInstance(myProject);
+    vcs.invokeRefreshSvnRoots(false);
     final CommittedChangesProvider<SvnChangeList,ChangeBrowserSettings> committedChangesProvider = vcs.getCommittedChangesProvider();
     final List<SvnChangeList> changeListList =
       committedChangesProvider.getCommittedChanges(committedChangesProvider.createDefaultSettings(),
@@ -180,6 +196,7 @@ public class SvnCommittedViewTest extends SvnTestCase {
     verify(runSvn("copy", "-m", "test", myRepoUrl + "/trunk", myRepoUrl + "/branch"));
 
     final SvnVcs17 vcs = SvnVcs17.getInstance(myProject);
+    vcs.invokeRefreshSvnRoots(false);
     final CommittedChangesProvider<SvnChangeList,ChangeBrowserSettings> committedChangesProvider = vcs.getCommittedChangesProvider();
     final List<SvnChangeList> changeListList =
       committedChangesProvider.getCommittedChanges(committedChangesProvider.createDefaultSettings(),
@@ -209,6 +226,7 @@ public class SvnCommittedViewTest extends SvnTestCase {
     checkin();
 
     final SvnVcs17 vcs = SvnVcs17.getInstance(myProject);
+    vcs.invokeRefreshSvnRoots(false);
     final CommittedChangesProvider<SvnChangeList,ChangeBrowserSettings> committedChangesProvider = vcs.getCommittedChangesProvider();
     final List<SvnChangeList> changeListList =
       committedChangesProvider.getCommittedChanges(committedChangesProvider.createDefaultSettings(),
diff --git a/plugins/svn4idea/testSource/org/jetbrains/idea/svn17/SvnRenameTest.java b/plugins/svn4idea/testSource/org/jetbrains/idea/svn17/SvnRenameTest.java
index 41e4b818363a..8c3363fae655 100644
--- a/plugins/svn4idea/testSource/org/jetbrains/idea/svn17/SvnRenameTest.java
+++ b/plugins/svn4idea/testSource/org/jetbrains/idea/svn17/SvnRenameTest.java
@@ -96,6 +96,10 @@ public class SvnRenameTest extends SvnTestCase {
     verifyChange(changes.get(3), "child" + File.separatorChar + "grandChild" + File.separatorChar + "b.txt", "childnew" + File.separatorChar + "grandChild" + File.separatorChar + "b.txt");
 
     VirtualFile oldChild = myWorkingCopyDir.findChild("child");
+    if (oldChild == null) {
+      myWorkingCopyDir.refresh(false, true);
+      oldChild = myWorkingCopyDir.findChild("child");
+    }
     Assert.assertEquals(FileStatus.DELETED, changeListManager.getStatus(oldChild));
   }