diff --git a/java/java-impl/src/com/intellij/codeInsight/intention/impl/FieldFromParameterUtils.java b/java/java-impl/src/com/intellij/codeInsight/intention/impl/FieldFromParameterUtils.java
index c98b002ae664..37fb882e5e66 100644
--- a/java/java-impl/src/com/intellij/codeInsight/intention/impl/FieldFromParameterUtils.java
+++ b/java/java-impl/src/com/intellij/codeInsight/intention/impl/FieldFromParameterUtils.java
@@ -189,12 +189,12 @@ public final class FieldFromParameterUtils {
     final NullableNotNullManager manager = NullableNotNullManager.getInstance(project);
     final PsiAnnotation nullable = manager.getNullableAnnotation(parameter, false);
     if (nullable != null && !manager.isContainerAnnotation(nullable)) {
-      modifierList.addAfter(factory.createAnnotationFromText("@" + nullable, field), null);
+      modifierList.addAfter(factory.createAnnotationFromText("@" + nullable.getQualifiedName(), field), null);
     }
     else if (isFinal) {
       final PsiAnnotation notNull = manager.getNotNullAnnotation(parameter, false);
       if (notNull != null && !manager.isContainerAnnotation(notNull)) {
-        modifierList.addAfter(factory.createAnnotationFromText("@" + notNull, field), null);
+        modifierList.addAfter(factory.createAnnotationFromText("@" + notNull.getQualifiedName(), field), null);
       }
     }
 
diff --git a/java/java-tests/testSrc/com/intellij/codeInspection/DataFlowInspectionTest.java b/java/java-tests/testSrc/com/intellij/codeInspection/DataFlowInspectionTest.java
index 3bdcae2b9093..2153675e5484 100644
--- a/java/java-tests/testSrc/com/intellij/codeInspection/DataFlowInspectionTest.java
+++ b/java/java-tests/testSrc/com/intellij/codeInspection/DataFlowInspectionTest.java
@@ -18,6 +18,7 @@ package com.intellij.codeInspection;
 import com.intellij.JavaTestUtil;
 import com.intellij.codeInspection.dataFlow.DataFlowInspection;
 import com.intellij.testFramework.LightProjectDescriptor;
+import com.intellij.testFramework.fixtures.JavaCodeInsightTestFixture;
 import com.intellij.testFramework.fixtures.LightCodeInsightFixtureTestCase;
 import org.jetbrains.annotations.NotNull;
 
@@ -258,14 +259,8 @@ public class DataFlowInspectionTest extends LightCodeInsightFixtureTestCase {
   public void testAccessingSameArrayElements() { doTest(); }
 
   public void testParametersAreNonnullByDefault() {
-    addJavaxNullabilityAnnotations();
-
-    myFixture.addClass("package javax.annotation;" +
-                       "@javax.annotation.meta.TypeQualifierDefault(java.lang.annotation.ElementType.PARAMETER) @javax.annotation.Nonnull " +
-                       "public @interface ParametersAreNonnullByDefault {}");
-    myFixture.addClass("package javax.annotation;" +
-                       "@javax.annotation.meta.TypeQualifierDefault(java.lang.annotation.ElementType.PARAMETER) @javax.annotation.Nullable " +
-                       "public @interface ParametersAreNullableByDefault {}");
+    addJavaxNullabilityAnnotations(myFixture);
+    addJavaxDefaultNullabilityAnnotations(myFixture);
     
     myFixture.addClass("package foo; public class AnotherPackageNotNull { public static void foo(String s) {}}");
     myFixture.addFileToProject("foo/package-info.java", "@javax.annotation.ParametersAreNonnullByDefault package foo;");
@@ -273,17 +268,26 @@ public class DataFlowInspectionTest extends LightCodeInsightFixtureTestCase {
     doTest(); 
   }
 
-  private void addJavaxNullabilityAnnotations() {
-    myFixture.addClass("package javax.annotation;" +
-                       "public @interface Nonnull {}");
-    myFixture.addClass("package javax.annotation.meta;" +
-                       "public @interface TypeQualifier {}");
-    myFixture.addClass("package javax.annotation.meta;" +
-                       "public @interface TypeQualifierDefault { java.lang.annotation.ElementType[] value() default {};}");
+  public static void addJavaxDefaultNullabilityAnnotations(final JavaCodeInsightTestFixture fixture) {
+    fixture.addClass("package javax.annotation;" +
+                     "@javax.annotation.meta.TypeQualifierDefault(java.lang.annotation.ElementType.PARAMETER) @javax.annotation.Nonnull " +
+                     "public @interface ParametersAreNonnullByDefault {}");
+    fixture.addClass("package javax.annotation;" +
+                     "@javax.annotation.meta.TypeQualifierDefault(java.lang.annotation.ElementType.PARAMETER) @javax.annotation.Nullable " +
+                     "public @interface ParametersAreNullableByDefault {}");
+  }
+
+  public static void addJavaxNullabilityAnnotations(final JavaCodeInsightTestFixture fixture) {
+    fixture.addClass("package javax.annotation;" +
+                     "public @interface Nonnull {}");
+    fixture.addClass("package javax.annotation;" +
+                     "public @interface Nullable {}");
+    fixture.addClass("package javax.annotation.meta;" +
+                     "public @interface TypeQualifierDefault { java.lang.annotation.ElementType[] value() default {};}");
   }
 
   public void testCustomTypeQualifierDefault() {
-    addJavaxNullabilityAnnotations();
+    addJavaxNullabilityAnnotations(myFixture);
     myFixture.addClass("package bar;" +
                        "@javax.annotation.meta.TypeQualifierDefault(java.lang.annotation.ElementType.METHOD) @javax.annotation.Nonnull " +
                        "public @interface MethodsAreNotNullByDefault {}");
diff --git a/java/java-tests/testSrc/com/intellij/codeInspection/NullableStuffInspectionTest.java b/java/java-tests/testSrc/com/intellij/codeInspection/NullableStuffInspectionTest.java
index e925dd49a8ea..3520ec08d750 100644
--- a/java/java-tests/testSrc/com/intellij/codeInspection/NullableStuffInspectionTest.java
+++ b/java/java-tests/testSrc/com/intellij/codeInspection/NullableStuffInspectionTest.java
@@ -40,8 +40,8 @@ public class NullableStuffInspectionTest extends LightCodeInsightFixtureTestCase
   }
 
   public void testHonorSuperParameterDefault() {
-    myFixture.addClass("package javax.annotation; public @interface ParametersAreNonnullByDefault {}");
-    myFixture.addClass("package javax.annotation; public @interface Nullable {}");
+    DataFlowInspectionTest.addJavaxNullabilityAnnotations(myFixture);
+    DataFlowInspectionTest.addJavaxDefaultNullabilityAnnotations(myFixture);
     myFixture.addFileToProject("foo/package-info.java", "@javax.annotation.ParametersAreNonnullByDefault package foo;");
 
     myFixture.addClass("import javax.annotation.*; package foo; public interface NullableFunction { void fun(@Nullable Object o); }");
@@ -51,7 +51,8 @@ public class NullableStuffInspectionTest extends LightCodeInsightFixtureTestCase
   }
 
   public void testHonorThisParameterDefault() {
-    myFixture.addClass("package javax.annotation; public @interface ParametersAreNonnullByDefault {}");
+    DataFlowInspectionTest.addJavaxNullabilityAnnotations(myFixture);
+    DataFlowInspectionTest.addJavaxDefaultNullabilityAnnotations(myFixture);
     myFixture.addFileToProject("foo/package-info.java", "@javax.annotation.ParametersAreNonnullByDefault package foo;");
 
     myFixture.configureFromExistingVirtualFile(myFixture.copyFileToProject(getTestName(false) + ".java", "foo/Classes.java"));
@@ -60,8 +61,8 @@ public class NullableStuffInspectionTest extends LightCodeInsightFixtureTestCase
   }
 
   public void testHonorParameterDefaultInSetters() {
-    myFixture.addClass("package javax.annotation; public @interface ParametersAreNonnullByDefault {}");
-    myFixture.addClass("package javax.annotation; public @interface Nullable {}");
+    DataFlowInspectionTest.addJavaxNullabilityAnnotations(myFixture);
+    DataFlowInspectionTest.addJavaxDefaultNullabilityAnnotations(myFixture);
     myFixture.addFileToProject("foo/package-info.java", "@javax.annotation.ParametersAreNonnullByDefault package foo;");
 
     myFixture.configureFromExistingVirtualFile(myFixture.copyFileToProject(getTestName(false) + ".java", "foo/Classes.java"));