diff --git a/pom.xml b/pom.xml
index 29c700b1bd..1ecc24b881 100644
--- a/pom.xml
+++ b/pom.xml
@@ -226,7 +226,7 @@
       <!--
       This plugin is used to generate AOT metadata during tests so that it can be
       compared against those in META-INF/native-image/org.kohsuke/github-api/*.
-      The tests are located in src/test/java/org.kohsuke.aot
+      The tests are start with the name "Aot..." 
       -->
       <plugin>
         <groupId>org.springframework.boot</groupId>
diff --git a/src/test/java/org/kohsuke/aot/AotIntegrationTest.java b/src/test/java/org/kohsuke/github/AotIntegrationTest.java
similarity index 96%
rename from src/test/java/org/kohsuke/aot/AotIntegrationTest.java
rename to src/test/java/org/kohsuke/github/AotIntegrationTest.java
index 574661906f..403dbeb990 100644
--- a/src/test/java/org/kohsuke/aot/AotIntegrationTest.java
+++ b/src/test/java/org/kohsuke/github/AotIntegrationTest.java
@@ -1,4 +1,4 @@
-package org.kohsuke.aot;
+package org.kohsuke.github;
 
 import com.fasterxml.jackson.databind.JsonNode;
 import com.fasterxml.jackson.databind.ObjectMapper;
@@ -77,6 +77,7 @@ private Stream<String> readAotConfigToStreamOfClassNames(String reflectionConfig
                 .map(jsonNode -> jsonNode.get("name"))
                 .map(JsonNode::toString)
                 .map(reflectConfigEntryClassName -> reflectConfigEntryClassName.replace("\"", ""))
-                .filter(x -> x.contains("org.kohsuke.github"));
+                .filter(x -> x.contains("org.kohsuke.github"))
+                .filter(x -> !x.contains("org.kohsuke.github.AotTest"));
     }
 }
diff --git a/src/test/java/org/kohsuke/aot/AotTestApplication.java b/src/test/java/org/kohsuke/github/AotTestApplication.java
similarity index 90%
rename from src/test/java/org/kohsuke/aot/AotTestApplication.java
rename to src/test/java/org/kohsuke/github/AotTestApplication.java
index 0e3081d937..bc4231fabe 100644
--- a/src/test/java/org/kohsuke/aot/AotTestApplication.java
+++ b/src/test/java/org/kohsuke/github/AotTestApplication.java
@@ -1,4 +1,4 @@
-package org.kohsuke.aot;
+package org.kohsuke.github;
 
 import org.springframework.boot.autoconfigure.SpringBootApplication;
 import org.springframework.boot.builder.SpringApplicationBuilder;
@@ -8,7 +8,7 @@
  * required for test purpose.
  */
 @SpringBootApplication
-public class AotTestApplication {
+class AotTestApplication {
 
     /**
      * Runs a spring boot application to generate AOT hints
diff --git a/src/test/java/org/kohsuke/aot/AotTestRuntimeHints.java b/src/test/java/org/kohsuke/github/AotTestRuntimeHints.java
similarity index 99%
rename from src/test/java/org/kohsuke/aot/AotTestRuntimeHints.java
rename to src/test/java/org/kohsuke/github/AotTestRuntimeHints.java
index 0dbad0591c..5f321bc028 100644
--- a/src/test/java/org/kohsuke/aot/AotTestRuntimeHints.java
+++ b/src/test/java/org/kohsuke/github/AotTestRuntimeHints.java
@@ -1,4 +1,4 @@
-package org.kohsuke.aot;
+package org.kohsuke.github;
 
 import org.jetbrains.annotations.NotNull;
 import org.springframework.aot.hint.MemberCategory;
diff --git a/src/test/resources/META-INF/spring/aot.factories b/src/test/resources/META-INF/spring/aot.factories
index f81c736a2b..bd66387017 100644
--- a/src/test/resources/META-INF/spring/aot.factories
+++ b/src/test/resources/META-INF/spring/aot.factories
@@ -1 +1 @@
-org.springframework.aot.hint.RuntimeHintsRegistrar=org.kohsuke.aot.AotTestRuntimeHints
\ No newline at end of file
+org.springframework.aot.hint.RuntimeHintsRegistrar=org.kohsuke.github.AotTestRuntimeHints
\ No newline at end of file