diff --git a/java/java-analysis-impl/src/com/intellij/codeInsight/intention/impl/AddNullableNotNullAnnotationFix.java b/java/java-analysis-impl/src/com/intellij/codeInsight/intention/impl/AddNullableNotNullAnnotationFix.java
index 272ce37708ad..50fed30e0c46 100644
--- a/java/java-analysis-impl/src/com/intellij/codeInsight/intention/impl/AddNullableNotNullAnnotationFix.java
+++ b/java/java-analysis-impl/src/com/intellij/codeInsight/intention/impl/AddNullableNotNullAnnotationFix.java
@@ -45,11 +45,20 @@ public class AddNullableNotNullAnnotationFix extends AddAnnotationPsiFix {
     if (owner == null || AnnotationUtil.isAnnotated(owner, getAnnotationsToRemove()[0], false, false)) {
       return false;
     }
+    return canAnnotate(owner);
+  }
+
+  static boolean canAnnotate(@NotNull PsiModifierListOwner owner) {
     if (owner instanceof PsiMethod) {
       PsiType returnType = ((PsiMethod)owner).getReturnType();
-
       return returnType != null && !(returnType instanceof PsiPrimitiveType);
     }
+
+    if (owner instanceof PsiClass) {
+      return false;
+    }
+
     return true;
   }
+
 }
diff --git a/java/java-impl/src/com/intellij/codeInsight/intention/impl/AddAnnotationIntention.java b/java/java-impl/src/com/intellij/codeInsight/intention/impl/AddAnnotationIntention.java
index 027928a4f695..49debc92f92f 100644
--- a/java/java-impl/src/com/intellij/codeInsight/intention/impl/AddAnnotationIntention.java
+++ b/java/java-impl/src/com/intellij/codeInsight/intention/impl/AddAnnotationIntention.java
@@ -31,7 +31,6 @@ import com.intellij.openapi.project.Project;
 import com.intellij.openapi.util.Pair;
 import com.intellij.psi.*;
 import com.intellij.psi.codeStyle.CodeStyleSettingsManager;
-import com.intellij.psi.util.PsiUtil;
 import com.intellij.util.IncorrectOperationException;
 import org.jetbrains.annotations.NotNull;
 
@@ -62,16 +61,10 @@ public abstract class AddAnnotationIntention extends BaseIntentionAction {
     setText(AddAnnotationPsiFix.calcText(owner, toAdd));
     if (isAnnotatedSkipInferred(owner, toAdd)) return false;
 
-    if (owner instanceof PsiMethod) {
-      PsiType returnType = ((PsiMethod)owner).getReturnType();
-
-      return returnType != null && !(returnType instanceof PsiPrimitiveType);
-    }
-
-    if (owner instanceof PsiClass) {
-      return PsiUtil.isLanguageLevel8OrHigher(owner);
-    }
+    return canAnnotate(owner);
+  }
 
+  protected boolean canAnnotate(@NotNull PsiModifierListOwner owner) {
     return true;
   }
 
diff --git a/java/java-impl/src/com/intellij/codeInsight/intention/impl/AddNotNullAnnotationIntention.java b/java/java-impl/src/com/intellij/codeInsight/intention/impl/AddNotNullAnnotationIntention.java
index acc2f8d7009b..8c6605ed6dd0 100644
--- a/java/java-impl/src/com/intellij/codeInsight/intention/impl/AddNotNullAnnotationIntention.java
+++ b/java/java-impl/src/com/intellij/codeInsight/intention/impl/AddNotNullAnnotationIntention.java
@@ -26,6 +26,7 @@ import com.intellij.codeInsight.NullableNotNullManager;
 import com.intellij.codeInsight.intention.LowPriorityAction;
 import com.intellij.openapi.project.Project;
 import com.intellij.openapi.util.Pair;
+import com.intellij.psi.PsiModifierListOwner;
 import com.intellij.util.ArrayUtil;
 import org.jetbrains.annotations.NotNull;
 
@@ -43,4 +44,9 @@ public class AddNotNullAnnotationIntention extends AddAnnotationIntention implem
     final List<String> nullables = NullableNotNullManager.getInstance(project).getNullables();
     return ArrayUtil.toStringArray(nullables);
   }
+
+  @Override
+  protected boolean canAnnotate(@NotNull PsiModifierListOwner owner) {
+    return AddNullableNotNullAnnotationFix.canAnnotate(owner);
+  }
 }
diff --git a/java/java-impl/src/com/intellij/codeInsight/intention/impl/AddNullableAnnotationIntention.java b/java/java-impl/src/com/intellij/codeInsight/intention/impl/AddNullableAnnotationIntention.java
index fda712a11619..836e631c6327 100644
--- a/java/java-impl/src/com/intellij/codeInsight/intention/impl/AddNullableAnnotationIntention.java
+++ b/java/java-impl/src/com/intellij/codeInsight/intention/impl/AddNullableAnnotationIntention.java
@@ -26,6 +26,7 @@ import com.intellij.codeInsight.NullableNotNullManager;
 import com.intellij.codeInsight.intention.LowPriorityAction;
 import com.intellij.openapi.project.Project;
 import com.intellij.openapi.util.Pair;
