diff --git a/testData/psi/normalizeDeclaration/1.java b/java/java-tests/testData/psi/normalizeDeclaration/1.java
similarity index 100%
rename from testData/psi/normalizeDeclaration/1.java
rename to java/java-tests/testData/psi/normalizeDeclaration/1.java
diff --git a/testData/psi/normalizeDeclaration/1_after.java b/java/java-tests/testData/psi/normalizeDeclaration/1_after.java
similarity index 100%
rename from testData/psi/normalizeDeclaration/1_after.java
rename to java/java-tests/testData/psi/normalizeDeclaration/1_after.java
diff --git a/testData/psi/normalizeDeclaration/2.java b/java/java-tests/testData/psi/normalizeDeclaration/2.java
similarity index 100%
rename from testData/psi/normalizeDeclaration/2.java
rename to java/java-tests/testData/psi/normalizeDeclaration/2.java
diff --git a/testData/psi/normalizeDeclaration/2_after.java b/java/java-tests/testData/psi/normalizeDeclaration/2_after.java
similarity index 100%
rename from testData/psi/normalizeDeclaration/2_after.java
rename to java/java-tests/testData/psi/normalizeDeclaration/2_after.java
diff --git a/testData/psi/normalizeDeclaration/SCR6549.java b/java/java-tests/testData/psi/normalizeDeclaration/SCR6549.java
similarity index 100%
rename from testData/psi/normalizeDeclaration/SCR6549.java
rename to java/java-tests/testData/psi/normalizeDeclaration/SCR6549.java
diff --git a/testData/psi/normalizeDeclaration/SCR6549_after.java b/java/java-tests/testData/psi/normalizeDeclaration/SCR6549_after.java
similarity index 100%
rename from testData/psi/normalizeDeclaration/SCR6549_after.java
rename to java/java-tests/testData/psi/normalizeDeclaration/SCR6549_after.java
diff --git a/testData/psi/normalizeDeclaration/SCR9467.java b/java/java-tests/testData/psi/normalizeDeclaration/SCR9467.java
similarity index 100%
rename from testData/psi/normalizeDeclaration/SCR9467.java
rename to java/java-tests/testData/psi/normalizeDeclaration/SCR9467.java
diff --git a/testData/psi/normalizeDeclaration/SCR9467_1.java b/java/java-tests/testData/psi/normalizeDeclaration/SCR9467_1.java
similarity index 100%
rename from testData/psi/normalizeDeclaration/SCR9467_1.java
rename to java/java-tests/testData/psi/normalizeDeclaration/SCR9467_1.java
diff --git a/testData/psi/normalizeDeclaration/SCR9467_1_after.java b/java/java-tests/testData/psi/normalizeDeclaration/SCR9467_1_after.java
similarity index 100%
rename from testData/psi/normalizeDeclaration/SCR9467_1_after.java
rename to java/java-tests/testData/psi/normalizeDeclaration/SCR9467_1_after.java
diff --git a/testData/psi/normalizeDeclaration/SCR9467_after.java b/java/java-tests/testData/psi/normalizeDeclaration/SCR9467_after.java
similarity index 100%
rename from testData/psi/normalizeDeclaration/SCR9467_after.java
rename to java/java-tests/testData/psi/normalizeDeclaration/SCR9467_after.java
diff --git a/idea-tests/src/com/intellij/psi/NormalizeDeclarationTest.java b/java/java-tests/testSrc/com/intellij/psi/NormalizeDeclarationTest.java
similarity index 87%
rename from idea-tests/src/com/intellij/psi/NormalizeDeclarationTest.java
rename to java/java-tests/testSrc/com/intellij/psi/NormalizeDeclarationTest.java
index 800175f55baa..fe78d9877f23 100644
--- a/idea-tests/src/com/intellij/psi/NormalizeDeclarationTest.java
+++ b/java/java-tests/testSrc/com/intellij/psi/NormalizeDeclarationTest.java
@@ -1,16 +1,16 @@
 package com.intellij.psi;
 
-import com.intellij.openapi.application.ex.PathManagerEx;
+import com.intellij.JavaTestUtil;
 import com.intellij.openapi.util.io.FileUtil;
 import com.intellij.openapi.util.text.StringUtil;
+import com.intellij.psi.impl.source.PostprocessReformattingAspect;
 import com.intellij.testFramework.PsiTestCase;
 import com.intellij.testFramework.PsiTestUtil;
-import com.intellij.psi.impl.source.PostprocessReformattingAspect;
 
 import java.io.File;
 
 public class NormalizeDeclarationTest extends PsiTestCase{
-  private static final String BASE_PATH = PathManagerEx.getTestDataPath() + "/psi/normalizeDeclaration";
+  private static final String BASE_PATH = JavaTestUtil.getJavaTestDataPath() + "/psi/normalizeDeclaration";
 
   public NormalizeDeclarationTest() {
     myRunCommandForTest = true;
@@ -39,7 +39,7 @@ public class NormalizeDeclarationTest extends PsiTestCase{
     PsiTestUtil.checkFileStructure(myFile);
   }
 
-  private String loadFile(String name) throws Exception {
+  private static String loadFile(String name) throws Exception {
     String fullName = BASE_PATH + File.separatorChar + name;
     String text = new String(FileUtil.loadFileText(new File(fullName)));
     text = StringUtil.convertLineSeparators(text);