diff --git a/java/java-analysis-impl/src/com/intellij/codeInspection/nullable/NullableStuffInspectionBase.java b/java/java-analysis-impl/src/com/intellij/codeInspection/nullable/NullableStuffInspectionBase.java
index 736cb4dec27d..0ade64997b4a 100644
--- a/java/java-analysis-impl/src/com/intellij/codeInspection/nullable/NullableStuffInspectionBase.java
+++ b/java/java-analysis-impl/src/com/intellij/codeInspection/nullable/NullableStuffInspectionBase.java
@@ -161,8 +161,7 @@ public class NullableStuffInspectionBase extends BaseJavaBatchLocalInspectionToo
                                      addAnnoFix);
             }
             if (PropertyUtil.isSimpleSetter(setter)) {
-              if (annotated.isDeclaredNotNull && isNullableNotInferred(parameter, false) ||
-                  annotated.isDeclaredNullable && isNotNullNotInferred(parameter, false, false)) {
+              if (annotated.isDeclaredNotNull && isNullableNotInferred(parameter, false)) {
                 final PsiIdentifier nameIdentifier1 = parameter.getNameIdentifier();
                 assertValidElement(setter, parameter, nameIdentifier1);
                 holder.registerProblem(nameIdentifier1, InspectionsBundle.message(
diff --git a/java/java-tests/testData/inspection/nullableProblems/GetterSetterProblems.java b/java/java-tests/testData/inspection/nullableProblems/GetterSetterProblems.java
index c8a5816ec741..e12d8e2de3d4 100644
--- a/java/java-tests/testData/inspection/nullableProblems/GetterSetterProblems.java
+++ b/java/java-tests/testData/inspection/nullableProblems/GetterSetterProblems.java
@@ -1,4 +1,7 @@
 import org.jetbrains.annotations.NotNull;
+import org.jetbrains.annotations.Nullable;
+
+import java.lang.Object;
 
 class B {
      @NotNull
@@ -26,16 +29,16 @@ class C {
     this.c = c;
   }
 
-  C(@<error descr="Cannot resolve symbol 'Nullable'">Nullable</error> C <warning descr="Constructor parameter for @NotNull field might be annotated @NotNull itself">c</warning>, int i) {
+  C(@Nullable C c, int i) {
     this.c = c;
   }
 
-  @<error descr="Cannot resolve symbol 'Nullable'">Nullable</error>
-  public C <warning descr="Getter for @NotNull field might be annotated @NotNull itself">getC</warning>() {
+  @Nullable
+  public C <warning descr="Getter for @NotNull field is annotated @Nullable">getC</warning>() {
     return c;
   }
 
-  public void setC(@<error descr="Cannot resolve symbol 'Nullable'">Nullable</error> C <warning descr="Setter parameter for @NotNull field might be annotated @NotNull itself">c</warning>) {
+  public void setC(@Nullable C <warning descr="Setter parameter for @NotNull field is annotated @Nullable">c</warning>) {
     this.c = c;
   }
 
@@ -50,7 +53,7 @@ class C {
 }
 
 class D {
-    @<error descr="Cannot resolve symbol 'Nullable'">Nullable</error> Long myL;
+    @Nullable Long myL;
 
     D(long l) {
       myL = l;
@@ -64,4 +67,11 @@ class E {
     this.c = c;
   }
 
+}
+class F {
+  @Nullable Object field;
+
+  public void setField(@NotNull Object field) {
+    this.field = field;
+  }
 }
\ No newline at end of file
diff --git a/java/java-tests/testData/inspection/nullableProblems/HonorParameterDefaultInSetters.java b/java/java-tests/testData/inspection/nullableProblems/HonorParameterDefaultInSetters.java
index a6b9b17afe42..8d74c640e574 100644
--- a/java/java-tests/testData/inspection/nullableProblems/HonorParameterDefaultInSetters.java
+++ b/java/java-tests/testData/inspection/nullableProblems/HonorParameterDefaultInSetters.java
@@ -7,7 +7,7 @@ class C {
   private String a;
   private String b;
 
-  public void setA(String <warning descr="Setter parameter for @Nullable field is annotated @ParametersAreNonnullByDefault">a</warning>) {
+  public void setA(String a) {
     this.a = a;
   }