diff --git a/integration-test/src/test/java/com/reajason/javaweb/integration/memshell/glassfish/GlassFish6ContainerTest.java b/integration-test/src/test/java/com/reajason/javaweb/integration/memshell/glassfish/GlassFish6ContainerTest.java
index f0b65d8b..c80bc567 100644
--- a/integration-test/src/test/java/com/reajason/javaweb/integration/memshell/glassfish/GlassFish6ContainerTest.java
+++ b/integration-test/src/test/java/com/reajason/javaweb/integration/memshell/glassfish/GlassFish6ContainerTest.java
@@ -4,7 +4,6 @@ import com.reajason.javaweb.integration.AbstractContainerTest;
 import com.reajason.javaweb.integration.ContainerTestConfig;
 import com.reajason.javaweb.memshell.ShellTool;
 import com.reajason.javaweb.memshell.ShellType;
-import com.reajason.javaweb.memshell.shelltool.antsword.AntSword;
 import com.reajason.javaweb.packer.Packers;
 import net.bytebuddy.jar.asm.Opcodes;
 import org.testcontainers.containers.GenericContainer;
@@ -26,6 +25,7 @@ public class GlassFish6ContainerTest extends AbstractContainerTest {
             "reajason/glassfish:6.2.6-jdk11",
             "/usr/local/glassfish6/glassfish/domains/domain1/autodeploy/app.war")
             .warFile(warJakartaFile)
