diff --git a/platform/vcs-tests/testSrc/com/intellij/openapi/vcs/roots/VcsIntegrationEnablerTest.java b/platform/vcs-tests/testSrc/com/intellij/openapi/vcs/roots/VcsIntegrationEnablerTest.java
index 32f794ff20b9..4272c3c0f7ef 100644
--- a/platform/vcs-tests/testSrc/com/intellij/openapi/vcs/roots/VcsIntegrationEnablerTest.java
+++ b/platform/vcs-tests/testSrc/com/intellij/openapi/vcs/roots/VcsIntegrationEnablerTest.java
@@ -32,7 +32,7 @@ import java.io.File;
 import java.util.Collection;
 import java.util.List;
 
-public class VcsIntegrationEnablerTest extends VcsRootPlatformTest {
+public class VcsIntegrationEnablerTest extends VcsRootBaseTest {
 
   private VirtualFile myTestRoot;
 
diff --git a/platform/vcs-impl/testSrc/com/intellij/openapi/vcs/roots/VcsRootPlatformTest.java b/platform/vcs-tests/testSrc/com/intellij/openapi/vcs/roots/VcsRootBaseTest.java
similarity index 98%
rename from platform/vcs-impl/testSrc/com/intellij/openapi/vcs/roots/VcsRootPlatformTest.java
rename to platform/vcs-tests/testSrc/com/intellij/openapi/vcs/roots/VcsRootBaseTest.java
index a0806a72dc4a..d1d13f576b1e 100644
--- a/platform/vcs-impl/testSrc/com/intellij/openapi/vcs/roots/VcsRootPlatformTest.java
+++ b/platform/vcs-tests/testSrc/com/intellij/openapi/vcs/roots/VcsRootBaseTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2000-2015 JetBrains s.r.o.
+ * Copyright 2000-2017 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.
@@ -50,7 +50,7 @@ import java.util.HashSet;
 import static com.intellij.openapi.vcs.Executor.cd;
 import static com.intellij.openapi.vcs.Executor.mkdir;
 
-public abstract class VcsRootPlatformTest extends UsefulTestCase {
+public abstract class VcsRootBaseTest extends UsefulTestCase {
 
   public static final String DOT_MOCK = ".mock";
 
diff --git a/platform/vcs-tests/testSrc/com/intellij/openapi/vcs/roots/VcsRootDetectorTest.java b/platform/vcs-tests/testSrc/com/intellij/openapi/vcs/roots/VcsRootDetectorTest.java
index 2e3fa67ca5e4..672f802a094c 100644
--- a/platform/vcs-tests/testSrc/com/intellij/openapi/vcs/roots/VcsRootDetectorTest.java
+++ b/platform/vcs-tests/testSrc/com/intellij/openapi/vcs/roots/VcsRootDetectorTest.java
@@ -41,7 +41,7 @@ import static com.intellij.openapi.vcs.Executor.mkdir;
  * @author Nadya Zabrodina
  */
 
-public class VcsRootDetectorTest extends VcsRootPlatformTest {
+public class VcsRootDetectorTest extends VcsRootBaseTest {
 
   public void testNoRootsInProject() throws IOException {
     doTest(new VcsRootConfiguration(), null);
diff --git a/platform/vcs-tests/testSrc/com/intellij/openapi/vcs/roots/VcsRootErrorsFinderTest.java b/platform/vcs-tests/testSrc/com/intellij/openapi/vcs/roots/VcsRootErrorsFinderTest.java
index 3fa1f04ba0f0..09f5ac1b4df8 100644
--- a/platform/vcs-tests/testSrc/com/intellij/openapi/vcs/roots/VcsRootErrorsFinderTest.java
+++ b/platform/vcs-tests/testSrc/com/intellij/openapi/vcs/roots/VcsRootErrorsFinderTest.java
@@ -31,7 +31,7 @@ import java.util.Collection;
 /**
  * @author Nadya Zabrodina
  */
-public class VcsRootErrorsFinderTest extends VcsRootPlatformTest {
+public class VcsRootErrorsFinderTest extends VcsRootBaseTest {
 
   static final String PROJECT = VcsDirectoryMapping.PROJECT_CONSTANT;
 
diff --git a/platform/vcs-tests/testSrc/com/intellij/openapi/vcs/roots/VcsRootProblemNotifierTest.kt b/platform/vcs-tests/testSrc/com/intellij/openapi/vcs/roots/VcsRootProblemNotifierTest.kt
index a42f6ceeebe9..be5196e04c8b 100644
--- a/platform/vcs-tests/testSrc/com/intellij/openapi/vcs/roots/VcsRootProblemNotifierTest.kt
+++ b/platform/vcs-tests/testSrc/com/intellij/openapi/vcs/roots/VcsRootProblemNotifierTest.kt
@@ -36,7 +36,7 @@ import com.intellij.openapi.util.io.FileUtil.toSystemDependentName
 import com.intellij.openapi.vcs.VcsConfiguration
 import com.intellij.openapi.vcs.VcsRootChecker
 import com.intellij.openapi.vcs.changes.committed.MockAbstractVcs
-import com.intellij.openapi.vcs.roots.VcsRootPlatformTest.DOT_MOCK
+import com.intellij.openapi.vcs.roots.VcsRootBaseTest.DOT_MOCK
 import com.intellij.openapi.vfs.LocalFileSystem
 import com.intellij.vcs.test.VcsPlatformTest
 import com.intellij.vcsUtil.VcsUtil.getFilePath