diff --git a/plugins/groovy/groovy-psi/src/org/jetbrains/plugins/groovy/lang/psi/impl/InferenceContext.java b/plugins/groovy/groovy-psi/src/org/jetbrains/plugins/groovy/lang/psi/impl/InferenceContext.java
index 0c0cbe8b82c5..d52ea94af983 100644
--- a/plugins/groovy/groovy-psi/src/org/jetbrains/plugins/groovy/lang/psi/impl/InferenceContext.java
+++ b/plugins/groovy/groovy-psi/src/org/jetbrains/plugins/groovy/lang/psi/impl/InferenceContext.java
@@ -47,5 +47,5 @@ public interface InferenceContext {
   }
 
   <T extends GroovyPsiElement>
-  @Nullable PsiType getExpressionType(@NotNull T element, @NotNull Function<? super T, ? extends PsiType> calculator);
+  @Nullable PsiType getExpressionType(@NotNull T element, @NotNull Function<? super T, ? extends @Nullable PsiType> calculator);
 }
diff --git a/plugins/groovy/groovy-psi/src/org/jetbrains/plugins/groovy/lang/psi/impl/PartialContext.kt b/plugins/groovy/groovy-psi/src/org/jetbrains/plugins/groovy/lang/psi/impl/PartialContext.kt
index 6626e883445e..fc9eab55e9ad 100644
--- a/plugins/groovy/groovy-psi/src/org/jetbrains/plugins/groovy/lang/psi/impl/PartialContext.kt
+++ b/plugins/groovy/groovy-psi/src/org/jetbrains/plugins/groovy/lang/psi/impl/PartialContext.kt
@@ -56,7 +56,7 @@ internal class PartialContext(private val types: Map<VariableDescriptor, DFAType
     }
   }
 