+            .jakarta(true)
             .targetJdkVersion(Opcodes.V11)
             .assertLogs(false)
             .supportedShellTypes(List.of(
diff --git a/integration-test/src/test/java/com/reajason/javaweb/integration/memshell/glassfish/GlassFish7ContainerTest.java b/integration-test/src/test/java/com/reajason/javaweb/integration/memshell/glassfish/GlassFish7ContainerTest.java
index 3e52ebb9..44313c18 100644
--- a/integration-test/src/test/java/com/reajason/javaweb/integration/memshell/glassfish/GlassFish7ContainerTest.java
+++ b/integration-test/src/test/java/com/reajason/javaweb/integration/memshell/glassfish/GlassFish7ContainerTest.java
@@ -25,6 +25,7 @@ public class GlassFish7ContainerTest extends AbstractContainerTest {
                     "reajason/glassfish:7.0.20-jdk17",
                     "/usr/local/glassfish7/glassfish/domains/domain1/autodeploy/app.war")
             .warFile(warJakartaFile)
+            .jakarta(true)
             .targetJdkVersion(Opcodes.V17)
             .supportedShellTypes(List.of(
                     ShellType.JAKARTA_FILTER,
diff --git a/integration-test/src/test/java/com/reajason/javaweb/integration/memshell/jbosseap/JbossEap81ContainerTest.java b/integration-test/src/test/java/com/reajason/javaweb/integration/memshell/jbosseap/JbossEap81ContainerTest.java
index 367fafec..e7ad7440 100644
--- a/integration-test/src/test/java/com/reajason/javaweb/integration/memshell/jbosseap/JbossEap81ContainerTest.java
+++ b/integration-test/src/test/java/com/reajason/javaweb/integration/memshell/jbosseap/JbossEap81ContainerTest.java
@@ -25,6 +25,7 @@ public class JbossEap81ContainerTest extends AbstractContainerTest {
             "reajason/jboss:eap-8.1-jdk17",
             "/usr/local/jboss/standalone/deployments/app.war")
             .warFile(warJakartaFile)
+            .jakarta(true)
             .targetJdkVersion(Opcodes.V17)
             .supportedShellTypes(List.of(
                     ShellType.JAKARTA_SERVLET,
diff --git a/integration-test/src/test/java/com/reajason/javaweb/integration/memshell/tomcat/Tomcat10ContainerTest.java b/integration-test/src/test/java/com/reajason/javaweb/integration/memshell/tomcat/Tomcat10ContainerTest.java
index bebf7511..ec3d5e3a 100644
--- a/integration-test/src/test/java/com/reajason/javaweb/integration/memshell/tomcat/Tomcat10ContainerTest.java
+++ b/integration-test/src/test/java/com/reajason/javaweb/integration/memshell/tomcat/Tomcat10ContainerTest.java
@@ -23,6 +23,7 @@ import static com.reajason.javaweb.integration.ContainerTool.warJakartaFile;
 public class Tomcat10ContainerTest extends AbstractContainerTest {
     private static final ContainerTestConfig CONFIG = ContainerTestConfig.tomcat("tomcat:10.1-jre11")
             .warFile(warJakartaFile)
+            .jakarta(true)
             .targetJdkVersion(Opcodes.V11)
             .supportedShellTypes(List.of(
                     ShellType.JAKARTA_FILTER,
diff --git a/integration-test/src/test/java/com/reajason/javaweb/integration/memshell/tomcat/Tomcat11ContainerTest.java b/integration-test/src/test/java/com/reajason/javaweb/integration/memshell/tomcat/Tomcat11ContainerTest.java
index 6ecff2b4..9e479a02 100644
--- a/integration-test/src/test/java/com/reajason/javaweb/integration/memshell/tomcat/Tomcat11ContainerTest.java
+++ b/integration-test/src/test/java/com/reajason/javaweb/integration/memshell/tomcat/Tomcat11ContainerTest.java
@@ -23,6 +23,7 @@ import static com.reajason.javaweb.integration.ContainerTool.warJakartaFile;
 public class Tomcat11ContainerTest extends AbstractContainerTest {
     private static final ContainerTestConfig CONFIG = ContainerTestConfig.tomcat("tomcat:11.0-jre17")
             .warFile(warJakartaFile)
+            .jakarta(true)
             .targetJdkVersion(Opcodes.V17)
             .supportedShellTypes(List.of(
                     ShellType.JAKARTA_FILTER,
diff --git a/integration-test/src/test/java/com/reajason/javaweb/integration/memshell/tomcat/Tomcat11JRE21ContainerTest.java b/integration-test/src/test/java/com/reajason/javaweb/integration/memshell/tomcat/Tomcat11JRE21ContainerTest.java
index 5d8a0a82..af36369e 100644
--- a/integration-test/src/test/java/com/reajason/javaweb/integration/memshell/tomcat/Tomcat11JRE21ContainerTest.java
+++ b/integration-test/src/test/java/com/reajason/javaweb/integration/memshell/tomcat/Tomcat11JRE21ContainerTest.java
@@ -23,6 +23,7 @@ import static com.reajason.javaweb.integration.ContainerTool.warJakartaFile;
 public class Tomcat11JRE21ContainerTest extends AbstractContainerTest {
     private static final ContainerTestConfig CONFIG = ContainerTestConfig.tomcat("tomcat:11.0-jre21")
             .warFile(warJakartaFile)
+            .jakarta(true)
             .targetJdkVersion(Opcodes.V21)
             .supportedShellTypes(List.of(
                     ShellType.JAKARTA_FILTER,
diff --git a/integration-test/src/test/java/com/reajason/javaweb/integration/memshell/wildfly/Wildfly27ContainerTest.java b/integration-test/src/test/java/com/reajason/javaweb/integration/memshell/wildfly/Wildfly27ContainerTest.java
index d714e135..8aa2f85e 100644
--- a/integration-test/src/test/java/com/reajason/javaweb/integration/memshell/wildfly/Wildfly27ContainerTest.java
+++ b/integration-test/src/test/java/com/reajason/javaweb/integration/memshell/wildfly/Wildfly27ContainerTest.java
@@ -25,6 +25,7 @@ public class Wildfly27ContainerTest extends AbstractContainerTest {
             "quay.io/wildfly/wildfly:27.0.1.Final-jdk11",
             "/opt/jboss/wildfly/standalone/deployments/app.war")
             .warFile(warJakartaFile)
+            .jakarta(true)
             .targetJdkVersion(Opcodes.V11)
             .supportedShellTypes(List.of(
                     ShellType.JAKARTA_SERVLET,
diff --git a/integration-test/src/test/java/com/reajason/javaweb/integration/memshell/wildfly/Wildfly30ContainerTest.java b/integration-test/src/test/java/com/reajason/javaweb/integration/memshell/wildfly/Wildfly30ContainerTest.java
index 0cd67ab8..5a60e83c 100644
--- a/integration-test/src/test/java/com/reajason/javaweb/integration/memshell/wildfly/Wildfly30ContainerTest.java
+++ b/integration-test/src/test/java/com/reajason/javaweb/integration/memshell/wildfly/Wildfly30ContainerTest.java
@@ -25,6 +25,7 @@ public class Wildfly30ContainerTest extends AbstractContainerTest {
             "quay.io/wildfly/wildfly:30.0.1.Final-jdk17",
             "/opt/jboss/wildfly/standalone/deployments/app.war")
             .warFile(warJakartaFile)
+            .jakarta(true)
             .targetJdkVersion(Opcodes.V17)
             .supportedShellTypes(List.of(
                     ShellType.JAKARTA_SERVLET,
diff --git a/integration-test/src/test/java/com/reajason/javaweb/integration/memshell/wildfly/Wildfly36ContainerTest.java b/integration-test/src/test/java/com/reajason/javaweb/integration/memshell/wildfly/Wildfly36ContainerTest.java
index d55a4fc7..4f80b2f4 100644
--- a/integration-test/src/test/java/com/reajason/javaweb/integration/memshell/wildfly/Wildfly36ContainerTest.java
+++ b/integration-test/src/test/java/com/reajason/javaweb/integration/memshell/wildfly/Wildfly36ContainerTest.java
@@ -25,6 +25,7 @@ public class Wildfly36ContainerTest extends AbstractContainerTest {
             "quay.io/wildfly/wildfly:36.0.0.Final-jdk21",
             "/opt/jboss/wildfly/standalone/deployments/app.war")
             .warFile(warJakartaFile)
+            .jakarta(true)
             .targetJdkVersion(Opcodes.V21)
             .supportedShellTypes(List.of(
                     ShellType.JAKARTA_SERVLET,