diff --git a/plugins/spellchecker/spellchecker.iml b/plugins/spellchecker/spellchecker.iml
index 3c976c5f6267..80754d1ebb18 100644
--- a/plugins/spellchecker/spellchecker.iml
+++ b/plugins/spellchecker/spellchecker.iml
@@ -4,6 +4,7 @@
     <exclude-output />
     <content url="file://$MODULE_DIR$">
       <sourceFolder url="file://$MODULE_DIR$/src" isTestSource="false" />
+      <sourceFolder url="file://$MODULE_DIR$/testSrc" isTestSource="true" />
     </content>
     <orderEntry type="inheritedJdk" />
     <orderEntry type="sourceFolder" forTests="false" />
@@ -24,6 +25,7 @@
     <orderEntry type="module" module-name="platform-api" />
     <orderEntry type="module" module-name="platform-impl" />
     <orderEntry type="module" module-name="xml-openapi" />
+    <orderEntry type="module" module-name="testFramework-java" scope="TEST" />
   </component>
 </module>
 
diff --git a/plugins/spellchecker/tests/testData/inspection/classNameWithMistakes/TestUpgade.java b/plugins/spellchecker/testData/inspection/classNameWithMistakes/TestUpgade.java
similarity index 100%
rename from plugins/spellchecker/tests/testData/inspection/classNameWithMistakes/TestUpgade.java
rename to plugins/spellchecker/testData/inspection/classNameWithMistakes/TestUpgade.java
diff --git a/plugins/spellchecker/tests/testData/inspection/commentsWithMistakes/A.xml b/plugins/spellchecker/testData/inspection/commentsWithMistakes/A.xml
similarity index 100%
rename from plugins/spellchecker/tests/testData/inspection/commentsWithMistakes/A.xml
rename to plugins/spellchecker/testData/inspection/commentsWithMistakes/A.xml
diff --git a/plugins/spellchecker/tests/testData/inspection/commentsWithMistakes/SPITest1.java b/plugins/spellchecker/testData/inspection/commentsWithMistakes/SPITest1.java
similarity index 100%
rename from plugins/spellchecker/tests/testData/inspection/commentsWithMistakes/SPITest1.java
rename to plugins/spellchecker/testData/inspection/commentsWithMistakes/SPITest1.java
diff --git a/plugins/spellchecker/tests/testData/inspection/commentsWithMistakes/test.html b/plugins/spellchecker/testData/inspection/commentsWithMistakes/test.html
similarity index 100%
rename from plugins/spellchecker/tests/testData/inspection/commentsWithMistakes/test.html
rename to plugins/spellchecker/testData/inspection/commentsWithMistakes/test.html
diff --git a/plugins/spellchecker/tests/testData/inspection/commentsWithMistakes/test.txt b/plugins/spellchecker/testData/inspection/commentsWithMistakes/test.txt
similarity index 100%
rename from plugins/spellchecker/tests/testData/inspection/commentsWithMistakes/test.txt
rename to plugins/spellchecker/testData/inspection/commentsWithMistakes/test.txt
diff --git a/plugins/spellchecker/tests/testData/inspection/docCommentWithMistakes/SPITest6.java b/plugins/spellchecker/testData/inspection/docCommentWithMistakes/SPITest6.java
similarity index 100%
rename from plugins/spellchecker/tests/testData/inspection/docCommentWithMistakes/SPITest6.java
rename to plugins/spellchecker/testData/inspection/docCommentWithMistakes/SPITest6.java
diff --git a/plugins/spellchecker/tests/testData/inspection/fieldNameWithMistakes/SPITest2.java b/plugins/spellchecker/testData/inspection/fieldNameWithMistakes/SPITest2.java
similarity index 100%
rename from plugins/spellchecker/tests/testData/inspection/fieldNameWithMistakes/SPITest2.java
rename to plugins/spellchecker/testData/inspection/fieldNameWithMistakes/SPITest2.java
diff --git a/plugins/spellchecker/tests/testData/inspection/groovy/Test.groovy b/plugins/spellchecker/testData/inspection/groovy/Test.groovy
similarity index 100%
rename from plugins/spellchecker/tests/testData/inspection/groovy/Test.groovy
rename to plugins/spellchecker/testData/inspection/groovy/Test.groovy
diff --git a/plugins/spellchecker/tests/testData/inspection/js/test.js b/plugins/spellchecker/testData/inspection/js/test.js
similarity index 100%
rename from plugins/spellchecker/tests/testData/inspection/js/test.js
rename to plugins/spellchecker/testData/inspection/js/test.js
diff --git a/plugins/spellchecker/tests/testData/inspection/localVariableNameWithMistakes/SPITest3.java b/plugins/spellchecker/testData/inspection/localVariableNameWithMistakes/SPITest3.java
similarity index 100%
rename from plugins/spellchecker/tests/testData/inspection/localVariableNameWithMistakes/SPITest3.java
rename to plugins/spellchecker/testData/inspection/localVariableNameWithMistakes/SPITest3.java
diff --git a/plugins/spellchecker/tests/testData/inspection/methodNameWithMistakes/SPITest4.java b/plugins/spellchecker/testData/inspection/methodNameWithMistakes/SPITest4.java
similarity index 100%
rename from plugins/spellchecker/tests/testData/inspection/methodNameWithMistakes/SPITest4.java
rename to plugins/spellchecker/testData/inspection/methodNameWithMistakes/SPITest4.java
diff --git a/plugins/spellchecker/tests/testData/inspection/php/test.php b/plugins/spellchecker/testData/inspection/php/test.php
similarity index 100%
rename from plugins/spellchecker/tests/testData/inspection/php/test.php
rename to plugins/spellchecker/testData/inspection/php/test.php
diff --git a/plugins/spellchecker/tests/testData/inspection/stringWithMistakes/SPITest5.java b/plugins/spellchecker/testData/inspection/stringWithMistakes/SPITest5.java
similarity index 100%
rename from plugins/spellchecker/tests/testData/inspection/stringWithMistakes/SPITest5.java
rename to plugins/spellchecker/testData/inspection/stringWithMistakes/SPITest5.java
diff --git a/plugins/spellchecker/tests/testData/inspection/xmlWithMistakes/test.jsp b/plugins/spellchecker/testData/inspection/xmlWithMistakes/test.jsp
similarity index 100%
rename from plugins/spellchecker/tests/testData/inspection/xmlWithMistakes/test.jsp
rename to plugins/spellchecker/testData/inspection/xmlWithMistakes/test.jsp
diff --git a/plugins/spellchecker/tests/testData/inspection/xmlWithMistakes/test.xml b/plugins/spellchecker/testData/inspection/xmlWithMistakes/test.xml
similarity index 100%
rename from plugins/spellchecker/tests/testData/inspection/xmlWithMistakes/test.xml
rename to plugins/spellchecker/testData/inspection/xmlWithMistakes/test.xml
diff --git a/plugins/spellchecker/tests/src/com/intellij/spellchecker/inspection/ClassNameWithMistakesInspectionTest.java b/plugins/spellchecker/testSrc/com/intellij/spellchecker/inspection/ClassNameWithMistakesInspectionTest.java
similarity index 100%
rename from plugins/spellchecker/tests/src/com/intellij/spellchecker/inspection/ClassNameWithMistakesInspectionTest.java
rename to plugins/spellchecker/testSrc/com/intellij/spellchecker/inspection/ClassNameWithMistakesInspectionTest.java
diff --git a/plugins/spellchecker/tests/src/com/intellij/spellchecker/inspection/CommentsWithMistakesInspectionTest.java b/plugins/spellchecker/testSrc/com/intellij/spellchecker/inspection/CommentsWithMistakesInspectionTest.java
similarity index 100%
rename from plugins/spellchecker/tests/src/com/intellij/spellchecker/inspection/CommentsWithMistakesInspectionTest.java
rename to plugins/spellchecker/testSrc/com/intellij/spellchecker/inspection/CommentsWithMistakesInspectionTest.java
diff --git a/plugins/spellchecker/tests/src/com/intellij/spellchecker/inspection/DocCommentWithMistakesInspectionTest.java b/plugins/spellchecker/testSrc/com/intellij/spellchecker/inspection/DocCommentWithMistakesInspectionTest.java
similarity index 100%
rename from plugins/spellchecker/tests/src/com/intellij/spellchecker/inspection/DocCommentWithMistakesInspectionTest.java
rename to plugins/spellchecker/testSrc/com/intellij/spellchecker/inspection/DocCommentWithMistakesInspectionTest.java
diff --git a/plugins/spellchecker/tests/src/com/intellij/spellchecker/inspection/FieldNameWithMistakesInspectionTest.java b/plugins/spellchecker/testSrc/com/intellij/spellchecker/inspection/FieldNameWithMistakesInspectionTest.java
similarity index 100%
rename from plugins/spellchecker/tests/src/com/intellij/spellchecker/inspection/FieldNameWithMistakesInspectionTest.java
rename to plugins/spellchecker/testSrc/com/intellij/spellchecker/inspection/FieldNameWithMistakesInspectionTest.java
diff --git a/plugins/spellchecker/tests/src/com/intellij/spellchecker/inspection/GroovyFileWithTypos.java b/plugins/spellchecker/testSrc/com/intellij/spellchecker/inspection/GroovyFileWithTypos.java
similarity index 100%
rename from plugins/spellchecker/tests/src/com/intellij/spellchecker/inspection/GroovyFileWithTypos.java
rename to plugins/spellchecker/testSrc/com/intellij/spellchecker/inspection/GroovyFileWithTypos.java
diff --git a/plugins/spellchecker/tests/src/com/intellij/spellchecker/inspection/JSFileWithTypos.java b/plugins/spellchecker/testSrc/com/intellij/spellchecker/inspection/JSFileWithTypos.java
similarity index 100%
rename from plugins/spellchecker/tests/src/com/intellij/spellchecker/inspection/JSFileWithTypos.java
rename to plugins/spellchecker/testSrc/com/intellij/spellchecker/inspection/JSFileWithTypos.java
diff --git a/plugins/spellchecker/tests/src/com/intellij/spellchecker/inspection/LocalVariableWithMistakesInspectionTest.java b/plugins/spellchecker/testSrc/com/intellij/spellchecker/inspection/LocalVariableWithMistakesInspectionTest.java
similarity index 100%
rename from plugins/spellchecker/tests/src/com/intellij/spellchecker/inspection/LocalVariableWithMistakesInspectionTest.java
rename to plugins/spellchecker/testSrc/com/intellij/spellchecker/inspection/LocalVariableWithMistakesInspectionTest.java
diff --git a/plugins/spellchecker/tests/src/com/intellij/spellchecker/inspection/MethodNameWithMistakesInspectionTest.java b/plugins/spellchecker/testSrc/com/intellij/spellchecker/inspection/MethodNameWithMistakesInspectionTest.java
similarity index 100%
rename from plugins/spellchecker/tests/src/com/intellij/spellchecker/inspection/MethodNameWithMistakesInspectionTest.java
rename to plugins/spellchecker/testSrc/com/intellij/spellchecker/inspection/MethodNameWithMistakesInspectionTest.java
diff --git a/plugins/spellchecker/tests/src/com/intellij/spellchecker/inspection/PhpFileWithTypos.java b/plugins/spellchecker/testSrc/com/intellij/spellchecker/inspection/PhpFileWithTypos.java
similarity index 100%
rename from plugins/spellchecker/tests/src/com/intellij/spellchecker/inspection/PhpFileWithTypos.java
rename to plugins/spellchecker/testSrc/com/intellij/spellchecker/inspection/PhpFileWithTypos.java
diff --git a/plugins/spellchecker/tests/src/com/intellij/spellchecker/inspection/SpellcheckerInspectionTestCase.java b/plugins/spellchecker/testSrc/com/intellij/spellchecker/inspection/SpellcheckerInspectionTestCase.java
similarity index 100%
rename from plugins/spellchecker/tests/src/com/intellij/spellchecker/inspection/SpellcheckerInspectionTestCase.java
rename to plugins/spellchecker/testSrc/com/intellij/spellchecker/inspection/SpellcheckerInspectionTestCase.java
diff --git a/plugins/spellchecker/tests/src/com/intellij/spellchecker/inspection/StringWithMistakesInspectionTest.java b/plugins/spellchecker/testSrc/com/intellij/spellchecker/inspection/StringWithMistakesInspectionTest.java
similarity index 100%
rename from plugins/spellchecker/tests/src/com/intellij/spellchecker/inspection/StringWithMistakesInspectionTest.java
rename to plugins/spellchecker/testSrc/com/intellij/spellchecker/inspection/StringWithMistakesInspectionTest.java
diff --git a/plugins/spellchecker/tests/src/com/intellij/spellchecker/inspection/XmlWithMistakesInspectionTest.java b/plugins/spellchecker/testSrc/com/intellij/spellchecker/inspection/XmlWithMistakesInspectionTest.java
similarity index 100%
rename from plugins/spellchecker/tests/src/com/intellij/spellchecker/inspection/XmlWithMistakesInspectionTest.java
rename to plugins/spellchecker/testSrc/com/intellij/spellchecker/inspection/XmlWithMistakesInspectionTest.java
diff --git a/plugins/spellchecker/tests/src/com/intellij/spellchecker/inspector/SplitterTest.java b/plugins/spellchecker/testSrc/com/intellij/spellchecker/inspector/SplitterTest.java
similarity index 100%
rename from plugins/spellchecker/tests/src/com/intellij/spellchecker/inspector/SplitterTest.java
rename to plugins/spellchecker/testSrc/com/intellij/spellchecker/inspector/SplitterTest.java