diff --git a/build/checkstyle-config.xml b/build/checkstyle-config.xml
index beba271a4..594d28e1d 100644
--- a/build/checkstyle-config.xml
+++ b/build/checkstyle-config.xml
@@ -7,6 +7,10 @@
     <property name="charset" value="UTF-8"/>
     <property name="severity" value="error"/>
 
+    <module name="BeforeExecutionExclusionFileFilter">
+        <property name="fileNamePattern" value="module\-info\.java$"/>
+    </module>
+
     <module name="FileLength"/>
     <module name="FileTabCharacter"/>
     <module name="NewlineAtEndOfFile">
diff --git a/equalsverifier-core/src/main/java/module-info.java b/equalsverifier-core/src/main/java/module-info.java
new file mode 100644
index 000000000..58fe2e10d
--- /dev/null
+++ b/equalsverifier-core/src/main/java/module-info.java
@@ -0,0 +1,17 @@
+module nl.jqno.equalsverifier {
+    exports nl.jqno.equalsverifier;
+    exports nl.jqno.equalsverifier.api;
+
+    // Direct dependencies
+    requires net.bytebuddy;
+    requires org.objenesis;
+
+    // Built-in prefab values
+    requires static com.google.common;
+    requires static java.desktop;
+    requires static java.naming;
+    requires static java.rmi;
+    requires static java.sql;
+    requires static javafx.base;
+    requires static org.joda.time;
+}
diff --git a/equalsverifier-release-main/pom.xml b/equalsverifier-release-main/pom.xml
index a54645e63..c33be52cb 100644
--- a/equalsverifier-release-main/pom.xml
+++ b/equalsverifier-release-main/pom.xml
@@ -61,7 +61,6 @@
                             <addDefaultImplementationEntries>true</addDefaultImplementationEntries>
                         </manifest>
                         <manifestEntries>
-                            <Automatic-Module-Name>nl.jqno.equalsverifier</Automatic-Module-Name>
                             <Multi-Release>true</Multi-Release>
                             <Implementation-Title>EqualsVerifier</Implementation-Title>
                             <Website>${project.url}</Website>
diff --git a/equalsverifier-release-nodep/pom.xml b/equalsverifier-release-nodep/pom.xml
index 991e0c3b9..c77576aee 100644
--- a/equalsverifier-release-nodep/pom.xml
+++ b/equalsverifier-release-nodep/pom.xml
@@ -61,7 +61,6 @@
                             <addDefaultImplementationEntries>true</addDefaultImplementationEntries>
                         </manifest>
                         <manifestEntries>
-                            <Automatic-Module-Name>nl.jqno.equalsverifier</Automatic-Module-Name>
                             <Multi-Release>true</Multi-Release>
                             <Implementation-Title>EqualsVerifier (no dependencies)</Implementation-Title>
                             <Website>${project.url}</Website>
diff --git a/equalsverifier-release-verify/src/test/java/nl/jqno/equalsverifier/verify_release/jar/MainJavadocJarTest.java b/equalsverifier-release-verify/src/test/java/nl/jqno/equalsverifier/verify_release/jar/MainJavadocJarTest.java
index 32b09528a..3e8085dfe 100644
--- a/equalsverifier-release-verify/src/test/java/nl/jqno/equalsverifier/verify_release/jar/MainJavadocJarTest.java
+++ b/equalsverifier-release-verify/src/test/java/nl/jqno/equalsverifier/verify_release/jar/MainJavadocJarTest.java
@@ -27,6 +27,6 @@ static void clean() throws Exception {
 
     @Test
     void presenceOfCoreSources() {
-        jar.assertPresenceOf("/index.html", EV + "/EqualsVerifier.html");
+        jar.assertPresenceOf("/index.html", "/nl.jqno.equalsverifier" + EV + "/EqualsVerifier.html");
     }
 }
diff --git a/equalsverifier-release-verify/src/test/java/nl/jqno/equalsverifier/verify_release/jar/NodepJavadocJarTest.java b/equalsverifier-release-verify/src/test/java/nl/jqno/equalsverifier/verify_release/jar/NodepJavadocJarTest.java
index f24c27709..28af8d513 100644
--- a/equalsverifier-release-verify/src/test/java/nl/jqno/equalsverifier/verify_release/jar/NodepJavadocJarTest.java
+++ b/equalsverifier-release-verify/src/test/java/nl/jqno/equalsverifier/verify_release/jar/NodepJavadocJarTest.java
@@ -27,6 +27,6 @@ static void clean() throws Exception {
 
     @Test
     void presenceOfCoreSources() {
-        jar.assertPresenceOf("/index.html", EV + "/EqualsVerifier.html");
+        jar.assertPresenceOf("/index.html", "/nl.jqno.equalsverifier" + EV + "/EqualsVerifier.html");
     }
 }
diff --git a/equalsverifier-release-verify/src/test/java/nl/jqno/equalsverifier/verify_release/jar/helper/JarAsserter.java b/equalsverifier-release-verify/src/test/java/nl/jqno/equalsverifier/verify_release/jar/helper/JarAsserter.java
index 78d1a6263..a3f18dbd9 100644
--- a/equalsverifier-release-verify/src/test/java/nl/jqno/equalsverifier/verify_release/jar/helper/JarAsserter.java
+++ b/equalsverifier-release-verify/src/test/java/nl/jqno/equalsverifier/verify_release/jar/helper/JarAsserter.java
@@ -14,6 +14,7 @@ public JarAsserter(JarReader reader) {
 
     public void assertPresenceOfCoreClasses() {
         assertPresenceOf(
+            "/module-info.class",
             EV + "/EqualsVerifier.class",
             EV + "/internal/reflection/ClassProbe.class",
             EV + "/internal/checkers/HierarchyChecker.class");
@@ -51,7 +52,6 @@ public void assertContentOfManifest(String implementationTitle) {
         var manifest = new String(reader.getContentOf(filename));
         assertThat(manifest)
                 .satisfies(
-                    m -> assertContains("Automatic-Module-Name: nl.jqno.equalsverifier", m, filename),
                     m -> assertContains("Implementation-Title: " + implementationTitle, m, filename),
                     m -> assertContains("Implementation-Version: ", m, filename),
                     m -> assertContains("Multi-Release: true", m, filename),
diff --git a/pom.xml b/pom.xml
index 29199d5b3..b8cac9d8c 100644
--- a/pom.xml
+++ b/pom.xml
@@ -153,6 +153,7 @@
                 <version>${version.maven-surefire-plugin}</version>
                 <configuration>
                     <argLine>@{argline.full}</argLine>
+                    <useModulePath>false</useModulePath>
                     <trimStackTrace>false</trimStackTrace>
                     <useSystemClassLoader>false</useSystemClassLoader>
                 </configuration>