diff --git a/platform/diff-impl/intellij.platform.diff.tests.iml b/platform/diff-impl/intellij.platform.diff.tests.iml
index 671641055c8d..60a966d6d9e7 100644
--- a/platform/diff-impl/intellij.platform.diff.tests.iml
+++ b/platform/diff-impl/intellij.platform.diff.tests.iml
@@ -3,7 +3,7 @@
   <component name="NewModuleRootManager" inherit-compiler-output="true">
     <exclude-output />
     <content url="file://$MODULE_DIR$/tests">
-      <sourceFolder url="file://$MODULE_DIR$/tests" isTestSource="true" />
+      <sourceFolder url="file://$MODULE_DIR$/tests/testSrc" isTestSource="true" />
     </content>
     <orderEntry type="inheritedJdk" />
     <orderEntry type="sourceFolder" forTests="false" />
diff --git a/platform/diff-impl/tests/com/intellij/diff/DiffTestCase.kt b/platform/diff-impl/tests/testSrc/com/intellij/diff/DiffTestCase.kt
similarity index 100%
rename from platform/diff-impl/tests/com/intellij/diff/DiffTestCase.kt
rename to platform/diff-impl/tests/testSrc/com/intellij/diff/DiffTestCase.kt
diff --git a/platform/diff-impl/tests/com/intellij/diff/HeavyDiffTestCase.kt b/platform/diff-impl/tests/testSrc/com/intellij/diff/HeavyDiffTestCase.kt
similarity index 100%
rename from platform/diff-impl/tests/com/intellij/diff/HeavyDiffTestCase.kt
rename to platform/diff-impl/tests/testSrc/com/intellij/diff/HeavyDiffTestCase.kt
diff --git a/platform/diff-impl/tests/com/intellij/diff/comparison/BlocksComparisonUtilTest.kt b/platform/diff-impl/tests/testSrc/com/intellij/diff/comparison/BlocksComparisonUtilTest.kt
similarity index 100%
rename from platform/diff-impl/tests/com/intellij/diff/comparison/BlocksComparisonUtilTest.kt
rename to platform/diff-impl/tests/testSrc/com/intellij/diff/comparison/BlocksComparisonUtilTest.kt
diff --git a/platform/diff-impl/tests/com/intellij/diff/comparison/CharComparisonMergeUtilTest.kt b/platform/diff-impl/tests/testSrc/com/intellij/diff/comparison/CharComparisonMergeUtilTest.kt
similarity index 100%
rename from platform/diff-impl/tests/com/intellij/diff/comparison/CharComparisonMergeUtilTest.kt
rename to platform/diff-impl/tests/testSrc/com/intellij/diff/comparison/CharComparisonMergeUtilTest.kt
diff --git a/platform/diff-impl/tests/com/intellij/diff/comparison/CharComparisonUtilTest.kt b/platform/diff-impl/tests/testSrc/com/intellij/diff/comparison/CharComparisonUtilTest.kt
similarity index 100%
rename from platform/diff-impl/tests/com/intellij/diff/comparison/CharComparisonUtilTest.kt
rename to platform/diff-impl/tests/testSrc/com/intellij/diff/comparison/CharComparisonUtilTest.kt
diff --git a/platform/diff-impl/tests/com/intellij/diff/comparison/ComparisonMergeUtilTestBase.kt b/platform/diff-impl/tests/testSrc/com/intellij/diff/comparison/ComparisonMergeUtilTestBase.kt
similarity index 100%
rename from platform/diff-impl/tests/com/intellij/diff/comparison/ComparisonMergeUtilTestBase.kt
rename to platform/diff-impl/tests/testSrc/com/intellij/diff/comparison/ComparisonMergeUtilTestBase.kt
diff --git a/platform/diff-impl/tests/com/intellij/diff/comparison/ComparisonUtilAutoTest.kt b/platform/diff-impl/tests/testSrc/com/intellij/diff/comparison/ComparisonUtilAutoTest.kt
similarity index 100%
rename from platform/diff-impl/tests/com/intellij/diff/comparison/ComparisonUtilAutoTest.kt
rename to platform/diff-impl/tests/testSrc/com/intellij/diff/comparison/ComparisonUtilAutoTest.kt
diff --git a/platform/diff-impl/tests/com/intellij/diff/comparison/ComparisonUtilTest.kt b/platform/diff-impl/tests/testSrc/com/intellij/diff/comparison/ComparisonUtilTest.kt
similarity index 100%
rename from platform/diff-impl/tests/com/intellij/diff/comparison/ComparisonUtilTest.kt
rename to platform/diff-impl/tests/testSrc/com/intellij/diff/comparison/ComparisonUtilTest.kt
diff --git a/platform/diff-impl/tests/com/intellij/diff/comparison/ComparisonUtilTestBase.kt b/platform/diff-impl/tests/testSrc/com/intellij/diff/comparison/ComparisonUtilTestBase.kt
similarity index 100%
rename from platform/diff-impl/tests/com/intellij/diff/comparison/ComparisonUtilTestBase.kt
rename to platform/diff-impl/tests/testSrc/com/intellij/diff/comparison/ComparisonUtilTestBase.kt
diff --git a/platform/diff-impl/tests/com/intellij/diff/comparison/IgnoreComparisonUtilTest.kt b/platform/diff-impl/tests/testSrc/com/intellij/diff/comparison/IgnoreComparisonUtilTest.kt
similarity index 100%
rename from platform/diff-impl/tests/com/intellij/diff/comparison/IgnoreComparisonUtilTest.kt
rename to platform/diff-impl/tests/testSrc/com/intellij/diff/comparison/IgnoreComparisonUtilTest.kt
diff --git a/platform/diff-impl/tests/com/intellij/diff/comparison/LineComparisonMergeUtilTest.kt b/platform/diff-impl/tests/testSrc/com/intellij/diff/comparison/LineComparisonMergeUtilTest.kt
similarity index 100%
rename from platform/diff-impl/tests/com/intellij/diff/comparison/LineComparisonMergeUtilTest.kt
rename to platform/diff-impl/tests/testSrc/com/intellij/diff/comparison/LineComparisonMergeUtilTest.kt
diff --git a/platform/diff-impl/tests/com/intellij/diff/comparison/LineComparisonUtilTest.kt b/platform/diff-impl/tests/testSrc/com/intellij/diff/comparison/LineComparisonUtilTest.kt
similarity index 100%
rename from platform/diff-impl/tests/com/intellij/diff/comparison/LineComparisonUtilTest.kt
rename to platform/diff-impl/tests/testSrc/com/intellij/diff/comparison/LineComparisonUtilTest.kt
diff --git a/platform/diff-impl/tests/com/intellij/diff/comparison/MergeResolveUtilTest.kt b/platform/diff-impl/tests/testSrc/com/intellij/diff/comparison/MergeResolveUtilTest.kt
similarity index 100%
rename from platform/diff-impl/tests/com/intellij/diff/comparison/MergeResolveUtilTest.kt
rename to platform/diff-impl/tests/testSrc/com/intellij/diff/comparison/MergeResolveUtilTest.kt
diff --git a/platform/diff-impl/tests/com/intellij/diff/comparison/SplitComparisonUtilTest.kt b/platform/diff-impl/tests/testSrc/com/intellij/diff/comparison/SplitComparisonUtilTest.kt
similarity index 100%
rename from platform/diff-impl/tests/com/intellij/diff/comparison/SplitComparisonUtilTest.kt
rename to platform/diff-impl/tests/testSrc/com/intellij/diff/comparison/SplitComparisonUtilTest.kt
diff --git a/platform/diff-impl/tests/com/intellij/diff/comparison/TrimUtilTest.kt b/platform/diff-impl/tests/testSrc/com/intellij/diff/comparison/TrimUtilTest.kt
similarity index 100%
rename from platform/diff-impl/tests/com/intellij/diff/comparison/TrimUtilTest.kt
rename to platform/diff-impl/tests/testSrc/com/intellij/diff/comparison/TrimUtilTest.kt
diff --git a/platform/diff-impl/tests/com/intellij/diff/comparison/WordComparisonUtilTest.kt b/platform/diff-impl/tests/testSrc/com/intellij/diff/comparison/WordComparisonUtilTest.kt
similarity index 100%
rename from platform/diff-impl/tests/com/intellij/diff/comparison/WordComparisonUtilTest.kt
rename to platform/diff-impl/tests/testSrc/com/intellij/diff/comparison/WordComparisonUtilTest.kt
diff --git a/platform/diff-impl/tests/com/intellij/diff/comparison/WordMergeComparisonUtilTest.kt b/platform/diff-impl/tests/testSrc/com/intellij/diff/comparison/WordMergeComparisonUtilTest.kt
similarity index 100%
rename from platform/diff-impl/tests/com/intellij/diff/comparison/WordMergeComparisonUtilTest.kt
rename to platform/diff-impl/tests/testSrc/com/intellij/diff/comparison/WordMergeComparisonUtilTest.kt
diff --git a/platform/diff-impl/tests/com/intellij/diff/contents/FragmentContentTest.kt b/platform/diff-impl/tests/testSrc/com/intellij/diff/contents/FragmentContentTest.kt
similarity index 100%
rename from platform/diff-impl/tests/com/intellij/diff/contents/FragmentContentTest.kt
rename to platform/diff-impl/tests/testSrc/com/intellij/diff/contents/FragmentContentTest.kt
diff --git a/platform/diff-impl/tests/com/intellij/diff/merge/MergeAutoTest.kt b/platform/diff-impl/tests/testSrc/com/intellij/diff/merge/MergeAutoTest.kt
similarity index 100%
rename from platform/diff-impl/tests/com/intellij/diff/merge/MergeAutoTest.kt
rename to platform/diff-impl/tests/testSrc/com/intellij/diff/merge/MergeAutoTest.kt
diff --git a/platform/diff-impl/tests/com/intellij/diff/merge/MergeTest.kt b/platform/diff-impl/tests/testSrc/com/intellij/diff/merge/MergeTest.kt
similarity index 100%
rename from platform/diff-impl/tests/com/intellij/diff/merge/MergeTest.kt
rename to platform/diff-impl/tests/testSrc/com/intellij/diff/merge/MergeTest.kt
diff --git a/platform/diff-impl/tests/com/intellij/diff/merge/MergeTestBase.kt b/platform/diff-impl/tests/testSrc/com/intellij/diff/merge/MergeTestBase.kt
similarity index 100%
rename from platform/diff-impl/tests/com/intellij/diff/merge/MergeTestBase.kt
rename to platform/diff-impl/tests/testSrc/com/intellij/diff/merge/MergeTestBase.kt
diff --git a/platform/diff-impl/tests/com/intellij/diff/tools/fragmented/LineNumberConvertorCorrectorTest.kt b/platform/diff-impl/tests/testSrc/com/intellij/diff/tools/fragmented/LineNumberConvertorCorrectorTest.kt
similarity index 100%
rename from platform/diff-impl/tests/com/intellij/diff/tools/fragmented/LineNumberConvertorCorrectorTest.kt
rename to platform/diff-impl/tests/testSrc/com/intellij/diff/tools/fragmented/LineNumberConvertorCorrectorTest.kt
diff --git a/platform/diff-impl/tests/com/intellij/diff/tools/fragmented/LineNumberConvertorTest.kt b/platform/diff-impl/tests/testSrc/com/intellij/diff/tools/fragmented/LineNumberConvertorTest.kt
similarity index 100%
rename from platform/diff-impl/tests/com/intellij/diff/tools/fragmented/LineNumberConvertorTest.kt
rename to platform/diff-impl/tests/testSrc/com/intellij/diff/tools/fragmented/LineNumberConvertorTest.kt
diff --git a/platform/diff-impl/tests/com/intellij/diff/tools/fragmented/UnifiedFragmentBuilderAutoTest.kt b/platform/diff-impl/tests/testSrc/com/intellij/diff/tools/fragmented/UnifiedFragmentBuilderAutoTest.kt
similarity index 100%
rename from platform/diff-impl/tests/com/intellij/diff/tools/fragmented/UnifiedFragmentBuilderAutoTest.kt
rename to platform/diff-impl/tests/testSrc/com/intellij/diff/tools/fragmented/UnifiedFragmentBuilderAutoTest.kt
diff --git a/platform/diff-impl/tests/com/intellij/diff/tools/fragmented/UnifiedFragmentBuilderTest.kt b/platform/diff-impl/tests/testSrc/com/intellij/diff/tools/fragmented/UnifiedFragmentBuilderTest.kt
similarity index 100%
rename from platform/diff-impl/tests/com/intellij/diff/tools/fragmented/UnifiedFragmentBuilderTest.kt
rename to platform/diff-impl/tests/testSrc/com/intellij/diff/tools/fragmented/UnifiedFragmentBuilderTest.kt
diff --git a/platform/diff-impl/tests/com/intellij/diff/tools/util/PrevNextIterableTest.kt b/platform/diff-impl/tests/testSrc/com/intellij/diff/tools/util/PrevNextIterableTest.kt
similarity index 100%
rename from platform/diff-impl/tests/com/intellij/diff/tools/util/PrevNextIterableTest.kt
rename to platform/diff-impl/tests/testSrc/com/intellij/diff/tools/util/PrevNextIterableTest.kt
diff --git a/platform/diff-impl/tests/com/intellij/diff/util/DiffPerformanceTest.kt b/platform/diff-impl/tests/testSrc/com/intellij/diff/util/DiffPerformanceTest.kt
similarity index 100%
rename from platform/diff-impl/tests/com/intellij/diff/util/DiffPerformanceTest.kt
rename to platform/diff-impl/tests/testSrc/com/intellij/diff/util/DiffPerformanceTest.kt
diff --git a/platform/diff-impl/tests/com/intellij/diff/util/DiffUtilTest.kt b/platform/diff-impl/tests/testSrc/com/intellij/diff/util/DiffUtilTest.kt
similarity index 100%
rename from platform/diff-impl/tests/com/intellij/diff/util/DiffUtilTest.kt
rename to platform/diff-impl/tests/testSrc/com/intellij/diff/util/DiffUtilTest.kt
diff --git a/platform/diff-impl/tests/com/intellij/diff/util/LineOffsetsTest.kt b/platform/diff-impl/tests/testSrc/com/intellij/diff/util/LineOffsetsTest.kt
similarity index 100%
rename from platform/diff-impl/tests/com/intellij/diff/util/LineOffsetsTest.kt
rename to platform/diff-impl/tests/testSrc/com/intellij/diff/util/LineOffsetsTest.kt
diff --git a/platform/diff-impl/tests/com/intellij/openapi/diff/impl/settings/DiffColorSettingsTest.kt b/platform/diff-impl/tests/testSrc/com/intellij/openapi/diff/impl/settings/DiffColorSettingsTest.kt
similarity index 100%
rename from platform/diff-impl/tests/com/intellij/openapi/diff/impl/settings/DiffColorSettingsTest.kt
rename to platform/diff-impl/tests/testSrc/com/intellij/openapi/diff/impl/settings/DiffColorSettingsTest.kt