+import com.intellij.psi.PsiModifierListOwner;
 import com.intellij.util.ArrayUtil;
 import org.jetbrains.annotations.NotNull;
 
@@ -43,4 +44,10 @@ public class AddNullableAnnotationIntention extends AddAnnotationIntention imple
     final List<String> notnulls = NullableNotNullManager.getInstance(project).getNotNulls();
     return ArrayUtil.toStringArray(notnulls);
   }
+
+  @Override
+  protected boolean canAnnotate(@NotNull PsiModifierListOwner owner) {
+    return AddNullableNotNullAnnotationFix.canAnnotate(owner);
+  }
+
 }
diff --git a/java/java-tests/testSrc/com/intellij/codeInsight/AddAnnotationFixTest.java b/java/java-tests/testSrc/com/intellij/codeInsight/AddAnnotationFixTest.java
index 80c6bfd156fb..9d33f69b5ca5 100644
--- a/java/java-tests/testSrc/com/intellij/codeInsight/AddAnnotationFixTest.java
+++ b/java/java-tests/testSrc/com/intellij/codeInsight/AddAnnotationFixTest.java
@@ -39,6 +39,7 @@ import com.intellij.openapi.vfs.LocalFileSystem;
 import com.intellij.openapi.vfs.VfsUtilCore;
 import com.intellij.openapi.vfs.VirtualFile;
 import com.intellij.psi.*;
+import com.intellij.psi.codeStyle.CodeStyleSettingsManager;
 import com.intellij.psi.util.PsiTreeUtil;
 import com.intellij.testFramework.PsiTestUtil;
 import com.intellij.testFramework.UsefulTestCase;
@@ -79,10 +80,13 @@ public class AddAnnotationFixTest extends UsefulTestCase {
     myFixture.setUp();
     myModule = builder.getFixture().getModule();
     myProject = myFixture.getProject();
+
+    CodeStyleSettingsManager.getSettings(myProject).USE_EXTERNAL_ANNOTATIONS = true;
   }
 
   @Override
   protected void tearDown() throws Exception {
+    CodeStyleSettingsManager.getSettings(myProject).USE_EXTERNAL_ANNOTATIONS = false;
     try {
       myFixture.tearDown();
     }
@@ -182,9 +186,6 @@ public class AddAnnotationFixTest extends UsefulTestCase {
     final PsiFile file = myFixture.getFile();
     final Editor editor = myFixture.getEditor();
 
-    final IntentionAction fix = myFixture.findSingleIntention("Annotate method 'get' as @NotNull");
-    assertTrue(fix.isAvailable(myProject, editor, file));
-
     // expecting other @Nullable annotations to be removed, and default @NotNull to be added
     List<Trinity<PsiModifierListOwner, String, Boolean>> expectedSequence = new ArrayList<>();
     for (String notNull : NullableNotNullManager.getInstance(myProject).getNullables()) {
@@ -192,12 +193,7 @@ public class AddAnnotationFixTest extends UsefulTestCase {
     }
     expectedSequence.add(Trinity.create(getOwner(), AnnotationUtil.NOT_NULL, true));
     startListening(expectedSequence);
-    new WriteCommandAction(myProject){
-      @Override
-      protected void run(@NotNull final Result result) throws Throwable {
-        fix.invoke(myProject, editor, file);
-      }
-    }.execute();
+    myFixture.launchAction(myFixture.findSingleIntention("Annotate method 'get' as @NotNull"));
 
     FileDocumentManager.getInstance().saveAllDocuments();
 
@@ -216,6 +212,20 @@ public class AddAnnotationFixTest extends UsefulTestCase {
     PsiTestUtil.addSourceRoot(myModule, psiFile.getVirtualFile().getParent());
 
     assertNotAvailable("Annotate method 'get' as @NotNull");
+
+    assertFalse(((PsiMethod)getOwner()).isDeprecated());
+    myFixture.launchAction(myFixture.findSingleIntention("Annotate method 'get' as @Deprecated"));
+    assertTrue(((PsiMethod)getOwner()).isDeprecated());
+  }
+
+  public void testAvailableFixesOnClass() {
+    PsiFile psiFile = myFixture.configureByFile("lib/p/TestPrimitive.java");
+    PsiTestUtil.addSourceRoot(myModule, psiFile.getVirtualFile().getParent());
+    myFixture.getEditor().getCaretModel().moveToOffset(((PsiJavaFile) psiFile).getClasses()[0].getTextOffset());
+
+    myFixture.findSingleIntention("Annotate class 'Test' as @Deprecated");
+    assertNotAvailable("Annotate class 'Test' as @NotNull");
+    assertNotAvailable("Annotate class 'Test' as @Nullable");
   }
 
   private void assertNotAvailable(String hint) {