diff --git a/src/main/java/org/springframework/data/repository/aot/generate/AotRepositoryFragmentMetadata.java b/src/main/java/org/springframework/data/repository/aot/generate/AotRepositoryFragmentMetadata.java
index 3dc427acaa..ecfa8c27b2 100644
--- a/src/main/java/org/springframework/data/repository/aot/generate/AotRepositoryFragmentMetadata.java
+++ b/src/main/java/org/springframework/data/repository/aot/generate/AotRepositoryFragmentMetadata.java
@@ -30,7 +30,6 @@
 import org.springframework.data.javapoet.TypeNames;
 import org.springframework.data.repository.core.support.RepositoryFragment;
 import org.springframework.data.repository.query.QueryMethod;
-import org.springframework.javapoet.ParameterizedTypeName;
 import org.springframework.javapoet.TypeName;
 
 /**
diff --git a/src/main/java/org/springframework/data/util/TypeContributor.java b/src/main/java/org/springframework/data/util/TypeContributor.java
index 802ec9429a..e96076017b 100644
--- a/src/main/java/org/springframework/data/util/TypeContributor.java
+++ b/src/main/java/org/springframework/data/util/TypeContributor.java
@@ -22,7 +22,7 @@
 
 import org.springframework.aot.generate.GenerationContext;
 import org.springframework.aot.hint.BindingReflectionHintsRegistrar;
-import org.springframework.aot.hint.annotation.ReflectiveRuntimeHintsRegistrar;
+import org.springframework.aot.hint.MemberCategory;
 import org.springframework.core.annotation.MergedAnnotation;
 
 /**
diff --git a/src/test/java/org/springframework/data/repository/aot/generate/RepositoryBuilderUnitTests.java b/src/test/java/org/springframework/data/repository/aot/generate/RepositoryBuilderUnitTests.java
index d56e7bea60..1ae5bbe4c6 100644
--- a/src/test/java/org/springframework/data/repository/aot/generate/RepositoryBuilderUnitTests.java
+++ b/src/test/java/org/springframework/data/repository/aot/generate/RepositoryBuilderUnitTests.java
@@ -15,13 +15,7 @@
  */
 package org.springframework.data.repository.aot.generate;
 
-import static org.assertj.core.api.Assertions.assertThat;
-
-import example.UserRepository;
-
 import org.junit.jupiter.api.Test;
-import org.springframework.aot.test.generate.TestGenerationContext;
-import org.springframework.core.test.tools.TestCompiler;
 
 /**
  * @author Christoph Strobl