diff --git a/src/main/java/org/springframework/data/jpa/repository/package-info.java b/src/main/java/org/springframework/data/jpa/repository/package-info.java
index c27c800cb..61ce84616 100644
--- a/src/main/java/org/springframework/data/jpa/repository/package-info.java
+++ b/src/main/java/org/springframework/data/jpa/repository/package-info.java
@@ -1,7 +1,5 @@
 /**
  * Interfaces and annotations for JPA specific repositories.
  */
-@NonNullApi
+@org.springframework.lang.NonNullApi
 package org.springframework.data.jpa.repository;
-
-import org.springframework.lang.NonNullApi;
diff --git a/src/main/java/org/springframework/data/jpa/repository/query/package-info.java b/src/main/java/org/springframework/data/jpa/repository/query/package-info.java
index 9e269c303..4d7c118fd 100644
--- a/src/main/java/org/springframework/data/jpa/repository/query/package-info.java
+++ b/src/main/java/org/springframework/data/jpa/repository/query/package-info.java
@@ -1,7 +1,5 @@
 /**
  * Query implementation to exectue queries against JPA.
  */
-@NonNullApi
+@org.springframework.lang.NonNullApi
 package org.springframework.data.jpa.repository.query;
-
-import org.springframework.lang.NonNullApi;