diff --git a/pom.xml b/pom.xml
index e8c82c91b..3b2b79530 100644
--- a/pom.xml
+++ b/pom.xml
@@ -162,8 +162,10 @@
                             <goal>test-compile</goal>
                         </goals>
                         <configuration>
-                            <args>
-                            </args>
+                            <sourceDirs>
+                                <source>${project.basedir}/src/test/java</source>
+                                <source>${project.basedir}/src/test/kotlin</source>
+                            </sourceDirs>
                         </configuration>
                     </execution>
                 </executions>
@@ -179,6 +181,10 @@
                         -->
                         <include>tools.jackson.module.kotlin.**</include>
                     </includes>
+                    <!-- 11-Apr-2025, tatu: Cannot make JPMS work here, no matter what.
+                            So... turn it off
+                      -->
+                    <useModulePath>false</useModulePath>
                 </configuration>
             </plugin>
             <plugin>
@@ -196,12 +202,6 @@
                 </configuration>
             </plugin>
 
-            <!-- 02-Nov-2020, tatu: Add JDK9+ module info with Moditect -->
-            <plugin>
-                <groupId>org.moditect</groupId>
-                <artifactId>moditect-maven-plugin</artifactId>
-            </plugin>
-
             <!-- 05-Jul-2020, tatu: Add generation of Gradle Module Metadata -->
             <plugin>
                 <groupId>org.gradlex</groupId>
diff --git a/release-notes/VERSION b/release-notes/VERSION
index e3d3031c4..2673c4a99 100644
--- a/release-notes/VERSION
+++ b/release-notes/VERSION
@@ -24,6 +24,7 @@ Former maintainers:
 
 3.0.0-rc3 (not yet released)
 
+#887: Change 3.0 to use `module-info.java` directly [JSTEP-11]
 - Branch rename "master" -> "3.x" [JSTEP-12]
 
 3.0.0-rc2 (28-Mar-2025)
diff --git a/src/moditect/module-info.java b/src/main/java/module-info.java
similarity index 92%
rename from src/moditect/module-info.java
rename to src/main/java/module-info.java
index 987bf5680..309847485 100644
--- a/src/moditect/module-info.java
+++ b/src/main/java/module-info.java
@@ -1,10 +1,9 @@
 // Kotlin module-info for Main artifact
 module tools.jackson.module.kotlin
 {
-    requires java.desktop;
-
     requires kotlin.reflect;
     requires transitive kotlin.stdlib;
+    requires org.jetbrains.annotations;
 
     requires com.fasterxml.jackson.annotation;
     requires tools.jackson.core;