diff --git a/compiler/tests/org/jetbrains/jet/checkers/JetDiagnosticsTest.java b/compiler/tests/org/jetbrains/jet/checkers/JetDiagnosticsTest.java
index 2f8ae7df208..f4716276339 100644
--- a/compiler/tests/org/jetbrains/jet/checkers/JetDiagnosticsTest.java
+++ b/compiler/tests/org/jetbrains/jet/checkers/JetDiagnosticsTest.java
@@ -26,6 +26,7 @@ import org.jetbrains.annotations.NotNull;
 import org.jetbrains.jet.JetLiteFixture;
 import org.jetbrains.jet.JetTestCaseBuilder;
 import org.jetbrains.jet.JetTestUtils;
+import org.jetbrains.jet.lang.Configuration;
 import org.jetbrains.jet.lang.cfg.pseudocode.JetControlFlowDataTraceFactory;
 import org.jetbrains.jet.lang.diagnostics.DiagnosticUtils;
 import org.jetbrains.jet.lang.psi.JetFile;
@@ -111,12 +112,21 @@ public class JetDiagnosticsTest extends JetLiteFixture {
             }
         });
 
+        boolean importJdk = expectedText.contains("+JDK");
+//        Configuration configuration = importJdk ? JavaBridgeConfiguration.createJavaBridgeConfiguration(getProject()) : Configuration.EMPTY;
+
         List<JetFile> jetFiles = Lists.newArrayList();
         for (TestFile testFileFile : testFileFiles) {
             jetFiles.add(testFileFile.jetFile);
         }
 
-        BindingContext bindingContext = AnalyzerFacade.analyzeFilesWithJavaIntegration(getProject(), jetFiles, Predicates.<PsiFile>alwaysTrue(), JetControlFlowDataTraceFactory.EMPTY);
+        BindingContext bindingContext;
+        if (importJdk) {
+            bindingContext = AnalyzerFacade.analyzeFilesWithJavaIntegration(getProject(), jetFiles, Predicates.<PsiFile>alwaysTrue(), JetControlFlowDataTraceFactory.EMPTY);
+        }
+        else {
+            bindingContext = AnalyzingUtils.analyzeFiles(getProject(), Configuration.EMPTY, jetFiles, Predicates.<PsiFile>alwaysTrue(), JetControlFlowDataTraceFactory.EMPTY);
+        }
 
         boolean ok = true;