diff --git a/compiler/tests/org/jetbrains/jet/jvm/compiler/JdkAnnotationsValidityTest.java b/compiler/tests/org/jetbrains/jet/jvm/compiler/JdkAnnotationsValidityTest.java
index f4aea2cfedb..facf8ac2e08 100644
--- a/compiler/tests/org/jetbrains/jet/jvm/compiler/JdkAnnotationsValidityTest.java
+++ b/compiler/tests/org/jetbrains/jet/jvm/compiler/JdkAnnotationsValidityTest.java
@@ -32,8 +32,10 @@ import org.jetbrains.annotations.NotNull;
 import org.jetbrains.jet.ConfigurationKind;
 import org.jetbrains.jet.JetTestUtils;
 import org.jetbrains.jet.TestJdkKind;
+import org.jetbrains.jet.cli.jvm.JVMConfigurationKeys;
 import org.jetbrains.jet.cli.jvm.compiler.CompileEnvironmentUtil;
 import org.jetbrains.jet.cli.jvm.compiler.JetCoreEnvironment;
+import org.jetbrains.jet.config.CompilerConfiguration;
 import org.jetbrains.jet.di.InjectorForJavaSemanticServices;
 import org.jetbrains.jet.lang.descriptors.*;
 import org.jetbrains.jet.lang.resolve.BindingContext;
@@ -44,6 +46,7 @@ import org.jetbrains.jet.lang.resolve.name.FqName;
 import org.jetbrains.jet.lang.resolve.scopes.JetScope;
 import org.jetbrains.jet.renderer.DescriptorRenderer;
 
+import java.io.File;
 import java.io.IOException;
 import java.util.List;
 import java.util.Map;
@@ -56,8 +59,10 @@ public class JdkAnnotationsValidityTest extends UsefulTestCase {
     private static final int CLASSES_IN_CHUNK = 500;
 
     private static JetCoreEnvironment createEnvironment(Disposable parentDisposable) {
-        return JetTestUtils.createEnvironmentWithJdkAndNullabilityAnnotationsFromIdea(
-                parentDisposable, ConfigurationKind.JDK_AND_ANNOTATIONS, TestJdkKind.FULL_JDK);
+        CompilerConfiguration configuration = JetTestUtils.compilerConfigurationForTests(
+                ConfigurationKind.JDK_AND_ANNOTATIONS, TestJdkKind.FULL_JDK, JetTestUtils.getAnnotationsJar());
+        configuration.add(JVMConfigurationKeys.ANNOTATIONS_PATH_KEY, new File("ideaSDK/lib/jdkAnnotations.jar"));
+        return new JetCoreEnvironment(parentDisposable, configuration);
     }
 
     public void testNoErrorsInAlternativeSignatures() {
diff --git a/jdk-annotations/java/util/concurrent/annotations.xml b/jdk-annotations/java/util/concurrent/annotations.xml
index f07cf472514..a6681b0e46c 100644
--- a/jdk-annotations/java/util/concurrent/annotations.xml
+++ b/jdk-annotations/java/util/concurrent/annotations.xml
@@ -746,7 +746,7 @@
     </item>
     <item name='java.util.concurrent.ThreadFactory java.lang.Thread newThread(java.lang.Runnable)'>
         <annotation name='jet.runtime.typeinfo.KotlinSignature'>
-            <val name="value" val="&quot;fun newThread(r : Runnable) : Thread?&quot;"/>
+            <val name="value" val="&quot;fun newThread(r : Runnable) : Thread&quot;"/>
         </annotation>
     </item>
     <item name='java.util.concurrent.Executor void execute(java.lang.Runnable)'>
@@ -1415,7 +1415,7 @@
     </item>
     <item name='java.util.concurrent.ExecutorService T invokeAny(java.util.Collection&lt;? extends java.util.concurrent.Callable&lt;T&gt;&gt;)'>
         <annotation name='jet.runtime.typeinfo.KotlinSignature'>
-            <val name="value" val="&quot;fun &lt;T&gt; invokeAny(tasks : Collection&lt;Callable&lt;T&gt;&gt;) : T?&quot;"/>
+            <val name="value" val="&quot;fun &lt;T&gt; invokeAny(tasks : Collection&lt;Callable&lt;T&gt;&gt;) : T&quot;"/>
         </annotation>
     </item>
     <item name='java.util.concurrent.ForkJoinPool java.lang.String toString()'>