diff --git a/testData/psi/repositoryUse/modifyAnnotations/Test.java b/java/java-tests/testData/psi/repositoryUse/modifyAnnotations/Test.java
similarity index 100%
rename from testData/psi/repositoryUse/modifyAnnotations/Test.java
rename to java/java-tests/testData/psi/repositoryUse/modifyAnnotations/Test.java
diff --git a/idea-tests/src/com/intellij/psi/ModifyAnnotationsTest.java b/java/java-tests/testSrc/com/intellij/psi/ModifyAnnotationsTest.java
similarity index 86%
rename from idea-tests/src/com/intellij/psi/ModifyAnnotationsTest.java
rename to java/java-tests/testSrc/com/intellij/psi/ModifyAnnotationsTest.java
index 028c68d8df50..7becce1c59e1 100644
--- a/idea-tests/src/com/intellij/psi/ModifyAnnotationsTest.java
+++ b/java/java-tests/testSrc/com/intellij/psi/ModifyAnnotationsTest.java
@@ -1,13 +1,11 @@
 package com.intellij.psi;
 
+import com.intellij.JavaTestUtil;
 import com.intellij.openapi.application.ApplicationManager;
-import com.intellij.openapi.application.ex.PathManagerEx;
 import com.intellij.openapi.command.CommandProcessor;
 import com.intellij.openapi.projectRoots.Sdk;
 import com.intellij.openapi.projectRoots.impl.JavaSdkImpl;
-import com.intellij.openapi.roots.LanguageLevelProjectExtension;
 import com.intellij.openapi.vfs.VirtualFileFilter;
-import com.intellij.pom.java.LanguageLevel;
 import com.intellij.psi.search.GlobalSearchScope;
 import com.intellij.testFramework.PsiTestCase;
 import com.intellij.testFramework.PsiTestUtil;
@@ -25,8 +23,7 @@ public class ModifyAnnotationsTest extends PsiTestCase {
 
         public void run() {
           try {
-            LanguageLevelProjectExtension.getInstance(myProject).setLanguageLevel(LanguageLevel.JDK_1_5);
-            String root = PathManagerEx.getTestDataPath() + "/psi/repositoryUse/modifyAnnotations";
+            String root = JavaTestUtil.getJavaTestDataPath() + "/psi/repositoryUse/modifyAnnotations";
             PsiTestUtil.removeAllRoots(myModule, JavaSdkImpl.getMockJdk15("mock 1.5"));
             PsiTestUtil.createTestProjectStructure(myProject, myModule, root, myFilesToDelete);
           }