diff --git a/plugins/svn4idea/src/org/jetbrains/idea/svn/SvnVcs.java b/plugins/svn4idea/src/org/jetbrains/idea/svn/SvnVcs.java
index 21276d99c35a..0ded70085796 100644
--- a/plugins/svn4idea/src/org/jetbrains/idea/svn/SvnVcs.java
+++ b/plugins/svn4idea/src/org/jetbrains/idea/svn/SvnVcs.java
@@ -579,7 +579,7 @@ public class SvnVcs extends AbstractVcs<CommittedChangeList> {
     final String property = System.getProperty(KEEP_CONNECTIONS_KEY);
     final boolean keep;
     if (StringUtil.isEmptyOrSpaces(property)) {
-      keep = true;  // default
+      keep = ! ApplicationManager.getApplication().isUnitTestMode();  // default
     } else {
       keep = Boolean.getBoolean(KEEP_CONNECTIONS_KEY);
     }
diff --git a/plugins/svn4idea/testSource/org/jetbrains/idea/svn/SvnTestCase.java b/plugins/svn4idea/testSource/org/jetbrains/idea/svn/SvnTestCase.java
index 1c9901b5937b..c0f0ecac7392 100644
--- a/plugins/svn4idea/testSource/org/jetbrains/idea/svn/SvnTestCase.java
+++ b/plugins/svn4idea/testSource/org/jetbrains/idea/svn/SvnTestCase.java
@@ -48,7 +48,7 @@ public abstract class SvnTestCase extends AbstractVcsTestCase {
 
   @Before
   public void setUp() throws Exception {
-    System.setProperty("svnkit.wc.17", "false");
+    //System.setProperty("svnkit.wc.17", "false");
     UIUtil.invokeAndWaitIfNeeded(new Runnable() {
       @Override
       public void run() {