diff --git a/pom.xml b/pom.xml
index 0a2b365..440bb4a 100644
--- a/pom.xml
+++ b/pom.xml
@@ -183,7 +183,7 @@
                         <failsOnError>true</failsOnError>
                         <suppressionsLocation>checkstyle-suppressions.xml</suppressionsLocation>
                         <includeTestSourceDirectory>true</includeTestSourceDirectory>
-                        <excludes>**/*$logger.java,**/*$bundle.java</excludes>
+                        <excludes>**/*$logger.java,**/*$bundle.java,**/module-info.java</excludes>
                     </configuration>
                 </plugin>
 
@@ -247,6 +247,29 @@
                         <wildfly.launcher.bootable.jar>${wildfly.launcher.bootable.jar}</wildfly.launcher.bootable.jar>
                     </systemPropertyVariables>
                 </configuration>
+                <executions>
+                    <execution>
+                        <id>default-test</id>
+                        <phase>test</phase>
+                        <goals>
+                            <goal>test</goal>
+                        </goals>
+                        <configuration>
+                            <excludedGroups>non-modular</excludedGroups>
+                        </configuration>
+                    </execution>
+                    <execution>
+                        <id>non-modular-tests</id>
+                        <phase>test</phase>
+                        <goals>
+                            <goal>test</goal>
+                        </goals>
+                        <configuration>
+                            <groups>non-modular</groups>
+                            <useModulePath>false</useModulePath>
+                        </configuration>
+                    </execution>
+                </executions>
             </plugin>
             <plugin>
                 <groupId>org.wildfly.plugins</groupId>
diff --git a/src/main/java/module-info.java b/src/main/java/module-info.java
new file mode 100644
index 0000000..a71ede1
--- /dev/null
+++ b/src/main/java/module-info.java
@@ -0,0 +1,9 @@
+/**
+ * @author <a href="mailto:jperkins@redhat.com">James R. Perkins</a>
+ */
+module org.wildfly.launcher {
+    // Only required for compiling
+    requires static org.jboss.logging.annotations;
+
+    exports org.wildfly.core.launcher;
+}
\ No newline at end of file
diff --git a/src/test/java/org/wildfly/core/launcher/ServerLauncherTest.java b/src/test/java/org/wildfly/core/launcher/ServerLauncherTest.java
index 95229af..5be7381 100644
--- a/src/test/java/org/wildfly/core/launcher/ServerLauncherTest.java
+++ b/src/test/java/org/wildfly/core/launcher/ServerLauncherTest.java
@@ -14,6 +14,7 @@
 import java.util.stream.Stream;
 
 import org.junit.jupiter.api.Assertions;
+import org.junit.jupiter.api.Tag;
 import org.junit.jupiter.api.TestInfo;
 import org.junit.jupiter.api.TestTemplate;
 import org.junit.jupiter.api.extension.ExtendWith;
@@ -31,6 +32,7 @@
 /**
  * @author <a href="mailto:jperkins@redhat.com">James R. Perkins</a>
  */
+@Tag("non-modular")
 class ServerLauncherTest {
     private static final Path JBOSS_HOME = Path.of(System.getProperty("jboss.home"));
     private static final Path BOOTABLE_JAR = Path.of(System.getProperty("wildfly.launcher.bootable.jar"));