diff --git a/plugins/svn4idea/testSource/org/jetbrains/idea/svn/SvnClientRunner.java b/plugins/svn4idea/testSource/org/jetbrains/idea/svn/SvnClientRunner.java
index 42c62dd1e3e4..74b089a5946f 100644
--- a/plugins/svn4idea/testSource/org/jetbrains/idea/svn/SvnClientRunner.java
+++ b/plugins/svn4idea/testSource/org/jetbrains/idea/svn/SvnClientRunner.java
@@ -40,4 +40,6 @@ public interface SvnClientRunner {
   void delete(VirtualFile root, String path) throws IOException;
 
   void copy(VirtualFile root, String path, String from) throws IOException;
+
+  void testSvnVersion(VirtualFile root) throws IOException;
 }
diff --git a/plugins/svn4idea/testSource/org/jetbrains/idea/svn/SvnClientRunnerImpl.java b/plugins/svn4idea/testSource/org/jetbrains/idea/svn/SvnClientRunnerImpl.java
index f9e063356451..46fefc70aa33 100644
--- a/plugins/svn4idea/testSource/org/jetbrains/idea/svn/SvnClientRunnerImpl.java
+++ b/plugins/svn4idea/testSource/org/jetbrains/idea/svn/SvnClientRunnerImpl.java
@@ -70,4 +70,9 @@ public class SvnClientRunnerImpl implements SvnClientRunner {
   public void copy(VirtualFile root, String path, String from) throws IOException {
     AbstractVcsTestCase.verify(runSvn(root, "copy", path, from));
   }
+
+  @Override
+  public void testSvnVersion(VirtualFile root) throws IOException {
+    AbstractVcsTestCase.verify(runSvn(root, "--version"));
+  }
 }
diff --git a/plugins/svn4idea/testSource/org/jetbrains/idea/svn/SvnTestCase.java b/plugins/svn4idea/testSource/org/jetbrains/idea/svn/SvnTestCase.java
index 4773f42f88ec..acf1369d58d7 100644
--- a/plugins/svn4idea/testSource/org/jetbrains/idea/svn/SvnTestCase.java
+++ b/plugins/svn4idea/testSource/org/jetbrains/idea/svn/SvnTestCase.java
@@ -60,9 +60,11 @@ public abstract class SvnTestCase extends AbstractJunitVcsTestCase  {
   private ChangeListManagerGate myGate;
   protected AtomicSectionsAware myRefreshCopiesStub;
   private TestClientRunner myRunner;
+  protected String myWcrootName;
 
   protected SvnTestCase() {
     PlatformTestCase.initPlatformLangPrefix();
+    myWcrootName = "wcroot";
   }
 
   @Before
@@ -92,7 +94,7 @@ public abstract class SvnTestCase extends AbstractJunitVcsTestCase  {
 
           ZipUtil.extract(new File(pluginRoot, "testData/svn/newrepo.zip"), myRepoRoot, null);
 
-          myWcRoot = new File(myTempDirFixture.getTempDirPath(), "wcroot");
+          myWcRoot = new File(myTempDirFixture.getTempDirPath(), myWcrootName);
           assert myWcRoot.mkdir() || myWcRoot.isDirectory() : myWcRoot;
 
           myRepoUrl = "file:///" + FileUtil.toSystemIndependentName(myRepoRoot.getPath());
diff --git a/plugins/svn4idea/testSource/org/jetbrains/idea/svn/SvnTreeConflictDataTest.java b/plugins/svn4idea/testSource/org/jetbrains/idea/svn/SvnTreeConflictDataTest.java
index 8726fce70f3d..c4baa369fe06 100644
--- a/plugins/svn4idea/testSource/org/jetbrains/idea/svn/SvnTreeConflictDataTest.java
+++ b/plugins/svn4idea/testSource/org/jetbrains/idea/svn/SvnTreeConflictDataTest.java
@@ -49,6 +49,7 @@ public class SvnTreeConflictDataTest extends SvnTestCase {
   @Override
   @Before
   public void setUp() throws Exception {
+    myWcrootName = "wcRootConflictData";
     super.setUp();
     disableSilentOperation(VcsConfiguration.StandardConfirmation.ADD);
 
@@ -120,6 +121,7 @@ public class SvnTreeConflictDataTest extends SvnTestCase {
   }
 
   private String createConflict(final TreeConflictData.Data data) throws Exception {
+    mySvnClientRunner.testSvnVersion(myWorkingCopyDir);
     createSubTree();
 
     final ConflictCreator creator = new ConflictCreator(myProject, myTheirs, myWorkingCopyDir, data, mySvnClientRunner);