diff --git a/java/java-impl/src/com/intellij/codeInspection/AddAssertStatementFix.java b/java/java-impl/src/com/intellij/codeInspection/AddAssertStatementFix.java
index 1379bb7227dc..aa209916d6d2 100644
--- a/java/java-impl/src/com/intellij/codeInspection/AddAssertStatementFix.java
+++ b/java/java-impl/src/com/intellij/codeInspection/AddAssertStatementFix.java
@@ -42,7 +42,7 @@ public class AddAssertStatementFix implements LocalQuickFix {
 
   @Override
   public void applyFix(@NotNull Project project, @NotNull ProblemDescriptor descriptor) {
-    PsiExpression element = PsiTreeUtil.getParentOfType(descriptor.getPsiElement(), PsiExpression.class);
+    PsiExpression element = PsiTreeUtil.getNonStrictParentOfType(descriptor.getPsiElement(), PsiExpression.class);
     if (element == null) return;
     CodeBlockSurrounder surrounder = CodeBlockSurrounder.forExpression(element);
     if (surrounder == null) return;
diff --git a/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/addAssert/afterInForDeclaration.java b/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/addAssert/afterInForDeclaration.java
new file mode 100644
index 000000000000..c17aa6513177
--- /dev/null
+++ b/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/addAssert/afterInForDeclaration.java
@@ -0,0 +1,14 @@
+// "Assert 'list != null'" "true"
+import java.util.List;
+
+class A{
+  void test(List<String> list){
+    if(list == null) {
+      System.out.println("oops");
+    }
+      assert list != null;
+      for(String s : list) {
+      
+    }
+  }
+}
\ No newline at end of file
diff --git a/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/addAssert/beforeInForDeclaration.java b/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/addAssert/beforeInForDeclaration.java
new file mode 100644
index 000000000000..cc6b7eef7a80
--- /dev/null
+++ b/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/addAssert/beforeInForDeclaration.java
@@ -0,0 +1,13 @@
+// "Assert 'list != null'" "true"
+import java.util.List;
+
+class A{
+  void test(List<String> list){
+    if(list == null) {
+      System.out.println("oops");
+    }
+    for(String s : li<caret>st) {
+      
+    }
+  }
+}
\ No newline at end of file