diff --git a/compiler/tests/org/jetbrains/kotlin/jvm/compiler/annotation/ExpectLoadError.java b/compiler/testData/loadJava/include/org/jetbrains/kotlin/jvm/compiler/annotation/ExpectLoadError.java
similarity index 100%
rename from compiler/tests/org/jetbrains/kotlin/jvm/compiler/annotation/ExpectLoadError.java
rename to compiler/testData/loadJava/include/org/jetbrains/kotlin/jvm/compiler/annotation/ExpectLoadError.java
diff --git a/compiler/tests/org/jetbrains/kotlin/jvm/compiler/AbstractLoadJavaTest.java b/compiler/tests/org/jetbrains/kotlin/jvm/compiler/AbstractLoadJavaTest.java
index 455b1dc74b9..44dbb563970 100644
--- a/compiler/tests/org/jetbrains/kotlin/jvm/compiler/AbstractLoadJavaTest.java
+++ b/compiler/tests/org/jetbrains/kotlin/jvm/compiler/AbstractLoadJavaTest.java
@@ -142,7 +142,8 @@ public abstract class AbstractLoadJavaTest extends TestCaseWithTmpdir {
         CompilerConfiguration configuration = JetTestUtils.compilerConfigurationForTests(
                 ConfigurationKind.JDK_ONLY, TestJdkKind.MOCK_JDK, tmpdir);
         addKotlinSourceRoot(configuration, sourcesDir.getAbsolutePath());
-        addJavaSourceRoot(configuration, new File("compiler/tests")); // for @ExpectLoadError annotation
+        addJavaSourceRoot(configuration, new File("compiler/testData/loadJava/include"));
+
         KotlinCoreEnvironment environment =
                 KotlinCoreEnvironment.createForTests(getTestRootDisposable(), configuration, EnvironmentConfigFiles.JVM_CONFIG_FILES);
 
diff --git a/compiler/tests/org/jetbrains/kotlin/jvm/compiler/ExpectedLoadErrorsUtil.java b/compiler/tests/org/jetbrains/kotlin/jvm/compiler/ExpectedLoadErrorsUtil.java
index 10627ade633..cdf983a252a 100644
--- a/compiler/tests/org/jetbrains/kotlin/jvm/compiler/ExpectedLoadErrorsUtil.java
+++ b/compiler/tests/org/jetbrains/kotlin/jvm/compiler/ExpectedLoadErrorsUtil.java
@@ -21,7 +21,6 @@ import org.jetbrains.annotations.NotNull;
 import org.jetbrains.kotlin.descriptors.*;
 import org.jetbrains.kotlin.descriptors.annotations.AnnotationDescriptor;
 import org.jetbrains.kotlin.descriptors.impl.DeclarationDescriptorVisitorEmptyBodies;
-import org.jetbrains.kotlin.jvm.compiler.annotation.ExpectLoadError;
 import org.jetbrains.kotlin.load.java.JavaBindingContext;
 import org.jetbrains.kotlin.name.FqName;
 import org.jetbrains.kotlin.renderer.DescriptorRenderer;
@@ -35,7 +34,7 @@ import static com.intellij.testFramework.UsefulTestCase.assertNotNull;
 import static com.intellij.testFramework.UsefulTestCase.assertSameElements;
 
 public class ExpectedLoadErrorsUtil {
-    public static final String ANNOTATION_CLASS_NAME = ExpectLoadError.class.getName();
+    public static final String ANNOTATION_CLASS_NAME = "org.jetbrains.kotlin.jvm.compiler.annotation.ExpectLoadError";
 
     public static void checkForLoadErrors(
             @NotNull PackageViewDescriptor packageFromJava,
@@ -88,6 +87,7 @@ public class ExpectedLoadErrorsUtil {
                 CompileTimeConstant<?> argument = annotation.getAllValueArguments().values().iterator().next();
 
                 String error = (String) argument.getValue();
+                //noinspection ConstantConditions
                 List<String> errors = Arrays.asList(error.split("\\|"));
 
                 map.put(descriptor, errors);
diff --git a/compiler/tests/org/jetbrains/kotlin/jvm/compiler/LoadDescriptorUtil.java b/compiler/tests/org/jetbrains/kotlin/jvm/compiler/LoadDescriptorUtil.java
index b847ad86b14..8143d09bff8 100644
--- a/compiler/tests/org/jetbrains/kotlin/jvm/compiler/LoadDescriptorUtil.java
+++ b/compiler/tests/org/jetbrains/kotlin/jvm/compiler/LoadDescriptorUtil.java
@@ -88,7 +88,7 @@ public final class LoadDescriptorUtil {
                 testJdkKind,
                 JetTestUtils.getAnnotationsJar(),
                 javaRoot,
-                new File("compiler/tests") // for @ExpectLoadError annotation
+                new File("compiler/testData/loadJava/include")
         );
         KotlinCoreEnvironment environment =
                 KotlinCoreEnvironment.createForTests(disposable, configuration, EnvironmentConfigFiles.JVM_CONFIG_FILES);
@@ -107,7 +107,7 @@ public final class LoadDescriptorUtil {
                            JetTestUtils.getAnnotationsJar().getPath();
         JetTestUtils.compileJavaFiles(javaFiles, Arrays.asList(
                 "-classpath", classPath,
-                "-sourcepath", "compiler/tests", // for @ExpectLoadError annotation
+                "-sourcepath", "compiler/testData/loadJava/include",
                 "-d", outDir.getPath()
         ));
     }