-  override fun <T : GroovyPsiElement> getExpressionType(element: T, calculator: Function<in T, out PsiType>): PsiType {
+  override fun <T : GroovyPsiElement> getExpressionType(element: T, calculator: Function<in T, out PsiType?>): PsiType? {
     return doGetCachedValue(Pair(element, "type")) {
       calculator.apply(element)
     }
diff --git a/plugins/groovy/groovy-psi/src/org/jetbrains/plugins/groovy/lang/psi/impl/TopInferenceContext.kt b/plugins/groovy/groovy-psi/src/org/jetbrains/plugins/groovy/lang/psi/impl/TopInferenceContext.kt
index 3070c18a590d..c3d6c1a4ec7c 100644
--- a/plugins/groovy/groovy-psi/src/org/jetbrains/plugins/groovy/lang/psi/impl/TopInferenceContext.kt
+++ b/plugins/groovy/groovy-psi/src/org/jetbrains/plugins/groovy/lang/psi/impl/TopInferenceContext.kt
@@ -23,7 +23,7 @@ class TopInferenceContext : InferenceContext {
     return ResolveCache.getInstance(ref.element.project).resolveWithCaching(ref, resolver, true, incomplete)
   }
 
-  override fun <T : GroovyPsiElement> getExpressionType(element: T, calculator: Function<in T, out PsiType>): PsiType? {
+  override fun <T : GroovyPsiElement> getExpressionType(element: T, calculator: Function<in T, out PsiType?>): PsiType? {
     return CachedValuesManager.getProjectPsiDependentCache(element, calculator)
   }
 }
diff --git a/plugins/groovy/test/org/jetbrains/plugins/groovy/lang/MissingReturnTest.java b/plugins/groovy/test/org/jetbrains/plugins/groovy/lang/MissingReturnTest.java
index 6df281b7db89..e0796416f96d 100644
--- a/plugins/groovy/test/org/jetbrains/plugins/groovy/lang/MissingReturnTest.java
+++ b/plugins/groovy/test/org/jetbrains/plugins/groovy/lang/MissingReturnTest.java
@@ -1,7 +1,6 @@
 // Copyright 2000-2024 JetBrains s.r.o. and contributors. Use of this source code is governed by the Apache 2.0 license.
 package org.jetbrains.plugins.groovy.lang;
 
-import com.intellij.idea.IJIgnore;
 import org.jetbrains.plugins.groovy.LightGroovyTestCase;
 import org.jetbrains.plugins.groovy.codeInspection.noReturnMethod.MissingReturnInspection;
 import org.jetbrains.plugins.groovy.util.TestUtils;
@@ -24,7 +23,6 @@ public class MissingReturnTest extends LightGroovyTestCase {
 
   public void testMissingReturnTryCatch() { doTest(); }
 
-  @IJIgnore(issue = "IJPL-150165")
   public void testMissingReturnLastNull() { doTest(); }
 
   public void testMissingReturnImplicitReturns() { doTest(); }
diff --git a/plugins/groovy/test/org/jetbrains/plugins/groovy/lang/resolve/TypeInferenceTest.groovy b/plugins/groovy/test/org/jetbrains/plugins/groovy/lang/resolve/TypeInferenceTest.groovy
index 8fd0719449fe..0b4cbe1c43fa 100644
--- a/plugins/groovy/test/org/jetbrains/plugins/groovy/lang/resolve/TypeInferenceTest.groovy
+++ b/plugins/groovy/test/org/jetbrains/plugins/groovy/lang/resolve/TypeInferenceTest.groovy
@@ -1,19 +1,14 @@
 // Copyright 2000-2022 JetBrains s.r.o. and contributors. Use of this source code is governed by the Apache 2.0 license.
 package org.jetbrains.plugins.groovy.lang.resolve
 
-import com.intellij.idea.IJIgnore
 import com.intellij.openapi.util.RecursionManager
 import com.intellij.psi.PsiClassType
-import com.intellij.psi.PsiElement
 import com.intellij.psi.PsiIntersectionType
 import com.intellij.psi.PsiReference
 import com.intellij.psi.PsiType
 import com.intellij.psi.impl.source.PsiImmediateClassType
 import groovy.transform.CompileStatic
-import org.jetbrains.plugins.groovy.codeInsight.template.postfix.templates.GrArgPostfixTemplate
-import org.jetbrains.plugins.groovy.codeStyle.GrReferenceAdjuster
 import org.jetbrains.plugins.groovy.lang.psi.GroovyFile
-import org.jetbrains.plugins.groovy.lang.psi.api.statements.arguments.GrArgumentLabel
 import org.jetbrains.plugins.groovy.lang.psi.api.statements.expressions.GrAssignmentExpression
 import org.jetbrains.plugins.groovy.lang.psi.api.statements.expressions.GrExpression
 import org.jetbrains.plugins.groovy.lang.psi.api.statements.expressions.GrReferenceExpression
@@ -24,7 +19,6 @@ import org.jetbrains.plugins.groovy.lang.psi.util.PsiUtil
 import static com.intellij.psi.CommonClassNames.*
 import static org.jetbrains.plugins.groovy.lang.psi.dataFlow.types.NestedContextKt.allowNestedContext
 import static org.jetbrains.plugins.groovy.lang.psi.dataFlow.types.NestedContextKt.allowNestedContextOnce
-import static org.jetbrains.plugins.groovy.lang.psi.dataFlow.types.NestedContextKt.forbidNestedContext
 
 @CompileStatic
 class TypeInferenceTest extends TypeInferenceTestBase {
@@ -1214,7 +1208,6 @@ while (u) {
 ''', null
   }
 
-  @IJIgnore(issue = "IJPL-150165")
   void 'test no soe cyclic multi-assignment'() {
     allowNestedContext(4, testRootDisposable)
     doTest '''\
@@ -1978,7 +1971,6 @@ protected void onLoadConfig (Map configSection) {
 }""", null
   }
 
-  @IJIgnore(issue = "IJPL-150165")
   void 'test soe with large flow'() {
     RecursionManager.disableAssertOnRecursionPrevention(testRootDisposable)
     RecursionManager.disableMissedCacheAssertions(testRootDisposable)