diff --git a/java/java-tests/testSrc/com/intellij/psi/autodetect/AbstractNewLineBlocksIteratorTest.java b/java/java-tests/testSrc/com/intellij/psi/codeStyle/autodetect/AbstractNewLineBlocksIteratorTest.java
similarity index 98%
rename from java/java-tests/testSrc/com/intellij/psi/autodetect/AbstractNewLineBlocksIteratorTest.java
rename to java/java-tests/testSrc/com/intellij/psi/codeStyle/autodetect/AbstractNewLineBlocksIteratorTest.java
index 2b6350e05e1a..7e7e7a35ef2c 100644
--- a/java/java-tests/testSrc/com/intellij/psi/autodetect/AbstractNewLineBlocksIteratorTest.java
+++ b/java/java-tests/testSrc/com/intellij/psi/codeStyle/autodetect/AbstractNewLineBlocksIteratorTest.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.intellij.psi.autodetect;
+package com.intellij.psi.codeStyle.autodetect;
 
 import com.intellij.formatting.Block;
 import com.intellij.formatting.FormattingModel;
diff --git a/java/java-tests/testSrc/com/intellij/psi/autodetect/JavaAutoDetectIndentTest.java b/java/java-tests/testSrc/com/intellij/psi/codeStyle/autodetect/JavaAutoDetectIndentTest.java
similarity index 97%
rename from java/java-tests/testSrc/com/intellij/psi/autodetect/JavaAutoDetectIndentTest.java
rename to java/java-tests/testSrc/com/intellij/psi/codeStyle/autodetect/JavaAutoDetectIndentTest.java
index f1b90dced63d..70bca2a7fd66 100644
--- a/java/java-tests/testSrc/com/intellij/psi/autodetect/JavaAutoDetectIndentTest.java
+++ b/java/java-tests/testSrc/com/intellij/psi/codeStyle/autodetect/JavaAutoDetectIndentTest.java
@@ -13,10 +13,11 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.intellij.psi.autodetect;
+package com.intellij.psi.codeStyle.autodetect;
 
 import com.intellij.JavaTestUtil;
 import com.intellij.openapi.fileTypes.PlainTextLanguage;
+import com.intellij.psi.autodetect.AbstractIndentAutoDetectionTest;
 import com.intellij.psi.codeStyle.CommonCodeStyleSettings;
 import com.intellij.psi.codeStyle.autodetect.LineIndentInfo;
 import com.intellij.psi.codeStyle.autodetect.LineIndentInfoBuilder;
diff --git a/java/java-tests/testSrc/com/intellij/psi/autodetect/NewLineBlocksIteratorTest.java b/java/java-tests/testSrc/com/intellij/psi/codeStyle/autodetect/NewLineBlocksIteratorTest.java
similarity index 96%
rename from java/java-tests/testSrc/com/intellij/psi/autodetect/NewLineBlocksIteratorTest.java
rename to java/java-tests/testSrc/com/intellij/psi/codeStyle/autodetect/NewLineBlocksIteratorTest.java
index 25c4416ad73a..2e3269ff02b9 100644
--- a/java/java-tests/testSrc/com/intellij/psi/autodetect/NewLineBlocksIteratorTest.java
+++ b/java/java-tests/testSrc/com/intellij/psi/codeStyle/autodetect/NewLineBlocksIteratorTest.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.intellij.psi.autodetect;
+package com.intellij.psi.codeStyle.autodetect;
 
 import com.intellij.JavaTestUtil;
 import org.jetbrains.annotations.NotNull;