gistfile1.txt

diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/ee/entityManager/Client.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/ee/entityManager/Client.java
index 15f2f94a2..dc678c646 100644
--- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/ee/entityManager/Client.java
+++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/ee/entityManager/Client.java
@@ -20,8 +20,12 @@ import java.lang.System.Logger;
 import java.util.HashMap;
 import java.util.Map;
 import java.util.Properties;
-
+import org.jboss.arquillian.container.test.api.Deployment;
+import org.jboss.shrinkwrap.api.Archive;
+import org.jboss.shrinkwrap.api.ShrinkWrap;
+import org.jboss.shrinkwrap.api.spec.EnterpriseArchive;
 import org.jboss.shrinkwrap.api.spec.JavaArchive;
+import org.jboss.shrinkwrap.api.spec.WebArchive;
 import org.junit.jupiter.api.AfterEach;
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
@@ -34,6 +38,59 @@ import jakarta.persistence.TransactionRequiredException;
 
 public class Client extends PMClientBase {
 
+  @Deployment(testable = false)
+  public static Archive<?> deployment() {
+
+    final EnterpriseArchive ear = ShrinkWrap.create(EnterpriseArchive.class, "jpa_ee_entityManager_vehicles.ear");
+    // TODO: filter/eliminate the library jar classes that shouldn't be included
+    // Add ear/lib jars
+
+    JavaArchive jpa_ee_entityManager_jar = ShrinkWrap.create(JavaArchive.class, "jpa_ee_entityManager_jar");
+    jpa_ee_entityManager_jar.addClass(ee.jakarta.tck.persistence.ee.entityManager.Order.class);
+    ear.addAsLibrary(jpa_ee_entityManager_jar);
+    // Add ear submodules
+
+    JavaArchive jpa_ee_entityManager_appmanaged_vehicle_client_jar = ShrinkWrap.create(JavaArchive.class, "jpa_ee_entityManager_appmanaged_vehicle_client_jar");
+    jpa_ee_entityManager_appmanaged_vehicle_client_jar.addClass(ee.jakarta.tck.persistence.common.PMClientBase.class);
+    ear.addAsModule(jpa_ee_entityManager_appmanaged_vehicle_client_jar);
+
+    JavaArchive jpa_ee_entityManager_appmanaged_vehicle_ejb_jar = ShrinkWrap.create(JavaArchive.class, "jpa_ee_entityManager_appmanaged_vehicle_ejb_jar");
+    jpa_ee_entityManager_appmanaged_vehicle_ejb_jar.addClass(ee.jakarta.tck.persistence.common.PMClientBase.class);
+    jpa_ee_entityManager_appmanaged_vehicle_ejb_jar.addClass(ee.jakarta.tck.persistence.ee.entityManager.Client.class);
+    ear.addAsModule(jpa_ee_entityManager_appmanaged_vehicle_ejb_jar);
+
+    WebArchive jpa_ee_entityManager_pmservlet_vehicle_web_war = ShrinkWrap.create(WebArchive.class, "jpa_ee_entityManager_pmservlet_vehicle_web_war");
+    jpa_ee_entityManager_pmservlet_vehicle_web_war.addAsWebInfResource("web.xml");
+
+    JavaArchive jpa_ee_entityManager_jar = ShrinkWrap.create(JavaArchive.class, "jpa_ee_entityManager.jar");
+    jpa_ee_entityManager_jar.addClass(ee.jakarta.tck.persistence.ee.entityManager.Order.class);
+    jpa_ee_entityManager_jar.addAsManifestResource("META-INF/MANIFEST.MF");
+    jpa_ee_entityManager_jar.addAsManifestResource("META-INF/persistence.xml");
+    jpa_ee_entityManager_pmservlet_vehicle_web_war.addAsLibrary(jpa_ee_entityManager_jar);
+    jpa_ee_entityManager_pmservlet_vehicle_web_war.addClass(ee.jakarta.tck.persistence.common.PMClientBase.class);
+    jpa_ee_entityManager_pmservlet_vehicle_web_war.addClass(ee.jakarta.tck.persistence.ee.entityManager.Client.class);
+    ear.addAsModule(jpa_ee_entityManager_pmservlet_vehicle_web_war);
+
+    JavaArchive jpa_ee_entityManager_stateful3_vehicle_client_jar = ShrinkWrap.create(JavaArchive.class, "jpa_ee_entityManager_stateful3_vehicle_client_jar");
+    jpa_ee_entityManager_stateful3_vehicle_client_jar.addClass(ee.jakarta.tck.persistence.common.PMClientBase.class);
+    ear.addAsModule(jpa_ee_entityManager_stateful3_vehicle_client_jar);
+
+    JavaArchive jpa_ee_entityManager_stateful3_vehicle_ejb_jar = ShrinkWrap.create(JavaArchive.class, "jpa_ee_entityManager_stateful3_vehicle_ejb_jar");
+    jpa_ee_entityManager_stateful3_vehicle_ejb_jar.addClass(ee.jakarta.tck.persistence.common.PMClientBase.class);
+    jpa_ee_entityManager_stateful3_vehicle_ejb_jar.addClass(ee.jakarta.tck.persistence.ee.entityManager.Client.class);
+    ear.addAsModule(jpa_ee_entityManager_stateful3_vehicle_ejb_jar);
+
+    JavaArchive jpa_ee_entityManager_stateless3_vehicle_client_jar = ShrinkWrap.create(JavaArchive.class, "jpa_ee_entityManager_stateless3_vehicle_client_jar");
+    jpa_ee_entityManager_stateless3_vehicle_client_jar.addClass(ee.jakarta.tck.persistence.common.PMClientBase.class);
+    ear.addAsModule(jpa_ee_entityManager_stateless3_vehicle_client_jar);
+
+    JavaArchive jpa_ee_entityManager_stateless3_vehicle_ejb_jar = ShrinkWrap.create(JavaArchive.class, "jpa_ee_entityManager_stateless3_vehicle_ejb_jar");
+    jpa_ee_entityManager_stateless3_vehicle_ejb_jar.addClass(ee.jakarta.tck.persistence.common.PMClientBase.class);
+    jpa_ee_entityManager_stateless3_vehicle_ejb_jar.addClass(ee.jakarta.tck.persistence.ee.entityManager.Client.class);
+    ear.addAsModule(jpa_ee_entityManager_stateless3_vehicle_ejb_jar);
+    return ear;
+  }
+
 	private static final Logger logger = (Logger) System.getLogger(Client.class.getName());
 
 	Properties props = null;
diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/ee/entityManagerFactory/Client.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/ee/entityManagerFactory/Client.java
index be6ef03f3..5f0d32421 100644
--- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/ee/entityManagerFactory/Client.java
+++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/ee/entityManagerFactory/Client.java
@@ -18,8 +18,12 @@ package ee.jakarta.tck.persistence.ee.entityManagerFactory;
 
 import java.lang.System.Logger;
 import java.util.Properties;
-
+import org.jboss.arquillian.container.test.api.Deployment;
+import org.jboss.shrinkwrap.api.Archive;
+import org.jboss.shrinkwrap.api.ShrinkWrap;
+import org.jboss.shrinkwrap.api.spec.EnterpriseArchive;
 import org.jboss.shrinkwrap.api.spec.JavaArchive;
+import org.jboss.shrinkwrap.api.spec.WebArchive;
 import org.junit.jupiter.api.AfterEach;
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
@@ -32,6 +36,80 @@ import jakarta.persistence.Persistence;
 
 public class Client extends PMClientBase {
 
+  @Deployment(testable = false)
+  public static Archive<?> deployment() {
+
+    final EnterpriseArchive ear = ShrinkWrap.create(EnterpriseArchive.class, "jpa_ee_entityManagerFactory_vehicles.ear");
+    // TODO: filter/eliminate the library jar classes that shouldn't be included
+    // Add ear/lib jars
+
+    JavaArchive jpa_ee_entityManagerFactory_jar = ShrinkWrap.create(JavaArchive.class, "jpa_ee_entityManagerFactory_jar");
+    jpa_ee_entityManagerFactory_jar.addClass(ee.jakarta.tck.persistence.ee.entityManagerFactory.Order.class);
+    ear.addAsLibrary(jpa_ee_entityManagerFactory_jar);
+    // Add ear submodules
+
+    JavaArchive jpa_ee_entityManagerFactory_appmanagedNoTx_vehicle_client_jar = ShrinkWrap.create(JavaArchive.class, "jpa_ee_entityManagerFactory_appmanagedNoTx_vehicle_client_jar");
+    jpa_ee_entityManagerFactory_appmanagedNoTx_vehicle_client_jar.addClass(ee.jakarta.tck.persistence.common.PMClientBase.class);
+    ear.addAsModule(jpa_ee_entityManagerFactory_appmanagedNoTx_vehicle_client_jar);
+
+    JavaArchive jpa_ee_entityManagerFactory_appmanagedNoTx_vehicle_ejb_jar = ShrinkWrap.create(JavaArchive.class, "jpa_ee_entityManagerFactory_appmanagedNoTx_vehicle_ejb_jar");
+    jpa_ee_entityManagerFactory_appmanagedNoTx_vehicle_ejb_jar.addClass(ee.jakarta.tck.persistence.common.PMClientBase.class);
+    jpa_ee_entityManagerFactory_appmanagedNoTx_vehicle_ejb_jar.addClass(ee.jakarta.tck.persistence.ee.entityManagerFactory.Client.class);
+    ear.addAsModule(jpa_ee_entityManagerFactory_appmanagedNoTx_vehicle_ejb_jar);
+
+    JavaArchive jpa_ee_entityManagerFactory_appmanaged_vehicle_client_jar = ShrinkWrap.create(JavaArchive.class, "jpa_ee_entityManagerFactory_appmanaged_vehicle_client_jar");
+    jpa_ee_entityManagerFactory_appmanaged_vehicle_client_jar.addClass(ee.jakarta.tck.persistence.common.PMClientBase.class);
+    ear.addAsModule(jpa_ee_entityManagerFactory_appmanaged_vehicle_client_jar);
+
+    JavaArchive jpa_ee_entityManagerFactory_appmanaged_vehicle_ejb_jar = ShrinkWrap.create(JavaArchive.class, "jpa_ee_entityManagerFactory_appmanaged_vehicle_ejb_jar");
+    jpa_ee_entityManagerFactory_appmanaged_vehicle_ejb_jar.addClass(ee.jakarta.tck.persistence.common.PMClientBase.class);
+    jpa_ee_entityManagerFactory_appmanaged_vehicle_ejb_jar.addClass(ee.jakarta.tck.persistence.ee.entityManagerFactory.Client.class);
+    ear.addAsModule(jpa_ee_entityManagerFactory_appmanaged_vehicle_ejb_jar);
+
+    WebArchive jpa_ee_entityManagerFactory_pmservlet_vehicle_web_war = ShrinkWrap.create(WebArchive.class, "jpa_ee_entityManagerFactory_pmservlet_vehicle_web_war");
+    jpa_ee_entityManagerFactory_pmservlet_vehicle_web_war.addAsWebInfResource("web.xml");
+
+    JavaArchive jpa_ee_entityManagerFactory_jar = ShrinkWrap.create(JavaArchive.class, "jpa_ee_entityManagerFactory.jar");
+    jpa_ee_entityManagerFactory_jar.addClass(ee.jakarta.tck.persistence.ee.entityManagerFactory.Order.class);
+    jpa_ee_entityManagerFactory_jar.addAsManifestResource("META-INF/MANIFEST.MF");
+    jpa_ee_entityManagerFactory_jar.addAsManifestResource("META-INF/persistence.xml");
+    jpa_ee_entityManagerFactory_pmservlet_vehicle_web_war.addAsLibrary(jpa_ee_entityManagerFactory_jar);
+    jpa_ee_entityManagerFactory_pmservlet_vehicle_web_war.addClass(ee.jakarta.tck.persistence.common.PMClientBase.class);
+    jpa_ee_entityManagerFactory_pmservlet_vehicle_web_war.addClass(ee.jakarta.tck.persistence.ee.entityManagerFactory.Client.class);
+    ear.addAsModule(jpa_ee_entityManagerFactory_pmservlet_vehicle_web_war);
+
+    WebArchive jpa_ee_entityManagerFactory_puservlet_vehicle_web_war = ShrinkWrap.create(WebArchive.class, "jpa_ee_entityManagerFactory_puservlet_vehicle_web_war");
+    jpa_ee_entityManagerFactory_puservlet_vehicle_web_war.addAsWebInfResource("web.xml");
+
+    JavaArchive jpa_ee_entityManagerFactory_jar = ShrinkWrap.create(JavaArchive.class, "jpa_ee_entityManagerFactory.jar");
+    jpa_ee_entityManagerFactory_jar.addClass(ee.jakarta.tck.persistence.ee.entityManagerFactory.Order.class);
+    jpa_ee_entityManagerFactory_jar.addAsManifestResource("META-INF/MANIFEST.MF");
+    jpa_ee_entityManagerFactory_jar.addAsManifestResource("META-INF/persistence.xml");
+    jpa_ee_entityManagerFactory_puservlet_vehicle_web_war.addAsLibrary(jpa_ee_entityManagerFactory_jar);
+    jpa_ee_entityManagerFactory_puservlet_vehicle_web_war.addClass(ee.jakarta.tck.persistence.common.PMClientBase.class);
+    jpa_ee_entityManagerFactory_puservlet_vehicle_web_war.addClass(ee.jakarta.tck.persistence.ee.entityManagerFactory.Client.class);
+    ear.addAsModule(jpa_ee_entityManagerFactory_puservlet_vehicle_web_war);
+
+    JavaArchive jpa_ee_entityManagerFactory_stateful3_vehicle_client_jar = ShrinkWrap.create(JavaArchive.class, "jpa_ee_entityManagerFactory_stateful3_vehicle_client_jar");
+    jpa_ee_entityManagerFactory_stateful3_vehicle_client_jar.addClass(ee.jakarta.tck.persistence.common.PMClientBase.class);
+    ear.addAsModule(jpa_ee_entityManagerFactory_stateful3_vehicle_client_jar);
+
+    JavaArchive jpa_ee_entityManagerFactory_stateful3_vehicle_ejb_jar = ShrinkWrap.create(JavaArchive.class, "jpa_ee_entityManagerFactory_stateful3_vehicle_ejb_jar");
+    jpa_ee_entityManagerFactory_stateful3_vehicle_ejb_jar.addClass(ee.jakarta.tck.persistence.common.PMClientBase.class);
+    jpa_ee_entityManagerFactory_stateful3_vehicle_ejb_jar.addClass(ee.jakarta.tck.persistence.ee.entityManagerFactory.Client.class);
+    ear.addAsModule(jpa_ee_entityManagerFactory_stateful3_vehicle_ejb_jar);
+
+    JavaArchive jpa_ee_entityManagerFactory_stateless3_vehicle_client_jar = ShrinkWrap.create(JavaArchive.class, "jpa_ee_entityManagerFactory_stateless3_vehicle_client_jar");
+    jpa_ee_entityManagerFactory_stateless3_vehicle_client_jar.addClass(ee.jakarta.tck.persistence.common.PMClientBase.class);
+    ear.addAsModule(jpa_ee_entityManagerFactory_stateless3_vehicle_client_jar);
+
+    JavaArchive jpa_ee_entityManagerFactory_stateless3_vehicle_ejb_jar = ShrinkWrap.create(JavaArchive.class, "jpa_ee_entityManagerFactory_stateless3_vehicle_ejb_jar");
+    jpa_ee_entityManagerFactory_stateless3_vehicle_ejb_jar.addClass(ee.jakarta.tck.persistence.common.PMClientBase.class);
+    jpa_ee_entityManagerFactory_stateless3_vehicle_ejb_jar.addClass(ee.jakarta.tck.persistence.ee.entityManagerFactory.Client.class);
+    ear.addAsModule(jpa_ee_entityManagerFactory_stateless3_vehicle_ejb_jar);
+    return ear;
+  }
+
 	private static final Logger logger = (Logger) System.getLogger(Client.class.getName());
 
 	Properties props = null;
diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/ee/packaging/appclient/annotation/Client.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/ee/packaging/appclient/annotation/Client.java
index 325ce8265..9c22c91ca 100644
--- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/ee/packaging/appclient/annotation/Client.java
+++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/ee/packaging/appclient/annotation/Client.java
@@ -21,7 +21,11 @@
 package ee.jakarta.tck.persistence.ee.packaging.appclient.annotation;
 
 import java.lang.System.Logger;
-
+import org.jboss.arquillian.container.test.api.Deployment;
+import org.jboss.shrinkwrap.api.Archive;
+import org.jboss.shrinkwrap.api.ShrinkWrap;
+import org.jboss.shrinkwrap.api.spec.EnterpriseArchive;
+import org.jboss.shrinkwrap.api.spec.JavaArchive;
 import org.junit.jupiter.api.AfterEach;
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
@@ -33,6 +37,19 @@ import jakarta.persistence.PersistenceUnit;
 
 public class Client {
 
+  @Deployment(testable = false)
+  public static Archive<?> deployment() {
+
+    final EnterpriseArchive ear = ShrinkWrap.create(EnterpriseArchive.class, "jpa_ee_packaging_appclient_annotation.ear");
+    // Add ear submodules
+
+    JavaArchive jpa_ee_packaging_appclient_annotation_client_jar = ShrinkWrap.create(JavaArchive.class, "jpa_ee_packaging_appclient_annotation_client_jar");
+    jpa_ee_packaging_appclient_annotation_client_jar.addClass(ee.jakarta.tck.persistence.ee.packaging.appclient.annotation.Client.class);
+    jpa_ee_packaging_appclient_annotation_client_jar.addClass(ee.jakarta.tck.persistence.ee.packaging.appclient.annotation.Coffee.class);
+    ear.addAsModule(jpa_ee_packaging_appclient_annotation_client_jar);
+    return ear;
+  }
+
 	private static final Logger logger = (Logger) System.getLogger(Client.class.getName());
 
 	private static final Coffee cRef[] = new Coffee[5];
diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/ee/packaging/appclient/descriptor/Client.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/ee/packaging/appclient/descriptor/Client.java
index 63c63d5d2..0caf57cd2 100644
--- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/ee/packaging/appclient/descriptor/Client.java
+++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/ee/packaging/appclient/descriptor/Client.java
@@ -21,7 +21,11 @@
 package ee.jakarta.tck.persistence.ee.packaging.appclient.descriptor;
 
 import java.lang.System.Logger;
-
+import org.jboss.arquillian.container.test.api.Deployment;
+import org.jboss.shrinkwrap.api.Archive;
+import org.jboss.shrinkwrap.api.ShrinkWrap;
+import org.jboss.shrinkwrap.api.spec.EnterpriseArchive;
+import org.jboss.shrinkwrap.api.spec.JavaArchive;
 import org.junit.jupiter.api.AfterEach;
 import org.junit.jupiter.api.Test;
 
@@ -33,6 +37,19 @@ import jakarta.persistence.EntityTransaction;
 
 public class Client {
 
+  @Deployment(testable = false)
+  public static Archive<?> deployment() {
+
+    final EnterpriseArchive ear = ShrinkWrap.create(EnterpriseArchive.class, "jpa_ee_packaging_appclient_descriptor.ear");
+    // Add ear submodules
+
+    JavaArchive jpa_ee_packaging_appclient_descriptor_client_jar = ShrinkWrap.create(JavaArchive.class, "jpa_ee_packaging_appclient_descriptor_client_jar");
+    jpa_ee_packaging_appclient_descriptor_client_jar.addClass(ee.jakarta.tck.persistence.ee.packaging.appclient.descriptor.Client.class);
+    jpa_ee_packaging_appclient_descriptor_client_jar.addClass(ee.jakarta.tck.persistence.ee.packaging.appclient.descriptor.Coffee.class);
+    ear.addAsModule(jpa_ee_packaging_appclient_descriptor_client_jar);
+    return ear;
+  }
+
 	private static final Logger logger = (Logger) System.getLogger(Client.class.getName());
 
 	private static final Coffee cRef[] = new Coffee[5];
diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/ee/packaging/ejb/descriptor/Client.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/ee/packaging/ejb/descriptor/Client.java
index 5d730f906..561c9ffc4 100644
--- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/ee/packaging/ejb/descriptor/Client.java
+++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/ee/packaging/ejb/descriptor/Client.java
@@ -23,6 +23,11 @@ package ee.jakarta.tck.persistence.ee.packaging.ejb.descriptor;
 import java.lang.System.Logger;
 import java.util.Properties;
 
+import org.jboss.arquillian.container.test.api.Deployment;
+import org.jboss.shrinkwrap.api.Archive;
+import org.jboss.shrinkwrap.api.ShrinkWrap;
+import org.jboss.shrinkwrap.api.spec.EnterpriseArchive;
+import org.jboss.shrinkwrap.api.spec.JavaArchive;
 import org.junit.jupiter.api.AfterEach;
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
@@ -31,6 +36,31 @@ import com.sun.ts.lib.util.TSNamingContext;
 
 public class Client {
 
+  @Deployment(testable = false)
+  public static Archive<?> deployment() {
+
+    final EnterpriseArchive ear = ShrinkWrap.create(EnterpriseArchive.class, "jpa_ee_packaging_ejb_descriptor.ear");
+    // Add ear submodules
+
+    JavaArchive jpa_ee_packaging_ejb_descriptor_client_jar = ShrinkWrap.create(JavaArchive.class, "jpa_ee_packaging_ejb_descriptor_client_jar");
+    jpa_ee_packaging_ejb_descriptor_client_jar.addClass(ee.jakarta.tck.persistence.ee.packaging.ejb.descriptor.C.class);
+    jpa_ee_packaging_ejb_descriptor_client_jar.addClass(ee.jakarta.tck.persistence.ee.packaging.ejb.descriptor.Client.class);
+    jpa_ee_packaging_ejb_descriptor_client_jar.addClass(ee.jakarta.tck.persistence.ee.packaging.ejb.descriptor.Stateful3IF.class);
+    jpa_ee_packaging_ejb_descriptor_client_jar.addClass(ee.jakarta.tck.persistence.ee.packaging.ejb.descriptor.Stateless3IF.class);
+    ear.addAsModule(jpa_ee_packaging_ejb_descriptor_client_jar);
+
+    JavaArchive jpa_ee_packaging_ejb_descriptor_ejb_jar = ShrinkWrap.create(JavaArchive.class, "jpa_ee_packaging_ejb_descriptor_ejb_jar");
+    jpa_ee_packaging_ejb_descriptor_ejb_jar.addClass(ee.jakarta.tck.persistence.ee.packaging.ejb.descriptor.A.class);
+    jpa_ee_packaging_ejb_descriptor_ejb_jar.addClass(ee.jakarta.tck.persistence.ee.packaging.ejb.descriptor.B.class);
+    jpa_ee_packaging_ejb_descriptor_ejb_jar.addClass(ee.jakarta.tck.persistence.ee.packaging.ejb.descriptor.C.class);
+    jpa_ee_packaging_ejb_descriptor_ejb_jar.addClass(ee.jakarta.tck.persistence.ee.packaging.ejb.descriptor.Stateful3Bean.class);
+    jpa_ee_packaging_ejb_descriptor_ejb_jar.addClass(ee.jakarta.tck.persistence.ee.packaging.ejb.descriptor.Stateful3IF.class);
+    jpa_ee_packaging_ejb_descriptor_ejb_jar.addClass(ee.jakarta.tck.persistence.ee.packaging.ejb.descriptor.Stateless3Bean.class);
+    jpa_ee_packaging_ejb_descriptor_ejb_jar.addClass(ee.jakarta.tck.persistence.ee.packaging.ejb.descriptor.Stateless3IF.class);
+    ear.addAsModule(jpa_ee_packaging_ejb_descriptor_ejb_jar);
+    return ear;
+  }
+
 	private static final Logger logger = (Logger) System.getLogger(Client.class.getName());
 
 	public static final String StatefulRef = "java:comp/env/ejb/Stateful3Bean";
diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/ee/packaging/ejb/exclude/Client.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/ee/packaging/ejb/exclude/Client.java
index 906e071c6..fdc8dd72f 100644
--- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/ee/packaging/ejb/exclude/Client.java
+++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/ee/packaging/ejb/exclude/Client.java
@@ -22,7 +22,11 @@ package ee.jakarta.tck.persistence.ee.packaging.ejb.exclude;
 
 import java.lang.System.Logger;
 import java.util.Properties;
-
+import org.jboss.arquillian.container.test.api.Deployment;
+import org.jboss.shrinkwrap.api.Archive;
+import org.jboss.shrinkwrap.api.ShrinkWrap;
+import org.jboss.shrinkwrap.api.spec.EnterpriseArchive;
+import org.jboss.shrinkwrap.api.spec.JavaArchive;
 import org.junit.jupiter.api.AfterEach;
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
@@ -31,6 +35,26 @@ import jakarta.ejb.EJB;
 
 public class Client {
 
+  @Deployment(testable = false)
+  public static Archive<?> deployment() {
+
+    final EnterpriseArchive ear = ShrinkWrap.create(EnterpriseArchive.class, "jpa_ee_packaging_ejb_exclude.ear");
+    // Add ear submodules
+
+    JavaArchive jpa_ee_packaging_ejb_exclude_client_jar = ShrinkWrap.create(JavaArchive.class, "jpa_ee_packaging_ejb_exclude_client_jar");
+    jpa_ee_packaging_ejb_exclude_client_jar.addClass(ee.jakarta.tck.persistence.ee.packaging.ejb.exclude.Client.class);
+    jpa_ee_packaging_ejb_exclude_client_jar.addClass(ee.jakarta.tck.persistence.ee.packaging.ejb.exclude.Stateful3IF.class);
+    ear.addAsModule(jpa_ee_packaging_ejb_exclude_client_jar);
+
+    JavaArchive jpa_ee_packaging_ejb_exclude_ejb_jar = ShrinkWrap.create(JavaArchive.class, "jpa_ee_packaging_ejb_exclude_ejb_jar");
+    jpa_ee_packaging_ejb_exclude_ejb_jar.addClass(ee.jakarta.tck.persistence.ee.packaging.ejb.exclude.A.class);
+    jpa_ee_packaging_ejb_exclude_ejb_jar.addClass(ee.jakarta.tck.persistence.ee.packaging.ejb.exclude.B.class);
+    jpa_ee_packaging_ejb_exclude_ejb_jar.addClass(ee.jakarta.tck.persistence.ee.packaging.ejb.exclude.Stateful3Bean.class);
+    jpa_ee_packaging_ejb_exclude_ejb_jar.addClass(ee.jakarta.tck.persistence.ee.packaging.ejb.exclude.Stateful3IF.class);
+    ear.addAsModule(jpa_ee_packaging_ejb_exclude_ejb_jar);
+    return ear;
+  }
+
 	private static final Logger logger = (Logger) System.getLogger(Client.class.getName());
 
 	@EJB(beanName = "Stateful3Bean")
diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/ee/packaging/ejb/resource_local/Client.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/ee/packaging/ejb/resource_local/Client.java
index 2e0fcee9f..4dfa3c871 100644
--- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/ee/packaging/ejb/resource_local/Client.java
+++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/ee/packaging/ejb/resource_local/Client.java
@@ -23,6 +23,11 @@ package ee.jakarta.tck.persistence.ee.packaging.ejb.resource_local;
 import java.lang.System.Logger;
 import java.util.Properties;
 
+import org.jboss.arquillian.container.test.api.Deployment;
+import org.jboss.shrinkwrap.api.Archive;
+import org.jboss.shrinkwrap.api.ShrinkWrap;
+import org.jboss.shrinkwrap.api.spec.EnterpriseArchive;
+import org.jboss.shrinkwrap.api.spec.JavaArchive;
 import org.junit.jupiter.api.AfterEach;
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
@@ -31,6 +36,26 @@ import com.sun.ts.lib.util.TSNamingContext;
 
 public class Client {
 
+  @Deployment(testable = false)
+  public static Archive<?> deployment() {
+
+    final EnterpriseArchive ear = ShrinkWrap.create(EnterpriseArchive.class, "jpa_ee_packaging_ejb_resource_local.ear");
+    // Add ear submodules
+
+    JavaArchive jpa_ee_packaging_ejb_resource_local_client_jar = ShrinkWrap.create(JavaArchive.class, "jpa_ee_packaging_ejb_resource_local_client_jar");
+    jpa_ee_packaging_ejb_resource_local_client_jar.addClass(ee.jakarta.tck.persistence.ee.packaging.ejb.resource_local.Client.class);
+    jpa_ee_packaging_ejb_resource_local_client_jar.addClass(ee.jakarta.tck.persistence.ee.packaging.ejb.resource_local.Stateless3IF.class);
+    ear.addAsModule(jpa_ee_packaging_ejb_resource_local_client_jar);
+
+    JavaArchive jpa_ee_packaging_ejb_resource_local_ejb_jar = ShrinkWrap.create(JavaArchive.class, "jpa_ee_packaging_ejb_resource_local_ejb_jar");
+    jpa_ee_packaging_ejb_resource_local_ejb_jar.addClass(ee.jakarta.tck.persistence.ee.packaging.ejb.resource_local.Stateless3Bean.class);
+    jpa_ee_packaging_ejb_resource_local_ejb_jar.addClass(ee.jakarta.tck.persistence.ee.packaging.ejb.resource_local.Stateless3IF.class);
+    jpa_ee_packaging_ejb_resource_local_ejb_jar.addClass(ee.jakarta.tck.persistence.ee.common.A.class);
+    jpa_ee_packaging_ejb_resource_local_ejb_jar.addClass(ee.jakarta.tck.persistence.ee.common.B.class);
+    ear.addAsModule(jpa_ee_packaging_ejb_resource_local_ejb_jar);
+    return ear;
+  }
+
 	private static final Logger logger = (Logger) System.getLogger(Client.class.getName());
 
 	private Stateless3IF bean = null;
diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/ee/packaging/ejb/standalone/Client.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/ee/packaging/ejb/standalone/Client.java
index 6d9e8927b..49a03cdb1 100644
--- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/ee/packaging/ejb/standalone/Client.java
+++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/ee/packaging/ejb/standalone/Client.java
@@ -22,7 +22,11 @@ package ee.jakarta.tck.persistence.ee.packaging.ejb.standalone;
 
 import java.lang.System.Logger;
 import java.util.Properties;
-
+import org.jboss.arquillian.container.test.api.Deployment;
+import org.jboss.shrinkwrap.api.Archive;
+import org.jboss.shrinkwrap.api.ShrinkWrap;
+import org.jboss.shrinkwrap.api.spec.EnterpriseArchive;
+import org.jboss.shrinkwrap.api.spec.JavaArchive;
 import org.junit.jupiter.api.AfterEach;
 import org.junit.jupiter.api.Test;
 
@@ -30,6 +34,19 @@ import jakarta.ejb.EJB;
 
 public class Client {
 
+  @Deployment(testable = false)
+  public static Archive<?> deployment() {
+
+    final EnterpriseArchive ear = ShrinkWrap.create(EnterpriseArchive.class, "jpa_ee_packaging_ejb_standalone_ejb.ear");
+    // Add ear submodules
+
+    JavaArchive jpa_ee_packaging_ejb_standalone_client_jar = ShrinkWrap.create(JavaArchive.class, "jpa_ee_packaging_ejb_standalone_client_jar");
+    jpa_ee_packaging_ejb_standalone_client_jar.addClass(ee.jakarta.tck.persistence.ee.packaging.ejb.standalone.Client.class);
+    jpa_ee_packaging_ejb_standalone_client_jar.addClass(ee.jakarta.tck.persistence.ee.packaging.ejb.standalone.Stateful3IF.class);
+    ear.addAsModule(jpa_ee_packaging_ejb_standalone_client_jar);
+    return ear;
+  }
+
 	private static final Logger logger = (Logger) System.getLogger(Client.class.getName());
 
 	@EJB(name = "ejb/Stateful3Bean", beanInterface = Stateful3IF.class)
diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/ee/packaging/web/scope/Client.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/ee/packaging/web/scope/Client.java
index f9712863f..8238ef566 100644
--- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/ee/packaging/web/scope/Client.java
+++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/ee/packaging/web/scope/Client.java
@@ -21,13 +21,34 @@
 package ee.jakarta.tck.persistence.ee.packaging.web.scope;
 
 import java.lang.System.Logger;
-
+import org.jboss.arquillian.container.test.api.Deployment;
+import org.jboss.shrinkwrap.api.Archive;
+import org.jboss.shrinkwrap.api.ShrinkWrap;
+import org.jboss.shrinkwrap.api.spec.EnterpriseArchive;
+import org.jboss.shrinkwrap.api.spec.WebArchive;
 import org.junit.jupiter.api.Test;
 
 import ee.jakarta.tck.persistence.ee.util.AbstractUrlClient;
 
 public class Client extends AbstractUrlClient {
 
+  @Deployment(testable = false)
+  public static Archive<?> deployment() {
+
+    final EnterpriseArchive ear = ShrinkWrap.create(EnterpriseArchive.class, "jpa_ee_packaging_web_scope.ear");
+    // Add ear submodules
+
+    WebArchive jpa_ee_packaging_web_scope_web_war = ShrinkWrap.create(WebArchive.class, "jpa_ee_packaging_web_scope_web_war");
+    jpa_ee_packaging_web_scope_web_war.addAsWebInfResource("web.xml");
+    jpa_ee_packaging_web_scope_web_war.addClass(ee.jakarta.tck.persistence.ee.packaging.web.scope.ServletTest.class);
+    jpa_ee_packaging_web_scope_web_war.addClass(ee.jakarta.tck.persistence.ee.common.Account.class);
+    jpa_ee_packaging_web_scope_web_war.addClass(ee.jakarta.tck.persistence.ee.util.Data.class);
+    jpa_ee_packaging_web_scope_web_war.addClass(ee.jakarta.tck.persistence.ee.util.HttpTCKServlet.class);
+    jpa_ee_packaging_web_scope_web_war.addClass(META - INF.persistence.xml.class);
+    ear.addAsModule(jpa_ee_packaging_web_scope_web_war);
+    return ear;
+  }
+
 	private static final Logger logger = (Logger) System.getLogger(Client.class.getName());
 
 	public static final String SERVLET_NAME = "ServletTest";
diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/ee/packaging/web/standalone/Client.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/ee/packaging/web/standalone/Client.java
index ddfdb3814..0e729bd4f 100644
--- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/ee/packaging/web/standalone/Client.java
+++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/ee/packaging/web/standalone/Client.java
@@ -21,13 +21,32 @@
 package ee.jakarta.tck.persistence.ee.packaging.web.standalone;
 
 import java.lang.System.Logger;
-
+import org.jboss.arquillian.container.test.api.Deployment;
+import org.jboss.shrinkwrap.api.ShrinkWrap;
+import org.jboss.shrinkwrap.api.spec.JavaArchive;
+import org.jboss.shrinkwrap.api.spec.WebArchive;
 import org.junit.jupiter.api.Test;
 
 import ee.jakarta.tck.persistence.ee.util.AbstractUrlClient;
 
 public class Client extends AbstractUrlClient {
 
+  @Deployment(testable = false)
+  public static WebArchive getTestArchive() throws Exception {
+
+    WebArchive jpa_ee_packaging_web_standalone_component_web_war = ShrinkWrap.create(WebArchive.class, "jpa_ee_packaging_web_standalone_component_web_war");
+    jpa_ee_packaging_web_standalone_component_web_war.addAsWebInfResource("web.xml");
+
+    JavaArchive jpa_ee_packaging_web_standalone_jar = ShrinkWrap.create(JavaArchive.class, "jpa_ee_packaging_web_standalone.jar");
+    jpa_ee_packaging_web_standalone_jar.addClass(ee.jakarta.tck.persistence.ee.common.Account.class);
+    jpa_ee_packaging_web_standalone_jar.addAsManifestResource("META-INF/MANIFEST.MF");
+    jpa_ee_packaging_web_standalone_jar.addAsManifestResource("META-INF/persistence.xml");
+    jpa_ee_packaging_web_standalone_component_web_war.addAsLibrary(jpa_ee_packaging_web_standalone_jar);
+    jpa_ee_packaging_web_standalone_component_web_war.addClass(ee.jakarta.tck.persistence.ee.packaging.web.standalone.ServletTest.class);
+    jpa_ee_packaging_web_standalone_component_web_war.addClass(ee.jakarta.tck.persistence.ee.util.Data.class);
+    jpa_ee_packaging_web_standalone_component_web_war.addClass(ee.jakarta.tck.persistence.ee.util.HttpTCKServlet.class);
+  }
+
 	private static final Logger logger = (Logger) System.getLogger(Client.class.getName());
 
 	public static final String SERVLET_NAME = "ServletTest";
diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/ee/pluggability/contracts/jta/Client.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/ee/pluggability/contracts/jta/Client.java
index 70c7ecb90..426086d61 100644
--- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/ee/pluggability/contracts/jta/Client.java
+++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/ee/pluggability/contracts/jta/Client.java
@@ -22,7 +22,12 @@ import java.util.ArrayList;
 import java.util.List;
 import java.util.Map;
 import java.util.Properties;
-
+import org.jboss.arquillian.container.test.api.Deployment;
+import org.jboss.shrinkwrap.api.Archive;
+import org.jboss.shrinkwrap.api.ShrinkWrap;
+import org.jboss.shrinkwrap.api.spec.EnterpriseArchive;
+import org.jboss.shrinkwrap.api.spec.JavaArchive;
+import org.jboss.shrinkwrap.api.spec.WebArchive;
 import org.junit.jupiter.api.AfterEach;
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
@@ -39,6 +44,99 @@ import jakarta.persistence.spi.PersistenceUnitTransactionType;
 
 public class Client extends PMClientBase {
 
+  @Deployment(testable = false)
+  public static Archive<?> deployment() {
+
+    final EnterpriseArchive ear = ShrinkWrap.create(EnterpriseArchive.class, "jpa_ee_pluggability_contracts_jta_vehicles.ear");
+    // TODO: filter/eliminate the library jar classes that shouldn't be included
+    // Add ear/lib jars
+
+    JavaArchive jpa_alternate_provider_jar = ShrinkWrap.create(JavaArchive.class, "jpa_alternate_provider_jar");
+    jpa_alternate_provider_jar.addClass(ee.jakarta.tck.persistence.common.pluggability.altprovider.implementation.CacheImpl.class);
+    jpa_alternate_provider_jar.addClass(ee.jakarta.tck.persistence.common.pluggability.altprovider.implementation.ClassTransformerImpl.class);
+    jpa_alternate_provider_jar.addClass(ee.jakarta.tck.persistence.common.pluggability.altprovider.implementation.EntityManagerFactoryImpl.class);
+    jpa_alternate_provider_jar.addClass(ee.jakarta.tck.persistence.common.pluggability.altprovider.implementation.EntityManagerImpl.class);
+    jpa_alternate_provider_jar.addClass(ee.jakarta.tck.persistence.common.pluggability.altprovider.implementation.EntityTransactionImpl.class);
+    jpa_alternate_provider_jar.addClass(ee.jakarta.tck.persistence.common.pluggability.altprovider.implementation.PersistenceProvider.class);
+    jpa_alternate_provider_jar.addClass(ee.jakarta.tck.persistence.common.pluggability.altprovider.implementation.PersistenceUnitInfoImpl.class);
+    jpa_alternate_provider_jar.addClass(ee.jakarta.tck.persistence.common.pluggability.altprovider.implementation.QueryImpl.class);
+    jpa_alternate_provider_jar.addClass(ee.jakarta.tck.persistence.common.pluggability.altprovider.implementation.TSLogRecord.class);
+    jpa_alternate_provider_jar.addClass(ee.jakarta.tck.persistence.common.pluggability.altprovider.implementation.TSLogger.class);
+    jpa_alternate_provider_jar.addClass(ee.jakarta.tck.persistence.common.pluggability.altprovider.implementation.TSXMLFormatter.class);
+    ear.addAsLibrary(jpa_alternate_provider_jar);
+
+    JavaArchive jpa_ee_pluggability_contracts_jta_jar = ShrinkWrap.create(JavaArchive.class, "jpa_ee_pluggability_contracts_jta_jar");
+    jpa_ee_pluggability_contracts_jta_jar.addClass(ee.jakarta.tck.persistence.common.pluggability.util.LogFileProcessor.class);
+    jpa_ee_pluggability_contracts_jta_jar.addClass(ee.jakarta.tck.persistence.common.pluggability.util.LogRecordEntry.class);
+    jpa_ee_pluggability_contracts_jta_jar.addClass(ee.jakarta.tck.persistence.ee.pluggability.contracts.jta.Order.class);
+    jpa_ee_pluggability_contracts_jta_jar.addClass(ee.jakarta.tck.persistence.ee.pluggability.contracts.jta.Order2.class);
+    jpa_ee_pluggability_contracts_jta_jar.addClass(ee.jakarta.tck.persistence.ee.pluggability.contracts.jta.Order3.class);
+    jpa_ee_pluggability_contracts_jta_jar.addClass(ee.jakarta.tck.persistence.ee.pluggability.contracts.jta.Order4.class);
+    ear.addAsLibrary(jpa_ee_pluggability_contracts_jta_jar);
+    // Add ear submodules
+
+    JavaArchive jpa_ee_pluggability_contracts_jta_appmanaged_vehicle_client_jar = ShrinkWrap.create(JavaArchive.class, "jpa_ee_pluggability_contracts_jta_appmanaged_vehicle_client_jar");
+    jpa_ee_pluggability_contracts_jta_appmanaged_vehicle_client_jar.addClass(ee.jakarta.tck.persistence.common.PMClientBase.class);
+    ear.addAsModule(jpa_ee_pluggability_contracts_jta_appmanaged_vehicle_client_jar);
+
+    JavaArchive jpa_ee_pluggability_contracts_jta_appmanaged_vehicle_ejb_jar = ShrinkWrap.create(JavaArchive.class, "jpa_ee_pluggability_contracts_jta_appmanaged_vehicle_ejb_jar");
+    jpa_ee_pluggability_contracts_jta_appmanaged_vehicle_ejb_jar.addClass(ee.jakarta.tck.persistence.common.PMClientBase.class);
+    jpa_ee_pluggability_contracts_jta_appmanaged_vehicle_ejb_jar.addClass(ee.jakarta.tck.persistence.ee.pluggability.contracts.jta.Client.class);
+    ear.addAsModule(jpa_ee_pluggability_contracts_jta_appmanaged_vehicle_ejb_jar);
+
+    WebArchive jpa_ee_pluggability_contracts_jta_pmservlet_vehicle_web_war = ShrinkWrap.create(WebArchive.class, "jpa_ee_pluggability_contracts_jta_pmservlet_vehicle_web_war");
+    jpa_ee_pluggability_contracts_jta_pmservlet_vehicle_web_war.addAsWebInfResource("web.xml");
+
+    JavaArchive jpa_alternate_provider_jar = ShrinkWrap.create(JavaArchive.class, "jpa_alternate_provider.jar");
+    jpa_alternate_provider_jar.addClass(ee.jakarta.tck.persistence.common.pluggability.altprovider.implementation.CacheImpl.class);
+    jpa_alternate_provider_jar.addClass(ee.jakarta.tck.persistence.common.pluggability.altprovider.implementation.ClassTransformerImpl.class);
+    jpa_alternate_provider_jar.addClass(ee.jakarta.tck.persistence.common.pluggability.altprovider.implementation.EntityManagerFactoryImpl.class);
+    jpa_alternate_provider_jar.addClass(ee.jakarta.tck.persistence.common.pluggability.altprovider.implementation.EntityManagerImpl.class);
+    jpa_alternate_provider_jar.addClass(ee.jakarta.tck.persistence.common.pluggability.altprovider.implementation.EntityTransactionImpl.class);
+    jpa_alternate_provider_jar.addClass(ee.jakarta.tck.persistence.common.pluggability.altprovider.implementation.PersistenceProvider.class);
+    jpa_alternate_provider_jar.addClass(ee.jakarta.tck.persistence.common.pluggability.altprovider.implementation.PersistenceUnitInfoImpl.class);
+    jpa_alternate_provider_jar.addClass(ee.jakarta.tck.persistence.common.pluggability.altprovider.implementation.QueryImpl.class);
+    jpa_alternate_provider_jar.addClass(ee.jakarta.tck.persistence.common.pluggability.altprovider.implementation.TSLogRecord.class);
+    jpa_alternate_provider_jar.addClass(ee.jakarta.tck.persistence.common.pluggability.altprovider.implementation.TSLogger.class);
+    jpa_alternate_provider_jar.addClass(ee.jakarta.tck.persistence.common.pluggability.altprovider.implementation.TSXMLFormatter.class);
+    jpa_alternate_provider_jar.addAsManifestResource("META-INF/MANIFEST.MF");
+    jpa_alternate_provider_jar.addAsManifestResource("META-INF/services/jakarta.persistence.spi.PersistenceProvider");
+    jpa_ee_pluggability_contracts_jta_pmservlet_vehicle_web_war.addAsLibrary(jpa_alternate_provider_jar);
+
+    JavaArchive jpa_ee_pluggability_contracts_jta_jar = ShrinkWrap.create(JavaArchive.class, "jpa_ee_pluggability_contracts_jta.jar");
+    jpa_ee_pluggability_contracts_jta_jar.addClass(ee.jakarta.tck.persistence.common.pluggability.util.LogFileProcessor.class);
+    jpa_ee_pluggability_contracts_jta_jar.addClass(ee.jakarta.tck.persistence.common.pluggability.util.LogRecordEntry.class);
+    jpa_ee_pluggability_contracts_jta_jar.addClass(ee.jakarta.tck.persistence.ee.pluggability.contracts.jta.Order.class);
+    jpa_ee_pluggability_contracts_jta_jar.addClass(ee.jakarta.tck.persistence.ee.pluggability.contracts.jta.Order2.class);
+    jpa_ee_pluggability_contracts_jta_jar.addClass(ee.jakarta.tck.persistence.ee.pluggability.contracts.jta.Order3.class);
+    jpa_ee_pluggability_contracts_jta_jar.addClass(ee.jakarta.tck.persistence.ee.pluggability.contracts.jta.Order4.class);
+    jpa_ee_pluggability_contracts_jta_jar.addAsManifestResource("META-INF/MANIFEST.MF");
+    jpa_ee_pluggability_contracts_jta_jar.addAsManifestResource("META-INF/persistence.xml");
+    jpa_ee_pluggability_contracts_jta_pmservlet_vehicle_web_war.addAsLibrary(jpa_ee_pluggability_contracts_jta_jar);
+    jpa_ee_pluggability_contracts_jta_pmservlet_vehicle_web_war.addClass(ee.jakarta.tck.persistence.common.PMClientBase.class);
+    jpa_ee_pluggability_contracts_jta_pmservlet_vehicle_web_war.addClass(ee.jakarta.tck.persistence.ee.pluggability.contracts.jta.Client.class);
+    ear.addAsModule(jpa_ee_pluggability_contracts_jta_pmservlet_vehicle_web_war);
+
+    JavaArchive jpa_ee_pluggability_contracts_jta_stateful3_vehicle_client_jar = ShrinkWrap.create(JavaArchive.class, "jpa_ee_pluggability_contracts_jta_stateful3_vehicle_client_jar");
+    jpa_ee_pluggability_contracts_jta_stateful3_vehicle_client_jar.addClass(ee.jakarta.tck.persistence.common.PMClientBase.class);
+    ear.addAsModule(jpa_ee_pluggability_contracts_jta_stateful3_vehicle_client_jar);
+
+    JavaArchive jpa_ee_pluggability_contracts_jta_stateful3_vehicle_ejb_jar = ShrinkWrap.create(JavaArchive.class, "jpa_ee_pluggability_contracts_jta_stateful3_vehicle_ejb_jar");
+    jpa_ee_pluggability_contracts_jta_stateful3_vehicle_ejb_jar.addClass(ee.jakarta.tck.persistence.common.PMClientBase.class);
+    jpa_ee_pluggability_contracts_jta_stateful3_vehicle_ejb_jar.addClass(ee.jakarta.tck.persistence.ee.pluggability.contracts.jta.Client.class);
+    ear.addAsModule(jpa_ee_pluggability_contracts_jta_stateful3_vehicle_ejb_jar);
+
+    JavaArchive jpa_ee_pluggability_contracts_jta_stateless3_vehicle_client_jar = ShrinkWrap.create(JavaArchive.class, "jpa_ee_pluggability_contracts_jta_stateless3_vehicle_client_jar");
+    jpa_ee_pluggability_contracts_jta_stateless3_vehicle_client_jar.addClass(ee.jakarta.tck.persistence.common.PMClientBase.class);
+    ear.addAsModule(jpa_ee_pluggability_contracts_jta_stateless3_vehicle_client_jar);
+
+    JavaArchive jpa_ee_pluggability_contracts_jta_stateless3_vehicle_ejb_jar = ShrinkWrap.create(JavaArchive.class, "jpa_ee_pluggability_contracts_jta_stateless3_vehicle_ejb_jar");
+    jpa_ee_pluggability_contracts_jta_stateless3_vehicle_ejb_jar.addClass(ee.jakarta.tck.persistence.common.PMClientBase.class);
+    jpa_ee_pluggability_contracts_jta_stateless3_vehicle_ejb_jar.addClass(ee.jakarta.tck.persistence.ee.pluggability.contracts.jta.Client.class);
+    ear.addAsModule(jpa_ee_pluggability_contracts_jta_stateless3_vehicle_ejb_jar);
+    return ear;
+  }
+
 	private static final Logger logger = (Logger) System.getLogger(Client.class.getName());
 
 	private transient EntityManagerImpl emImpl;
diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/ee/pluggability/contracts/resource_local/Client.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/ee/pluggability/contracts/resource_local/Client.java
index 012670589..90c0d7b50 100644
--- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/ee/pluggability/contracts/resource_local/Client.java
+++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/ee/pluggability/contracts/resource_local/Client.java
@@ -22,7 +22,12 @@ import java.util.ArrayList;
 import java.util.List;
 import java.util.Map;
 import java.util.Properties;
-
+import org.jboss.arquillian.container.test.api.Deployment;
+import org.jboss.shrinkwrap.api.Archive;
+import org.jboss.shrinkwrap.api.ShrinkWrap;
+import org.jboss.shrinkwrap.api.spec.EnterpriseArchive;
+import org.jboss.shrinkwrap.api.spec.JavaArchive;
+import org.jboss.shrinkwrap.api.spec.WebArchive;
 import org.junit.jupiter.api.AfterEach;
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
@@ -39,6 +44,84 @@ import jakarta.persistence.spi.PersistenceUnitTransactionType;
 
 public class Client extends PMClientBase {
 
+  @Deployment(testable = false)
+  public static Archive<?> deployment() {
+
+    final EnterpriseArchive ear = ShrinkWrap.create(EnterpriseArchive.class, "pluggability_contracts_resource_local_vehicles.ear");
+    // TODO: filter/eliminate the library jar classes that shouldn't be included
+    // Add ear/lib jars
+
+    JavaArchive jpa_alternate_provider_jar = ShrinkWrap.create(JavaArchive.class, "jpa_alternate_provider_jar");
+    jpa_alternate_provider_jar.addClass(ee.jakarta.tck.persistence.common.pluggability.altprovider.implementation.CacheImpl.class);
+    jpa_alternate_provider_jar.addClass(ee.jakarta.tck.persistence.common.pluggability.altprovider.implementation.ClassTransformerImpl.class);
+    jpa_alternate_provider_jar.addClass(ee.jakarta.tck.persistence.common.pluggability.altprovider.implementation.EntityManagerFactoryImpl.class);
+    jpa_alternate_provider_jar.addClass(ee.jakarta.tck.persistence.common.pluggability.altprovider.implementation.EntityManagerImpl.class);
+    jpa_alternate_provider_jar.addClass(ee.jakarta.tck.persistence.common.pluggability.altprovider.implementation.EntityTransactionImpl.class);
+    jpa_alternate_provider_jar.addClass(ee.jakarta.tck.persistence.common.pluggability.altprovider.implementation.PersistenceProvider.class);
+    jpa_alternate_provider_jar.addClass(ee.jakarta.tck.persistence.common.pluggability.altprovider.implementation.PersistenceUnitInfoImpl.class);
+    jpa_alternate_provider_jar.addClass(ee.jakarta.tck.persistence.common.pluggability.altprovider.implementation.QueryImpl.class);
+    jpa_alternate_provider_jar.addClass(ee.jakarta.tck.persistence.common.pluggability.altprovider.implementation.TSLogRecord.class);
+    jpa_alternate_provider_jar.addClass(ee.jakarta.tck.persistence.common.pluggability.altprovider.implementation.TSLogger.class);
+    jpa_alternate_provider_jar.addClass(ee.jakarta.tck.persistence.common.pluggability.altprovider.implementation.TSXMLFormatter.class);
+    ear.addAsLibrary(jpa_alternate_provider_jar);
+
+    JavaArchive pluggability_contracts_resource_local_jar = ShrinkWrap.create(JavaArchive.class, "pluggability_contracts_resource_local_jar");
+    pluggability_contracts_resource_local_jar.addClass(ee.jakarta.tck.persistence.common.pluggability.util.LogFileProcessor.class);
+    pluggability_contracts_resource_local_jar.addClass(ee.jakarta.tck.persistence.common.pluggability.util.LogRecordEntry.class);
+    pluggability_contracts_resource_local_jar.addClass(ee.jakarta.tck.persistence.ee.pluggability.contracts.resource_local.Order.class);
+    pluggability_contracts_resource_local_jar.addClass(ee.jakarta.tck.persistence.ee.pluggability.contracts.resource_local.Order2.class);
+    pluggability_contracts_resource_local_jar.addClass(ee.jakarta.tck.persistence.ee.pluggability.contracts.resource_local.Order3.class);
+    pluggability_contracts_resource_local_jar.addClass(ee.jakarta.tck.persistence.ee.pluggability.contracts.resource_local.Order4.class);
+    ear.addAsLibrary(pluggability_contracts_resource_local_jar);
+    // Add ear submodules
+
+    JavaArchive pluggability_contracts_resource_local_appmanagedNoTx_vehicle_client_jar = ShrinkWrap.create(JavaArchive.class, "pluggability_contracts_resource_local_appmanagedNoTx_vehicle_client_jar");
+    pluggability_contracts_resource_local_appmanagedNoTx_vehicle_client_jar.addClass(ee.jakarta.tck.persistence.common.PMClientBase.class);
+    ear.addAsModule(pluggability_contracts_resource_local_appmanagedNoTx_vehicle_client_jar);
+
+    JavaArchive pluggability_contracts_resource_local_appmanagedNoTx_vehicle_ejb_jar = ShrinkWrap.create(JavaArchive.class, "pluggability_contracts_resource_local_appmanagedNoTx_vehicle_ejb_jar");
+    pluggability_contracts_resource_local_appmanagedNoTx_vehicle_ejb_jar.addClass(ee.jakarta.tck.persistence.common.PMClientBase.class);
+    pluggability_contracts_resource_local_appmanagedNoTx_vehicle_ejb_jar.addClass(ee.jakarta.tck.persistence.ee.pluggability.contracts.resource_local.Client.class);
+    ear.addAsModule(pluggability_contracts_resource_local_appmanagedNoTx_vehicle_ejb_jar);
+
+    WebArchive pluggability_contracts_resource_local_puservlet_vehicle_web_war = ShrinkWrap.create(WebArchive.class, "pluggability_contracts_resource_local_puservlet_vehicle_web_war");
+    pluggability_contracts_resource_local_puservlet_vehicle_web_war.addAsWebInfResource("web.xml");
+
+    JavaArchive jpa_alternate_provider_jar = ShrinkWrap.create(JavaArchive.class, "jpa_alternate_provider.jar");
+    jpa_alternate_provider_jar.addClass(ee.jakarta.tck.persistence.common.pluggability.altprovider.implementation.CacheImpl.class);
+    jpa_alternate_provider_jar.addClass(ee.jakarta.tck.persistence.common.pluggability.altprovider.implementation.ClassTransformerImpl.class);
+    jpa_alternate_provider_jar.addClass(ee.jakarta.tck.persistence.common.pluggability.altprovider.implementation.EntityManagerFactoryImpl.class);
+    jpa_alternate_provider_jar.addClass(ee.jakarta.tck.persistence.common.pluggability.altprovider.implementation.EntityManagerImpl.class);
+    jpa_alternate_provider_jar.addClass(ee.jakarta.tck.persistence.common.pluggability.altprovider.implementation.EntityTransactionImpl.class);
+    jpa_alternate_provider_jar.addClass(ee.jakarta.tck.persistence.common.pluggability.altprovider.implementation.PersistenceProvider.class);
+    jpa_alternate_provider_jar.addClass(ee.jakarta.tck.persistence.common.pluggability.altprovider.implementation.PersistenceUnitInfoImpl.class);
+    jpa_alternate_provider_jar.addClass(ee.jakarta.tck.persistence.common.pluggability.altprovider.implementation.QueryImpl.class);
+    jpa_alternate_provider_jar.addClass(ee.jakarta.tck.persistence.common.pluggability.altprovider.implementation.TSLogRecord.class);
+    jpa_alternate_provider_jar.addClass(ee.jakarta.tck.persistence.common.pluggability.altprovider.implementation.TSLogger.class);
+    jpa_alternate_provider_jar.addClass(ee.jakarta.tck.persistence.common.pluggability.altprovider.implementation.TSXMLFormatter.class);
+    jpa_alternate_provider_jar.addAsManifestResource("META-INF/MANIFEST.MF");
+    jpa_alternate_provider_jar.addAsManifestResource("META-INF/services/jakarta.persistence.spi.PersistenceProvider");
+    pluggability_contracts_resource_local_puservlet_vehicle_web_war.addAsLibrary(jpa_alternate_provider_jar);
+
+    JavaArchive pluggability_contracts_resource_local_jar = ShrinkWrap.create(JavaArchive.class, "pluggability_contracts_resource_local.jar");
+    pluggability_contracts_resource_local_jar.addClass(ee.jakarta.tck.persistence.common.pluggability.util.LogFileProcessor.class);
+    pluggability_contracts_resource_local_jar.addClass(ee.jakarta.tck.persistence.common.pluggability.util.LogRecordEntry.class);
+    pluggability_contracts_resource_local_jar.addClass(ee.jakarta.tck.persistence.ee.pluggability.contracts.resource_local.Order.class);
+    pluggability_contracts_resource_local_jar.addClass(ee.jakarta.tck.persistence.ee.pluggability.contracts.resource_local.Order2.class);
+    pluggability_contracts_resource_local_jar.addClass(ee.jakarta.tck.persistence.ee.pluggability.contracts.resource_local.Order3.class);
+    pluggability_contracts_resource_local_jar.addClass(ee.jakarta.tck.persistence.ee.pluggability.contracts.resource_local.Order4.class);
+    pluggability_contracts_resource_local_jar.addAsManifestResource("META-INF/MANIFEST.MF");
+    pluggability_contracts_resource_local_jar.addAsManifestResource("META-INF/myMappingFile1.xml");
+    pluggability_contracts_resource_local_jar.addAsManifestResource("META-INF/myMappingFile2.xml");
+    pluggability_contracts_resource_local_jar.addAsManifestResource("META-INF/orm.xml");
+    pluggability_contracts_resource_local_jar.addAsManifestResource("META-INF/persistence.xml");
+    pluggability_contracts_resource_local_puservlet_vehicle_web_war.addAsLibrary(pluggability_contracts_resource_local_jar);
+    pluggability_contracts_resource_local_puservlet_vehicle_web_war.addClass(ee.jakarta.tck.persistence.common.PMClientBase.class);
+    pluggability_contracts_resource_local_puservlet_vehicle_web_war.addClass(ee.jakarta.tck.persistence.ee.pluggability.contracts.resource_local.Client.class);
+    ear.addAsModule(pluggability_contracts_resource_local_puservlet_vehicle_web_war);
+    return ear;
+  }
+
 	private static final Logger logger = (Logger) System.getLogger(Client.class.getName());
 
 	private transient EntityManagerImpl emImpl;
diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/ee/propagation/am/Client.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/ee/propagation/am/Client.java
index fe48d91d2..db603b803 100644
--- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/ee/propagation/am/Client.java
+++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/ee/propagation/am/Client.java
@@ -22,7 +22,11 @@ package ee.jakarta.tck.persistence.ee.propagation.am;
 
 import java.lang.System.Logger;
 import java.util.Properties;
-
+import org.jboss.arquillian.container.test.api.Deployment;
+import org.jboss.shrinkwrap.api.Archive;
+import org.jboss.shrinkwrap.api.ShrinkWrap;
+import org.jboss.shrinkwrap.api.spec.EnterpriseArchive;
+import org.jboss.shrinkwrap.api.spec.JavaArchive;
 import org.junit.jupiter.api.AfterEach;
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
@@ -31,6 +35,40 @@ import jakarta.ejb.EJB;
 
 public class Client {
 
+  @Deployment(testable = false)
+  public static Archive<?> deployment() {
+
+    final EnterpriseArchive ear = ShrinkWrap.create(EnterpriseArchive.class, "jpa_ee_propagation_am.ear");
+    // TODO: filter/eliminate the library jar classes that shouldn't be included
+    // Add ear/lib jars
+
+    JavaArchive jpa_ee_propagation_am_jar = ShrinkWrap.create(JavaArchive.class, "jpa_ee_propagation_am_jar");
+    jpa_ee_propagation_am_jar.addClass(ee.jakarta.tck.persistence.ee.common.A.class);
+    jpa_ee_propagation_am_jar.addClass(ee.jakarta.tck.persistence.ee.common.Account.class);
+    jpa_ee_propagation_am_jar.addClass(ee.jakarta.tck.persistence.ee.common.B.class);
+    jpa_ee_propagation_am_jar.addClass(ee.jakarta.tck.persistence.ee.propagation.am.Member.class);
+    jpa_ee_propagation_am_jar.addClass(ee.jakarta.tck.persistence.ee.propagation.am.Member2.class);
+    ear.addAsLibrary(jpa_ee_propagation_am_jar);
+    // Add ear submodules
+
+    JavaArchive jpa_ee_propagation_am_client_jar = ShrinkWrap.create(JavaArchive.class, "jpa_ee_propagation_am_client_jar");
+    jpa_ee_propagation_am_client_jar.addClass(ee.jakarta.tck.persistence.ee.propagation.am.Client.class);
+    jpa_ee_propagation_am_client_jar.addClass(ee.jakarta.tck.persistence.ee.propagation.am.Stateful3IF.class);
+    jpa_ee_propagation_am_client_jar.addClass(ee.jakarta.tck.persistence.ee.propagation.am.Stateful3IF2.class);
+    jpa_ee_propagation_am_client_jar.addClass(ee.jakarta.tck.persistence.ee.propagation.am.Stateless3IF.class);
+    ear.addAsModule(jpa_ee_propagation_am_client_jar);
+
+    JavaArchive jpa_ee_propagation_am_ejb_jar = ShrinkWrap.create(JavaArchive.class, "jpa_ee_propagation_am_ejb_jar");
+    jpa_ee_propagation_am_ejb_jar.addClass(ee.jakarta.tck.persistence.ee.propagation.am.Stateful3Bean.class);
+    jpa_ee_propagation_am_ejb_jar.addClass(ee.jakarta.tck.persistence.ee.propagation.am.Stateful3Bean2.class);
+    jpa_ee_propagation_am_ejb_jar.addClass(ee.jakarta.tck.persistence.ee.propagation.am.Stateful3IF.class);
+    jpa_ee_propagation_am_ejb_jar.addClass(ee.jakarta.tck.persistence.ee.propagation.am.Stateful3IF2.class);
+    jpa_ee_propagation_am_ejb_jar.addClass(ee.jakarta.tck.persistence.ee.propagation.am.Stateless3Bean.class);
+    jpa_ee_propagation_am_ejb_jar.addClass(ee.jakarta.tck.persistence.ee.propagation.am.Stateless3IF.class);
+    ear.addAsModule(jpa_ee_propagation_am_ejb_jar);
+    return ear;
+  }
+
 	private static final Logger logger = (Logger) System.getLogger(Client.class.getName());
 
 	@EJB(name = "ejb/Stateful3Bean", beanInterface = Stateful3IF.class)
diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/ee/propagation/cm/extended/Client.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/ee/propagation/cm/extended/Client.java
index 9c33fc423..d9f598b51 100644
--- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/ee/propagation/cm/extended/Client.java
+++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/ee/propagation/cm/extended/Client.java
@@ -22,7 +22,11 @@ package ee.jakarta.tck.persistence.ee.propagation.cm.extended;
 
 import java.lang.System.Logger;
 import java.util.Properties;
-
+import org.jboss.arquillian.container.test.api.Deployment;
+import org.jboss.shrinkwrap.api.Archive;
+import org.jboss.shrinkwrap.api.ShrinkWrap;
+import org.jboss.shrinkwrap.api.spec.EnterpriseArchive;
+import org.jboss.shrinkwrap.api.spec.JavaArchive;
 import org.junit.jupiter.api.AfterEach;
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
@@ -31,6 +35,34 @@ import jakarta.ejb.EJB;
 
 public class Client {
 
+  @Deployment(testable = false)
+  public static Archive<?> deployment() {
+
+    final EnterpriseArchive ear = ShrinkWrap.create(EnterpriseArchive.class, "jpa_ee_propagation_cm_ext.ear");
+    // TODO: filter/eliminate the library jar classes that shouldn't be included
+    // Add ear/lib jars
+
+    JavaArchive jpa_ee_propagation_cm_ext_jar = ShrinkWrap.create(JavaArchive.class, "jpa_ee_propagation_cm_ext_jar");
+    jpa_ee_propagation_cm_ext_jar.addClass(ee.jakarta.tck.persistence.ee.common.A.class);
+    jpa_ee_propagation_cm_ext_jar.addClass(ee.jakarta.tck.persistence.ee.common.Account.class);
+    jpa_ee_propagation_cm_ext_jar.addClass(ee.jakarta.tck.persistence.ee.common.B.class);
+    ear.addAsLibrary(jpa_ee_propagation_cm_ext_jar);
+    // Add ear submodules
+
+    JavaArchive jpa_ee_propagation_cm_ext_client_jar = ShrinkWrap.create(JavaArchive.class, "jpa_ee_propagation_cm_ext_client_jar");
+    jpa_ee_propagation_cm_ext_client_jar.addClass(ee.jakarta.tck.persistence.ee.propagation.cm.extended.Client.class);
+    jpa_ee_propagation_cm_ext_client_jar.addClass(ee.jakarta.tck.persistence.ee.propagation.cm.extended.Stateful3IF.class);
+    ear.addAsModule(jpa_ee_propagation_cm_ext_client_jar);
+
+    JavaArchive jpa_ee_propagation_cm_ext_ejb_jar = ShrinkWrap.create(JavaArchive.class, "jpa_ee_propagation_cm_ext_ejb_jar");
+    jpa_ee_propagation_cm_ext_ejb_jar.addClass(ee.jakarta.tck.persistence.ee.propagation.cm.extended.Stateful3Bean.class);
+    jpa_ee_propagation_cm_ext_ejb_jar.addClass(ee.jakarta.tck.persistence.ee.propagation.cm.extended.Stateful3IF.class);
+    jpa_ee_propagation_cm_ext_ejb_jar.addClass(ee.jakarta.tck.persistence.ee.propagation.cm.extended.Teller.class);
+    jpa_ee_propagation_cm_ext_ejb_jar.addClass(ee.jakarta.tck.persistence.ee.propagation.cm.extended.TellerBean.class);
+    ear.addAsModule(jpa_ee_propagation_cm_ext_ejb_jar);
+    return ear;
+  }
+
 	private static final Logger logger = (Logger) System.getLogger(Client.class.getName());
 
 	@EJB(name = "ejb/Stateful3Bean", beanInterface = Stateful3IF.class)
diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/ee/propagation/cm/jta/Client.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/ee/propagation/cm/jta/Client.java
index fca346443..f75982839 100644
--- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/ee/propagation/cm/jta/Client.java
+++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/ee/propagation/cm/jta/Client.java
@@ -21,13 +21,63 @@
 package ee.jakarta.tck.persistence.ee.propagation.cm.jta;
 
 import java.lang.System.Logger;
-
+import org.jboss.arquillian.container.test.api.Deployment;
+import org.jboss.shrinkwrap.api.Archive;
+import org.jboss.shrinkwrap.api.ShrinkWrap;
+import org.jboss.shrinkwrap.api.spec.EnterpriseArchive;
+import org.jboss.shrinkwrap.api.spec.JavaArchive;
+import org.jboss.shrinkwrap.api.spec.WebArchive;
 import org.junit.jupiter.api.Test;
 
 import ee.jakarta.tck.persistence.ee.util.AbstractUrlClient;
 
 public class Client extends AbstractUrlClient {
 
+  @Deployment(testable = false)
+  public static Archive<?> deployment() {
+
+    final EnterpriseArchive ear = ShrinkWrap.create(EnterpriseArchive.class, "jpa_ee_propagation_cm_jta.ear");
+    // TODO: filter/eliminate the library jar classes that shouldn't be included
+    // Add ear/lib jars
+
+    JavaArchive jpa_ee_propagation_cm_jta_jar = ShrinkWrap.create(JavaArchive.class, "jpa_ee_propagation_cm_jta_jar");
+    jpa_ee_propagation_cm_jta_jar.addClass(ee.jakarta.tck.persistence.ee.common.A.class);
+    jpa_ee_propagation_cm_jta_jar.addClass(ee.jakarta.tck.persistence.ee.common.Account.class);
+    jpa_ee_propagation_cm_jta_jar.addClass(ee.jakarta.tck.persistence.ee.common.B.class);
+    ear.addAsLibrary(jpa_ee_propagation_cm_jta_jar);
+    // Add ear submodules
+
+    JavaArchive jpa_ee_propagation_cm_jta_ejb_jar = ShrinkWrap.create(JavaArchive.class, "jpa_ee_propagation_cm_jta_ejb_jar");
+    jpa_ee_propagation_cm_jta_ejb_jar.addClass(ee.jakarta.tck.persistence.ee.propagation.cm.jta.Teller.class);
+    jpa_ee_propagation_cm_jta_ejb_jar.addClass(ee.jakarta.tck.persistence.ee.propagation.cm.jta.TellerBean.class);
+    jpa_ee_propagation_cm_jta_ejb_jar.addClass(ee.jakarta.tck.persistence.ee.propagation.cm.jta.TellerBean2.class);
+    ear.addAsModule(jpa_ee_propagation_cm_jta_ejb_jar);
+
+    WebArchive jpa_ee_propagation_cm_jta_web_war = ShrinkWrap.create(WebArchive.class, "jpa_ee_propagation_cm_jta_web_war");
+    jpa_ee_propagation_cm_jta_web_war.addAsWebInfResource("web.xml");
+
+    JavaArchive jpa_ee_propagation_cm_jta_jar = ShrinkWrap.create(JavaArchive.class, "jpa_ee_propagation_cm_jta.jar");
+    jpa_ee_propagation_cm_jta_jar.addClass(ee.jakarta.tck.persistence.ee.common.A.class);
+    jpa_ee_propagation_cm_jta_jar.addClass(ee.jakarta.tck.persistence.ee.common.Account.class);
+    jpa_ee_propagation_cm_jta_jar.addClass(ee.jakarta.tck.persistence.ee.common.B.class);
+    jpa_ee_propagation_cm_jta_jar.addAsManifestResource("META-INF/MANIFEST.MF");
+    jpa_ee_propagation_cm_jta_jar.addAsManifestResource("META-INF/persistence.xml");
+    jpa_ee_propagation_cm_jta_web_war.addAsLibrary(jpa_ee_propagation_cm_jta_jar);
+
+    JavaArchive jpa_ee_propagation_cm_jta_ejb_jar = ShrinkWrap.create(JavaArchive.class, "jpa_ee_propagation_cm_jta_ejb.jar");
+    jpa_ee_propagation_cm_jta_ejb_jar.addClass(ee.jakarta.tck.persistence.ee.propagation.cm.jta.Teller.class);
+    jpa_ee_propagation_cm_jta_ejb_jar.addClass(ee.jakarta.tck.persistence.ee.propagation.cm.jta.TellerBean.class);
+    jpa_ee_propagation_cm_jta_ejb_jar.addClass(ee.jakarta.tck.persistence.ee.propagation.cm.jta.TellerBean2.class);
+    jpa_ee_propagation_cm_jta_ejb_jar.addAsManifestResource("META-INF/MANIFEST.MF");
+    jpa_ee_propagation_cm_jta_web_war.addAsLibrary(jpa_ee_propagation_cm_jta_ejb_jar);
+    jpa_ee_propagation_cm_jta_web_war.addClass(ee.jakarta.tck.persistence.ee.propagation.cm.jta.ServletTest.class);
+    jpa_ee_propagation_cm_jta_web_war.addClass(ee.jakarta.tck.persistence.ee.propagation.cm.jta.Teller.class);
+    jpa_ee_propagation_cm_jta_web_war.addClass(ee.jakarta.tck.persistence.ee.util.Data.class);
+    jpa_ee_propagation_cm_jta_web_war.addClass(ee.jakarta.tck.persistence.ee.util.HttpTCKServlet.class);
+    ear.addAsModule(jpa_ee_propagation_cm_jta_web_war);
+    return ear;
+  }
+
 	private static final Logger logger = (Logger) System.getLogger(Client.class.getName());
 
 	public static final String SERVLET_NAME = "ServletTest";
diff --git a/jpa/spec-tests/src/main/java/ee/jakarta/tck/persistence/core/EntityGraph/Client.java b/jpa/spec-tests/src/main/java/ee/jakarta/tck/persistence/core/EntityGraph/Client.java
index 06da3f66d..009b52629 100644
--- a/jpa/spec-tests/src/main/java/ee/jakarta/tck/persistence/core/EntityGraph/Client.java
+++ b/jpa/spec-tests/src/main/java/ee/jakarta/tck/persistence/core/EntityGraph/Client.java
@@ -21,8 +21,12 @@ import java.util.ArrayList;
 import java.util.Date;
 import java.util.List;
 import java.util.Properties;
-
+import org.jboss.arquillian.container.test.api.Deployment;
+import org.jboss.shrinkwrap.api.Archive;
+import org.jboss.shrinkwrap.api.ShrinkWrap;
+import org.jboss.shrinkwrap.api.spec.EnterpriseArchive;
 import org.jboss.shrinkwrap.api.spec.JavaArchive;
+import org.jboss.shrinkwrap.api.spec.WebArchive;
 import org.junit.jupiter.api.AfterEach;
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
@@ -36,6 +40,89 @@ import jakarta.persistence.metamodel.Metamodel;
 
 public class Client extends PMClientBase {
 
+  @Deployment(testable = false)
+  public static Archive<?> deployment() {
+
+    final EnterpriseArchive ear = ShrinkWrap.create(EnterpriseArchive.class, "jpa_core_EntityGraph_vehicles.ear");
+    // TODO: filter/eliminate the library jar classes that shouldn't be included
+    // Add ear/lib jars
+
+    JavaArchive jpa_core_EntityGraph_jar = ShrinkWrap.create(JavaArchive.class, "jpa_core_EntityGraph_jar");
+    jpa_core_EntityGraph_jar.addClass(ee.jakarta.tck.persistence.core.EntityGraph.Department.class);
+    jpa_core_EntityGraph_jar.addClass(ee.jakarta.tck.persistence.core.EntityGraph.Employee.class);
+    jpa_core_EntityGraph_jar.addClass(ee.jakarta.tck.persistence.core.EntityGraph.Employee2.class);
+    jpa_core_EntityGraph_jar.addClass(ee.jakarta.tck.persistence.core.EntityGraph.Employee3.class);
+    ear.addAsLibrary(jpa_core_EntityGraph_jar);
+    // Add ear submodules
+
+    JavaArchive jpa_core_EntityGraph_appmanagedNoTx_vehicle_client_jar = ShrinkWrap.create(JavaArchive.class, "jpa_core_EntityGraph_appmanagedNoTx_vehicle_client_jar");
+    jpa_core_EntityGraph_appmanagedNoTx_vehicle_client_jar.addClass(ee.jakarta.tck.persistence.common.PMClientBase.class);
+    ear.addAsModule(jpa_core_EntityGraph_appmanagedNoTx_vehicle_client_jar);
+
+    JavaArchive jpa_core_EntityGraph_appmanagedNoTx_vehicle_ejb_jar = ShrinkWrap.create(JavaArchive.class, "jpa_core_EntityGraph_appmanagedNoTx_vehicle_ejb_jar");
+    jpa_core_EntityGraph_appmanagedNoTx_vehicle_ejb_jar.addClass(ee.jakarta.tck.persistence.common.PMClientBase.class);
+    jpa_core_EntityGraph_appmanagedNoTx_vehicle_ejb_jar.addClass(ee.jakarta.tck.persistence.core.EntityGraph.Client.class);
+    ear.addAsModule(jpa_core_EntityGraph_appmanagedNoTx_vehicle_ejb_jar);
+
+    JavaArchive jpa_core_EntityGraph_appmanaged_vehicle_client_jar = ShrinkWrap.create(JavaArchive.class, "jpa_core_EntityGraph_appmanaged_vehicle_client_jar");
+    jpa_core_EntityGraph_appmanaged_vehicle_client_jar.addClass(ee.jakarta.tck.persistence.common.PMClientBase.class);
+    ear.addAsModule(jpa_core_EntityGraph_appmanaged_vehicle_client_jar);
+
+    JavaArchive jpa_core_EntityGraph_appmanaged_vehicle_ejb_jar = ShrinkWrap.create(JavaArchive.class, "jpa_core_EntityGraph_appmanaged_vehicle_ejb_jar");
+    jpa_core_EntityGraph_appmanaged_vehicle_ejb_jar.addClass(ee.jakarta.tck.persistence.common.PMClientBase.class);
+    jpa_core_EntityGraph_appmanaged_vehicle_ejb_jar.addClass(ee.jakarta.tck.persistence.core.EntityGraph.Client.class);
+    ear.addAsModule(jpa_core_EntityGraph_appmanaged_vehicle_ejb_jar);
+
+    WebArchive jpa_core_EntityGraph_pmservlet_vehicle_web_war = ShrinkWrap.create(WebArchive.class, "jpa_core_EntityGraph_pmservlet_vehicle_web_war");
+    jpa_core_EntityGraph_pmservlet_vehicle_web_war.addAsWebInfResource("web.xml");
+
+    JavaArchive jpa_core_EntityGraph_jar = ShrinkWrap.create(JavaArchive.class, "jpa_core_EntityGraph.jar");
+    jpa_core_EntityGraph_jar.addClass(ee.jakarta.tck.persistence.core.EntityGraph.Department.class);
+    jpa_core_EntityGraph_jar.addClass(ee.jakarta.tck.persistence.core.EntityGraph.Employee.class);
+    jpa_core_EntityGraph_jar.addClass(ee.jakarta.tck.persistence.core.EntityGraph.Employee2.class);
+    jpa_core_EntityGraph_jar.addClass(ee.jakarta.tck.persistence.core.EntityGraph.Employee3.class);
+    jpa_core_EntityGraph_jar.addAsManifestResource("META-INF/MANIFEST.MF");
+    jpa_core_EntityGraph_jar.addAsManifestResource("META-INF/persistence.xml");
+    jpa_core_EntityGraph_pmservlet_vehicle_web_war.addAsLibrary(jpa_core_EntityGraph_jar);
+    jpa_core_EntityGraph_pmservlet_vehicle_web_war.addClass(ee.jakarta.tck.persistence.common.PMClientBase.class);
+    jpa_core_EntityGraph_pmservlet_vehicle_web_war.addClass(ee.jakarta.tck.persistence.core.EntityGraph.Client.class);
+    ear.addAsModule(jpa_core_EntityGraph_pmservlet_vehicle_web_war);
+
+    WebArchive jpa_core_EntityGraph_puservlet_vehicle_web_war = ShrinkWrap.create(WebArchive.class, "jpa_core_EntityGraph_puservlet_vehicle_web_war");
+    jpa_core_EntityGraph_puservlet_vehicle_web_war.addAsWebInfResource("web.xml");
+
+    JavaArchive jpa_core_EntityGraph_jar = ShrinkWrap.create(JavaArchive.class, "jpa_core_EntityGraph.jar");
+    jpa_core_EntityGraph_jar.addClass(ee.jakarta.tck.persistence.core.EntityGraph.Department.class);
+    jpa_core_EntityGraph_jar.addClass(ee.jakarta.tck.persistence.core.EntityGraph.Employee.class);
+    jpa_core_EntityGraph_jar.addClass(ee.jakarta.tck.persistence.core.EntityGraph.Employee2.class);
+    jpa_core_EntityGraph_jar.addClass(ee.jakarta.tck.persistence.core.EntityGraph.Employee3.class);
+    jpa_core_EntityGraph_jar.addAsManifestResource("META-INF/MANIFEST.MF");
+    jpa_core_EntityGraph_jar.addAsManifestResource("META-INF/persistence.xml");
+    jpa_core_EntityGraph_puservlet_vehicle_web_war.addAsLibrary(jpa_core_EntityGraph_jar);
+    jpa_core_EntityGraph_puservlet_vehicle_web_war.addClass(ee.jakarta.tck.persistence.common.PMClientBase.class);
+    jpa_core_EntityGraph_puservlet_vehicle_web_war.addClass(ee.jakarta.tck.persistence.core.EntityGraph.Client.class);
+    ear.addAsModule(jpa_core_EntityGraph_puservlet_vehicle_web_war);
+
+    JavaArchive jpa_core_EntityGraph_stateful3_vehicle_client_jar = ShrinkWrap.create(JavaArchive.class, "jpa_core_EntityGraph_stateful3_vehicle_client_jar");
+    jpa_core_EntityGraph_stateful3_vehicle_client_jar.addClass(ee.jakarta.tck.persistence.common.PMClientBase.class);
+    ear.addAsModule(jpa_core_EntityGraph_stateful3_vehicle_client_jar);
+
+    JavaArchive jpa_core_EntityGraph_stateful3_vehicle_ejb_jar = ShrinkWrap.create(JavaArchive.class, "jpa_core_EntityGraph_stateful3_vehicle_ejb_jar");
+    jpa_core_EntityGraph_stateful3_vehicle_ejb_jar.addClass(ee.jakarta.tck.persistence.common.PMClientBase.class);
+    jpa_core_EntityGraph_stateful3_vehicle_ejb_jar.addClass(ee.jakarta.tck.persistence.core.EntityGraph.Client.class);
+    ear.addAsModule(jpa_core_EntityGraph_stateful3_vehicle_ejb_jar);
+
+    JavaArchive jpa_core_EntityGraph_stateless3_vehicle_client_jar = ShrinkWrap.create(JavaArchive.class, "jpa_core_EntityGraph_stateless3_vehicle_client_jar");
+    jpa_core_EntityGraph_stateless3_vehicle_client_jar.addClass(ee.jakarta.tck.persistence.common.PMClientBase.class);
+    ear.addAsModule(jpa_core_EntityGraph_stateless3_vehicle_client_jar);
+
+    JavaArchive jpa_core_EntityGraph_stateless3_vehicle_ejb_jar = ShrinkWrap.create(JavaArchive.class, "jpa_core_EntityGraph_stateless3_vehicle_ejb_jar");
+    jpa_core_EntityGraph_stateless3_vehicle_ejb_jar.addClass(ee.jakarta.tck.persistence.common.PMClientBase.class);
+    jpa_core_EntityGraph_stateless3_vehicle_ejb_jar.addClass(ee.jakarta.tck.persistence.core.EntityGraph.Client.class);
+    ear.addAsModule(jpa_core_EntityGraph_stateless3_vehicle_ejb_jar);
+    return ear;
+  }
+
 	private static final Logger logger = (Logger) System.getLogger(Client.class.getName());
 
 	Employee3[] empRef = new Employee3[5];
diff --git a/jpa/spec-tests/src/main/java/ee/jakarta/tck/persistence/core/StoredProcedureQuery/Client.java b/jpa/spec-tests/src/main/java/ee/jakarta/tck/persistence/core/StoredProcedureQuery/Client.java
index 9674a1995..31360fa66 100644
--- a/jpa/spec-tests/src/main/java/ee/jakarta/tck/persistence/core/StoredProcedureQuery/Client.java
+++ b/jpa/spec-tests/src/main/java/ee/jakarta/tck/persistence/core/StoredProcedureQuery/Client.java
@@ -21,7 +21,12 @@ import java.util.ArrayList;
 import java.util.Calendar;
 import java.util.Date;
 import java.util.List;
-
+import org.jboss.arquillian.container.test.api.Deployment;
+import org.jboss.shrinkwrap.api.Archive;
+import org.jboss.shrinkwrap.api.ShrinkWrap;
+import org.jboss.shrinkwrap.api.spec.EnterpriseArchive;
+import org.jboss.shrinkwrap.api.spec.JavaArchive;
+import org.jboss.shrinkwrap.api.spec.WebArchive;
 import org.junit.jupiter.api.AfterEach;
 
 import ee.jakarta.tck.persistence.common.PMClientBase;
@@ -29,6 +34,88 @@ import jakarta.persistence.StoredProcedureQuery;
 
 public class Client extends PMClientBase {
 
+  @Deployment(testable = false)
+  public static Archive<?> deployment() {
+
+    final EnterpriseArchive ear = ShrinkWrap.create(EnterpriseArchive.class, "jpa_core_StoredProcedureQuery_vehicles.ear");
+    // TODO: filter/eliminate the library jar classes that shouldn't be included
+    // Add ear/lib jars
+
+    JavaArchive jpa_core_StoredProcedureQuery_jar = ShrinkWrap.create(JavaArchive.class, "jpa_core_StoredProcedureQuery_jar");
+    jpa_core_StoredProcedureQuery_jar.addClass(ee.jakarta.tck.persistence.core.StoredProcedureQuery.Employee.class);
+    jpa_core_StoredProcedureQuery_jar.addClass(ee.jakarta.tck.persistence.core.StoredProcedureQuery.Employee2.class);
+    jpa_core_StoredProcedureQuery_jar.addClass(ee.jakarta.tck.persistence.core.StoredProcedureQuery.EmployeeMappedSC.class);
+    ear.addAsLibrary(jpa_core_StoredProcedureQuery_jar);
+    // Add ear submodules
+
+    JavaArchive jpa_core_StoredProcedureQuery_appmanagedNoTx_vehicle_client_jar = ShrinkWrap.create(JavaArchive.class, "jpa_core_StoredProcedureQuery_appmanagedNoTx_vehicle_client_jar");
+    jpa_core_StoredProcedureQuery_appmanagedNoTx_vehicle_client_jar.addClass(ee.jakarta.tck.persistence.common.PMClientBase.class);
+    ear.addAsModule(jpa_core_StoredProcedureQuery_appmanagedNoTx_vehicle_client_jar);
+
+    JavaArchive jpa_core_StoredProcedureQuery_appmanagedNoTx_vehicle_ejb_jar = ShrinkWrap.create(JavaArchive.class, "jpa_core_StoredProcedureQuery_appmanagedNoTx_vehicle_ejb_jar");
+    jpa_core_StoredProcedureQuery_appmanagedNoTx_vehicle_ejb_jar.addClass(ee.jakarta.tck.persistence.common.PMClientBase.class);
+    jpa_core_StoredProcedureQuery_appmanagedNoTx_vehicle_ejb_jar.addClass(ee.jakarta.tck.persistence.core.StoredProcedureQuery.Client.class);
+    ear.addAsModule(jpa_core_StoredProcedureQuery_appmanagedNoTx_vehicle_ejb_jar);
+
+    JavaArchive jpa_core_StoredProcedureQuery_appmanaged_vehicle_client_jar = ShrinkWrap.create(JavaArchive.class, "jpa_core_StoredProcedureQuery_appmanaged_vehicle_client_jar");
+    jpa_core_StoredProcedureQuery_appmanaged_vehicle_client_jar.addClass(ee.jakarta.tck.persistence.common.PMClientBase.class);
+    ear.addAsModule(jpa_core_StoredProcedureQuery_appmanaged_vehicle_client_jar);
+
+    JavaArchive jpa_core_StoredProcedureQuery_appmanaged_vehicle_ejb_jar = ShrinkWrap.create(JavaArchive.class, "jpa_core_StoredProcedureQuery_appmanaged_vehicle_ejb_jar");
+    jpa_core_StoredProcedureQuery_appmanaged_vehicle_ejb_jar.addClass(ee.jakarta.tck.persistence.common.PMClientBase.class);
+    jpa_core_StoredProcedureQuery_appmanaged_vehicle_ejb_jar.addClass(ee.jakarta.tck.persistence.core.StoredProcedureQuery.Client.class);
+    ear.addAsModule(jpa_core_StoredProcedureQuery_appmanaged_vehicle_ejb_jar);
+
+    WebArchive jpa_core_StoredProcedureQuery_pmservlet_vehicle_web_war = ShrinkWrap.create(WebArchive.class, "jpa_core_StoredProcedureQuery_pmservlet_vehicle_web_war");
+    jpa_core_StoredProcedureQuery_pmservlet_vehicle_web_war.addAsWebInfResource("web.xml");
+
+    JavaArchive jpa_core_StoredProcedureQuery_jar = ShrinkWrap.create(JavaArchive.class, "jpa_core_StoredProcedureQuery.jar");
+    jpa_core_StoredProcedureQuery_jar.addClass(ee.jakarta.tck.persistence.core.StoredProcedureQuery.Employee.class);
+    jpa_core_StoredProcedureQuery_jar.addClass(ee.jakarta.tck.persistence.core.StoredProcedureQuery.Employee2.class);
+    jpa_core_StoredProcedureQuery_jar.addClass(ee.jakarta.tck.persistence.core.StoredProcedureQuery.EmployeeMappedSC.class);
+    jpa_core_StoredProcedureQuery_jar.addAsManifestResource("myMappingFile.xml");
+    jpa_core_StoredProcedureQuery_jar.addAsManifestResource("META-INF/MANIFEST.MF");
+    jpa_core_StoredProcedureQuery_jar.addAsManifestResource("META-INF/persistence.xml");
+    jpa_core_StoredProcedureQuery_pmservlet_vehicle_web_war.addAsLibrary(jpa_core_StoredProcedureQuery_jar);
+    jpa_core_StoredProcedureQuery_pmservlet_vehicle_web_war.addClass(ee.jakarta.tck.persistence.common.PMClientBase.class);
+    jpa_core_StoredProcedureQuery_pmservlet_vehicle_web_war.addClass(ee.jakarta.tck.persistence.core.StoredProcedureQuery.Client.class);
+    ear.addAsModule(jpa_core_StoredProcedureQuery_pmservlet_vehicle_web_war);
+
+    WebArchive jpa_core_StoredProcedureQuery_puservlet_vehicle_web_war = ShrinkWrap.create(WebArchive.class, "jpa_core_StoredProcedureQuery_puservlet_vehicle_web_war");
+    jpa_core_StoredProcedureQuery_puservlet_vehicle_web_war.addAsWebInfResource("web.xml");
+
+    JavaArchive jpa_core_StoredProcedureQuery_jar = ShrinkWrap.create(JavaArchive.class, "jpa_core_StoredProcedureQuery.jar");
+    jpa_core_StoredProcedureQuery_jar.addClass(ee.jakarta.tck.persistence.core.StoredProcedureQuery.Employee.class);
+    jpa_core_StoredProcedureQuery_jar.addClass(ee.jakarta.tck.persistence.core.StoredProcedureQuery.Employee2.class);
+    jpa_core_StoredProcedureQuery_jar.addClass(ee.jakarta.tck.persistence.core.StoredProcedureQuery.EmployeeMappedSC.class);
+    jpa_core_StoredProcedureQuery_jar.addAsManifestResource("myMappingFile.xml");
+    jpa_core_StoredProcedureQuery_jar.addAsManifestResource("META-INF/MANIFEST.MF");
+    jpa_core_StoredProcedureQuery_jar.addAsManifestResource("META-INF/persistence.xml");
+    jpa_core_StoredProcedureQuery_puservlet_vehicle_web_war.addAsLibrary(jpa_core_StoredProcedureQuery_jar);
+    jpa_core_StoredProcedureQuery_puservlet_vehicle_web_war.addClass(ee.jakarta.tck.persistence.common.PMClientBase.class);
+    jpa_core_StoredProcedureQuery_puservlet_vehicle_web_war.addClass(ee.jakarta.tck.persistence.core.StoredProcedureQuery.Client.class);
+    ear.addAsModule(jpa_core_StoredProcedureQuery_puservlet_vehicle_web_war);
+
+    JavaArchive jpa_core_StoredProcedureQuery_stateful3_vehicle_client_jar = ShrinkWrap.create(JavaArchive.class, "jpa_core_StoredProcedureQuery_stateful3_vehicle_client_jar");
+    jpa_core_StoredProcedureQuery_stateful3_vehicle_client_jar.addClass(ee.jakarta.tck.persistence.common.PMClientBase.class);
+    ear.addAsModule(jpa_core_StoredProcedureQuery_stateful3_vehicle_client_jar);
+
+    JavaArchive jpa_core_StoredProcedureQuery_stateful3_vehicle_ejb_jar = ShrinkWrap.create(JavaArchive.class, "jpa_core_StoredProcedureQuery_stateful3_vehicle_ejb_jar");
+    jpa_core_StoredProcedureQuery_stateful3_vehicle_ejb_jar.addClass(ee.jakarta.tck.persistence.common.PMClientBase.class);
+    jpa_core_StoredProcedureQuery_stateful3_vehicle_ejb_jar.addClass(ee.jakarta.tck.persistence.core.StoredProcedureQuery.Client.class);
+    ear.addAsModule(jpa_core_StoredProcedureQuery_stateful3_vehicle_ejb_jar);
+
+    JavaArchive jpa_core_StoredProcedureQuery_stateless3_vehicle_client_jar = ShrinkWrap.create(JavaArchive.class, "jpa_core_StoredProcedureQuery_stateless3_vehicle_client_jar");
+    jpa_core_StoredProcedureQuery_stateless3_vehicle_client_jar.addClass(ee.jakarta.tck.persistence.common.PMClientBase.class);
+    ear.addAsModule(jpa_core_StoredProcedureQuery_stateless3_vehicle_client_jar);
+
+    JavaArchive jpa_core_StoredProcedureQuery_stateless3_vehicle_ejb_jar = ShrinkWrap.create(JavaArchive.class, "jpa_core_StoredProcedureQuery_stateless3_vehicle_ejb_jar");
+    jpa_core_StoredProcedureQuery_stateless3_vehicle_ejb_jar.addClass(ee.jakarta.tck.persistence.common.PMClientBase.class);
+    jpa_core_StoredProcedureQuery_stateless3_vehicle_ejb_jar.addClass(ee.jakarta.tck.persistence.core.StoredProcedureQuery.Client.class);
+    ear.addAsModule(jpa_core_StoredProcedureQuery_stateless3_vehicle_ejb_jar);
+    return ear;
+  }
+
 	private static final Logger logger = (Logger) System.getLogger(Client.class.getName());
 
 	List<Employee> empRef = new ArrayList<Employee>();
diff --git a/jpa/spec-tests/src/main/java/ee/jakarta/tck/persistence/core/StoredProcedureQuery/Client1.java b/jpa/spec-tests/src/main/java/ee/jakarta/tck/persistence/core/StoredProcedureQuery/Client1.java
index 154ab65f3..2ec1fcd05 100644
--- a/jpa/spec-tests/src/main/java/ee/jakarta/tck/persistence/core/StoredProcedureQuery/Client1.java
+++ b/jpa/spec-tests/src/main/java/ee/jakarta/tck/persistence/core/StoredProcedureQuery/Client1.java
@@ -22,8 +22,12 @@ import java.util.Calendar;
 import java.util.Date;
 import java.util.List;
 import java.util.Set;
-
+import org.jboss.arquillian.container.test.api.Deployment;
+import org.jboss.shrinkwrap.api.Archive;
+import org.jboss.shrinkwrap.api.ShrinkWrap;
+import org.jboss.shrinkwrap.api.spec.EnterpriseArchive;
 import org.jboss.shrinkwrap.api.spec.JavaArchive;
+import org.jboss.shrinkwrap.api.spec.WebArchive;
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
 
@@ -40,6 +44,88 @@ import jakarta.persistence.TransactionRequiredException;
 
 public class Client1 extends Client {
 
+  @Deployment(testable = false)
+  public static Archive<?> deployment() {
+
+    final EnterpriseArchive ear = ShrinkWrap.create(EnterpriseArchive.class, "jpa_core_StoredProcedureQuery_vehicles.ear");
+    // TODO: filter/eliminate the library jar classes that shouldn't be included
+    // Add ear/lib jars
+
+    JavaArchive jpa_core_StoredProcedureQuery_jar = ShrinkWrap.create(JavaArchive.class, "jpa_core_StoredProcedureQuery_jar");
+    jpa_core_StoredProcedureQuery_jar.addClass(ee.jakarta.tck.persistence.core.StoredProcedureQuery.Employee.class);
+    jpa_core_StoredProcedureQuery_jar.addClass(ee.jakarta.tck.persistence.core.StoredProcedureQuery.Employee2.class);
+    jpa_core_StoredProcedureQuery_jar.addClass(ee.jakarta.tck.persistence.core.StoredProcedureQuery.EmployeeMappedSC.class);
+    ear.addAsLibrary(jpa_core_StoredProcedureQuery_jar);
+    // Add ear submodules
+
+    JavaArchive jpa_core_StoredProcedureQuery_appmanagedNoTx_vehicle_client_jar = ShrinkWrap.create(JavaArchive.class, "jpa_core_StoredProcedureQuery_appmanagedNoTx_vehicle_client_jar");
+    jpa_core_StoredProcedureQuery_appmanagedNoTx_vehicle_client_jar.addClass(ee.jakarta.tck.persistence.common.PMClientBase.class);
+    ear.addAsModule(jpa_core_StoredProcedureQuery_appmanagedNoTx_vehicle_client_jar);
+
+    JavaArchive jpa_core_StoredProcedureQuery_appmanagedNoTx_vehicle_ejb_jar = ShrinkWrap.create(JavaArchive.class, "jpa_core_StoredProcedureQuery_appmanagedNoTx_vehicle_ejb_jar");
+    jpa_core_StoredProcedureQuery_appmanagedNoTx_vehicle_ejb_jar.addClass(ee.jakarta.tck.persistence.common.PMClientBase.class);
+    jpa_core_StoredProcedureQuery_appmanagedNoTx_vehicle_ejb_jar.addClass(ee.jakarta.tck.persistence.core.StoredProcedureQuery.Client.class);
+    ear.addAsModule(jpa_core_StoredProcedureQuery_appmanagedNoTx_vehicle_ejb_jar);
+
+    JavaArchive jpa_core_StoredProcedureQuery_appmanaged_vehicle_client_jar = ShrinkWrap.create(JavaArchive.class, "jpa_core_StoredProcedureQuery_appmanaged_vehicle_client_jar");
+    jpa_core_StoredProcedureQuery_appmanaged_vehicle_client_jar.addClass(ee.jakarta.tck.persistence.common.PMClientBase.class);
+    ear.addAsModule(jpa_core_StoredProcedureQuery_appmanaged_vehicle_client_jar);
+
+    JavaArchive jpa_core_StoredProcedureQuery_appmanaged_vehicle_ejb_jar = ShrinkWrap.create(JavaArchive.class, "jpa_core_StoredProcedureQuery_appmanaged_vehicle_ejb_jar");
+    jpa_core_StoredProcedureQuery_appmanaged_vehicle_ejb_jar.addClass(ee.jakarta.tck.persistence.common.PMClientBase.class);
+    jpa_core_StoredProcedureQuery_appmanaged_vehicle_ejb_jar.addClass(ee.jakarta.tck.persistence.core.StoredProcedureQuery.Client.class);
+    ear.addAsModule(jpa_core_StoredProcedureQuery_appmanaged_vehicle_ejb_jar);
+
+    WebArchive jpa_core_StoredProcedureQuery_pmservlet_vehicle_web_war = ShrinkWrap.create(WebArchive.class, "jpa_core_StoredProcedureQuery_pmservlet_vehicle_web_war");
+    jpa_core_StoredProcedureQuery_pmservlet_vehicle_web_war.addAsWebInfResource("web.xml");
+
+    JavaArchive jpa_core_StoredProcedureQuery_jar = ShrinkWrap.create(JavaArchive.class, "jpa_core_StoredProcedureQuery.jar");
+    jpa_core_StoredProcedureQuery_jar.addClass(ee.jakarta.tck.persistence.core.StoredProcedureQuery.Employee.class);
+    jpa_core_StoredProcedureQuery_jar.addClass(ee.jakarta.tck.persistence.core.StoredProcedureQuery.Employee2.class);
+    jpa_core_StoredProcedureQuery_jar.addClass(ee.jakarta.tck.persistence.core.StoredProcedureQuery.EmployeeMappedSC.class);
+    jpa_core_StoredProcedureQuery_jar.addAsManifestResource("myMappingFile.xml");
+    jpa_core_StoredProcedureQuery_jar.addAsManifestResource("META-INF/MANIFEST.MF");
+    jpa_core_StoredProcedureQuery_jar.addAsManifestResource("META-INF/persistence.xml");
+    jpa_core_StoredProcedureQuery_pmservlet_vehicle_web_war.addAsLibrary(jpa_core_StoredProcedureQuery_jar);
+    jpa_core_StoredProcedureQuery_pmservlet_vehicle_web_war.addClass(ee.jakarta.tck.persistence.common.PMClientBase.class);
+    jpa_core_StoredProcedureQuery_pmservlet_vehicle_web_war.addClass(ee.jakarta.tck.persistence.core.StoredProcedureQuery.Client.class);
+    ear.addAsModule(jpa_core_StoredProcedureQuery_pmservlet_vehicle_web_war);
+
+    WebArchive jpa_core_StoredProcedureQuery_puservlet_vehicle_web_war = ShrinkWrap.create(WebArchive.class, "jpa_core_StoredProcedureQuery_puservlet_vehicle_web_war");
+    jpa_core_StoredProcedureQuery_puservlet_vehicle_web_war.addAsWebInfResource("web.xml");
+
+    JavaArchive jpa_core_StoredProcedureQuery_jar = ShrinkWrap.create(JavaArchive.class, "jpa_core_StoredProcedureQuery.jar");
+    jpa_core_StoredProcedureQuery_jar.addClass(ee.jakarta.tck.persistence.core.StoredProcedureQuery.Employee.class);
+    jpa_core_StoredProcedureQuery_jar.addClass(ee.jakarta.tck.persistence.core.StoredProcedureQuery.Employee2.class);
+    jpa_core_StoredProcedureQuery_jar.addClass(ee.jakarta.tck.persistence.core.StoredProcedureQuery.EmployeeMappedSC.class);
+    jpa_core_StoredProcedureQuery_jar.addAsManifestResource("myMappingFile.xml");
+    jpa_core_StoredProcedureQuery_jar.addAsManifestResource("META-INF/MANIFEST.MF");
+    jpa_core_StoredProcedureQuery_jar.addAsManifestResource("META-INF/persistence.xml");
+    jpa_core_StoredProcedureQuery_puservlet_vehicle_web_war.addAsLibrary(jpa_core_StoredProcedureQuery_jar);
+    jpa_core_StoredProcedureQuery_puservlet_vehicle_web_war.addClass(ee.jakarta.tck.persistence.common.PMClientBase.class);
+    jpa_core_StoredProcedureQuery_puservlet_vehicle_web_war.addClass(ee.jakarta.tck.persistence.core.StoredProcedureQuery.Client.class);
+    ear.addAsModule(jpa_core_StoredProcedureQuery_puservlet_vehicle_web_war);
+
+    JavaArchive jpa_core_StoredProcedureQuery_stateful3_vehicle_client_jar = ShrinkWrap.create(JavaArchive.class, "jpa_core_StoredProcedureQuery_stateful3_vehicle_client_jar");
+    jpa_core_StoredProcedureQuery_stateful3_vehicle_client_jar.addClass(ee.jakarta.tck.persistence.common.PMClientBase.class);
+    ear.addAsModule(jpa_core_StoredProcedureQuery_stateful3_vehicle_client_jar);
+
+    JavaArchive jpa_core_StoredProcedureQuery_stateful3_vehicle_ejb_jar = ShrinkWrap.create(JavaArchive.class, "jpa_core_StoredProcedureQuery_stateful3_vehicle_ejb_jar");
+    jpa_core_StoredProcedureQuery_stateful3_vehicle_ejb_jar.addClass(ee.jakarta.tck.persistence.common.PMClientBase.class);
+    jpa_core_StoredProcedureQuery_stateful3_vehicle_ejb_jar.addClass(ee.jakarta.tck.persistence.core.StoredProcedureQuery.Client.class);
+    ear.addAsModule(jpa_core_StoredProcedureQuery_stateful3_vehicle_ejb_jar);
+
+    JavaArchive jpa_core_StoredProcedureQuery_stateless3_vehicle_client_jar = ShrinkWrap.create(JavaArchive.class, "jpa_core_StoredProcedureQuery_stateless3_vehicle_client_jar");
+    jpa_core_StoredProcedureQuery_stateless3_vehicle_client_jar.addClass(ee.jakarta.tck.persistence.common.PMClientBase.class);
+    ear.addAsModule(jpa_core_StoredProcedureQuery_stateless3_vehicle_client_jar);
+
+    JavaArchive jpa_core_StoredProcedureQuery_stateless3_vehicle_ejb_jar = ShrinkWrap.create(JavaArchive.class, "jpa_core_StoredProcedureQuery_stateless3_vehicle_ejb_jar");
+    jpa_core_StoredProcedureQuery_stateless3_vehicle_ejb_jar.addClass(ee.jakarta.tck.persistence.common.PMClientBase.class);
+    jpa_core_StoredProcedureQuery_stateless3_vehicle_ejb_jar.addClass(ee.jakarta.tck.persistence.core.StoredProcedureQuery.Client.class);
+    ear.addAsModule(jpa_core_StoredProcedureQuery_stateless3_vehicle_ejb_jar);
+    return ear;
+  }
+
     private static final Logger logger = (Logger) System.getLogger(Client1.class.getName());
 
     public Client1() {
diff --git a/jpa/spec-tests/src/main/java/ee/jakarta/tck/persistence/core/StoredProcedureQuery/Client2.java b/jpa/spec-tests/src/main/java/ee/jakarta/tck/persistence/core/StoredProcedureQuery/Client2.java
index 9fdaf1472..798435c21 100644
--- a/jpa/spec-tests/src/main/java/ee/jakarta/tck/persistence/core/StoredProcedureQuery/Client2.java
+++ b/jpa/spec-tests/src/main/java/ee/jakarta/tck/persistence/core/StoredProcedureQuery/Client2.java
@@ -20,8 +20,12 @@ import java.lang.System.Logger;
 import java.util.ArrayList;
 import java.util.Calendar;
 import java.util.List;
-
+import org.jboss.arquillian.container.test.api.Deployment;
+import org.jboss.shrinkwrap.api.Archive;
+import org.jboss.shrinkwrap.api.ShrinkWrap;
+import org.jboss.shrinkwrap.api.spec.EnterpriseArchive;
 import org.jboss.shrinkwrap.api.spec.JavaArchive;
+import org.jboss.shrinkwrap.api.spec.WebArchive;
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
 
@@ -33,6 +37,88 @@ import jakarta.persistence.TemporalType;
 
 public class Client2 extends Client {
 
+  @Deployment(testable = false)
+  public static Archive<?> deployment() {
+
+    final EnterpriseArchive ear = ShrinkWrap.create(EnterpriseArchive.class, "jpa_core_StoredProcedureQuery_vehicles.ear");
+    // TODO: filter/eliminate the library jar classes that shouldn't be included
+    // Add ear/lib jars
+
+    JavaArchive jpa_core_StoredProcedureQuery_jar = ShrinkWrap.create(JavaArchive.class, "jpa_core_StoredProcedureQuery_jar");
+    jpa_core_StoredProcedureQuery_jar.addClass(ee.jakarta.tck.persistence.core.StoredProcedureQuery.Employee.class);
+    jpa_core_StoredProcedureQuery_jar.addClass(ee.jakarta.tck.persistence.core.StoredProcedureQuery.Employee2.class);
+    jpa_core_StoredProcedureQuery_jar.addClass(ee.jakarta.tck.persistence.core.StoredProcedureQuery.EmployeeMappedSC.class);
+    ear.addAsLibrary(jpa_core_StoredProcedureQuery_jar);
+    // Add ear submodules
+
+    JavaArchive jpa_core_StoredProcedureQuery_appmanagedNoTx_vehicle_client_jar = ShrinkWrap.create(JavaArchive.class, "jpa_core_StoredProcedureQuery_appmanagedNoTx_vehicle_client_jar");
+    jpa_core_StoredProcedureQuery_appmanagedNoTx_vehicle_client_jar.addClass(ee.jakarta.tck.persistence.common.PMClientBase.class);
+    ear.addAsModule(jpa_core_StoredProcedureQuery_appmanagedNoTx_vehicle_client_jar);
+
+    JavaArchive jpa_core_StoredProcedureQuery_appmanagedNoTx_vehicle_ejb_jar = ShrinkWrap.create(JavaArchive.class, "jpa_core_StoredProcedureQuery_appmanagedNoTx_vehicle_ejb_jar");
+    jpa_core_StoredProcedureQuery_appmanagedNoTx_vehicle_ejb_jar.addClass(ee.jakarta.tck.persistence.common.PMClientBase.class);
+    jpa_core_StoredProcedureQuery_appmanagedNoTx_vehicle_ejb_jar.addClass(ee.jakarta.tck.persistence.core.StoredProcedureQuery.Client.class);
+    ear.addAsModule(jpa_core_StoredProcedureQuery_appmanagedNoTx_vehicle_ejb_jar);
+
+    JavaArchive jpa_core_StoredProcedureQuery_appmanaged_vehicle_client_jar = ShrinkWrap.create(JavaArchive.class, "jpa_core_StoredProcedureQuery_appmanaged_vehicle_client_jar");
+    jpa_core_StoredProcedureQuery_appmanaged_vehicle_client_jar.addClass(ee.jakarta.tck.persistence.common.PMClientBase.class);
+    ear.addAsModule(jpa_core_StoredProcedureQuery_appmanaged_vehicle_client_jar);
+
+    JavaArchive jpa_core_StoredProcedureQuery_appmanaged_vehicle_ejb_jar = ShrinkWrap.create(JavaArchive.class, "jpa_core_StoredProcedureQuery_appmanaged_vehicle_ejb_jar");
+    jpa_core_StoredProcedureQuery_appmanaged_vehicle_ejb_jar.addClass(ee.jakarta.tck.persistence.common.PMClientBase.class);
+    jpa_core_StoredProcedureQuery_appmanaged_vehicle_ejb_jar.addClass(ee.jakarta.tck.persistence.core.StoredProcedureQuery.Client.class);
+    ear.addAsModule(jpa_core_StoredProcedureQuery_appmanaged_vehicle_ejb_jar);
+
+    WebArchive jpa_core_StoredProcedureQuery_pmservlet_vehicle_web_war = ShrinkWrap.create(WebArchive.class, "jpa_core_StoredProcedureQuery_pmservlet_vehicle_web_war");
+    jpa_core_StoredProcedureQuery_pmservlet_vehicle_web_war.addAsWebInfResource("web.xml");
+
+    JavaArchive jpa_core_StoredProcedureQuery_jar = ShrinkWrap.create(JavaArchive.class, "jpa_core_StoredProcedureQuery.jar");
+    jpa_core_StoredProcedureQuery_jar.addClass(ee.jakarta.tck.persistence.core.StoredProcedureQuery.Employee.class);
+    jpa_core_StoredProcedureQuery_jar.addClass(ee.jakarta.tck.persistence.core.StoredProcedureQuery.Employee2.class);
+    jpa_core_StoredProcedureQuery_jar.addClass(ee.jakarta.tck.persistence.core.StoredProcedureQuery.EmployeeMappedSC.class);
+    jpa_core_StoredProcedureQuery_jar.addAsManifestResource("myMappingFile.xml");
+    jpa_core_StoredProcedureQuery_jar.addAsManifestResource("META-INF/MANIFEST.MF");
+    jpa_core_StoredProcedureQuery_jar.addAsManifestResource("META-INF/persistence.xml");
+    jpa_core_StoredProcedureQuery_pmservlet_vehicle_web_war.addAsLibrary(jpa_core_StoredProcedureQuery_jar);
+    jpa_core_StoredProcedureQuery_pmservlet_vehicle_web_war.addClass(ee.jakarta.tck.persistence.common.PMClientBase.class);
+    jpa_core_StoredProcedureQuery_pmservlet_vehicle_web_war.addClass(ee.jakarta.tck.persistence.core.StoredProcedureQuery.Client.class);
+    ear.addAsModule(jpa_core_StoredProcedureQuery_pmservlet_vehicle_web_war);
+
+    WebArchive jpa_core_StoredProcedureQuery_puservlet_vehicle_web_war = ShrinkWrap.create(WebArchive.class, "jpa_core_StoredProcedureQuery_puservlet_vehicle_web_war");
+    jpa_core_StoredProcedureQuery_puservlet_vehicle_web_war.addAsWebInfResource("web.xml");
+
+    JavaArchive jpa_core_StoredProcedureQuery_jar = ShrinkWrap.create(JavaArchive.class, "jpa_core_StoredProcedureQuery.jar");
+    jpa_core_StoredProcedureQuery_jar.addClass(ee.jakarta.tck.persistence.core.StoredProcedureQuery.Employee.class);
+    jpa_core_StoredProcedureQuery_jar.addClass(ee.jakarta.tck.persistence.core.StoredProcedureQuery.Employee2.class);
+    jpa_core_StoredProcedureQuery_jar.addClass(ee.jakarta.tck.persistence.core.StoredProcedureQuery.EmployeeMappedSC.class);
+    jpa_core_StoredProcedureQuery_jar.addAsManifestResource("myMappingFile.xml");
+    jpa_core_StoredProcedureQuery_jar.addAsManifestResource("META-INF/MANIFEST.MF");
+    jpa_core_StoredProcedureQuery_jar.addAsManifestResource("META-INF/persistence.xml");
+    jpa_core_StoredProcedureQuery_puservlet_vehicle_web_war.addAsLibrary(jpa_core_StoredProcedureQuery_jar);
+    jpa_core_StoredProcedureQuery_puservlet_vehicle_web_war.addClass(ee.jakarta.tck.persistence.common.PMClientBase.class);
+    jpa_core_StoredProcedureQuery_puservlet_vehicle_web_war.addClass(ee.jakarta.tck.persistence.core.StoredProcedureQuery.Client.class);
+    ear.addAsModule(jpa_core_StoredProcedureQuery_puservlet_vehicle_web_war);
+
+    JavaArchive jpa_core_StoredProcedureQuery_stateful3_vehicle_client_jar = ShrinkWrap.create(JavaArchive.class, "jpa_core_StoredProcedureQuery_stateful3_vehicle_client_jar");
+    jpa_core_StoredProcedureQuery_stateful3_vehicle_client_jar.addClass(ee.jakarta.tck.persistence.common.PMClientBase.class);
+    ear.addAsModule(jpa_core_StoredProcedureQuery_stateful3_vehicle_client_jar);
+
+    JavaArchive jpa_core_StoredProcedureQuery_stateful3_vehicle_ejb_jar = ShrinkWrap.create(JavaArchive.class, "jpa_core_StoredProcedureQuery_stateful3_vehicle_ejb_jar");
+    jpa_core_StoredProcedureQuery_stateful3_vehicle_ejb_jar.addClass(ee.jakarta.tck.persistence.common.PMClientBase.class);
+    jpa_core_StoredProcedureQuery_stateful3_vehicle_ejb_jar.addClass(ee.jakarta.tck.persistence.core.StoredProcedureQuery.Client.class);
+    ear.addAsModule(jpa_core_StoredProcedureQuery_stateful3_vehicle_ejb_jar);
+
+    JavaArchive jpa_core_StoredProcedureQuery_stateless3_vehicle_client_jar = ShrinkWrap.create(JavaArchive.class, "jpa_core_StoredProcedureQuery_stateless3_vehicle_client_jar");
+    jpa_core_StoredProcedureQuery_stateless3_vehicle_client_jar.addClass(ee.jakarta.tck.persistence.common.PMClientBase.class);
+    ear.addAsModule(jpa_core_StoredProcedureQuery_stateless3_vehicle_client_jar);
+
+    JavaArchive jpa_core_StoredProcedureQuery_stateless3_vehicle_ejb_jar = ShrinkWrap.create(JavaArchive.class, "jpa_core_StoredProcedureQuery_stateless3_vehicle_ejb_jar");
+    jpa_core_StoredProcedureQuery_stateless3_vehicle_ejb_jar.addClass(ee.jakarta.tck.persistence.common.PMClientBase.class);
+    jpa_core_StoredProcedureQuery_stateless3_vehicle_ejb_jar.addClass(ee.jakarta.tck.persistence.core.StoredProcedureQuery.Client.class);
+    ear.addAsModule(jpa_core_StoredProcedureQuery_stateless3_vehicle_ejb_jar);
+    return ear;
+  }
+
 	private static final Logger logger = (Logger) System.getLogger(Client2.class.getName());
 
 	public Client2() {
diff --git a/jpa/spec-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/access/field/Client.java b/jpa/spec-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/access/field/Client.java
index 838f6364e..e2710d8fc 100644
--- a/jpa/spec-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/access/field/Client.java
+++ b/jpa/spec-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/access/field/Client.java
@@ -17,13 +17,98 @@
 package ee.jakarta.tck.persistence.core.annotations.access.field;
 
 import java.lang.System.Logger;
-
+import org.jboss.arquillian.container.test.api.Deployment;
+import org.jboss.shrinkwrap.api.Archive;
+import org.jboss.shrinkwrap.api.ShrinkWrap;
+import org.jboss.shrinkwrap.api.spec.EnterpriseArchive;
+import org.jboss.shrinkwrap.api.spec.JavaArchive;
+import org.jboss.shrinkwrap.api.spec.WebArchive;
 import org.junit.jupiter.api.AfterEach;
 
 import ee.jakarta.tck.persistence.common.PMClientBase;
 
 public class Client extends PMClientBase {
 
+  @Deployment(testable = false)
+  public static Archive<?> deployment() {
+
+    final EnterpriseArchive ear = ShrinkWrap.create(EnterpriseArchive.class, "jpa_core_annotations_access_field_vehicles.ear");
+    // TODO: filter/eliminate the library jar classes that shouldn't be included
+    // Add ear/lib jars
+
+    JavaArchive jpa_core_annotations_access_field_jar = ShrinkWrap.create(JavaArchive.class, "jpa_core_annotations_access_field_jar");
+    jpa_core_annotations_access_field_jar.addClass(ee.jakarta.tck.persistence.core.annotations.access.field.DataTypes.class);
+    jpa_core_annotations_access_field_jar.addClass(ee.jakarta.tck.persistence.core.annotations.access.field.DataTypes2.class);
+    jpa_core_annotations_access_field_jar.addClass(ee.jakarta.tck.persistence.core.types.common.Grade.class);
+    ear.addAsLibrary(jpa_core_annotations_access_field_jar);
+    // Add ear submodules
+
+    JavaArchive jpa_core_annotations_access_field_appmanagedNoTx_vehicle_client_jar = ShrinkWrap.create(JavaArchive.class, "jpa_core_annotations_access_field_appmanagedNoTx_vehicle_client_jar");
+    jpa_core_annotations_access_field_appmanagedNoTx_vehicle_client_jar.addClass(ee.jakarta.tck.persistence.common.PMClientBase.class);
+    ear.addAsModule(jpa_core_annotations_access_field_appmanagedNoTx_vehicle_client_jar);
+
+    JavaArchive jpa_core_annotations_access_field_appmanagedNoTx_vehicle_ejb_jar = ShrinkWrap.create(JavaArchive.class, "jpa_core_annotations_access_field_appmanagedNoTx_vehicle_ejb_jar");
+    jpa_core_annotations_access_field_appmanagedNoTx_vehicle_ejb_jar.addClass(ee.jakarta.tck.persistence.common.PMClientBase.class);
+    jpa_core_annotations_access_field_appmanagedNoTx_vehicle_ejb_jar.addClass(ee.jakarta.tck.persistence.core.annotations.access.field.Client.class);
+    ear.addAsModule(jpa_core_annotations_access_field_appmanagedNoTx_vehicle_ejb_jar);
+
+    JavaArchive jpa_core_annotations_access_field_appmanaged_vehicle_client_jar = ShrinkWrap.create(JavaArchive.class, "jpa_core_annotations_access_field_appmanaged_vehicle_client_jar");
+    jpa_core_annotations_access_field_appmanaged_vehicle_client_jar.addClass(ee.jakarta.tck.persistence.common.PMClientBase.class);
+    ear.addAsModule(jpa_core_annotations_access_field_appmanaged_vehicle_client_jar);
+
+    JavaArchive jpa_core_annotations_access_field_appmanaged_vehicle_ejb_jar = ShrinkWrap.create(JavaArchive.class, "jpa_core_annotations_access_field_appmanaged_vehicle_ejb_jar");
+    jpa_core_annotations_access_field_appmanaged_vehicle_ejb_jar.addClass(ee.jakarta.tck.persistence.common.PMClientBase.class);
+    jpa_core_annotations_access_field_appmanaged_vehicle_ejb_jar.addClass(ee.jakarta.tck.persistence.core.annotations.access.field.Client.class);
+    ear.addAsModule(jpa_core_annotations_access_field_appmanaged_vehicle_ejb_jar);
+
+    WebArchive jpa_core_annotations_access_field_pmservlet_vehicle_web_war = ShrinkWrap.create(WebArchive.class, "jpa_core_annotations_access_field_pmservlet_vehicle_web_war");
+    jpa_core_annotations_access_field_pmservlet_vehicle_web_war.addAsWebInfResource("web.xml");
+
+    JavaArchive jpa_core_annotations_access_field_jar = ShrinkWrap.create(JavaArchive.class, "jpa_core_annotations_access_field.jar");
+    jpa_core_annotations_access_field_jar.addClass(ee.jakarta.tck.persistence.core.annotations.access.field.DataTypes.class);
+    jpa_core_annotations_access_field_jar.addClass(ee.jakarta.tck.persistence.core.annotations.access.field.DataTypes2.class);
+    jpa_core_annotations_access_field_jar.addClass(ee.jakarta.tck.persistence.core.types.common.Grade.class);
+    jpa_core_annotations_access_field_jar.addAsManifestResource("META-INF/MANIFEST.MF");
+    jpa_core_annotations_access_field_jar.addAsManifestResource("META-INF/persistence.xml");
+    jpa_core_annotations_access_field_pmservlet_vehicle_web_war.addAsLibrary(jpa_core_annotations_access_field_jar);
+    jpa_core_annotations_access_field_pmservlet_vehicle_web_war.addClass(ee.jakarta.tck.persistence.common.PMClientBase.class);
+    jpa_core_annotations_access_field_pmservlet_vehicle_web_war.addClass(ee.jakarta.tck.persistence.core.annotations.access.field.Client.class);
+    ear.addAsModule(jpa_core_annotations_access_field_pmservlet_vehicle_web_war);
+
+    WebArchive jpa_core_annotations_access_field_puservlet_vehicle_web_war = ShrinkWrap.create(WebArchive.class, "jpa_core_annotations_access_field_puservlet_vehicle_web_war");
+    jpa_core_annotations_access_field_puservlet_vehicle_web_war.addAsWebInfResource("web.xml");
+
+    JavaArchive jpa_core_annotations_access_field_jar = ShrinkWrap.create(JavaArchive.class, "jpa_core_annotations_access_field.jar");
+    jpa_core_annotations_access_field_jar.addClass(ee.jakarta.tck.persistence.core.annotations.access.field.DataTypes.class);
+    jpa_core_annotations_access_field_jar.addClass(ee.jakarta.tck.persistence.core.annotations.access.field.DataTypes2.class);
+    jpa_core_annotations_access_field_jar.addClass(ee.jakarta.tck.persistence.core.types.common.Grade.class);
+    jpa_core_annotations_access_field_jar.addAsManifestResource("META-INF/MANIFEST.MF");
+    jpa_core_annotations_access_field_jar.addAsManifestResource("META-INF/persistence.xml");
+    jpa_core_annotations_access_field_puservlet_vehicle_web_war.addAsLibrary(jpa_core_annotations_access_field_jar);
+    jpa_core_annotations_access_field_puservlet_vehicle_web_war.addClass(ee.jakarta.tck.persistence.common.PMClientBase.class);
+    jpa_core_annotations_access_field_puservlet_vehicle_web_war.addClass(ee.jakarta.tck.persistence.core.annotations.access.field.Client.class);
+    ear.addAsModule(jpa_core_annotations_access_field_puservlet_vehicle_web_war);
+
+    JavaArchive jpa_core_annotations_access_field_stateful3_vehicle_client_jar = ShrinkWrap.create(JavaArchive.class, "jpa_core_annotations_access_field_stateful3_vehicle_client_jar");
+    jpa_core_annotations_access_field_stateful3_vehicle_client_jar.addClass(ee.jakarta.tck.persistence.common.PMClientBase.class);
+    ear.addAsModule(jpa_core_annotations_access_field_stateful3_vehicle_client_jar);
+
+    JavaArchive jpa_core_annotations_access_field_stateful3_vehicle_ejb_jar = ShrinkWrap.create(JavaArchive.class, "jpa_core_annotations_access_field_stateful3_vehicle_ejb_jar");
+    jpa_core_annotations_access_field_stateful3_vehicle_ejb_jar.addClass(ee.jakarta.tck.persistence.common.PMClientBase.class);
+    jpa_core_annotations_access_field_stateful3_vehicle_ejb_jar.addClass(ee.jakarta.tck.persistence.core.annotations.access.field.Client.class);
+    ear.addAsModule(jpa_core_annotations_access_field_stateful3_vehicle_ejb_jar);
+
+    JavaArchive jpa_core_annotations_access_field_stateless3_vehicle_client_jar = ShrinkWrap.create(JavaArchive.class, "jpa_core_annotations_access_field_stateless3_vehicle_client_jar");
+    jpa_core_annotations_access_field_stateless3_vehicle_client_jar.addClass(ee.jakarta.tck.persistence.common.PMClientBase.class);
+    ear.addAsModule(jpa_core_annotations_access_field_stateless3_vehicle_client_jar);
+
+    JavaArchive jpa_core_annotations_access_field_stateless3_vehicle_ejb_jar = ShrinkWrap.create(JavaArchive.class, "jpa_core_annotations_access_field_stateless3_vehicle_ejb_jar");
+    jpa_core_annotations_access_field_stateless3_vehicle_ejb_jar.addClass(ee.jakarta.tck.persistence.common.PMClientBase.class);
+    jpa_core_annotations_access_field_stateless3_vehicle_ejb_jar.addClass(ee.jakarta.tck.persistence.core.annotations.access.field.Client.class);
+    ear.addAsModule(jpa_core_annotations_access_field_stateless3_vehicle_ejb_jar);
+    return ear;
+  }
+
 	protected DataTypes d1;
 
 	protected DataTypes2 d2;
diff --git a/jpa/spec-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/access/field/Client1.java b/jpa/spec-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/access/field/Client1.java
index c01b0bae4..1a20886cc 100644
--- a/jpa/spec-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/access/field/Client1.java
+++ b/jpa/spec-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/access/field/Client1.java
@@ -2,8 +2,12 @@ package ee.jakarta.tck.persistence.core.annotations.access.field;
 
 import java.lang.System.Logger;
 import java.util.Arrays;
-
+import org.jboss.arquillian.container.test.api.Deployment;
+import org.jboss.shrinkwrap.api.Archive;
+import org.jboss.shrinkwrap.api.ShrinkWrap;
+import org.jboss.shrinkwrap.api.spec.EnterpriseArchive;
 import org.jboss.shrinkwrap.api.spec.JavaArchive;
+import org.jboss.shrinkwrap.api.spec.WebArchive;
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
 
@@ -12,6 +16,86 @@ import jakarta.persistence.Query;
 
 public class Client1 extends Client {
 
+  @Deployment(testable = false)
+  public static Archive<?> deployment() {
+
+    final EnterpriseArchive ear = ShrinkWrap.create(EnterpriseArchive.class, "jpa_core_annotations_access_field_vehicles.ear");
+    // TODO: filter/eliminate the library jar classes that shouldn't be included
+    // Add ear/lib jars
+
+    JavaArchive jpa_core_annotations_access_field_jar = ShrinkWrap.create(JavaArchive.class, "jpa_core_annotations_access_field_jar");
+    jpa_core_annotations_access_field_jar.addClass(ee.jakarta.tck.persistence.core.annotations.access.field.DataTypes.class);
+    jpa_core_annotations_access_field_jar.addClass(ee.jakarta.tck.persistence.core.annotations.access.field.DataTypes2.class);
+    jpa_core_annotations_access_field_jar.addClass(ee.jakarta.tck.persistence.core.types.common.Grade.class);
+    ear.addAsLibrary(jpa_core_annotations_access_field_jar);
+    // Add ear submodules
+
+    JavaArchive jpa_core_annotations_access_field_appmanagedNoTx_vehicle_client_jar = ShrinkWrap.create(JavaArchive.class, "jpa_core_annotations_access_field_appmanagedNoTx_vehicle_client_jar");
+    jpa_core_annotations_access_field_appmanagedNoTx_vehicle_client_jar.addClass(ee.jakarta.tck.persistence.common.PMClientBase.class);
+    ear.addAsModule(jpa_core_annotations_access_field_appmanagedNoTx_vehicle_client_jar);
+
+    JavaArchive jpa_core_annotations_access_field_appmanagedNoTx_vehicle_ejb_jar = ShrinkWrap.create(JavaArchive.class, "jpa_core_annotations_access_field_appmanagedNoTx_vehicle_ejb_jar");
+    jpa_core_annotations_access_field_appmanagedNoTx_vehicle_ejb_jar.addClass(ee.jakarta.tck.persistence.common.PMClientBase.class);
+    jpa_core_annotations_access_field_appmanagedNoTx_vehicle_ejb_jar.addClass(ee.jakarta.tck.persistence.core.annotations.access.field.Client.class);
+    ear.addAsModule(jpa_core_annotations_access_field_appmanagedNoTx_vehicle_ejb_jar);
+
+    JavaArchive jpa_core_annotations_access_field_appmanaged_vehicle_client_jar = ShrinkWrap.create(JavaArchive.class, "jpa_core_annotations_access_field_appmanaged_vehicle_client_jar");
+    jpa_core_annotations_access_field_appmanaged_vehicle_client_jar.addClass(ee.jakarta.tck.persistence.common.PMClientBase.class);
+    ear.addAsModule(jpa_core_annotations_access_field_appmanaged_vehicle_client_jar);
+
+    JavaArchive jpa_core_annotations_access_field_appmanaged_vehicle_ejb_jar = ShrinkWrap.create(JavaArchive.class, "jpa_core_annotations_access_field_appmanaged_vehicle_ejb_jar");
+    jpa_core_annotations_access_field_appmanaged_vehicle_ejb_jar.addClass(ee.jakarta.tck.persistence.common.PMClientBase.class);
+    jpa_core_annotations_access_field_appmanaged_vehicle_ejb_jar.addClass(ee.jakarta.tck.persistence.core.annotations.access.field.Client.class);
+    ear.addAsModule(jpa_core_annotations_access_field_appmanaged_vehicle_ejb_jar);
+
+    WebArchive jpa_core_annotations_access_field_pmservlet_vehicle_web_war = ShrinkWrap.create(WebArchive.class, "jpa_core_annotations_access_field_pmservlet_vehicle_web_war");
+    jpa_core_annotations_access_field_pmservlet_vehicle_web_war.addAsWebInfResource("web.xml");
+
+    JavaArchive jpa_core_annotations_access_field_jar = ShrinkWrap.create(JavaArchive.class, "jpa_core_annotations_access_field.jar");
+    jpa_core_annotations_access_field_jar.addClass(ee.jakarta.tck.persistence.core.annotations.access.field.DataTypes.class);
+    jpa_core_annotations_access_field_jar.addClass(ee.jakarta.tck.persistence.core.annotations.access.field.DataTypes2.class);
+    jpa_core_annotations_access_field_jar.addClass(ee.jakarta.tck.persistence.core.types.common.Grade.class);
+    jpa_core_annotations_access_field_jar.addAsManifestResource("META-INF/MANIFEST.MF");
+    jpa_core_annotations_access_field_jar.addAsManifestResource("META-INF/persistence.xml");
+    jpa_core_annotations_access_field_pmservlet_vehicle_web_war.addAsLibrary(jpa_core_annotations_access_field_jar);
+    jpa_core_annotations_access_field_pmservlet_vehicle_web_war.addClass(ee.jakarta.tck.persistence.common.PMClientBase.class);
+    jpa_core_annotations_access_field_pmservlet_vehicle_web_war.addClass(ee.jakarta.tck.persistence.core.annotations.access.field.Client.class);
+    ear.addAsModule(jpa_core_annotations_access_field_pmservlet_vehicle_web_war);
+
+    WebArchive jpa_core_annotations_access_field_puservlet_vehicle_web_war = ShrinkWrap.create(WebArchive.class, "jpa_core_annotations_access_field_puservlet_vehicle_web_war");
+    jpa_core_annotations_access_field_puservlet_vehicle_web_war.addAsWebInfResource("web.xml");
+
+    JavaArchive jpa_core_annotations_access_field_jar = ShrinkWrap.create(JavaArchive.class, "jpa_core_annotations_access_field.jar");
+    jpa_core_annotations_access_field_jar.addClass(ee.jakarta.tck.persistence.core.annotations.access.field.DataTypes.class);
+    jpa_core_annotations_access_field_jar.addClass(ee.jakarta.tck.persistence.core.annotations.access.field.DataTypes2.class);
+    jpa_core_annotations_access_field_jar.addClass(ee.jakarta.tck.persistence.core.types.common.Grade.class);
+    jpa_core_annotations_access_field_jar.addAsManifestResource("META-INF/MANIFEST.MF");
+    jpa_core_annotations_access_field_jar.addAsManifestResource("META-INF/persistence.xml");
+    jpa_core_annotations_access_field_puservlet_vehicle_web_war.addAsLibrary(jpa_core_annotations_access_field_jar);
+    jpa_core_annotations_access_field_puservlet_vehicle_web_war.addClass(ee.jakarta.tck.persistence.common.PMClientBase.class);
+    jpa_core_annotations_access_field_puservlet_vehicle_web_war.addClass(ee.jakarta.tck.persistence.core.annotations.access.field.Client.class);
+    ear.addAsModule(jpa_core_annotations_access_field_puservlet_vehicle_web_war);
+
+    JavaArchive jpa_core_annotations_access_field_stateful3_vehicle_client_jar = ShrinkWrap.create(JavaArchive.class, "jpa_core_annotations_access_field_stateful3_vehicle_client_jar");
+    jpa_core_annotations_access_field_stateful3_vehicle_client_jar.addClass(ee.jakarta.tck.persistence.common.PMClientBase.class);
+    ear.addAsModule(jpa_core_annotations_access_field_stateful3_vehicle_client_jar);
+
+    JavaArchive jpa_core_annotations_access_field_stateful3_vehicle_ejb_jar = ShrinkWrap.create(JavaArchive.class, "jpa_core_annotations_access_field_stateful3_vehicle_ejb_jar");
+    jpa_core_annotations_access_field_stateful3_vehicle_ejb_jar.addClass(ee.jakarta.tck.persistence.common.PMClientBase.class);
+    jpa_core_annotations_access_field_stateful3_vehicle_ejb_jar.addClass(ee.jakarta.tck.persistence.core.annotations.access.field.Client.class);
+    ear.addAsModule(jpa_core_annotations_access_field_stateful3_vehicle_ejb_jar);
+
+    JavaArchive jpa_core_annotations_access_field_stateless3_vehicle_client_jar = ShrinkWrap.create(JavaArchive.class, "jpa_core_annotations_access_field_stateless3_vehicle_client_jar");
+    jpa_core_annotations_access_field_stateless3_vehicle_client_jar.addClass(ee.jakarta.tck.persistence.common.PMClientBase.class);
+    ear.addAsModule(jpa_core_annotations_access_field_stateless3_vehicle_client_jar);
+
+    JavaArchive jpa_core_annotations_access_field_stateless3_vehicle_ejb_jar = ShrinkWrap.create(JavaArchive.class, "jpa_core_annotations_access_field_stateless3_vehicle_ejb_jar");
+    jpa_core_annotations_access_field_stateless3_vehicle_ejb_jar.addClass(ee.jakarta.tck.persistence.common.PMClientBase.class);
+    jpa_core_annotations_access_field_stateless3_vehicle_ejb_jar.addClass(ee.jakarta.tck.persistence.core.annotations.access.field.Client.class);
+    ear.addAsModule(jpa_core_annotations_access_field_stateless3_vehicle_ejb_jar);
+    return ear;
+  }
+
 	private static final Logger logger = (Logger) System.getLogger(Client1.class.getName());
 
 	public JavaArchive createDeployment() throws Exception {
diff --git a/jpa/spec-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/access/field/Client2.java b/jpa/spec-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/access/field/Client2.java
index c557ca4ed..9a701d6e5 100644
--- a/jpa/spec-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/access/field/Client2.java
+++ b/jpa/spec-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/access/field/Client2.java
@@ -2,12 +2,97 @@ package ee.jakarta.tck.persistence.core.annotations.access.field;
 
 import java.lang.System.Logger;
 
+import org.jboss.arquillian.container.test.api.Deployment;
+import org.jboss.shrinkwrap.api.Archive;
+import org.jboss.shrinkwrap.api.ShrinkWrap;
+import org.jboss.shrinkwrap.api.spec.EnterpriseArchive;
 import org.jboss.shrinkwrap.api.spec.JavaArchive;
+import org.jboss.shrinkwrap.api.spec.WebArchive;
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
 
 public class Client2 extends Client {
 
+  @Deployment(testable = false)
+  public static Archive<?> deployment() {
+
+    final EnterpriseArchive ear = ShrinkWrap.create(EnterpriseArchive.class, "jpa_core_annotations_access_field_vehicles.ear");
+    // TODO: filter/eliminate the library jar classes that shouldn't be included
+    // Add ear/lib jars
+
+    JavaArchive jpa_core_annotations_access_field_jar = ShrinkWrap.create(JavaArchive.class, "jpa_core_annotations_access_field_jar");
+    jpa_core_annotations_access_field_jar.addClass(ee.jakarta.tck.persistence.core.annotations.access.field.DataTypes.class);
+    jpa_core_annotations_access_field_jar.addClass(ee.jakarta.tck.persistence.core.annotations.access.field.DataTypes2.class);
+    jpa_core_annotations_access_field_jar.addClass(ee.jakarta.tck.persistence.core.types.common.Grade.class);
+    ear.addAsLibrary(jpa_core_annotations_access_field_jar);
+    // Add ear submodules
+
+    JavaArchive jpa_core_annotations_access_field_appmanagedNoTx_vehicle_client_jar = ShrinkWrap.create(JavaArchive.class, "jpa_core_annotations_access_field_appmanagedNoTx_vehicle_client_jar");
+    jpa_core_annotations_access_field_appmanagedNoTx_vehicle_client_jar.addClass(ee.jakarta.tck.persistence.common.PMClientBase.class);
+    ear.addAsModule(jpa_core_annotations_access_field_appmanagedNoTx_vehicle_client_jar);
+
+    JavaArchive jpa_core_annotations_access_field_appmanagedNoTx_vehicle_ejb_jar = ShrinkWrap.create(JavaArchive.class, "jpa_core_annotations_access_field_appmanagedNoTx_vehicle_ejb_jar");
+    jpa_core_annotations_access_field_appmanagedNoTx_vehicle_ejb_jar.addClass(ee.jakarta.tck.persistence.common.PMClientBase.class);
+    jpa_core_annotations_access_field_appmanagedNoTx_vehicle_ejb_jar.addClass(ee.jakarta.tck.persistence.core.annotations.access.field.Client.class);
+    ear.addAsModule(jpa_core_annotations_access_field_appmanagedNoTx_vehicle_ejb_jar);
+
+    JavaArchive jpa_core_annotations_access_field_appmanaged_vehicle_client_jar = ShrinkWrap.create(JavaArchive.class, "jpa_core_annotations_access_field_appmanaged_vehicle_client_jar");
+    jpa_core_annotations_access_field_appmanaged_vehicle_client_jar.addClass(ee.jakarta.tck.persistence.common.PMClientBase.class);
+    ear.addAsModule(jpa_core_annotations_access_field_appmanaged_vehicle_client_jar);
+
+    JavaArchive jpa_core_annotations_access_field_appmanaged_vehicle_ejb_jar = ShrinkWrap.create(JavaArchive.class, "jpa_core_annotations_access_field_appmanaged_vehicle_ejb_jar");
+    jpa_core_annotations_access_field_appmanaged_vehicle_ejb_jar.addClass(ee.jakarta.tck.persistence.common.PMClientBase.class);
+    jpa_core_annotations_access_field_appmanaged_vehicle_ejb_jar.addClass(ee.jakarta.tck.persistence.core.annotations.access.field.Client.class);
+    ear.addAsModule(jpa_core_annotations_access_field_appmanaged_vehicle_ejb_jar);
+
+    WebArchive jpa_core_annotations_access_field_pmservlet_vehicle_web_war = ShrinkWrap.create(WebArchive.class, "jpa_core_annotations_access_field_pmservlet_vehicle_web_war");
+    jpa_core_annotations_access_field_pmservlet_vehicle_web_war.addAsWebInfResource("web.xml");
+
+    JavaArchive jpa_core_annotations_access_field_jar = ShrinkWrap.create(JavaArchive.class, "jpa_core_annotations_access_field.jar");
+    jpa_core_annotations_access_field_jar.addClass(ee.jakarta.tck.persistence.core.annotations.access.field.DataTypes.class);
+    jpa_core_annotations_access_field_jar.addClass(ee.jakarta.tck.persistence.core.annotations.access.field.DataTypes2.class);
+    jpa_core_annotations_access_field_jar.addClass(ee.jakarta.tck.persistence.core.types.common.Grade.class);
+    jpa_core_annotations_access_field_jar.addAsManifestResource("META-INF/MANIFEST.MF");
+    jpa_core_annotations_access_field_jar.addAsManifestResource("META-INF/persistence.xml");
+    jpa_core_annotations_access_field_pmservlet_vehicle_web_war.addAsLibrary(jpa_core_annotations_access_field_jar);
+    jpa_core_annotations_access_field_pmservlet_vehicle_web_war.addClass(ee.jakarta.tck.persistence.common.PMClientBase.class);
+    jpa_core_annotations_access_field_pmservlet_vehicle_web_war.addClass(ee.jakarta.tck.persistence.core.annotations.access.field.Client.class);
+    ear.addAsModule(jpa_core_annotations_access_field_pmservlet_vehicle_web_war);
+
+    WebArchive jpa_core_annotations_access_field_puservlet_vehicle_web_war = ShrinkWrap.create(WebArchive.class, "jpa_core_annotations_access_field_puservlet_vehicle_web_war");
+    jpa_core_annotations_access_field_puservlet_vehicle_web_war.addAsWebInfResource("web.xml");
+
+    JavaArchive jpa_core_annotations_access_field_jar = ShrinkWrap.create(JavaArchive.class, "jpa_core_annotations_access_field.jar");
+    jpa_core_annotations_access_field_jar.addClass(ee.jakarta.tck.persistence.core.annotations.access.field.DataTypes.class);
+    jpa_core_annotations_access_field_jar.addClass(ee.jakarta.tck.persistence.core.annotations.access.field.DataTypes2.class);
+    jpa_core_annotations_access_field_jar.addClass(ee.jakarta.tck.persistence.core.types.common.Grade.class);
+    jpa_core_annotations_access_field_jar.addAsManifestResource("META-INF/MANIFEST.MF");
+    jpa_core_annotations_access_field_jar.addAsManifestResource("META-INF/persistence.xml");
+    jpa_core_annotations_access_field_puservlet_vehicle_web_war.addAsLibrary(jpa_core_annotations_access_field_jar);
+    jpa_core_annotations_access_field_puservlet_vehicle_web_war.addClass(ee.jakarta.tck.persistence.common.PMClientBase.class);
+    jpa_core_annotations_access_field_puservlet_vehicle_web_war.addClass(ee.jakarta.tck.persistence.core.annotations.access.field.Client.class);
+    ear.addAsModule(jpa_core_annotations_access_field_puservlet_vehicle_web_war);
+
+    JavaArchive jpa_core_annotations_access_field_stateful3_vehicle_client_jar = ShrinkWrap.create(JavaArchive.class, "jpa_core_annotations_access_field_stateful3_vehicle_client_jar");
+    jpa_core_annotations_access_field_stateful3_vehicle_client_jar.addClass(ee.jakarta.tck.persistence.common.PMClientBase.class);
+    ear.addAsModule(jpa_core_annotations_access_field_stateful3_vehicle_client_jar);
+
+    JavaArchive jpa_core_annotations_access_field_stateful3_vehicle_ejb_jar = ShrinkWrap.create(JavaArchive.class, "jpa_core_annotations_access_field_stateful3_vehicle_ejb_jar");
+    jpa_core_annotations_access_field_stateful3_vehicle_ejb_jar.addClass(ee.jakarta.tck.persistence.common.PMClientBase.class);
+    jpa_core_annotations_access_field_stateful3_vehicle_ejb_jar.addClass(ee.jakarta.tck.persistence.core.annotations.access.field.Client.class);
+    ear.addAsModule(jpa_core_annotations_access_field_stateful3_vehicle_ejb_jar);
+
+    JavaArchive jpa_core_annotations_access_field_stateless3_vehicle_client_jar = ShrinkWrap.create(JavaArchive.class, "jpa_core_annotations_access_field_stateless3_vehicle_client_jar");
+    jpa_core_annotations_access_field_stateless3_vehicle_client_jar.addClass(ee.jakarta.tck.persistence.common.PMClientBase.class);
+    ear.addAsModule(jpa_core_annotations_access_field_stateless3_vehicle_client_jar);
+
+    JavaArchive jpa_core_annotations_access_field_stateless3_vehicle_ejb_jar = ShrinkWrap.create(JavaArchive.class, "jpa_core_annotations_access_field_stateless3_vehicle_ejb_jar");
+    jpa_core_annotations_access_field_stateless3_vehicle_ejb_jar.addClass(ee.jakarta.tck.persistence.common.PMClientBase.class);
+    jpa_core_annotations_access_field_stateless3_vehicle_ejb_jar.addClass(ee.jakarta.tck.persistence.core.annotations.access.field.Client.class);
+    ear.addAsModule(jpa_core_annotations_access_field_stateless3_vehicle_ejb_jar);
+    return ear;
+  }
+
 	private static final Logger logger = (Logger) System.getLogger(Client2.class.getName());
 
 	public JavaArchive createDeployment() throws Exception {
diff --git a/jpa/spec-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/access/field/Client3.java b/jpa/spec-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/access/field/Client3.java
index 6140c7054..ca43ae8eb 100644
--- a/jpa/spec-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/access/field/Client3.java
+++ b/jpa/spec-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/access/field/Client3.java
@@ -2,12 +2,97 @@ package ee.jakarta.tck.persistence.core.annotations.access.field;
 
 import java.lang.System.Logger;
 
+import org.jboss.arquillian.container.test.api.Deployment;
+import org.jboss.shrinkwrap.api.Archive;
+import org.jboss.shrinkwrap.api.ShrinkWrap;
+import org.jboss.shrinkwrap.api.spec.EnterpriseArchive;
 import org.jboss.shrinkwrap.api.spec.JavaArchive;
+import org.jboss.shrinkwrap.api.spec.WebArchive;
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
 
 public class Client3 extends Client {
 
+  @Deployment(testable = false)
+  public static Archive<?> deployment() {
+
+    final EnterpriseArchive ear = ShrinkWrap.create(EnterpriseArchive.class, "jpa_core_annotations_access_field_vehicles.ear");
+    // TODO: filter/eliminate the library jar classes that shouldn't be included
+    // Add ear/lib jars
+
+    JavaArchive jpa_core_annotations_access_field_jar = ShrinkWrap.create(JavaArchive.class, "jpa_core_annotations_access_field_jar");
+    jpa_core_annotations_access_field_jar.addClass(ee.jakarta.tck.persistence.core.annotations.access.field.DataTypes.class);
+    jpa_core_annotations_access_field_jar.addClass(ee.jakarta.tck.persistence.core.annotations.access.field.DataTypes2.class);
+    jpa_core_annotations_access_field_jar.addClass(ee.jakarta.tck.persistence.core.types.common.Grade.class);
+    ear.addAsLibrary(jpa_core_annotations_access_field_jar);
+    // Add ear submodules
+
+    JavaArchive jpa_core_annotations_access_field_appmanagedNoTx_vehicle_client_jar = ShrinkWrap.create(JavaArchive.class, "jpa_core_annotations_access_field_appmanagedNoTx_vehicle_client_jar");
+    jpa_core_annotations_access_field_appmanagedNoTx_vehicle_client_jar.addClass(ee.jakarta.tck.persistence.common.PMClientBase.class);
+    ear.addAsModule(jpa_core_annotations_access_field_appmanagedNoTx_vehicle_client_jar);
+
+    JavaArchive jpa_core_annotations_access_field_appmanagedNoTx_vehicle_ejb_jar = ShrinkWrap.create(JavaArchive.class, "jpa_core_annotations_access_field_appmanagedNoTx_vehicle_ejb_jar");
+    jpa_core_annotations_access_field_appmanagedNoTx_vehicle_ejb_jar.addClass(ee.jakarta.tck.persistence.common.PMClientBase.class);
+    jpa_core_annotations_access_field_appmanagedNoTx_vehicle_ejb_jar.addClass(ee.jakarta.tck.persistence.core.annotations.access.field.Client.class);
+    ear.addAsModule(jpa_core_annotations_access_field_appmanagedNoTx_vehicle_ejb_jar);
+
+    JavaArchive jpa_core_annotations_access_field_appmanaged_vehicle_client_jar = ShrinkWrap.create(JavaArchive.class, "jpa_core_annotations_access_field_appmanaged_vehicle_client_jar");
+    jpa_core_annotations_access_field_appmanaged_vehicle_client_jar.addClass(ee.jakarta.tck.persistence.common.PMClientBase.class);
+    ear.addAsModule(jpa_core_annotations_access_field_appmanaged_vehicle_client_jar);
+
+    JavaArchive jpa_core_annotations_access_field_appmanaged_vehicle_ejb_jar = ShrinkWrap.create(JavaArchive.class, "jpa_core_annotations_access_field_appmanaged_vehicle_ejb_jar");
+    jpa_core_annotations_access_field_appmanaged_vehicle_ejb_jar.addClass(ee.jakarta.tck.persistence.common.PMClientBase.class);
+    jpa_core_annotations_access_field_appmanaged_vehicle_ejb_jar.addClass(ee.jakarta.tck.persistence.core.annotations.access.field.Client.class);
+    ear.addAsModule(jpa_core_annotations_access_field_appmanaged_vehicle_ejb_jar);
+
+    WebArchive jpa_core_annotations_access_field_pmservlet_vehicle_web_war = ShrinkWrap.create(WebArchive.class, "jpa_core_annotations_access_field_pmservlet_vehicle_web_war");
+    jpa_core_annotations_access_field_pmservlet_vehicle_web_war.addAsWebInfResource("web.xml");
+
+    JavaArchive jpa_core_annotations_access_field_jar = ShrinkWrap.create(JavaArchive.class, "jpa_core_annotations_access_field.jar");
+    jpa_core_annotations_access_field_jar.addClass(ee.jakarta.tck.persistence.core.annotations.access.field.DataTypes.class);
+    jpa_core_annotations_access_field_jar.addClass(ee.jakarta.tck.persistence.core.annotations.access.field.DataTypes2.class);
+    jpa_core_annotations_access_field_jar.addClass(ee.jakarta.tck.persistence.core.types.common.Grade.class);
+    jpa_core_annotations_access_field_jar.addAsManifestResource("META-INF/MANIFEST.MF");
+    jpa_core_annotations_access_field_jar.addAsManifestResource("META-INF/persistence.xml");
+    jpa_core_annotations_access_field_pmservlet_vehicle_web_war.addAsLibrary(jpa_core_annotations_access_field_jar);
+    jpa_core_annotations_access_field_pmservlet_vehicle_web_war.addClass(ee.jakarta.tck.persistence.common.PMClientBase.class);
+    jpa_core_annotations_access_field_pmservlet_vehicle_web_war.addClass(ee.jakarta.tck.persistence.core.annotations.access.field.Client.class);
+    ear.addAsModule(jpa_core_annotations_access_field_pmservlet_vehicle_web_war);
+
+    WebArchive jpa_core_annotations_access_field_puservlet_vehicle_web_war = ShrinkWrap.create(WebArchive.class, "jpa_core_annotations_access_field_puservlet_vehicle_web_war");
+    jpa_core_annotations_access_field_puservlet_vehicle_web_war.addAsWebInfResource("web.xml");
+
+    JavaArchive jpa_core_annotations_access_field_jar = ShrinkWrap.create(JavaArchive.class, "jpa_core_annotations_access_field.jar");
+    jpa_core_annotations_access_field_jar.addClass(ee.jakarta.tck.persistence.core.annotations.access.field.DataTypes.class);
+    jpa_core_annotations_access_field_jar.addClass(ee.jakarta.tck.persistence.core.annotations.access.field.DataTypes2.class);
+    jpa_core_annotations_access_field_jar.addClass(ee.jakarta.tck.persistence.core.types.common.Grade.class);
+    jpa_core_annotations_access_field_jar.addAsManifestResource("META-INF/MANIFEST.MF");
+    jpa_core_annotations_access_field_jar.addAsManifestResource("META-INF/persistence.xml");
+    jpa_core_annotations_access_field_puservlet_vehicle_web_war.addAsLibrary(jpa_core_annotations_access_field_jar);
+    jpa_core_annotations_access_field_puservlet_vehicle_web_war.addClass(ee.jakarta.tck.persistence.common.PMClientBase.class);
+    jpa_core_annotations_access_field_puservlet_vehicle_web_war.addClass(ee.jakarta.tck.persistence.core.annotations.access.field.Client.class);
+    ear.addAsModule(jpa_core_annotations_access_field_puservlet_vehicle_web_war);
+
+    JavaArchive jpa_core_annotations_access_field_stateful3_vehicle_client_jar = ShrinkWrap.create(JavaArchive.class, "jpa_core_annotations_access_field_stateful3_vehicle_client_jar");
+    jpa_core_annotations_access_field_stateful3_vehicle_client_jar.addClass(ee.jakarta.tck.persistence.common.PMClientBase.class);
+    ear.addAsModule(jpa_core_annotations_access_field_stateful3_vehicle_client_jar);
+
+    JavaArchive jpa_core_annotations_access_field_stateful3_vehicle_ejb_jar = ShrinkWrap.create(JavaArchive.class, "jpa_core_annotations_access_field_stateful3_vehicle_ejb_jar");
+    jpa_core_annotations_access_field_stateful3_vehicle_ejb_jar.addClass(ee.jakarta.tck.persistence.common.PMClientBase.class);
+    jpa_core_annotations_access_field_stateful3_vehicle_ejb_jar.addClass(ee.jakarta.tck.persistence.core.annotations.access.field.Client.class);
+    ear.addAsModule(jpa_core_annotations_access_field_stateful3_vehicle_ejb_jar);
+
+    JavaArchive jpa_core_annotations_access_field_stateless3_vehicle_client_jar = ShrinkWrap.create(JavaArchive.class, "jpa_core_annotations_access_field_stateless3_vehicle_client_jar");
+    jpa_core_annotations_access_field_stateless3_vehicle_client_jar.addClass(ee.jakarta.tck.persistence.common.PMClientBase.class);
+    ear.addAsModule(jpa_core_annotations_access_field_stateless3_vehicle_client_jar);
+
+    JavaArchive jpa_core_annotations_access_field_stateless3_vehicle_ejb_jar = ShrinkWrap.create(JavaArchive.class, "jpa_core_annotations_access_field_stateless3_vehicle_ejb_jar");
+    jpa_core_annotations_access_field_stateless3_vehicle_ejb_jar.addClass(ee.jakarta.tck.persistence.common.PMClientBase.class);
+    jpa_core_annotations_access_field_stateless3_vehicle_ejb_jar.addClass(ee.jakarta.tck.persistence.core.annotations.access.field.Client.class);
+    ear.addAsModule(jpa_core_annotations_access_field_stateless3_vehicle_ejb_jar);
+    return ear;
+  }
+
 	private static final Logger logger = (Logger) System.getLogger(Client3.class.getName());
 
 	public JavaArchive createDeployment() throws Exception {
diff --git a/jpa/spec-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/access/field/Client4.java b/jpa/spec-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/access/field/Client4.java
index 8f0f34633..fd927c431 100644
--- a/jpa/spec-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/access/field/Client4.java
+++ b/jpa/spec-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/access/field/Client4.java
@@ -2,8 +2,12 @@ package ee.jakarta.tck.persistence.core.annotations.access.field;
 
 import java.lang.System.Logger;
 import java.util.GregorianCalendar;
-
+import org.jboss.arquillian.container.test.api.Deployment;
+import org.jboss.shrinkwrap.api.Archive;
+import org.jboss.shrinkwrap.api.ShrinkWrap;
+import org.jboss.shrinkwrap.api.spec.EnterpriseArchive;
 import org.jboss.shrinkwrap.api.spec.JavaArchive;
+import org.jboss.shrinkwrap.api.spec.WebArchive;
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
 
@@ -11,6 +15,86 @@ import jakarta.persistence.TypedQuery;
 
 public class Client4 extends Client {
 
+  @Deployment(testable = false)
+  public static Archive<?> deployment() {
+
+    final EnterpriseArchive ear = ShrinkWrap.create(EnterpriseArchive.class, "jpa_core_annotations_access_field_vehicles.ear");
+    // TODO: filter/eliminate the library jar classes that shouldn't be included
+    // Add ear/lib jars
+
+    JavaArchive jpa_core_annotations_access_field_jar = ShrinkWrap.create(JavaArchive.class, "jpa_core_annotations_access_field_jar");
+    jpa_core_annotations_access_field_jar.addClass(ee.jakarta.tck.persistence.core.annotations.access.field.DataTypes.class);
+    jpa_core_annotations_access_field_jar.addClass(ee.jakarta.tck.persistence.core.annotations.access.field.DataTypes2.class);
+    jpa_core_annotations_access_field_jar.addClass(ee.jakarta.tck.persistence.core.types.common.Grade.class);
+    ear.addAsLibrary(jpa_core_annotations_access_field_jar);
+    // Add ear submodules
+
+    JavaArchive jpa_core_annotations_access_field_appmanagedNoTx_vehicle_client_jar = ShrinkWrap.create(JavaArchive.class, "jpa_core_annotations_access_field_appmanagedNoTx_vehicle_client_jar");
+    jpa_core_annotations_access_field_appmanagedNoTx_vehicle_client_jar.addClass(ee.jakarta.tck.persistence.common.PMClientBase.class);
+    ear.addAsModule(jpa_core_annotations_access_field_appmanagedNoTx_vehicle_client_jar);
+
+    JavaArchive jpa_core_annotations_access_field_appmanagedNoTx_vehicle_ejb_jar = ShrinkWrap.create(JavaArchive.class, "jpa_core_annotations_access_field_appmanagedNoTx_vehicle_ejb_jar");
+    jpa_core_annotations_access_field_appmanagedNoTx_vehicle_ejb_jar.addClass(ee.jakarta.tck.persistence.common.PMClientBase.class);
+    jpa_core_annotations_access_field_appmanagedNoTx_vehicle_ejb_jar.addClass(ee.jakarta.tck.persistence.core.annotations.access.field.Client.class);
+    ear.addAsModule(jpa_core_annotations_access_field_appmanagedNoTx_vehicle_ejb_jar);
+
+    JavaArchive jpa_core_annotations_access_field_appmanaged_vehicle_client_jar = ShrinkWrap.create(JavaArchive.class, "jpa_core_annotations_access_field_appmanaged_vehicle_client_jar");
+    jpa_core_annotations_access_field_appmanaged_vehicle_client_jar.addClass(ee.jakarta.tck.persistence.common.PMClientBase.class);
+    ear.addAsModule(jpa_core_annotations_access_field_appmanaged_vehicle_client_jar);
+
+    JavaArchive jpa_core_annotations_access_field_appmanaged_vehicle_ejb_jar = ShrinkWrap.create(JavaArchive.class, "jpa_core_annotations_access_field_appmanaged_vehicle_ejb_jar");
+    jpa_core_annotations_access_field_appmanaged_vehicle_ejb_jar.addClass(ee.jakarta.tck.persistence.common.PMClientBase.class);
+    jpa_core_annotations_access_field_appmanaged_vehicle_ejb_jar.addClass(ee.jakarta.tck.persistence.core.annotations.access.field.Client.class);
+    ear.addAsModule(jpa_core_annotations_access_field_appmanaged_vehicle_ejb_jar);
+
+    WebArchive jpa_core_annotations_access_field_pmservlet_vehicle_web_war = ShrinkWrap.create(WebArchive.class, "jpa_core_annotations_access_field_pmservlet_vehicle_web_war");
+    jpa_core_annotations_access_field_pmservlet_vehicle_web_war.addAsWebInfResource("web.xml");
+
+    JavaArchive jpa_core_annotations_access_field_jar = ShrinkWrap.create(JavaArchive.class, "jpa_core_annotations_access_field.jar");
+    jpa_core_annotations_access_field_jar.addClass(ee.jakarta.tck.persistence.core.annotations.access.field.DataTypes.class);
+    jpa_core_annotations_access_field_jar.addClass(ee.jakarta.tck.persistence.core.annotations.access.field.DataTypes2.class);
+    jpa_core_annotations_access_field_jar.addClass(ee.jakarta.tck.persistence.core.types.common.Grade.class);
+    jpa_core_annotations_access_field_jar.addAsManifestResource("META-INF/MANIFEST.MF");
+    jpa_core_annotations_access_field_jar.addAsManifestResource("META-INF/persistence.xml");
+    jpa_core_annotations_access_field_pmservlet_vehicle_web_war.addAsLibrary(jpa_core_annotations_access_field_jar);
+    jpa_core_annotations_access_field_pmservlet_vehicle_web_war.addClass(ee.jakarta.tck.persistence.common.PMClientBase.class);
+    jpa_core_annotations_access_field_pmservlet_vehicle_web_war.addClass(ee.jakarta.tck.persistence.core.annotations.access.field.Client.class);
+    ear.addAsModule(jpa_core_annotations_access_field_pmservlet_vehicle_web_war);
+
+    WebArchive jpa_core_annotations_access_field_puservlet_vehicle_web_war = ShrinkWrap.create(WebArchive.class, "jpa_core_annotations_access_field_puservlet_vehicle_web_war");
+    jpa_core_annotations_access_field_puservlet_vehicle_web_war.addAsWebInfResource("web.xml");
+
+    JavaArchive jpa_core_annotations_access_field_jar = ShrinkWrap.create(JavaArchive.class, "jpa_core_annotations_access_field.jar");
+    jpa_core_annotations_access_field_jar.addClass(ee.jakarta.tck.persistence.core.annotations.access.field.DataTypes.class);
+    jpa_core_annotations_access_field_jar.addClass(ee.jakarta.tck.persistence.core.annotations.access.field.DataTypes2.class);
+    jpa_core_annotations_access_field_jar.addClass(ee.jakarta.tck.persistence.core.types.common.Grade.class);
+    jpa_core_annotations_access_field_jar.addAsManifestResource("META-INF/MANIFEST.MF");
+    jpa_core_annotations_access_field_jar.addAsManifestResource("META-INF/persistence.xml");
+    jpa_core_annotations_access_field_puservlet_vehicle_web_war.addAsLibrary(jpa_core_annotations_access_field_jar);
+    jpa_core_annotations_access_field_puservlet_vehicle_web_war.addClass(ee.jakarta.tck.persistence.common.PMClientBase.class);
+    jpa_core_annotations_access_field_puservlet_vehicle_web_war.addClass(ee.jakarta.tck.persistence.core.annotations.access.field.Client.class);
+    ear.addAsModule(jpa_core_annotations_access_field_puservlet_vehicle_web_war);
+
+    JavaArchive jpa_core_annotations_access_field_stateful3_vehicle_client_jar = ShrinkWrap.create(JavaArchive.class, "jpa_core_annotations_access_field_stateful3_vehicle_client_jar");
+    jpa_core_annotations_access_field_stateful3_vehicle_client_jar.addClass(ee.jakarta.tck.persistence.common.PMClientBase.class);
+    ear.addAsModule(jpa_core_annotations_access_field_stateful3_vehicle_client_jar);
+
+    JavaArchive jpa_core_annotations_access_field_stateful3_vehicle_ejb_jar = ShrinkWrap.create(JavaArchive.class, "jpa_core_annotations_access_field_stateful3_vehicle_ejb_jar");
+    jpa_core_annotations_access_field_stateful3_vehicle_ejb_jar.addClass(ee.jakarta.tck.persistence.common.PMClientBase.class);
+    jpa_core_annotations_access_field_stateful3_vehicle_ejb_jar.addClass(ee.jakarta.tck.persistence.core.annotations.access.field.Client.class);
+    ear.addAsModule(jpa_core_annotations_access_field_stateful3_vehicle_ejb_jar);
+
+    JavaArchive jpa_core_annotations_access_field_stateless3_vehicle_client_jar = ShrinkWrap.create(JavaArchive.class, "jpa_core_annotations_access_field_stateless3_vehicle_client_jar");
+    jpa_core_annotations_access_field_stateless3_vehicle_client_jar.addClass(ee.jakarta.tck.persistence.common.PMClientBase.class);
+    ear.addAsModule(jpa_core_annotations_access_field_stateless3_vehicle_client_jar);
+
+    JavaArchive jpa_core_annotations_access_field_stateless3_vehicle_ejb_jar = ShrinkWrap.create(JavaArchive.class, "jpa_core_annotations_access_field_stateless3_vehicle_ejb_jar");
+    jpa_core_annotations_access_field_stateless3_vehicle_ejb_jar.addClass(ee.jakarta.tck.persistence.common.PMClientBase.class);
+    jpa_core_annotations_access_field_stateless3_vehicle_ejb_jar.addClass(ee.jakarta.tck.persistence.core.annotations.access.field.Client.class);
+    ear.addAsModule(jpa_core_annotations_access_field_stateless3_vehicle_ejb_jar);
+    return ear;
+  }
+
 	private static final Logger logger = (Logger) System.getLogger(Client4.class.getName());
 
 	public JavaArchive createDeployment() throws Exception {
diff --git a/jpa/spec-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/access/mappedsc/Client.java b/jpa/spec-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/access/mappedsc/Client.java
index bb7f7b488..d3cbe7523 100644
--- a/jpa/spec-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/access/mappedsc/Client.java
+++ b/jpa/spec-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/access/mappedsc/Client.java
@@ -18,8 +18,12 @@ package ee.jakarta.tck.persistence.core.annotations.access.mappedsc;
 
 import java.lang.System.Logger;
 import java.sql.Date;
-
+import org.jboss.arquillian.container.test.api.Deployment;
+import org.jboss.shrinkwrap.api.Archive;
+import org.jboss.shrinkwrap.api.ShrinkWrap;
+import org.jboss.shrinkwrap.api.spec.EnterpriseArchive;
 import org.jboss.shrinkwrap.api.spec.JavaArchive;
+import org.jboss.shrinkwrap.api.spec.WebArchive;
 import org.junit.jupiter.api.AfterEach;
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
@@ -28,6 +32,95 @@ import ee.jakarta.tck.persistence.common.PMClientBase;
 
 public class Client extends PMClientBase {
 
+  @Deployment(testable = false)
+  public static Archive<?> deployment() {
+
+    final EnterpriseArchive ear = ShrinkWrap.create(EnterpriseArchive.class, "jpa_core_anno_access_mappedsc_vehicles.ear");
+    // TODO: filter/eliminate the library jar classes that shouldn't be included
+    // Add ear/lib jars
+
+    JavaArchive jpa_core_anno_access_mappedsc_jar = ShrinkWrap.create(JavaArchive.class, "jpa_core_anno_access_mappedsc_jar");
+    jpa_core_anno_access_mappedsc_jar.addClass(ee.jakarta.tck.persistence.core.annotations.access.mappedsc.AbstractPersonnel.class);
+    jpa_core_anno_access_mappedsc_jar.addClass(ee.jakarta.tck.persistence.core.annotations.access.mappedsc.Department.class);
+    jpa_core_anno_access_mappedsc_jar.addClass(ee.jakarta.tck.persistence.core.annotations.access.mappedsc.Employee.class);
+    jpa_core_anno_access_mappedsc_jar.addClass(ee.jakarta.tck.persistence.core.annotations.access.mappedsc.FullTimeEmployee.class);
+    jpa_core_anno_access_mappedsc_jar.addClass(ee.jakarta.tck.persistence.core.annotations.access.mappedsc.PartTimeEmployee.class);
+    jpa_core_anno_access_mappedsc_jar.addClass(ee.jakarta.tck.persistence.core.annotations.access.mappedsc.Project.class);
+    ear.addAsLibrary(jpa_core_anno_access_mappedsc_jar);
+    // Add ear submodules
+
+    JavaArchive jpa_core_anno_access_mappedsc_appmanagedNoTx_vehicle_client_jar = ShrinkWrap.create(JavaArchive.class, "jpa_core_anno_access_mappedsc_appmanagedNoTx_vehicle_client_jar");
+    jpa_core_anno_access_mappedsc_appmanagedNoTx_vehicle_client_jar.addClass(ee.jakarta.tck.persistence.common.PMClientBase.class);
+    ear.addAsModule(jpa_core_anno_access_mappedsc_appmanagedNoTx_vehicle_client_jar);
+
+    JavaArchive jpa_core_anno_access_mappedsc_appmanagedNoTx_vehicle_ejb_jar = ShrinkWrap.create(JavaArchive.class, "jpa_core_anno_access_mappedsc_appmanagedNoTx_vehicle_ejb_jar");
+    jpa_core_anno_access_mappedsc_appmanagedNoTx_vehicle_ejb_jar.addClass(ee.jakarta.tck.persistence.common.PMClientBase.class);
+    jpa_core_anno_access_mappedsc_appmanagedNoTx_vehicle_ejb_jar.addClass(ee.jakarta.tck.persistence.core.annotations.access.mappedsc.Client.class);
+    ear.addAsModule(jpa_core_anno_access_mappedsc_appmanagedNoTx_vehicle_ejb_jar);
+
+    JavaArchive jpa_core_anno_access_mappedsc_appmanaged_vehicle_client_jar = ShrinkWrap.create(JavaArchive.class, "jpa_core_anno_access_mappedsc_appmanaged_vehicle_client_jar");
+    jpa_core_anno_access_mappedsc_appmanaged_vehicle_client_jar.addClass(ee.jakarta.tck.persistence.common.PMClientBase.class);
+    ear.addAsModule(jpa_core_anno_access_mappedsc_appmanaged_vehicle_client_jar);
+
+    JavaArchive jpa_core_anno_access_mappedsc_appmanaged_vehicle_ejb_jar = ShrinkWrap.create(JavaArchive.class, "jpa_core_anno_access_mappedsc_appmanaged_vehicle_ejb_jar");
+    jpa_core_anno_access_mappedsc_appmanaged_vehicle_ejb_jar.addClass(ee.jakarta.tck.persistence.common.PMClientBase.class);
+    jpa_core_anno_access_mappedsc_appmanaged_vehicle_ejb_jar.addClass(ee.jakarta.tck.persistence.core.annotations.access.mappedsc.Client.class);
+    ear.addAsModule(jpa_core_anno_access_mappedsc_appmanaged_vehicle_ejb_jar);
+
+    WebArchive jpa_core_anno_access_mappedsc_pmservlet_vehicle_web_war = ShrinkWrap.create(WebArchive.class, "jpa_core_anno_access_mappedsc_pmservlet_vehicle_web_war");
+    jpa_core_anno_access_mappedsc_pmservlet_vehicle_web_war.addAsWebInfResource("web.xml");
+
+    JavaArchive jpa_core_anno_access_mappedsc_jar = ShrinkWrap.create(JavaArchive.class, "jpa_core_anno_access_mappedsc.jar");
+    jpa_core_anno_access_mappedsc_jar.addClass(ee.jakarta.tck.persistence.core.annotations.access.mappedsc.AbstractPersonnel.class);
+    jpa_core_anno_access_mappedsc_jar.addClass(ee.jakarta.tck.persistence.core.annotations.access.mappedsc.Department.class);
+    jpa_core_anno_access_mappedsc_jar.addClass(ee.jakarta.tck.persistence.core.annotations.access.mappedsc.Employee.class);
+    jpa_core_anno_access_mappedsc_jar.addClass(ee.jakarta.tck.persistence.core.annotations.access.mappedsc.FullTimeEmployee.class);
+    jpa_core_anno_access_mappedsc_jar.addClass(ee.jakarta.tck.persistence.core.annotations.access.mappedsc.PartTimeEmployee.class);
+    jpa_core_anno_access_mappedsc_jar.addClass(ee.jakarta.tck.persistence.core.annotations.access.mappedsc.Project.class);
+    jpa_core_anno_access_mappedsc_jar.addAsManifestResource("META-INF/MANIFEST.MF");
+    jpa_core_anno_access_mappedsc_jar.addAsManifestResource("META-INF/persistence.xml");
+    jpa_core_anno_access_mappedsc_pmservlet_vehicle_web_war.addAsLibrary(jpa_core_anno_access_mappedsc_jar);
+    jpa_core_anno_access_mappedsc_pmservlet_vehicle_web_war.addClass(ee.jakarta.tck.persistence.common.PMClientBase.class);
+    jpa_core_anno_access_mappedsc_pmservlet_vehicle_web_war.addClass(ee.jakarta.tck.persistence.core.annotations.access.mappedsc.Client.class);
+    ear.addAsModule(jpa_core_anno_access_mappedsc_pmservlet_vehicle_web_war);
+
+    WebArchive jpa_core_anno_access_mappedsc_puservlet_vehicle_web_war = ShrinkWrap.create(WebArchive.class, "jpa_core_anno_access_mappedsc_puservlet_vehicle_web_war");
+    jpa_core_anno_access_mappedsc_puservlet_vehicle_web_war.addAsWebInfResource("web.xml");
+
+    JavaArchive jpa_core_anno_access_mappedsc_jar = ShrinkWrap.create(JavaArchive.class, "jpa_core_anno_access_mappedsc.jar");
+    jpa_core_anno_access_mappedsc_jar.addClass(ee.jakarta.tck.persistence.core.annotations.access.mappedsc.AbstractPersonnel.class);
+    jpa_core_anno_access_mappedsc_jar.addClass(ee.jakarta.tck.persistence.core.annotations.access.mappedsc.Department.class);
+    jpa_core_anno_access_mappedsc_jar.addClass(ee.jakarta.tck.persistence.core.annotations.access.mappedsc.Employee.class);
+    jpa_core_anno_access_mappedsc_jar.addClass(ee.jakarta.tck.persistence.core.annotations.access.mappedsc.FullTimeEmployee.class);
+    jpa_core_anno_access_mappedsc_jar.addClass(ee.jakarta.tck.persistence.core.annotations.access.mappedsc.PartTimeEmployee.class);
+    jpa_core_anno_access_mappedsc_jar.addClass(ee.jakarta.tck.persistence.core.annotations.access.mappedsc.Project.class);
+    jpa_core_anno_access_mappedsc_jar.addAsManifestResource("META-INF/MANIFEST.MF");
+    jpa_core_anno_access_mappedsc_jar.addAsManifestResource("META-INF/persistence.xml");
+    jpa_core_anno_access_mappedsc_puservlet_vehicle_web_war.addAsLibrary(jpa_core_anno_access_mappedsc_jar);
+    jpa_core_anno_access_mappedsc_puservlet_vehicle_web_war.addClass(ee.jakarta.tck.persistence.common.PMClientBase.class);
+    jpa_core_anno_access_mappedsc_puservlet_vehicle_web_war.addClass(ee.jakarta.tck.persistence.core.annotations.access.mappedsc.Client.class);
+    ear.addAsModule(jpa_core_anno_access_mappedsc_puservlet_vehicle_web_war);
+
+    JavaArchive jpa_core_anno_access_mappedsc_stateful3_vehicle_client_jar = ShrinkWrap.create(JavaArchive.class, "jpa_core_anno_access_mappedsc_stateful3_vehicle_client_jar");
+    jpa_core_anno_access_mappedsc_stateful3_vehicle_client_jar.addClass(ee.jakarta.tck.persistence.common.PMClientBase.class);
+    ear.addAsModule(jpa_core_anno_access_mappedsc_stateful3_vehicle_client_jar);
+
+    JavaArchive jpa_core_anno_access_mappedsc_stateful3_vehicle_ejb_jar = ShrinkWrap.create(JavaArchive.class, "jpa_core_anno_access_mappedsc_stateful3_vehicle_ejb_jar");
+    jpa_core_anno_access_mappedsc_stateful3_vehicle_ejb_jar.addClass(ee.jakarta.tck.persistence.common.PMClientBase.class);
+    jpa_core_anno_access_mappedsc_stateful3_vehicle_ejb_jar.addClass(ee.jakarta.tck.persistence.core.annotations.access.mappedsc.Client.class);
+    ear.addAsModule(jpa_core_anno_access_mappedsc_stateful3_vehicle_ejb_jar);
+
+    JavaArchive jpa_core_anno_access_mappedsc_stateless3_vehicle_client_jar = ShrinkWrap.create(JavaArchive.class, "jpa_core_anno_access_mappedsc_stateless3_vehicle_client_jar");
+    jpa_core_anno_access_mappedsc_stateless3_vehicle_client_jar.addClass(ee.jakarta.tck.persistence.common.PMClientBase.class);
+    ear.addAsModule(jpa_core_anno_access_mappedsc_stateless3_vehicle_client_jar);
+
+    JavaArchive jpa_core_anno_access_mappedsc_stateless3_vehicle_ejb_jar = ShrinkWrap.create(JavaArchive.class, "jpa_core_anno_access_mappedsc_stateless3_vehicle_ejb_jar");
+    jpa_core_anno_access_mappedsc_stateless3_vehicle_ejb_jar.addClass(ee.jakarta.tck.persistence.common.PMClientBase.class);
+    jpa_core_anno_access_mappedsc_stateless3_vehicle_ejb_jar.addClass(ee.jakarta.tck.persistence.core.annotations.access.mappedsc.Client.class);
+    ear.addAsModule(jpa_core_anno_access_mappedsc_stateless3_vehicle_ejb_jar);
+    return ear;
+  }
+
 	private static final Logger logger = (Logger) System.getLogger(Client.class.getName());
 
 	private static FullTimeEmployee ftRef[] = new FullTimeEmployee[5];
diff --git a/jpa/spec-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/access/property/Client.java b/jpa/spec-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/access/property/Client.java
index 0a29d19d2..ea9eb826b 100644
--- a/jpa/spec-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/access/property/Client.java
+++ b/jpa/spec-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/access/property/Client.java
@@ -1,13 +1,98 @@
 package ee.jakarta.tck.persistence.core.annotations.access.property;
 
 import java.lang.System.Logger;
-
+import org.jboss.arquillian.container.test.api.Deployment;
+import org.jboss.shrinkwrap.api.Archive;
+import org.jboss.shrinkwrap.api.ShrinkWrap;
+import org.jboss.shrinkwrap.api.spec.EnterpriseArchive;
+import org.jboss.shrinkwrap.api.spec.JavaArchive;
+import org.jboss.shrinkwrap.api.spec.WebArchive;
 import org.junit.jupiter.api.AfterEach;
 
 import ee.jakarta.tck.persistence.common.PMClientBase;
 
 public class Client extends PMClientBase {
 
+  @Deployment(testable = false)
+  public static Archive<?> deployment() {
+
+    final EnterpriseArchive ear = ShrinkWrap.create(EnterpriseArchive.class, "jpa_core_annotations_access_property_vehicles.ear");
+    // TODO: filter/eliminate the library jar classes that shouldn't be included
+    // Add ear/lib jars
+
+    JavaArchive jpa_core_annotations_access_property_jar = ShrinkWrap.create(JavaArchive.class, "jpa_core_annotations_access_property_jar");
+    jpa_core_annotations_access_property_jar.addClass(ee.jakarta.tck.persistence.core.annotations.access.property.DataTypes.class);
+    jpa_core_annotations_access_property_jar.addClass(ee.jakarta.tck.persistence.core.annotations.access.property.DataTypes2.class);
+    jpa_core_annotations_access_property_jar.addClass(ee.jakarta.tck.persistence.core.types.common.Grade.class);
+    ear.addAsLibrary(jpa_core_annotations_access_property_jar);
+    // Add ear submodules
+
+    JavaArchive jpa_core_annotations_access_property_appmanagedNoTx_vehicle_client_jar = ShrinkWrap.create(JavaArchive.class, "jpa_core_annotations_access_property_appmanagedNoTx_vehicle_client_jar");
+    jpa_core_annotations_access_property_appmanagedNoTx_vehicle_client_jar.addClass(ee.jakarta.tck.persistence.common.PMClientBase.class);
+    ear.addAsModule(jpa_core_annotations_access_property_appmanagedNoTx_vehicle_client_jar);
+
+    JavaArchive jpa_core_annotations_access_property_appmanagedNoTx_vehicle_ejb_jar = ShrinkWrap.create(JavaArchive.class, "jpa_core_annotations_access_property_appmanagedNoTx_vehicle_ejb_jar");
+    jpa_core_annotations_access_property_appmanagedNoTx_vehicle_ejb_jar.addClass(ee.jakarta.tck.persistence.common.PMClientBase.class);
+    jpa_core_annotations_access_property_appmanagedNoTx_vehicle_ejb_jar.addClass(ee.jakarta.tck.persistence.core.annotations.access.property.Client.class);
+    ear.addAsModule(jpa_core_annotations_access_property_appmanagedNoTx_vehicle_ejb_jar);
+
+    JavaArchive jpa_core_annotations_access_property_appmanaged_vehicle_client_jar = ShrinkWrap.create(JavaArchive.class, "jpa_core_annotations_access_property_appmanaged_vehicle_client_jar");
+    jpa_core_annotations_access_property_appmanaged_vehicle_client_jar.addClass(ee.jakarta.tck.persistence.common.PMClientBase.class);
+    ear.addAsModule(jpa_core_annotations_access_property_appmanaged_vehicle_client_jar);
+
+    JavaArchive jpa_core_annotations_access_property_appmanaged_vehicle_ejb_jar = ShrinkWrap.create(JavaArchive.class, "jpa_core_annotations_access_property_appmanaged_vehicle_ejb_jar");
+    jpa_core_annotations_access_property_appmanaged_vehicle_ejb_jar.addClass(ee.jakarta.tck.persistence.common.PMClientBase.class);
+    jpa_core_annotations_access_property_appmanaged_vehicle_ejb_jar.addClass(ee.jakarta.tck.persistence.core.annotations.access.property.Client.class);
+    ear.addAsModule(jpa_core_annotations_access_property_appmanaged_vehicle_ejb_jar);
+
+    WebArchive jpa_core_annotations_access_property_pmservlet_vehicle_web_war = ShrinkWrap.create(WebArchive.class, "jpa_core_annotations_access_property_pmservlet_vehicle_web_war");
+    jpa_core_annotations_access_property_pmservlet_vehicle_web_war.addAsWebInfResource("web.xml");
+
+    JavaArchive jpa_core_annotations_access_property_jar = ShrinkWrap.create(JavaArchive.class, "jpa_core_annotations_access_property.jar");
+    jpa_core_annotations_access_property_jar.addClass(ee.jakarta.tck.persistence.core.annotations.access.property.DataTypes.class);
+    jpa_core_annotations_access_property_jar.addClass(ee.jakarta.tck.persistence.core.annotations.access.property.DataTypes2.class);
+    jpa_core_annotations_access_property_jar.addClass(ee.jakarta.tck.persistence.core.types.common.Grade.class);
+    jpa_core_annotations_access_property_jar.addAsManifestResource("META-INF/MANIFEST.MF");
+    jpa_core_annotations_access_property_jar.addAsManifestResource("META-INF/persistence.xml");
+    jpa_core_annotations_access_property_pmservlet_vehicle_web_war.addAsLibrary(jpa_core_annotations_access_property_jar);
+    jpa_core_annotations_access_property_pmservlet_vehicle_web_war.addClass(ee.jakarta.tck.persistence.common.PMClientBase.class);
+    jpa_core_annotations_access_property_pmservlet_vehicle_web_war.addClass(ee.jakarta.tck.persistence.core.annotations.access.property.Client.class);
+    ear.addAsModule(jpa_core_annotations_access_property_pmservlet_vehicle_web_war);
+
+    WebArchive jpa_core_annotations_access_property_puservlet_vehicle_web_war = ShrinkWrap.create(WebArchive.class, "jpa_core_annotations_access_property_puservlet_vehicle_web_war");
+    jpa_core_annotations_access_property_puservlet_vehicle_web_war.addAsWebInfResource("web.xml");
+
+    JavaArchive jpa_core_annotations_access_property_jar = ShrinkWrap.create(JavaArchive.class, "jpa_core_annotations_access_property.jar");
+    jpa_core_annotations_access_property_jar.addClass(ee.jakarta.tck.persistence.core.annotations.access.property.DataTypes.class);
+    jpa_core_annotations_access_property_jar.addClass(ee.jakarta.tck.persistence.core.annotations.access.property.DataTypes2.class);
+    jpa_core_annotations_access_property_jar.addClass(ee.jakarta.tck.persistence.core.types.common.Grade.class);
+    jpa_core_annotations_access_property_jar.addAsManifestResource("META-INF/MANIFEST.MF");
+    jpa_core_annotations_access_property_jar.addAsManifestResource("META-INF/persistence.xml");
+    jpa_core_annotations_access_property_puservlet_vehicle_web_war.addAsLibrary(jpa_core_annotations_access_property_jar);
+    jpa_core_annotations_access_property_puservlet_vehicle_web_war.addClass(ee.jakarta.tck.persistence.common.PMClientBase.class);
+    jpa_core_annotations_access_property_puservlet_vehicle_web_war.addClass(ee.jakarta.tck.persistence.core.annotations.access.property.Client.class);
+    ear.addAsModule(jpa_core_annotations_access_property_puservlet_vehicle_web_war);
+
+    JavaArchive jpa_core_annotations_access_property_stateful3_vehicle_client_jar = ShrinkWrap.create(JavaArchive.class, "jpa_core_annotations_access_property_stateful3_vehicle_client_jar");
+    jpa_core_annotations_access_property_stateful3_vehicle_client_jar.addClass(ee.jakarta.tck.persistence.common.PMClientBase.class);
+    ear.addAsModule(jpa_core_annotations_access_property_stateful3_vehicle_client_jar);
+
+    JavaArchive jpa_core_annotations_access_property_stateful3_vehicle_ejb_jar = ShrinkWrap.create(JavaArchive.class, "jpa_core_annotations_access_property_stateful3_vehicle_ejb_jar");
+    jpa_core_annotations_access_property_stateful3_vehicle_ejb_jar.addClass(ee.jakarta.tck.persistence.common.PMClientBase.class);
+    jpa_core_annotations_access_property_stateful3_vehicle_ejb_jar.addClass(ee.jakarta.tck.persistence.core.annotations.access.property.Client.class);
+    ear.addAsModule(jpa_core_annotations_access_property_stateful3_vehicle_ejb_jar);
+
+    JavaArchive jpa_core_annotations_access_property_stateless3_vehicle_client_jar = ShrinkWrap.create(JavaArchive.class, "jpa_core_annotations_access_property_stateless3_vehicle_client_jar");
+    jpa_core_annotations_access_property_stateless3_vehicle_client_jar.addClass(ee.jakarta.tck.persistence.common.PMClientBase.class);
+    ear.addAsModule(jpa_core_annotations_access_property_stateless3_vehicle_client_jar);
+
+    JavaArchive jpa_core_annotations_access_property_stateless3_vehicle_ejb_jar = ShrinkWrap.create(JavaArchive.class, "jpa_core_annotations_access_property_stateless3_vehicle_ejb_jar");
+    jpa_core_annotations_access_property_stateless3_vehicle_ejb_jar.addClass(ee.jakarta.tck.persistence.common.PMClientBase.class);
+    jpa_core_annotations_access_property_stateless3_vehicle_ejb_jar.addClass(ee.jakarta.tck.persistence.core.annotations.access.property.Client.class);
+    ear.addAsModule(jpa_core_annotations_access_property_stateless3_vehicle_ejb_jar);
+    return ear;
+  }
+
 	protected DataTypes d1;
 
 	protected DataTypes2 d2;
diff --git a/jpa/spec-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/access/property/Client1.java b/jpa/spec-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/access/property/Client1.java
index 3bc2e26ee..0fd003621 100644
--- a/jpa/spec-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/access/property/Client1.java
+++ b/jpa/spec-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/access/property/Client1.java
@@ -18,8 +18,12 @@ package ee.jakarta.tck.persistence.core.annotations.access.property;
 
 import java.lang.System.Logger;
 import java.util.Arrays;
-
+import org.jboss.arquillian.container.test.api.Deployment;
+import org.jboss.shrinkwrap.api.Archive;
+import org.jboss.shrinkwrap.api.ShrinkWrap;
+import org.jboss.shrinkwrap.api.spec.EnterpriseArchive;
 import org.jboss.shrinkwrap.api.spec.JavaArchive;
+import org.jboss.shrinkwrap.api.spec.WebArchive;
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
 
@@ -27,6 +31,86 @@ import ee.jakarta.tck.persistence.core.types.common.Grade;
 
 public class Client1 extends Client {
 
+  @Deployment(testable = false)
+  public static Archive<?> deployment() {
+
+    final EnterpriseArchive ear = ShrinkWrap.create(EnterpriseArchive.class, "jpa_core_annotations_access_property_vehicles.ear");
+    // TODO: filter/eliminate the library jar classes that shouldn't be included
+    // Add ear/lib jars
+
+    JavaArchive jpa_core_annotations_access_property_jar = ShrinkWrap.create(JavaArchive.class, "jpa_core_annotations_access_property_jar");
+    jpa_core_annotations_access_property_jar.addClass(ee.jakarta.tck.persistence.core.annotations.access.property.DataTypes.class);
+    jpa_core_annotations_access_property_jar.addClass(ee.jakarta.tck.persistence.core.annotations.access.property.DataTypes2.class);
+    jpa_core_annotations_access_property_jar.addClass(ee.jakarta.tck.persistence.core.types.common.Grade.class);
+    ear.addAsLibrary(jpa_core_annotations_access_property_jar);
+    // Add ear submodules
+
+    JavaArchive jpa_core_annotations_access_property_appmanagedNoTx_vehicle_client_jar = ShrinkWrap.create(JavaArchive.class, "jpa_core_annotations_access_property_appmanagedNoTx_vehicle_client_jar");
+    jpa_core_annotations_access_property_appmanagedNoTx_vehicle_client_jar.addClass(ee.jakarta.tck.persistence.common.PMClientBase.class);
+    ear.addAsModule(jpa_core_annotations_access_property_appmanagedNoTx_vehicle_client_jar);
+
+    JavaArchive jpa_core_annotations_access_property_appmanagedNoTx_vehicle_ejb_jar = ShrinkWrap.create(JavaArchive.class, "jpa_core_annotations_access_property_appmanagedNoTx_vehicle_ejb_jar");
+    jpa_core_annotations_access_property_appmanagedNoTx_vehicle_ejb_jar.addClass(ee.jakarta.tck.persistence.common.PMClientBase.class);
+    jpa_core_annotations_access_property_appmanagedNoTx_vehicle_ejb_jar.addClass(ee.jakarta.tck.persistence.core.annotations.access.property.Client.class);
+    ear.addAsModule(jpa_core_annotations_access_property_appmanagedNoTx_vehicle_ejb_jar);
+
+    JavaArchive jpa_core_annotations_access_property_appmanaged_vehicle_client_jar = ShrinkWrap.create(JavaArchive.class, "jpa_core_annotations_access_property_appmanaged_vehicle_client_jar");
+    jpa_core_annotations_access_property_appmanaged_vehicle_client_jar.addClass(ee.jakarta.tck.persistence.common.PMClientBase.class);
+    ear.addAsModule(jpa_core_annotations_access_property_appmanaged_vehicle_client_jar);
+
+    JavaArchive jpa_core_annotations_access_property_appmanaged_vehicle_ejb_jar = ShrinkWrap.create(JavaArchive.class, "jpa_core_annotations_access_property_appmanaged_vehicle_ejb_jar");
+    jpa_core_annotations_access_property_appmanaged_vehicle_ejb_jar.addClass(ee.jakarta.tck.persistence.common.PMClientBase.class);
+    jpa_core_annotations_access_property_appmanaged_vehicle_ejb_jar.addClass(ee.jakarta.tck.persistence.core.annotations.access.property.Client.class);
+    ear.addAsModule(jpa_core_annotations_access_property_appmanaged_vehicle_ejb_jar);
+
+    WebArchive jpa_core_annotations_access_property_pmservlet_vehicle_web_war = ShrinkWrap.create(WebArchive.class, "jpa_core_annotations_access_property_pmservlet_vehicle_web_war");
+    jpa_core_annotations_access_property_pmservlet_vehicle_web_war.addAsWebInfResource("web.xml");
+
+    JavaArchive jpa_core_annotations_access_property_jar = ShrinkWrap.create(JavaArchive.class, "jpa_core_annotations_access_property.jar");
+    jpa_core_annotations_access_property_jar.addClass(ee.jakarta.tck.persistence.core.annotations.access.property.DataTypes.class);
+    jpa_core_annotations_access_property_jar.addClass(ee.jakarta.tck.persistence.core.annotations.access.property.DataTypes2.class);
+    jpa_core_annotations_access_property_jar.addClass(ee.jakarta.tck.persistence.core.types.common.Grade.class);
+    jpa_core_annotations_access_property_jar.addAsManifestResource("META-INF/MANIFEST.MF");
+    jpa_core_annotations_access_property_jar.addAsManifestResource("META-INF/persistence.xml");
+    jpa_core_annotations_access_property_pmservlet_vehicle_web_war.addAsLibrary(jpa_core_annotations_access_property_jar);
+    jpa_core_annotations_access_property_pmservlet_vehicle_web_war.addClass(ee.jakarta.tck.persistence.common.PMClientBase.class);
+    jpa_core_annotations_access_property_pmservlet_vehicle_web_war.addClass(ee.jakarta.tck.persistence.core.annotations.access.property.Client.class);
+    ear.addAsModule(jpa_core_annotations_access_property_pmservlet_vehicle_web_war);
+
+    WebArchive jpa_core_annotations_access_property_puservlet_vehicle_web_war = ShrinkWrap.create(WebArchive.class, "jpa_core_annotations_access_property_puservlet_vehicle_web_war");
+    jpa_core_annotations_access_property_puservlet_vehicle_web_war.addAsWebInfResource("web.xml");
+
+    JavaArchive jpa_core_annotations_access_property_jar = ShrinkWrap.create(JavaArchive.class, "jpa_core_annotations_access_property.jar");
+    jpa_core_annotations_access_property_jar.addClass(ee.jakarta.tck.persistence.core.annotations.access.property.DataTypes.class);
+    jpa_core_annotations_access_property_jar.addClass(ee.jakarta.tck.persistence.core.annotations.access.property.DataTypes2.class);
+    jpa_core_annotations_access_property_jar.addClass(ee.jakarta.tck.persistence.core.types.common.Grade.class);
+    jpa_core_annotations_access_property_jar.addAsManifestResource("META-INF/MANIFEST.MF");
+    jpa_core_annotations_access_property_jar.addAsManifestResource("META-INF/persistence.xml");
+    jpa_core_annotations_access_property_puservlet_vehicle_web_war.addAsLibrary(jpa_core_annotations_access_property_jar);
+    jpa_core_annotations_access_property_puservlet_vehicle_web_war.addClass(ee.jakarta.tck.persistence.common.PMClientBase.class);
+    jpa_core_annotations_access_property_puservlet_vehicle_web_war.addClass(ee.jakarta.tck.persistence.core.annotations.access.property.Client.class);
+    ear.addAsModule(jpa_core_annotations_access_property_puservlet_vehicle_web_war);
+
+    JavaArchive jpa_core_annotations_access_property_stateful3_vehicle_client_jar = ShrinkWrap.create(JavaArchive.class, "jpa_core_annotations_access_property_stateful3_vehicle_client_jar");
+    jpa_core_annotations_access_property_stateful3_vehicle_client_jar.addClass(ee.jakarta.tck.persistence.common.PMClientBase.class);
+    ear.addAsModule(jpa_core_annotations_access_property_stateful3_vehicle_client_jar);
+
+    JavaArchive jpa_core_annotations_access_property_stateful3_vehicle_ejb_jar = ShrinkWrap.create(JavaArchive.class, "jpa_core_annotations_access_property_stateful3_vehicle_ejb_jar");
+    jpa_core_annotations_access_property_stateful3_vehicle_ejb_jar.addClass(ee.jakarta.tck.persistence.common.PMClientBase.class);
+    jpa_core_annotations_access_property_stateful3_vehicle_ejb_jar.addClass(ee.jakarta.tck.persistence.core.annotations.access.property.Client.class);
+    ear.addAsModule(jpa_core_annotations_access_property_stateful3_vehicle_ejb_jar);
+
+    JavaArchive jpa_core_annotations_access_property_stateless3_vehicle_client_jar = ShrinkWrap.create(JavaArchive.class, "jpa_core_annotations_access_property_stateless3_vehicle_client_jar");
+    jpa_core_annotations_access_property_stateless3_vehicle_client_jar.addClass(ee.jakarta.tck.persistence.common.PMClientBase.class);
+    ear.addAsModule(jpa_core_annotations_access_property_stateless3_vehicle_client_jar);
+
+    JavaArchive jpa_core_annotations_access_property_stateless3_vehicle_ejb_jar = ShrinkWrap.create(JavaArchive.class, "jpa_core_annotations_access_property_stateless3_vehicle_ejb_jar");
+    jpa_core_annotations_access_property_stateless3_vehicle_ejb_jar.addClass(ee.jakarta.tck.persistence.common.PMClientBase.class);
+    jpa_core_annotations_access_property_stateless3_vehicle_ejb_jar.addClass(ee.jakarta.tck.persistence.core.annotations.access.property.Client.class);
+    ear.addAsModule(jpa_core_annotations_access_property_stateless3_vehicle_ejb_jar);
+    return ear;
+  }
+
 	private static final Logger logger = (Logger) System.getLogger(Client1.class.getName());
 
 	public JavaArchive createDeployment() throws Exception {
diff --git a/jpa/spec-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/access/property/Client2.java b/jpa/spec-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/access/property/Client2.java
index d197c75e2..a4288e5f0 100644
--- a/jpa/spec-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/access/property/Client2.java
+++ b/jpa/spec-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/access/property/Client2.java
@@ -2,12 +2,97 @@ package ee.jakarta.tck.persistence.core.annotations.access.property;
 
 import java.lang.System.Logger;
 
+import org.jboss.arquillian.container.test.api.Deployment;
+import org.jboss.shrinkwrap.api.Archive;
+import org.jboss.shrinkwrap.api.ShrinkWrap;
+import org.jboss.shrinkwrap.api.spec.EnterpriseArchive;
 import org.jboss.shrinkwrap.api.spec.JavaArchive;
+import org.jboss.shrinkwrap.api.spec.WebArchive;
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
 
 public class Client2 extends Client {
 
+  @Deployment(testable = false)
+  public static Archive<?> deployment() {
+
+    final EnterpriseArchive ear = ShrinkWrap.create(EnterpriseArchive.class, "jpa_core_annotations_access_property_vehicles.ear");
+    // TODO: filter/eliminate the library jar classes that shouldn't be included
+    // Add ear/lib jars
+
+    JavaArchive jpa_core_annotations_access_property_jar = ShrinkWrap.create(JavaArchive.class, "jpa_core_annotations_access_property_jar");
+    jpa_core_annotations_access_property_jar.addClass(ee.jakarta.tck.persistence.core.annotations.access.property.DataTypes.class);
+    jpa_core_annotations_access_property_jar.addClass(ee.jakarta.tck.persistence.core.annotations.access.property.DataTypes2.class);
+    jpa_core_annotations_access_property_jar.addClass(ee.jakarta.tck.persistence.core.types.common.Grade.class);
+    ear.addAsLibrary(jpa_core_annotations_access_property_jar);
+    // Add ear submodules
+
+    JavaArchive jpa_core_annotations_access_property_appmanagedNoTx_vehicle_client_jar = ShrinkWrap.create(JavaArchive.class, "jpa_core_annotations_access_property_appmanagedNoTx_vehicle_client_jar");
+    jpa_core_annotations_access_property_appmanagedNoTx_vehicle_client_jar.addClass(ee.jakarta.tck.persistence.common.PMClientBase.class);
+    ear.addAsModule(jpa_core_annotations_access_property_appmanagedNoTx_vehicle_client_jar);
+
+    JavaArchive jpa_core_annotations_access_property_appmanagedNoTx_vehicle_ejb_jar = ShrinkWrap.create(JavaArchive.class, "jpa_core_annotations_access_property_appmanagedNoTx_vehicle_ejb_jar");
+    jpa_core_annotations_access_property_appmanagedNoTx_vehicle_ejb_jar.addClass(ee.jakarta.tck.persistence.common.PMClientBase.class);
+    jpa_core_annotations_access_property_appmanagedNoTx_vehicle_ejb_jar.addClass(ee.jakarta.tck.persistence.core.annotations.access.property.Client.class);
+    ear.addAsModule(jpa_core_annotations_access_property_appmanagedNoTx_vehicle_ejb_jar);
+
+    JavaArchive jpa_core_annotations_access_property_appmanaged_vehicle_client_jar = ShrinkWrap.create(JavaArchive.class, "jpa_core_annotations_access_property_appmanaged_vehicle_client_jar");
+    jpa_core_annotations_access_property_appmanaged_vehicle_client_jar.addClass(ee.jakarta.tck.persistence.common.PMClientBase.class);
+    ear.addAsModule(jpa_core_annotations_access_property_appmanaged_vehicle_client_jar);
+
+    JavaArchive jpa_core_annotations_access_property_appmanaged_vehicle_ejb_jar = ShrinkWrap.create(JavaArchive.class, "jpa_core_annotations_access_property_appmanaged_vehicle_ejb_jar");
+    jpa_core_annotations_access_property_appmanaged_vehicle_ejb_jar.addClass(ee.jakarta.tck.persistence.common.PMClientBase.class);
+    jpa_core_annotations_access_property_appmanaged_vehicle_ejb_jar.addClass(ee.jakarta.tck.persistence.core.annotations.access.property.Client.class);
+    ear.addAsModule(jpa_core_annotations_access_property_appmanaged_vehicle_ejb_jar);
+
+    WebArchive jpa_core_annotations_access_property_pmservlet_vehicle_web_war = ShrinkWrap.create(WebArchive.class, "jpa_core_annotations_access_property_pmservlet_vehicle_web_war");
+    jpa_core_annotations_access_property_pmservlet_vehicle_web_war.addAsWebInfResource("web.xml");
+
+    JavaArchive jpa_core_annotations_access_property_jar = ShrinkWrap.create(JavaArchive.class, "jpa_core_annotations_access_property.jar");
+    jpa_core_annotations_access_property_jar.addClass(ee.jakarta.tck.persistence.core.annotations.access.property.DataTypes.class);
+    jpa_core_annotations_access_property_jar.addClass(ee.jakarta.tck.persistence.core.annotations.access.property.DataTypes2.class);
+    jpa_core_annotations_access_property_jar.addClass(ee.jakarta.tck.persistence.core.types.common.Grade.class);
+    jpa_core_annotations_access_property_jar.addAsManifestResource("META-INF/MANIFEST.MF");
+    jpa_core_annotations_access_property_jar.addAsManifestResource("META-INF/persistence.xml");
+    jpa_core_annotations_access_property_pmservlet_vehicle_web_war.addAsLibrary(jpa_core_annotations_access_property_jar);
+    jpa_core_annotations_access_property_pmservlet_vehicle_web_war.addClass(ee.jakarta.tck.persistence.common.PMClientBase.class);
+    jpa_core_annotations_access_property_pmservlet_vehicle_web_war.addClass(ee.jakarta.tck.persistence.core.annotations.access.property.Client.class);
+    ear.addAsModule(jpa_core_annotations_access_property_pmservlet_vehicle_web_war);
+
+    WebArchive jpa_core_annotations_access_property_puservlet_vehicle_web_war = ShrinkWrap.create(WebArchive.class, "jpa_core_annotations_access_property_puservlet_vehicle_web_war");
+    jpa_core_annotations_access_property_puservlet_vehicle_web_war.addAsWebInfResource("web.xml");
+
+    JavaArchive jpa_core_annotations_access_property_jar = ShrinkWrap.create(JavaArchive.class, "jpa_core_annotations_access_property.jar");
+    jpa_core_annotations_access_property_jar.addClass(ee.jakarta.tck.persistence.core.annotations.access.property.DataTypes.class);
+    jpa_core_annotations_access_property_jar.addClass(ee.jakarta.tck.persistence.core.annotations.access.property.DataTypes2.class);
+    jpa_core_annotations_access_property_jar.addClass(ee.jakarta.tck.persistence.core.types.common.Grade.class);
+    jpa_core_annotations_access_property_jar.addAsManifestResource("META-INF/MANIFEST.MF");
+    jpa_core_annotations_access_property_jar.addAsManifestResource("META-INF/persistence.xml");
+    jpa_core_annotations_access_property_puservlet_vehicle_web_war.addAsLibrary(jpa_core_annotations_access_property_jar);
+    jpa_core_annotations_access_property_puservlet_vehicle_web_war.addClass(ee.jakarta.tck.persistence.common.PMClientBase.class);
+    jpa_core_annotations_access_property_puservlet_vehicle_web_war.addClass(ee.jakarta.tck.persistence.core.annotations.access.property.Client.class);
+    ear.addAsModule(jpa_core_annotations_access_property_puservlet_vehicle_web_war);
+
+    JavaArchive jpa_core_annotations_access_property_stateful3_vehicle_client_jar = ShrinkWrap.create(JavaArchive.class, "jpa_core_annotations_access_property_stateful3_vehicle_client_jar");
+    jpa_core_annotations_access_property_stateful3_vehicle_client_jar.addClass(ee.jakarta.tck.persistence.common.PMClientBase.class);
+    ear.addAsModule(jpa_core_annotations_access_property_stateful3_vehicle_client_jar);
+
+    JavaArchive jpa_core_annotations_access_property_stateful3_vehicle_ejb_jar = ShrinkWrap.create(JavaArchive.class, "jpa_core_annotations_access_property_stateful3_vehicle_ejb_jar");
+    jpa_core_annotations_access_property_stateful3_vehicle_ejb_jar.addClass(ee.jakarta.tck.persistence.common.PMClientBase.class);
+    jpa_core_annotations_access_property_stateful3_vehicle_ejb_jar.addClass(ee.jakarta.tck.persistence.core.annotations.access.property.Client.class);
+    ear.addAsModule(jpa_core_annotations_access_property_stateful3_vehicle_ejb_jar);
+
+    JavaArchive jpa_core_annotations_access_property_stateless3_vehicle_client_jar = ShrinkWrap.create(JavaArchive.class, "jpa_core_annotations_access_property_stateless3_vehicle_client_jar");
+    jpa_core_annotations_access_property_stateless3_vehicle_client_jar.addClass(ee.jakarta.tck.persistence.common.PMClientBase.class);
+    ear.addAsModule(jpa_core_annotations_access_property_stateless3_vehicle_client_jar);
+
+    JavaArchive jpa_core_annotations_access_property_stateless3_vehicle_ejb_jar = ShrinkWrap.create(JavaArchive.class, "jpa_core_annotations_access_property_stateless3_vehicle_ejb_jar");
+    jpa_core_annotations_access_property_stateless3_vehicle_ejb_jar.addClass(ee.jakarta.tck.persistence.common.PMClientBase.class);
+    jpa_core_annotations_access_property_stateless3_vehicle_ejb_jar.addClass(ee.jakarta.tck.persistence.core.annotations.access.property.Client.class);
+    ear.addAsModule(jpa_core_annotations_access_property_stateless3_vehicle_ejb_jar);
+    return ear;
+  }
+
 	private static final Logger logger = (Logger) System.getLogger(Client2.class.getName());
 
 	public JavaArchive createDeployment() throws Exception {
diff --git a/jpa/spec-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/assocoverride/Client.java b/jpa/spec-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/assocoverride/Client.java
index 42bfb3240..9d0e044e7 100644
--- a/jpa/spec-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/assocoverride/Client.java
+++ b/jpa/spec-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/assocoverride/Client.java
@@ -18,8 +18,12 @@ package ee.jakarta.tck.persistence.core.annotations.assocoverride;
 
 import java.lang.System.Logger;
 import java.sql.Date;
-
+import org.jboss.arquillian.container.test.api.Deployment;
+import org.jboss.shrinkwrap.api.Archive;
+import org.jboss.shrinkwrap.api.ShrinkWrap;
+import org.jboss.shrinkwrap.api.spec.EnterpriseArchive;
 import org.jboss.shrinkwrap.api.spec.JavaArchive;
+import org.jboss.shrinkwrap.api.spec.WebArchive;
 import org.junit.jupiter.api.AfterEach;
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
@@ -28,6 +32,86 @@ import ee.jakarta.tck.persistence.common.PMClientBase;
 
 public class Client extends PMClientBase {
 
+  @Deployment(testable = false)
+  public static Archive<?> deployment() {
+
+    final EnterpriseArchive ear = ShrinkWrap.create(EnterpriseArchive.class, "jpa_core_annotations_assocoverride_vehicles.ear");
+    // TODO: filter/eliminate the library jar classes that shouldn't be included
+    // Add ear/lib jars
+
+    JavaArchive jpa_core_annotations_assocoverride_jar = ShrinkWrap.create(JavaArchive.class, "jpa_core_annotations_assocoverride_jar");
+    jpa_core_annotations_assocoverride_jar.addClass(ee.jakarta.tck.persistence.core.annotations.assocoverride.Address.class);
+    jpa_core_annotations_assocoverride_jar.addClass(ee.jakarta.tck.persistence.core.annotations.assocoverride.Employee.class);
+    jpa_core_annotations_assocoverride_jar.addClass(ee.jakarta.tck.persistence.core.annotations.assocoverride.PartTimeEmployee.class);
+    ear.addAsLibrary(jpa_core_annotations_assocoverride_jar);
+    // Add ear submodules
+
+    JavaArchive jpa_core_annotations_assocoverride_appmanagedNoTx_vehicle_client_jar = ShrinkWrap.create(JavaArchive.class, "jpa_core_annotations_assocoverride_appmanagedNoTx_vehicle_client_jar");
+    jpa_core_annotations_assocoverride_appmanagedNoTx_vehicle_client_jar.addClass(ee.jakarta.tck.persistence.common.PMClientBase.class);
+    ear.addAsModule(jpa_core_annotations_assocoverride_appmanagedNoTx_vehicle_client_jar);
+
+    JavaArchive jpa_core_annotations_assocoverride_appmanagedNoTx_vehicle_ejb_jar = ShrinkWrap.create(JavaArchive.class, "jpa_core_annotations_assocoverride_appmanagedNoTx_vehicle_ejb_jar");
+    jpa_core_annotations_assocoverride_appmanagedNoTx_vehicle_ejb_jar.addClass(ee.jakarta.tck.persistence.common.PMClientBase.class);
+    jpa_core_annotations_assocoverride_appmanagedNoTx_vehicle_ejb_jar.addClass(ee.jakarta.tck.persistence.core.annotations.assocoverride.Client.class);
+    ear.addAsModule(jpa_core_annotations_assocoverride_appmanagedNoTx_vehicle_ejb_jar);
+
+    JavaArchive jpa_core_annotations_assocoverride_appmanaged_vehicle_client_jar = ShrinkWrap.create(JavaArchive.class, "jpa_core_annotations_assocoverride_appmanaged_vehicle_client_jar");
+    jpa_core_annotations_assocoverride_appmanaged_vehicle_client_jar.addClass(ee.jakarta.tck.persistence.common.PMClientBase.class);
+    ear.addAsModule(jpa_core_annotations_assocoverride_appmanaged_vehicle_client_jar);
+
+    JavaArchive jpa_core_annotations_assocoverride_appmanaged_vehicle_ejb_jar = ShrinkWrap.create(JavaArchive.class, "jpa_core_annotations_assocoverride_appmanaged_vehicle_ejb_jar");
+    jpa_core_annotations_assocoverride_appmanaged_vehicle_ejb_jar.addClass(ee.jakarta.tck.persistence.common.PMClientBase.class);
+    jpa_core_annotations_assocoverride_appmanaged_vehicle_ejb_jar.addClass(ee.jakarta.tck.persistence.core.annotations.assocoverride.Client.class);
+    ear.addAsModule(jpa_core_annotations_assocoverride_appmanaged_vehicle_ejb_jar);
+
+    WebArchive jpa_core_annotations_assocoverride_pmservlet_vehicle_web_war = ShrinkWrap.create(WebArchive.class, "jpa_core_annotations_assocoverride_pmservlet_vehicle_web_war");
+    jpa_core_annotations_assocoverride_pmservlet_vehicle_web_war.addAsWebInfResource("web.xml");
+
+    JavaArchive jpa_core_annotations_assocoverride_jar = ShrinkWrap.create(JavaArchive.class, "jpa_core_annotations_assocoverride.jar");
+    jpa_core_annotations_assocoverride_jar.addClass(ee.jakarta.tck.persistence.core.annotations.assocoverride.Address.class);
+    jpa_core_annotations_assocoverride_jar.addClass(ee.jakarta.tck.persistence.core.annotations.assocoverride.Employee.class);
+    jpa_core_annotations_assocoverride_jar.addClass(ee.jakarta.tck.persistence.core.annotations.assocoverride.PartTimeEmployee.class);
+    jpa_core_annotations_assocoverride_jar.addAsManifestResource("META-INF/MANIFEST.MF");
+    jpa_core_annotations_assocoverride_jar.addAsManifestResource("META-INF/persistence.xml");
+    jpa_core_annotations_assocoverride_pmservlet_vehicle_web_war.addAsLibrary(jpa_core_annotations_assocoverride_jar);
+    jpa_core_annotations_assocoverride_pmservlet_vehicle_web_war.addClass(ee.jakarta.tck.persistence.common.PMClientBase.class);
+    jpa_core_annotations_assocoverride_pmservlet_vehicle_web_war.addClass(ee.jakarta.tck.persistence.core.annotations.assocoverride.Client.class);
+    ear.addAsModule(jpa_core_annotations_assocoverride_pmservlet_vehicle_web_war);
+
+    WebArchive jpa_core_annotations_assocoverride_puservlet_vehicle_web_war = ShrinkWrap.create(WebArchive.class, "jpa_core_annotations_assocoverride_puservlet_vehicle_web_war");
+    jpa_core_annotations_assocoverride_puservlet_vehicle_web_war.addAsWebInfResource("web.xml");
+
+    JavaArchive jpa_core_annotations_assocoverride_jar = ShrinkWrap.create(JavaArchive.class, "jpa_core_annotations_assocoverride.jar");
+    jpa_core_annotations_assocoverride_jar.addClass(ee.jakarta.tck.persistence.core.annotations.assocoverride.Address.class);
+    jpa_core_annotations_assocoverride_jar.addClass(ee.jakarta.tck.persistence.core.annotations.assocoverride.Employee.class);
+    jpa_core_annotations_assocoverride_jar.addClass(ee.jakarta.tck.persistence.core.annotations.assocoverride.PartTimeEmployee.class);
+    jpa_core_annotations_assocoverride_jar.addAsManifestResource("META-INF/MANIFEST.MF");
+    jpa_core_annotations_assocoverride_jar.addAsManifestResource("META-INF/persistence.xml");
+    jpa_core_annotations_assocoverride_puservlet_vehicle_web_war.addAsLibrary(jpa_core_annotations_assocoverride_jar);
+    jpa_core_annotations_assocoverride_puservlet_vehicle_web_war.addClass(ee.jakarta.tck.persistence.common.PMClientBase.class);
+    jpa_core_annotations_assocoverride_puservlet_vehicle_web_war.addClass(ee.jakarta.tck.persistence.core.annotations.assocoverride.Client.class);
+    ear.addAsModule(jpa_core_annotations_assocoverride_puservlet_vehicle_web_war);
+
+    JavaArchive jpa_core_annotations_assocoverride_stateful3_vehicle_client_jar = ShrinkWrap.create(JavaArchive.class, "jpa_core_annotations_assocoverride_stateful3_vehicle_client_jar");
+    jpa_core_annotations_assocoverride_stateful3_vehicle_client_jar.addClass(ee.jakarta.tck.persistence.common.PMClientBase.class);
+    ear.addAsModule(jpa_core_annotations_assocoverride_stateful3_vehicle_client_jar);
+
+    JavaArchive jpa_core_annotations_assocoverride_stateful3_vehicle_ejb_jar = ShrinkWrap.create(JavaArchive.class, "jpa_core_annotations_assocoverride_stateful3_vehicle_ejb_jar");
+    jpa_core_annotations_assocoverride_stateful3_vehicle_ejb_jar.addClass(ee.jakarta.tck.persistence.common.PMClientBase.class);
+    jpa_core_annotations_assocoverride_stateful3_vehicle_ejb_jar.addClass(ee.jakarta.tck.persistence.core.annotations.assocoverride.Client.class);
+    ear.addAsModule(jpa_core_annotations_assocoverride_stateful3_vehicle_ejb_jar);
+
+    JavaArchive jpa_core_annotations_assocoverride_stateless3_vehicle_client_jar = ShrinkWrap.create(JavaArchive.class, "jpa_core_annotations_assocoverride_stateless3_vehicle_client_jar");
+    jpa_core_annotations_assocoverride_stateless3_vehicle_client_jar.addClass(ee.jakarta.tck.persistence.common.PMClientBase.class);
+    ear.addAsModule(jpa_core_annotations_assocoverride_stateless3_vehicle_client_jar);
+
+    JavaArchive jpa_core_annotations_assocoverride_stateless3_vehicle_ejb_jar = ShrinkWrap.create(JavaArchive.class, "jpa_core_annotations_assocoverride_stateless3_vehicle_ejb_jar");
+    jpa_core_annotations_assocoverride_stateless3_vehicle_ejb_jar.addClass(ee.jakarta.tck.persistence.common.PMClientBase.class);
+    jpa_core_annotations_assocoverride_stateless3_vehicle_ejb_jar.addClass(ee.jakarta.tck.persistence.core.annotations.assocoverride.Client.class);
+    ear.addAsModule(jpa_core_annotations_assocoverride_stateless3_vehicle_ejb_jar);
+    return ear;
+  }
+
 	private static final Logger logger = (Logger) System.getLogger(Client.class.getName());
 
 	private static PartTimeEmployee ptRef[] = new PartTimeEmployee[5];
diff --git a/jpa/spec-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/basic/Client.java b/jpa/spec-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/basic/Client.java
index a340f285d..92cede55d 100644
--- a/jpa/spec-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/basic/Client.java
+++ b/jpa/spec-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/basic/Client.java
@@ -23,13 +23,92 @@ import java.sql.Time;
 import java.sql.Timestamp;
 import java.util.Calendar;
 import java.util.Date;
-
+import org.jboss.arquillian.container.test.api.Deployment;
+import org.jboss.shrinkwrap.api.Archive;
+import org.jboss.shrinkwrap.api.ShrinkWrap;
+import org.jboss.shrinkwrap.api.spec.EnterpriseArchive;
+import org.jboss.shrinkwrap.api.spec.JavaArchive;
+import org.jboss.shrinkwrap.api.spec.WebArchive;
 import org.junit.jupiter.api.AfterEach;
 
 import ee.jakarta.tck.persistence.common.PMClientBase;
 
 public class Client extends PMClientBase {
 
+  @Deployment(testable = false)
+  public static Archive<?> deployment() {
+
+    final EnterpriseArchive ear = ShrinkWrap.create(EnterpriseArchive.class, "jpa_core_annotations_basic_vehicles.ear");
+    // TODO: filter/eliminate the library jar classes that shouldn't be included
+    // Add ear/lib jars
+
+    JavaArchive jpa_core_annotations_basic_jar = ShrinkWrap.create(JavaArchive.class, "jpa_core_annotations_basic_jar");
+    jpa_core_annotations_basic_jar.addClass(ee.jakarta.tck.persistence.core.annotations.basic.A.class);
+    ear.addAsLibrary(jpa_core_annotations_basic_jar);
+    // Add ear submodules
+
+    JavaArchive jpa_core_annotations_basic_appmanagedNoTx_vehicle_client_jar = ShrinkWrap.create(JavaArchive.class, "jpa_core_annotations_basic_appmanagedNoTx_vehicle_client_jar");
+    jpa_core_annotations_basic_appmanagedNoTx_vehicle_client_jar.addClass(ee.jakarta.tck.persistence.common.PMClientBase.class);
+    ear.addAsModule(jpa_core_annotations_basic_appmanagedNoTx_vehicle_client_jar);
+
+    JavaArchive jpa_core_annotations_basic_appmanagedNoTx_vehicle_ejb_jar = ShrinkWrap.create(JavaArchive.class, "jpa_core_annotations_basic_appmanagedNoTx_vehicle_ejb_jar");
+    jpa_core_annotations_basic_appmanagedNoTx_vehicle_ejb_jar.addClass(ee.jakarta.tck.persistence.common.PMClientBase.class);
+    jpa_core_annotations_basic_appmanagedNoTx_vehicle_ejb_jar.addClass(ee.jakarta.tck.persistence.core.annotations.basic.Client.class);
+    ear.addAsModule(jpa_core_annotations_basic_appmanagedNoTx_vehicle_ejb_jar);
+
+    JavaArchive jpa_core_annotations_basic_appmanaged_vehicle_client_jar = ShrinkWrap.create(JavaArchive.class, "jpa_core_annotations_basic_appmanaged_vehicle_client_jar");
+    jpa_core_annotations_basic_appmanaged_vehicle_client_jar.addClass(ee.jakarta.tck.persistence.common.PMClientBase.class);
+    ear.addAsModule(jpa_core_annotations_basic_appmanaged_vehicle_client_jar);
+
+    JavaArchive jpa_core_annotations_basic_appmanaged_vehicle_ejb_jar = ShrinkWrap.create(JavaArchive.class, "jpa_core_annotations_basic_appmanaged_vehicle_ejb_jar");
+    jpa_core_annotations_basic_appmanaged_vehicle_ejb_jar.addClass(ee.jakarta.tck.persistence.common.PMClientBase.class);
+    jpa_core_annotations_basic_appmanaged_vehicle_ejb_jar.addClass(ee.jakarta.tck.persistence.core.annotations.basic.Client.class);
+    ear.addAsModule(jpa_core_annotations_basic_appmanaged_vehicle_ejb_jar);
+
+    WebArchive jpa_core_annotations_basic_pmservlet_vehicle_web_war = ShrinkWrap.create(WebArchive.class, "jpa_core_annotations_basic_pmservlet_vehicle_web_war");
+    jpa_core_annotations_basic_pmservlet_vehicle_web_war.addAsWebInfResource("web.xml");
+
+    JavaArchive jpa_core_annotations_basic_jar = ShrinkWrap.create(JavaArchive.class, "jpa_core_annotations_basic.jar");
+    jpa_core_annotations_basic_jar.addClass(ee.jakarta.tck.persistence.core.annotations.basic.A.class);
+    jpa_core_annotations_basic_jar.addAsManifestResource("META-INF/MANIFEST.MF");
+    jpa_core_annotations_basic_jar.addAsManifestResource("META-INF/persistence.xml");
+    jpa_core_annotations_basic_pmservlet_vehicle_web_war.addAsLibrary(jpa_core_annotations_basic_jar);
+    jpa_core_annotations_basic_pmservlet_vehicle_web_war.addClass(ee.jakarta.tck.persistence.common.PMClientBase.class);
+    jpa_core_annotations_basic_pmservlet_vehicle_web_war.addClass(ee.jakarta.tck.persistence.core.annotations.basic.Client.class);
+    ear.addAsModule(jpa_core_annotations_basic_pmservlet_vehicle_web_war);
+
+    WebArchive jpa_core_annotations_basic_puservlet_vehicle_web_war = ShrinkWrap.create(WebArchive.class, "jpa_core_annotations_basic_puservlet_vehicle_web_war");
+    jpa_core_annotations_basic_puservlet_vehicle_web_war.addAsWebInfResource("web.xml");
+
+    JavaArchive jpa_core_annotations_basic_jar = ShrinkWrap.create(JavaArchive.class, "jpa_core_annotations_basic.jar");
+    jpa_core_annotations_basic_jar.addClass(ee.jakarta.tck.persistence.core.annotations.basic.A.class);
+    jpa_core_annotations_basic_jar.addAsManifestResource("META-INF/MANIFEST.MF");
+    jpa_core_annotations_basic_jar.addAsManifestResource("META-INF/persistence.xml");
+    jpa_core_annotations_basic_puservlet_vehicle_web_war.addAsLibrary(jpa_core_annotations_basic_jar);
+    jpa_core_annotations_basic_puservlet_vehicle_web_war.addClass(ee.jakarta.tck.persistence.common.PMClientBase.class);
+    jpa_core_annotations_basic_puservlet_vehicle_web_war.addClass(ee.jakarta.tck.persistence.core.annotations.basic.Client.class);
+    ear.addAsModule(jpa_core_annotations_basic_puservlet_vehicle_web_war);
+
+    JavaArchive jpa_core_annotations_basic_stateful3_vehicle_client_jar = ShrinkWrap.create(JavaArchive.class, "jpa_core_annotations_basic_stateful3_vehicle_client_jar");
+    jpa_core_annotations_basic_stateful3_vehicle_client_jar.addClass(ee.jakarta.tck.persistence.common.PMClientBase.class);
+    ear.addAsModule(jpa_core_annotations_basic_stateful3_vehicle_client_jar);
+
+    JavaArchive jpa_core_annotations_basic_stateful3_vehicle_ejb_jar = ShrinkWrap.create(JavaArchive.class, "jpa_core_annotations_basic_stateful3_vehicle_ejb_jar");
+    jpa_core_annotations_basic_stateful3_vehicle_ejb_jar.addClass(ee.jakarta.tck.persistence.common.PMClientBase.class);
+    jpa_core_annotations_basic_stateful3_vehicle_ejb_jar.addClass(ee.jakarta.tck.persistence.core.annotations.basic.Client.class);
+    ear.addAsModule(jpa_core_annotations_basic_stateful3_vehicle_ejb_jar);
+
+    JavaArchive jpa_core_annotations_basic_stateless3_vehicle_client_jar = ShrinkWrap.create(JavaArchive.class, "jpa_core_annotations_basic_stateless3_vehicle_client_jar");
+    jpa_core_annotations_basic_stateless3_vehicle_client_jar.addClass(ee.jakarta.tck.persistence.common.PMClientBase.class);
+    ear.addAsModule(jpa_core_annotations_basic_stateless3_vehicle_client_jar);
+
+    JavaArchive jpa_core_annotations_basic_stateless3_vehicle_ejb_jar = ShrinkWrap.create(JavaArchive.class, "jpa_core_annotations_basic_stateless3_vehicle_ejb_jar");
+    jpa_core_annotations_basic_stateless3_vehicle_ejb_jar.addClass(ee.jakarta.tck.persistence.common.PMClientBase.class);
+    jpa_core_annotations_basic_stateless3_vehicle_ejb_jar.addClass(ee.jakarta.tck.persistence.core.annotations.basic.Client.class);
+    ear.addAsModule(jpa_core_annotations_basic_stateless3_vehicle_ejb_jar);
+    return ear;
+  }
+
 	private static final Logger logger = (Logger) System.getLogger(Client.class.getName());
 
 	public Client() {
diff --git a/jpa/spec-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/basic/Client1.java b/jpa/spec-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/basic/Client1.java
index 6be6a16bb..acc3be4e7 100644
--- a/jpa/spec-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/basic/Client1.java
+++ b/jpa/spec-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/basic/Client1.java
@@ -24,12 +24,91 @@ import java.sql.Timestamp;
 import java.util.Calendar;
 import java.util.Date;
 
+import org.jboss.arquillian.container.test.api.Deployment;
+import org.jboss.shrinkwrap.api.Archive;
+import org.jboss.shrinkwrap.api.ShrinkWrap;
+import org.jboss.shrinkwrap.api.spec.EnterpriseArchive;
 import org.jboss.shrinkwrap.api.spec.JavaArchive;
+import org.jboss.shrinkwrap.api.spec.WebArchive;
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
 
 public class Client1 extends Client {
 
+  @Deployment(testable = false)
+  public static Archive<?> deployment() {
+
+    final EnterpriseArchive ear = ShrinkWrap.create(EnterpriseArchive.class, "jpa_core_annotations_basic_vehicles.ear");
+    // TODO: filter/eliminate the library jar classes that shouldn't be included
+    // Add ear/lib jars
+
+    JavaArchive jpa_core_annotations_basic_jar = ShrinkWrap.create(JavaArchive.class, "jpa_core_annotations_basic_jar");
+    jpa_core_annotations_basic_jar.addClass(ee.jakarta.tck.persistence.core.annotations.basic.A.class);
+    ear.addAsLibrary(jpa_core_annotations_basic_jar);
+    // Add ear submodules
+
+    JavaArchive jpa_core_annotations_basic_appmanagedNoTx_vehicle_client_jar = ShrinkWrap.create(JavaArchive.class, "jpa_core_annotations_basic_appmanagedNoTx_vehicle_client_jar");
+    jpa_core_annotations_basic_appmanagedNoTx_vehicle_client_jar.addClass(ee.jakarta.tck.persistence.common.PMClientBase.class);
+    ear.addAsModule(jpa_core_annotations_basic_appmanagedNoTx_vehicle_client_jar);
+
+    JavaArchive jpa_core_annotations_basic_appmanagedNoTx_vehicle_ejb_jar = ShrinkWrap.create(JavaArchive.class, "jpa_core_annotations_basic_appmanagedNoTx_vehicle_ejb_jar");
+    jpa_core_annotations_basic_appmanagedNoTx_vehicle_ejb_jar.addClass(ee.jakarta.tck.persistence.common.PMClientBase.class);
+    jpa_core_annotations_basic_appmanagedNoTx_vehicle_ejb_jar.addClass(ee.jakarta.tck.persistence.core.annotations.basic.Client.class);
+    ear.addAsModule(jpa_core_annotations_basic_appmanagedNoTx_vehicle_ejb_jar);
+
+    JavaArchive jpa_core_annotations_basic_appmanaged_vehicle_client_jar = ShrinkWrap.create(JavaArchive.class, "jpa_core_annotations_basic_appmanaged_vehicle_client_jar");
+    jpa_core_annotations_basic_appmanaged_vehicle_client_jar.addClass(ee.jakarta.tck.persistence.common.PMClientBase.class);
+    ear.addAsModule(jpa_core_annotations_basic_appmanaged_vehicle_client_jar);
+
+    JavaArchive jpa_core_annotations_basic_appmanaged_vehicle_ejb_jar = ShrinkWrap.create(JavaArchive.class, "jpa_core_annotations_basic_appmanaged_vehicle_ejb_jar");
+    jpa_core_annotations_basic_appmanaged_vehicle_ejb_jar.addClass(ee.jakarta.tck.persistence.common.PMClientBase.class);
+    jpa_core_annotations_basic_appmanaged_vehicle_ejb_jar.addClass(ee.jakarta.tck.persistence.core.annotations.basic.Client.class);
+    ear.addAsModule(jpa_core_annotations_basic_appmanaged_vehicle_ejb_jar);
+
+    WebArchive jpa_core_annotations_basic_pmservlet_vehicle_web_war = ShrinkWrap.create(WebArchive.class, "jpa_core_annotations_basic_pmservlet_vehicle_web_war");
+    jpa_core_annotations_basic_pmservlet_vehicle_web_war.addAsWebInfResource("web.xml");
+
+    JavaArchive jpa_core_annotations_basic_jar = ShrinkWrap.create(JavaArchive.class, "jpa_core_annotations_basic.jar");
+    jpa_core_annotations_basic_jar.addClass(ee.jakarta.tck.persistence.core.annotations.basic.A.class);
+    jpa_core_annotations_basic_jar.addAsManifestResource("META-INF/MANIFEST.MF");
+    jpa_core_annotations_basic_jar.addAsManifestResource("META-INF/persistence.xml");
+    jpa_core_annotations_basic_pmservlet_vehicle_web_war.addAsLibrary(jpa_core_annotations_basic_jar);
+    jpa_core_annotations_basic_pmservlet_vehicle_web_war.addClass(ee.jakarta.tck.persistence.common.PMClientBase.class);
+    jpa_core_annotations_basic_pmservlet_vehicle_web_war.addClass(ee.jakarta.tck.persistence.core.annotations.basic.Client.class);
+    ear.addAsModule(jpa_core_annotations_basic_pmservlet_vehicle_web_war);
+
+    WebArchive jpa_core_annotations_basic_puservlet_vehicle_web_war = ShrinkWrap.create(WebArchive.class, "jpa_core_annotations_basic_puservlet_vehicle_web_war");
+    jpa_core_annotations_basic_puservlet_vehicle_web_war.addAsWebInfResource("web.xml");
+
+    JavaArchive jpa_core_annotations_basic_jar = ShrinkWrap.create(JavaArchive.class, "jpa_core_annotations_basic.jar");
+    jpa_core_annotations_basic_jar.addClass(ee.jakarta.tck.persistence.core.annotations.basic.A.class);
+    jpa_core_annotations_basic_jar.addAsManifestResource("META-INF/MANIFEST.MF");
+    jpa_core_annotations_basic_jar.addAsManifestResource("META-INF/persistence.xml");
+    jpa_core_annotations_basic_puservlet_vehicle_web_war.addAsLibrary(jpa_core_annotations_basic_jar);
+    jpa_core_annotations_basic_puservlet_vehicle_web_war.addClass(ee.jakarta.tck.persistence.common.PMClientBase.class);
+    jpa_core_annotations_basic_puservlet_vehicle_web_war.addClass(ee.jakarta.tck.persistence.core.annotations.basic.Client.class);
+    ear.addAsModule(jpa_core_annotations_basic_puservlet_vehicle_web_war);
+
+    JavaArchive jpa_core_annotations_basic_stateful3_vehicle_client_jar = ShrinkWrap.create(JavaArchive.class, "jpa_core_annotations_basic_stateful3_vehicle_client_jar");
+    jpa_core_annotations_basic_stateful3_vehicle_client_jar.addClass(ee.jakarta.tck.persistence.common.PMClientBase.class);
+    ear.addAsModule(jpa_core_annotations_basic_stateful3_vehicle_client_jar);
+
+    JavaArchive jpa_core_annotations_basic_stateful3_vehicle_ejb_jar = ShrinkWrap.create(JavaArchive.class, "jpa_core_annotations_basic_stateful3_vehicle_ejb_jar");
+    jpa_core_annotations_basic_stateful3_vehicle_ejb_jar.addClass(ee.jakarta.tck.persistence.common.PMClientBase.class);
+    jpa_core_annotations_basic_stateful3_vehicle_ejb_jar.addClass(ee.jakarta.tck.persistence.core.annotations.basic.Client.class);
+    ear.addAsModule(jpa_core_annotations_basic_stateful3_vehicle_ejb_jar);
+
+    JavaArchive jpa_core_annotations_basic_stateless3_vehicle_client_jar = ShrinkWrap.create(JavaArchive.class, "jpa_core_annotations_basic_stateless3_vehicle_client_jar");
+    jpa_core_annotations_basic_stateless3_vehicle_client_jar.addClass(ee.jakarta.tck.persistence.common.PMClientBase.class);
+    ear.addAsModule(jpa_core_annotations_basic_stateless3_vehicle_client_jar);
+
+    JavaArchive jpa_core_annotations_basic_stateless3_vehicle_ejb_jar = ShrinkWrap.create(JavaArchive.class, "jpa_core_annotations_basic_stateless3_vehicle_ejb_jar");
+    jpa_core_annotations_basic_stateless3_vehicle_ejb_jar.addClass(ee.jakarta.tck.persistence.common.PMClientBase.class);
+    jpa_core_annotations_basic_stateless3_vehicle_ejb_jar.addClass(ee.jakarta.tck.persistence.core.annotations.basic.Client.class);
+    ear.addAsModule(jpa_core_annotations_basic_stateless3_vehicle_ejb_jar);
+    return ear;
+  }
+
 	private static final Logger logger = (Logger) System.getLogger(Client1.class.getName());
 
 	public JavaArchive createDeployment() throws Exception {
diff --git a/jpa/spec-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/basic/Client2.java b/jpa/spec-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/basic/Client2.java
index ad5bf137c..462551c4c 100644
--- a/jpa/spec-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/basic/Client2.java
+++ b/jpa/spec-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/basic/Client2.java
@@ -20,12 +20,91 @@ import java.lang.System.Logger;
 import java.math.BigDecimal;
 import java.math.BigInteger;
 
+import org.jboss.arquillian.container.test.api.Deployment;
+import org.jboss.shrinkwrap.api.Archive;
+import org.jboss.shrinkwrap.api.ShrinkWrap;
+import org.jboss.shrinkwrap.api.spec.EnterpriseArchive;
 import org.jboss.shrinkwrap.api.spec.JavaArchive;
+import org.jboss.shrinkwrap.api.spec.WebArchive;
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
 
 public class Client2 extends Client {
 
+  @Deployment(testable = false)
+  public static Archive<?> deployment() {
+
+    final EnterpriseArchive ear = ShrinkWrap.create(EnterpriseArchive.class, "jpa_core_annotations_basic_vehicles.ear");
+    // TODO: filter/eliminate the library jar classes that shouldn't be included
+    // Add ear/lib jars
+
+    JavaArchive jpa_core_annotations_basic_jar = ShrinkWrap.create(JavaArchive.class, "jpa_core_annotations_basic_jar");
+    jpa_core_annotations_basic_jar.addClass(ee.jakarta.tck.persistence.core.annotations.basic.A.class);
+    ear.addAsLibrary(jpa_core_annotations_basic_jar);
+    // Add ear submodules
+
+    JavaArchive jpa_core_annotations_basic_appmanagedNoTx_vehicle_client_jar = ShrinkWrap.create(JavaArchive.class, "jpa_core_annotations_basic_appmanagedNoTx_vehicle_client_jar");
+    jpa_core_annotations_basic_appmanagedNoTx_vehicle_client_jar.addClass(ee.jakarta.tck.persistence.common.PMClientBase.class);
+    ear.addAsModule(jpa_core_annotations_basic_appmanagedNoTx_vehicle_client_jar);
+
+    JavaArchive jpa_core_annotations_basic_appmanagedNoTx_vehicle_ejb_jar = ShrinkWrap.create(JavaArchive.class, "jpa_core_annotations_basic_appmanagedNoTx_vehicle_ejb_jar");
+    jpa_core_annotations_basic_appmanagedNoTx_vehicle_ejb_jar.addClass(ee.jakarta.tck.persistence.common.PMClientBase.class);
+    jpa_core_annotations_basic_appmanagedNoTx_vehicle_ejb_jar.addClass(ee.jakarta.tck.persistence.core.annotations.basic.Client.class);
+    ear.addAsModule(jpa_core_annotations_basic_appmanagedNoTx_vehicle_ejb_jar);
+
+    JavaArchive jpa_core_annotations_basic_appmanaged_vehicle_client_jar = ShrinkWrap.create(JavaArchive.class, "jpa_core_annotations_basic_appmanaged_vehicle_client_jar");
+    jpa_core_annotations_basic_appmanaged_vehicle_client_jar.addClass(ee.jakarta.tck.persistence.common.PMClientBase.class);
+    ear.addAsModule(jpa_core_annotations_basic_appmanaged_vehicle_client_jar);
+
+    JavaArchive jpa_core_annotations_basic_appmanaged_vehicle_ejb_jar = ShrinkWrap.create(JavaArchive.class, "jpa_core_annotations_basic_appmanaged_vehicle_ejb_jar");
+    jpa_core_annotations_basic_appmanaged_vehicle_ejb_jar.addClass(ee.jakarta.tck.persistence.common.PMClientBase.class);
+    jpa_core_annotations_basic_appmanaged_vehicle_ejb_jar.addClass(ee.jakarta.tck.persistence.core.annotations.basic.Client.class);
+    ear.addAsModule(jpa_core_annotations_basic_appmanaged_vehicle_ejb_jar);
+
+    WebArchive jpa_core_annotations_basic_pmservlet_vehicle_web_war = ShrinkWrap.create(WebArchive.class, "jpa_core_annotations_basic_pmservlet_vehicle_web_war");
+    jpa_core_annotations_basic_pmservlet_vehicle_web_war.addAsWebInfResource("web.xml");
+
+    JavaArchive jpa_core_annotations_basic_jar = ShrinkWrap.create(JavaArchive.class, "jpa_core_annotations_basic.jar");
+    jpa_core_annotations_basic_jar.addClass(ee.jakarta.tck.persistence.core.annotations.basic.A.class);
+    jpa_core_annotations_basic_jar.addAsManifestResource("META-INF/MANIFEST.MF");
+    jpa_core_annotations_basic_jar.addAsManifestResource("META-INF/persistence.xml");
+    jpa_core_annotations_basic_pmservlet_vehicle_web_war.addAsLibrary(jpa_core_annotations_basic_jar);
+    jpa_core_annotations_basic_pmservlet_vehicle_web_war.addClass(ee.jakarta.tck.persistence.common.PMClientBase.class);
+    jpa_core_annotations_basic_pmservlet_vehicle_web_war.addClass(ee.jakarta.tck.persistence.core.annotations.basic.Client.class);
+    ear.addAsModule(jpa_core_annotations_basic_pmservlet_vehicle_web_war);
+
+    WebArchive jpa_core_annotations_basic_puservlet_vehicle_web_war = ShrinkWrap.create(WebArchive.class, "jpa_core_annotations_basic_puservlet_vehicle_web_war");
+    jpa_core_annotations_basic_puservlet_vehicle_web_war.addAsWebInfResource("web.xml");
+
+    JavaArchive jpa_core_annotations_basic_jar = ShrinkWrap.create(JavaArchive.class, "jpa_core_annotations_basic.jar");
+    jpa_core_annotations_basic_jar.addClass(ee.jakarta.tck.persistence.core.annotations.basic.A.class);
+    jpa_core_annotations_basic_jar.addAsManifestResource("META-INF/MANIFEST.MF");
+    jpa_core_annotations_basic_jar.addAsManifestResource("META-INF/persistence.xml");
+    jpa_core_annotations_basic_puservlet_vehicle_web_war.addAsLibrary(jpa_core_annotations_basic_jar);
+    jpa_core_annotations_basic_puservlet_vehicle_web_war.addClass(ee.jakarta.tck.persistence.common.PMClientBase.class);
+    jpa_core_annotations_basic_puservlet_vehicle_web_war.addClass(ee.jakarta.tck.persistence.core.annotations.basic.Client.class);
+    ear.addAsModule(jpa_core_annotations_basic_puservlet_vehicle_web_war);
+
+    JavaArchive jpa_core_annotations_basic_stateful3_vehicle_client_jar = ShrinkWrap.create(JavaArchive.class, "jpa_core_annotations_basic_stateful3_vehicle_client_jar");
+    jpa_core_annotations_basic_stateful3_vehicle_client_jar.addClass(ee.jakarta.tck.persistence.common.PMClientBase.class);
+    ear.addAsModule(jpa_core_annotations_basic_stateful3_vehicle_client_jar);
+
+    JavaArchive jpa_core_annotations_basic_stateful3_vehicle_ejb_jar = ShrinkWrap.create(JavaArchive.class, "jpa_core_annotations_basic_stateful3_vehicle_ejb_jar");
+    jpa_core_annotations_basic_stateful3_vehicle_ejb_jar.addClass(ee.jakarta.tck.persistence.common.PMClientBase.class);
+    jpa_core_annotations_basic_stateful3_vehicle_ejb_jar.addClass(ee.jakarta.tck.persistence.core.annotations.basic.Client.class);
+    ear.addAsModule(jpa_core_annotations_basic_stateful3_vehicle_ejb_jar);
+
+    JavaArchive jpa_core_annotations_basic_stateless3_vehicle_client_jar = ShrinkWrap.create(JavaArchive.class, "jpa_core_annotations_basic_stateless3_vehicle_client_jar");
+    jpa_core_annotations_basic_stateless3_vehicle_client_jar.addClass(ee.jakarta.tck.persistence.common.PMClientBase.class);
+    ear.addAsModule(jpa_core_annotations_basic_stateless3_vehicle_client_jar);
+
+    JavaArchive jpa_core_annotations_basic_stateless3_vehicle_ejb_jar = ShrinkWrap.create(JavaArchive.class, "jpa_core_annotations_basic_stateless3_vehicle_ejb_jar");
+    jpa_core_annotations_basic_stateless3_vehicle_ejb_jar.addClass(ee.jakarta.tck.persistence.common.PMClientBase.class);
+    jpa_core_annotations_basic_stateless3_vehicle_ejb_jar.addClass(ee.jakarta.tck.persistence.core.annotations.basic.Client.class);
+    ear.addAsModule(jpa_core_annotations_basic_stateless3_vehicle_ejb_jar);
+    return ear;
+  }
+
 	private static final Logger logger = (Logger) System.getLogger(Client2.class.getName());
 
 	public JavaArchive createDeployment() throws Exception {
diff --git a/jpa/spec-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/collectiontable/Client.java b/jpa/spec-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/collectiontable/Client.java
index 82d5ad03b..ab3967daa 100644
--- a/jpa/spec-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/collectiontable/Client.java
+++ b/jpa/spec-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/collectiontable/Client.java
@@ -20,8 +20,12 @@ import java.lang.System.Logger;
 import java.util.Collection;
 import java.util.HashSet;
 import java.util.Set;
-
+import org.jboss.arquillian.container.test.api.Deployment;
+import org.jboss.shrinkwrap.api.Archive;
+import org.jboss.shrinkwrap.api.ShrinkWrap;
+import org.jboss.shrinkwrap.api.spec.EnterpriseArchive;
 import org.jboss.shrinkwrap.api.spec.JavaArchive;
+import org.jboss.shrinkwrap.api.spec.WebArchive;
 import org.junit.jupiter.api.AfterEach;
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
@@ -30,6 +34,83 @@ import ee.jakarta.tck.persistence.common.PMClientBase;
 
 public class Client extends PMClientBase {
 
+  @Deployment(testable = false)
+  public static Archive<?> deployment() {
+
+    final EnterpriseArchive ear = ShrinkWrap.create(EnterpriseArchive.class, "jpa_core_annotations_collectiontable_vehicles.ear");
+    // TODO: filter/eliminate the library jar classes that shouldn't be included
+    // Add ear/lib jars
+
+    JavaArchive jpa_core_annotations_collectiontable_jar = ShrinkWrap.create(JavaArchive.class, "jpa_core_annotations_collectiontable_jar");
+    jpa_core_annotations_collectiontable_jar.addClass(ee.jakarta.tck.persistence.core.annotations.collectiontable.A.class);
+    jpa_core_annotations_collectiontable_jar.addClass(ee.jakarta.tck.persistence.core.annotations.collectiontable.Address.class);
+    ear.addAsLibrary(jpa_core_annotations_collectiontable_jar);
+    // Add ear submodules
+
+    JavaArchive jpa_core_annotations_collectiontable_appmanagedNoTx_vehicle_client_jar = ShrinkWrap.create(JavaArchive.class, "jpa_core_annotations_collectiontable_appmanagedNoTx_vehicle_client_jar");
+    jpa_core_annotations_collectiontable_appmanagedNoTx_vehicle_client_jar.addClass(ee.jakarta.tck.persistence.common.PMClientBase.class);
+    ear.addAsModule(jpa_core_annotations_collectiontable_appmanagedNoTx_vehicle_client_jar);
+
+    JavaArchive jpa_core_annotations_collectiontable_appmanagedNoTx_vehicle_ejb_jar = ShrinkWrap.create(JavaArchive.class, "jpa_core_annotations_collectiontable_appmanagedNoTx_vehicle_ejb_jar");
+    jpa_core_annotations_collectiontable_appmanagedNoTx_vehicle_ejb_jar.addClass(ee.jakarta.tck.persistence.common.PMClientBase.class);
+    jpa_core_annotations_collectiontable_appmanagedNoTx_vehicle_ejb_jar.addClass(ee.jakarta.tck.persistence.core.annotations.collectiontable.Client.class);
+    ear.addAsModule(jpa_core_annotations_collectiontable_appmanagedNoTx_vehicle_ejb_jar);
+
+    JavaArchive jpa_core_annotations_collectiontable_appmanaged_vehicle_client_jar = ShrinkWrap.create(JavaArchive.class, "jpa_core_annotations_collectiontable_appmanaged_vehicle_client_jar");
+    jpa_core_annotations_collectiontable_appmanaged_vehicle_client_jar.addClass(ee.jakarta.tck.persistence.common.PMClientBase.class);
+    ear.addAsModule(jpa_core_annotations_collectiontable_appmanaged_vehicle_client_jar);
+
+    JavaArchive jpa_core_annotations_collectiontable_appmanaged_vehicle_ejb_jar = ShrinkWrap.create(JavaArchive.class, "jpa_core_annotations_collectiontable_appmanaged_vehicle_ejb_jar");
+    jpa_core_annotations_collectiontable_appmanaged_vehicle_ejb_jar.addClass(ee.jakarta.tck.persistence.common.PMClientBase.class);
+    jpa_core_annotations_collectiontable_appmanaged_vehicle_ejb_jar.addClass(ee.jakarta.tck.persistence.core.annotations.collectiontable.Client.class);
+    ear.addAsModule(jpa_core_annotations_collectiontable_appmanaged_vehicle_ejb_jar);
+
+    WebArchive jpa_core_annotations_collectiontable_pmservlet_vehicle_web_war = ShrinkWrap.create(WebArchive.class, "jpa_core_annotations_collectiontable_pmservlet_vehicle_web_war");
+    jpa_core_annotations_collectiontable_pmservlet_vehicle_web_war.addAsWebInfResource("web.xml");
+
+    JavaArchive jpa_core_annotations_collectiontable_jar = ShrinkWrap.create(JavaArchive.class, "jpa_core_annotations_collectiontable.jar");
+    jpa_core_annotations_collectiontable_jar.addClass(ee.jakarta.tck.persistence.core.annotations.collectiontable.A.class);
+    jpa_core_annotations_collectiontable_jar.addClass(ee.jakarta.tck.persistence.core.annotations.collectiontable.Address.class);
+    jpa_core_annotations_collectiontable_jar.addAsManifestResource("META-INF/MANIFEST.MF");
+    jpa_core_annotations_collectiontable_jar.addAsManifestResource("META-INF/persistence.xml");
+    jpa_core_annotations_collectiontable_pmservlet_vehicle_web_war.addAsLibrary(jpa_core_annotations_collectiontable_jar);
+    jpa_core_annotations_collectiontable_pmservlet_vehicle_web_war.addClass(ee.jakarta.tck.persistence.common.PMClientBase.class);
+    jpa_core_annotations_collectiontable_pmservlet_vehicle_web_war.addClass(ee.jakarta.tck.persistence.core.annotations.collectiontable.Client.class);
+    ear.addAsModule(jpa_core_annotations_collectiontable_pmservlet_vehicle_web_war);
+
+    WebArchive jpa_core_annotations_collectiontable_puservlet_vehicle_web_war = ShrinkWrap.create(WebArchive.class, "jpa_core_annotations_collectiontable_puservlet_vehicle_web_war");
+    jpa_core_annotations_collectiontable_puservlet_vehicle_web_war.addAsWebInfResource("web.xml");
+
+    JavaArchive jpa_core_annotations_collectiontable_jar = ShrinkWrap.create(JavaArchive.class, "jpa_core_annotations_collectiontable.jar");
+    jpa_core_annotations_collectiontable_jar.addClass(ee.jakarta.tck.persistence.core.annotations.collectiontable.A.class);
+    jpa_core_annotations_collectiontable_jar.addClass(ee.jakarta.tck.persistence.core.annotations.collectiontable.Address.class);
+    jpa_core_annotations_collectiontable_jar.addAsManifestResource("META-INF/MANIFEST.MF");
+    jpa_core_annotations_collectiontable_jar.addAsManifestResource("META-INF/persistence.xml");
+    jpa_core_annotations_collectiontable_puservlet_vehicle_web_war.addAsLibrary(jpa_core_annotations_collectiontable_jar);
+    jpa_core_annotations_collectiontable_puservlet_vehicle_web_war.addClass(ee.jakarta.tck.persistence.common.PMClientBase.class);
+    jpa_core_annotations_collectiontable_puservlet_vehicle_web_war.addClass(ee.jakarta.tck.persistence.core.annotations.collectiontable.Client.class);
+    ear.addAsModule(jpa_core_annotations_collectiontable_puservlet_vehicle_web_war);
+
+    JavaArchive jpa_core_annotations_collectiontable_stateful3_vehicle_client_jar = ShrinkWrap.create(JavaArchive.class, "jpa_core_annotations_collectiontable_stateful3_vehicle_client_jar");
+    jpa_core_annotations_collectiontable_stateful3_vehicle_client_jar.addClass(ee.jakarta.tck.persistence.common.PMClientBase.class);
+    ear.addAsModule(jpa_core_annotations_collectiontable_stateful3_vehicle_client_jar);
+
+    JavaArchive jpa_core_annotations_collectiontable_stateful3_vehicle_ejb_jar = ShrinkWrap.create(JavaArchive.class, "jpa_core_annotations_collectiontable_stateful3_vehicle_ejb_jar");
+    jpa_core_annotations_collectiontable_stateful3_vehicle_ejb_jar.addClass(ee.jakarta.tck.persistence.common.PMClientBase.class);
+    jpa_core_annotations_collectiontable_stateful3_vehicle_ejb_jar.addClass(ee.jakarta.tck.persistence.core.annotations.collectiontable.Client.class);
+    ear.addAsModule(jpa_core_annotations_collectiontable_stateful3_vehicle_ejb_jar);
+
+    JavaArchive jpa_core_annotations_collectiontable_stateless3_vehicle_client_jar = ShrinkWrap.create(JavaArchive.class, "jpa_core_annotations_collectiontable_stateless3_vehicle_client_jar");
+    jpa_core_annotations_collectiontable_stateless3_vehicle_client_jar.addClass(ee.jakarta.tck.persistence.common.PMClientBase.class);
+    ear.addAsModule(jpa_core_annotations_collectiontable_stateless3_vehicle_client_jar);
+
+    JavaArchive jpa_core_annotations_collectiontable_stateless3_vehicle_ejb_jar = ShrinkWrap.create(JavaArchive.class, "jpa_core_annotations_collectiontable_stateless3_vehicle_ejb_jar");
+    jpa_core_annotations_collectiontable_stateless3_vehicle_ejb_jar.addClass(ee.jakarta.tck.persistence.common.PMClientBase.class);
+    jpa_core_annotations_collectiontable_stateless3_vehicle_ejb_jar.addClass(ee.jakarta.tck.persistence.core.annotations.collectiontable.Client.class);
+    ear.addAsModule(jpa_core_annotations_collectiontable_stateless3_vehicle_ejb_jar);
+    return ear;
+  }
+
 	public Client() {
 	}
 
diff --git a/jpa/spec-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/convert/Client.java b/jpa/spec-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/convert/Client.java
index 4a0d78138..1887453d6 100644
--- a/jpa/spec-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/convert/Client.java
+++ b/jpa/spec-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/convert/Client.java
@@ -20,8 +20,12 @@ package ee.jakarta.tck.persistence.core.annotations.convert;
 import java.lang.System.Logger;
 import java.util.ArrayList;
 import java.util.List;
-
+import org.jboss.arquillian.container.test.api.Deployment;
+import org.jboss.shrinkwrap.api.Archive;
+import org.jboss.shrinkwrap.api.ShrinkWrap;
+import org.jboss.shrinkwrap.api.spec.EnterpriseArchive;
 import org.jboss.shrinkwrap.api.spec.JavaArchive;
+import org.jboss.shrinkwrap.api.spec.WebArchive;
 import org.junit.jupiter.api.AfterEach;
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
@@ -35,6 +39,134 @@ import jakarta.persistence.criteria.Root;
 
 public class Client extends PMClientBase {
 
+  @Deployment(testable = false)
+  public static Archive<?> deployment() {
+
+    final EnterpriseArchive ear = ShrinkWrap.create(EnterpriseArchive.class, "jpa_core_convert_vehicles.ear");
+    // TODO: filter/eliminate the library jar classes that shouldn't be included
+    // Add ear/lib jars
+
+    JavaArchive jpa_core_convert_jar = ShrinkWrap.create(JavaArchive.class, "jpa_core_convert_jar");
+    jpa_core_convert_jar.addClass(ee.jakarta.tck.persistence.core.annotations.convert.Address.class);
+    jpa_core_convert_jar.addClass(ee.jakarta.tck.persistence.core.annotations.convert.B.class);
+    jpa_core_convert_jar.addClass(ee.jakarta.tck.persistence.core.annotations.convert.CharConverter.class);
+    jpa_core_convert_jar.addClass(ee.jakarta.tck.persistence.core.annotations.convert.CommaConverter.class);
+    jpa_core_convert_jar.addClass(ee.jakarta.tck.persistence.core.annotations.convert.Country.class);
+    jpa_core_convert_jar.addClass(ee.jakarta.tck.persistence.core.annotations.convert.Customer.class);
+    jpa_core_convert_jar.addClass(ee.jakarta.tck.persistence.core.annotations.convert.Department.class);
+    jpa_core_convert_jar.addClass(ee.jakarta.tck.persistence.core.annotations.convert.DisableAutoApplyConverter.class);
+    jpa_core_convert_jar.addClass(ee.jakarta.tck.persistence.core.annotations.convert.DotConverter.class);
+    jpa_core_convert_jar.addClass(ee.jakarta.tck.persistence.core.annotations.convert.DotConverter2.class);
+    jpa_core_convert_jar.addClass(ee.jakarta.tck.persistence.core.annotations.convert.Employee.class);
+    jpa_core_convert_jar.addClass(ee.jakarta.tck.persistence.core.annotations.convert.Employee2.class);
+    jpa_core_convert_jar.addClass(ee.jakarta.tck.persistence.core.annotations.convert.Employee3.class);
+    jpa_core_convert_jar.addClass(ee.jakarta.tck.persistence.core.annotations.convert.FullTimeEmployee.class);
+    jpa_core_convert_jar.addClass(ee.jakarta.tck.persistence.core.annotations.convert.FullTimeEmployee2.class);
+    jpa_core_convert_jar.addClass(ee.jakarta.tck.persistence.core.annotations.convert.IntegerConverter.class);
+    jpa_core_convert_jar.addClass(ee.jakarta.tck.persistence.core.annotations.convert.NumberToStateConverter.class);
+    jpa_core_convert_jar.addClass(ee.jakarta.tck.persistence.core.annotations.convert.SalaryConverter.class);
+    jpa_core_convert_jar.addClass(ee.jakarta.tck.persistence.core.annotations.convert.SpaceConverter.class);
+    ear.addAsLibrary(jpa_core_convert_jar);
+    // Add ear submodules
+
+    JavaArchive jpa_core_convert_appmanagedNoTx_vehicle_client_jar = ShrinkWrap.create(JavaArchive.class, "jpa_core_convert_appmanagedNoTx_vehicle_client_jar");
+    jpa_core_convert_appmanagedNoTx_vehicle_client_jar.addClass(ee.jakarta.tck.persistence.common.PMClientBase.class);
+    ear.addAsModule(jpa_core_convert_appmanagedNoTx_vehicle_client_jar);
+
+    JavaArchive jpa_core_convert_appmanagedNoTx_vehicle_ejb_jar = ShrinkWrap.create(JavaArchive.class, "jpa_core_convert_appmanagedNoTx_vehicle_ejb_jar");
+    jpa_core_convert_appmanagedNoTx_vehicle_ejb_jar.addClass(ee.jakarta.tck.persistence.common.PMClientBase.class);
+    jpa_core_convert_appmanagedNoTx_vehicle_ejb_jar.addClass(ee.jakarta.tck.persistence.core.annotations.convert.Client.class);
+    ear.addAsModule(jpa_core_convert_appmanagedNoTx_vehicle_ejb_jar);
+
+    JavaArchive jpa_core_convert_appmanaged_vehicle_client_jar = ShrinkWrap.create(JavaArchive.class, "jpa_core_convert_appmanaged_vehicle_client_jar");
+    jpa_core_convert_appmanaged_vehicle_client_jar.addClass(ee.jakarta.tck.persistence.common.PMClientBase.class);
+    ear.addAsModule(jpa_core_convert_appmanaged_vehicle_client_jar);
+
+    JavaArchive jpa_core_convert_appmanaged_vehicle_ejb_jar = ShrinkWrap.create(JavaArchive.class, "jpa_core_convert_appmanaged_vehicle_ejb_jar");
+    jpa_core_convert_appmanaged_vehicle_ejb_jar.addClass(ee.jakarta.tck.persistence.common.PMClientBase.class);
+    jpa_core_convert_appmanaged_vehicle_ejb_jar.addClass(ee.jakarta.tck.persistence.core.annotations.convert.Client.class);
+    ear.addAsModule(jpa_core_convert_appmanaged_vehicle_ejb_jar);
+
+    WebArchive jpa_core_convert_pmservlet_vehicle_web_war = ShrinkWrap.create(WebArchive.class, "jpa_core_convert_pmservlet_vehicle_web_war");
+    jpa_core_convert_pmservlet_vehicle_web_war.addAsWebInfResource("web.xml");
+
+    JavaArchive jpa_core_convert_jar = ShrinkWrap.create(JavaArchive.class, "jpa_core_convert.jar");
+    jpa_core_convert_jar.addClass(ee.jakarta.tck.persistence.core.annotations.convert.Address.class);
+    jpa_core_convert_jar.addClass(ee.jakarta.tck.persistence.core.annotations.convert.B.class);
+    jpa_core_convert_jar.addClass(ee.jakarta.tck.persistence.core.annotations.convert.CharConverter.class);
+    jpa_core_convert_jar.addClass(ee.jakarta.tck.persistence.core.annotations.convert.CommaConverter.class);
+    jpa_core_convert_jar.addClass(ee.jakarta.tck.persistence.core.annotations.convert.Country.class);
+    jpa_core_convert_jar.addClass(ee.jakarta.tck.persistence.core.annotations.convert.Customer.class);
+    jpa_core_convert_jar.addClass(ee.jakarta.tck.persistence.core.annotations.convert.Department.class);
+    jpa_core_convert_jar.addClass(ee.jakarta.tck.persistence.core.annotations.convert.DisableAutoApplyConverter.class);
+    jpa_core_convert_jar.addClass(ee.jakarta.tck.persistence.core.annotations.convert.DotConverter.class);
+    jpa_core_convert_jar.addClass(ee.jakarta.tck.persistence.core.annotations.convert.DotConverter2.class);
+    jpa_core_convert_jar.addClass(ee.jakarta.tck.persistence.core.annotations.convert.Employee.class);
+    jpa_core_convert_jar.addClass(ee.jakarta.tck.persistence.core.annotations.convert.Employee2.class);
+    jpa_core_convert_jar.addClass(ee.jakarta.tck.persistence.core.annotations.convert.Employee3.class);
+    jpa_core_convert_jar.addClass(ee.jakarta.tck.persistence.core.annotations.convert.FullTimeEmployee.class);
+    jpa_core_convert_jar.addClass(ee.jakarta.tck.persistence.core.annotations.convert.FullTimeEmployee2.class);
+    jpa_core_convert_jar.addClass(ee.jakarta.tck.persistence.core.annotations.convert.IntegerConverter.class);
+    jpa_core_convert_jar.addClass(ee.jakarta.tck.persistence.core.annotations.convert.NumberToStateConverter.class);
+    jpa_core_convert_jar.addClass(ee.jakarta.tck.persistence.core.annotations.convert.SalaryConverter.class);
+    jpa_core_convert_jar.addClass(ee.jakarta.tck.persistence.core.annotations.convert.SpaceConverter.class);
+    jpa_core_convert_jar.addAsManifestResource("META-INF/MANIFEST.MF");
+    jpa_core_convert_jar.addAsManifestResource("META-INF/persistence.xml");
+    jpa_core_convert_pmservlet_vehicle_web_war.addAsLibrary(jpa_core_convert_jar);
+    jpa_core_convert_pmservlet_vehicle_web_war.addClass(ee.jakarta.tck.persistence.common.PMClientBase.class);
+    jpa_core_convert_pmservlet_vehicle_web_war.addClass(ee.jakarta.tck.persistence.core.annotations.convert.Client.class);
+    ear.addAsModule(jpa_core_convert_pmservlet_vehicle_web_war);
+
+    WebArchive jpa_core_convert_puservlet_vehicle_web_war = ShrinkWrap.create(WebArchive.class, "jpa_core_convert_puservlet_vehicle_web_war");
+    jpa_core_convert_puservlet_vehicle_web_war.addAsWebInfResource("web.xml");
+
+    JavaArchive jpa_core_convert_jar = ShrinkWrap.create(JavaArchive.class, "jpa_core_convert.jar");
+    jpa_core_convert_jar.addClass(ee.jakarta.tck.persistence.core.annotations.convert.Address.class);
+    jpa_core_convert_jar.addClass(ee.jakarta.tck.persistence.core.annotations.convert.B.class);
+    jpa_core_convert_jar.addClass(ee.jakarta.tck.persistence.core.annotations.convert.CharConverter.class);
+    jpa_core_convert_jar.addClass(ee.jakarta.tck.persistence.core.annotations.convert.CommaConverter.class);
+    jpa_core_convert_jar.addClass(ee.jakarta.tck.persistence.core.annotations.convert.Country.class);
+    jpa_core_convert_jar.addClass(ee.jakarta.tck.persistence.core.annotations.convert.Customer.class);
+    jpa_core_convert_jar.addClass(ee.jakarta.tck.persistence.core.annotations.convert.Department.class);
+    jpa_core_convert_jar.addClass(ee.jakarta.tck.persistence.core.annotations.convert.DisableAutoApplyConverter.class);
+    jpa_core_convert_jar.addClass(ee.jakarta.tck.persistence.core.annotations.convert.DotConverter.class);
+    jpa_core_convert_jar.addClass(ee.jakarta.tck.persistence.core.annotations.convert.DotConverter2.class);
+    jpa_core_convert_jar.addClass(ee.jakarta.tck.persistence.core.annotations.convert.Employee.class);
+    jpa_core_convert_jar.addClass(ee.jakarta.tck.persistence.core.annotations.convert.Employee2.class);
+    jpa_core_convert_jar.addClass(ee.jakarta.tck.persistence.core.annotations.convert.Employee3.class);
+    jpa_core_convert_jar.addClass(ee.jakarta.tck.persistence.core.annotations.convert.FullTimeEmployee.class);
+    jpa_core_convert_jar.addClass(ee.jakarta.tck.persistence.core.annotations.convert.FullTimeEmployee2.class);
+    jpa_core_convert_jar.addClass(ee.jakarta.tck.persistence.core.annotations.convert.IntegerConverter.class);
+    jpa_core_convert_jar.addClass(ee.jakarta.tck.persistence.core.annotations.convert.NumberToStateConverter.class);
+    jpa_core_convert_jar.addClass(ee.jakarta.tck.persistence.core.annotations.convert.SalaryConverter.class);
+    jpa_core_convert_jar.addClass(ee.jakarta.tck.persistence.core.annotations.convert.SpaceConverter.class);
+    jpa_core_convert_jar.addAsManifestResource("META-INF/MANIFEST.MF");
+    jpa_core_convert_jar.addAsManifestResource("META-INF/persistence.xml");
+    jpa_core_convert_puservlet_vehicle_web_war.addAsLibrary(jpa_core_convert_jar);
+    jpa_core_convert_puservlet_vehicle_web_war.addClass(ee.jakarta.tck.persistence.common.PMClientBase.class);
+    jpa_core_convert_puservlet_vehicle_web_war.addClass(ee.jakarta.tck.persistence.core.annotations.convert.Client.class);
+    ear.addAsModule(jpa_core_convert_puservlet_vehicle_web_war);
+
+    JavaArchive jpa_core_convert_stateful3_vehicle_client_jar = ShrinkWrap.create(JavaArchive.class, "jpa_core_convert_stateful3_vehicle_client_jar");
+    jpa_core_convert_stateful3_vehicle_client_jar.addClass(ee.jakarta.tck.persistence.common.PMClientBase.class);
+    ear.addAsModule(jpa_core_convert_stateful3_vehicle_client_jar);
+
+    JavaArchive jpa_core_convert_stateful3_vehicle_ejb_jar = ShrinkWrap.create(JavaArchive.class, "jpa_core_convert_stateful3_vehicle_ejb_jar");
+    jpa_core_convert_stateful3_vehicle_ejb_jar.addClass(ee.jakarta.tck.persistence.common.PMClientBase.class);
+    jpa_core_convert_stateful3_vehicle_ejb_jar.addClass(ee.jakarta.tck.persistence.core.annotations.convert.Client.class);
+    ear.addAsModule(jpa_core_convert_stateful3_vehicle_ejb_jar);
+
+    JavaArchive jpa_core_convert_stateless3_vehicle_client_jar = ShrinkWrap.create(JavaArchive.class, "jpa_core_convert_stateless3_vehicle_client_jar");
+    jpa_core_convert_stateless3_vehicle_client_jar.addClass(ee.jakarta.tck.persistence.common.PMClientBase.class);
+    ear.addAsModule(jpa_core_convert_stateless3_vehicle_client_jar);
+
+    JavaArchive jpa_core_convert_stateless3_vehicle_ejb_jar = ShrinkWrap.create(JavaArchive.class, "jpa_core_convert_stateless3_vehicle_ejb_jar");
+    jpa_core_convert_stateless3_vehicle_ejb_jar.addClass(ee.jakarta.tck.persistence.common.PMClientBase.class);
+    jpa_core_convert_stateless3_vehicle_ejb_jar.addClass(ee.jakarta.tck.persistence.core.annotations.convert.Client.class);
+    ear.addAsModule(jpa_core_convert_stateless3_vehicle_ejb_jar);
+    return ear;
+  }
+
 	public Client() {
 	}
 
diff --git a/jpa/spec-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/discriminatorValue/Client.java b/jpa/spec-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/discriminatorValue/Client.java
index c0431a038..1b409e9e7 100644
--- a/jpa/spec-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/discriminatorValue/Client.java
+++ b/jpa/spec-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/discriminatorValue/Client.java
@@ -17,8 +17,12 @@
 package ee.jakarta.tck.persistence.core.annotations.discriminatorValue;
 
 import java.lang.System.Logger;
-
+import org.jboss.arquillian.container.test.api.Deployment;
+import org.jboss.shrinkwrap.api.Archive;
+import org.jboss.shrinkwrap.api.ShrinkWrap;
+import org.jboss.shrinkwrap.api.spec.EnterpriseArchive;
 import org.jboss.shrinkwrap.api.spec.JavaArchive;
+import org.jboss.shrinkwrap.api.spec.WebArchive;
 import org.junit.jupiter.api.AfterEach;
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
@@ -27,6 +31,92 @@ import ee.jakarta.tck.persistence.common.PMClientBase;
 
 public class Client extends PMClientBase {
 
+  @Deployment(testable = false)
+  public static Archive<?> deployment() {
+
+    final EnterpriseArchive ear = ShrinkWrap.create(EnterpriseArchive.class, "jpa_core_annotations_discrinimatorValue_vehicles.ear");
+    // TODO: filter/eliminate the library jar classes that shouldn't be included
+    // Add ear/lib jars
+
+    JavaArchive jpa_core_annotations_discrinimatorValue_jar = ShrinkWrap.create(JavaArchive.class, "jpa_core_annotations_discrinimatorValue_jar");
+    jpa_core_annotations_discrinimatorValue_jar.addClass(ee.jakarta.tck.persistence.core.annotations.discriminatorValue.PartProduct.class);
+    jpa_core_annotations_discrinimatorValue_jar.addClass(ee.jakarta.tck.persistence.core.annotations.discriminatorValue.PartProduct2.class);
+    jpa_core_annotations_discrinimatorValue_jar.addClass(ee.jakarta.tck.persistence.core.annotations.discriminatorValue.PricedPartProduct2.class);
+    jpa_core_annotations_discrinimatorValue_jar.addClass(ee.jakarta.tck.persistence.core.annotations.discriminatorValue.Product.class);
+    jpa_core_annotations_discrinimatorValue_jar.addClass(ee.jakarta.tck.persistence.core.annotations.discriminatorValue.Product2.class);
+    ear.addAsLibrary(jpa_core_annotations_discrinimatorValue_jar);
+    // Add ear submodules
+
+    JavaArchive jpa_core_annotations_discrinimatorValue_appmanagedNoTx_vehicle_client_jar = ShrinkWrap.create(JavaArchive.class, "jpa_core_annotations_discrinimatorValue_appmanagedNoTx_vehicle_client_jar");
+    jpa_core_annotations_discrinimatorValue_appmanagedNoTx_vehicle_client_jar.addClass(ee.jakarta.tck.persistence.common.PMClientBase.class);
+    ear.addAsModule(jpa_core_annotations_discrinimatorValue_appmanagedNoTx_vehicle_client_jar);
+
+    JavaArchive jpa_core_annotations_discrinimatorValue_appmanagedNoTx_vehicle_ejb_jar = ShrinkWrap.create(JavaArchive.class, "jpa_core_annotations_discrinimatorValue_appmanagedNoTx_vehicle_ejb_jar");
+    jpa_core_annotations_discrinimatorValue_appmanagedNoTx_vehicle_ejb_jar.addClass(ee.jakarta.tck.persistence.common.PMClientBase.class);
+    jpa_core_annotations_discrinimatorValue_appmanagedNoTx_vehicle_ejb_jar.addClass(ee.jakarta.tck.persistence.core.annotations.discriminatorValue.Client.class);
+    ear.addAsModule(jpa_core_annotations_discrinimatorValue_appmanagedNoTx_vehicle_ejb_jar);
+
+    JavaArchive jpa_core_annotations_discrinimatorValue_appmanaged_vehicle_client_jar = ShrinkWrap.create(JavaArchive.class, "jpa_core_annotations_discrinimatorValue_appmanaged_vehicle_client_jar");
+    jpa_core_annotations_discrinimatorValue_appmanaged_vehicle_client_jar.addClass(ee.jakarta.tck.persistence.common.PMClientBase.class);
+    ear.addAsModule(jpa_core_annotations_discrinimatorValue_appmanaged_vehicle_client_jar);
+
+    JavaArchive jpa_core_annotations_discrinimatorValue_appmanaged_vehicle_ejb_jar = ShrinkWrap.create(JavaArchive.class, "jpa_core_annotations_discrinimatorValue_appmanaged_vehicle_ejb_jar");
+    jpa_core_annotations_discrinimatorValue_appmanaged_vehicle_ejb_jar.addClass(ee.jakarta.tck.persistence.common.PMClientBase.class);
+    jpa_core_annotations_discrinimatorValue_appmanaged_vehicle_ejb_jar.addClass(ee.jakarta.tck.persistence.core.annotations.discriminatorValue.Client.class);
+    ear.addAsModule(jpa_core_annotations_discrinimatorValue_appmanaged_vehicle_ejb_jar);
+
+    WebArchive jpa_core_annotations_discrinimatorValue_pmservlet_vehicle_web_war = ShrinkWrap.create(WebArchive.class, "jpa_core_annotations_discrinimatorValue_pmservlet_vehicle_web_war");
+    jpa_core_annotations_discrinimatorValue_pmservlet_vehicle_web_war.addAsWebInfResource("web.xml");
+
+    JavaArchive jpa_core_annotations_discrinimatorValue_jar = ShrinkWrap.create(JavaArchive.class, "jpa_core_annotations_discrinimatorValue.jar");
+    jpa_core_annotations_discrinimatorValue_jar.addClass(ee.jakarta.tck.persistence.core.annotations.discriminatorValue.PartProduct.class);
+    jpa_core_annotations_discrinimatorValue_jar.addClass(ee.jakarta.tck.persistence.core.annotations.discriminatorValue.PartProduct2.class);
+    jpa_core_annotations_discrinimatorValue_jar.addClass(ee.jakarta.tck.persistence.core.annotations.discriminatorValue.PricedPartProduct2.class);
+    jpa_core_annotations_discrinimatorValue_jar.addClass(ee.jakarta.tck.persistence.core.annotations.discriminatorValue.Product.class);
+    jpa_core_annotations_discrinimatorValue_jar.addClass(ee.jakarta.tck.persistence.core.annotations.discriminatorValue.Product2.class);
+    jpa_core_annotations_discrinimatorValue_jar.addAsManifestResource("META-INF/MANIFEST.MF");
+    jpa_core_annotations_discrinimatorValue_jar.addAsManifestResource("META-INF/persistence.xml");
+    jpa_core_annotations_discrinimatorValue_pmservlet_vehicle_web_war.addAsLibrary(jpa_core_annotations_discrinimatorValue_jar);
+    jpa_core_annotations_discrinimatorValue_pmservlet_vehicle_web_war.addClass(ee.jakarta.tck.persistence.common.PMClientBase.class);
+    jpa_core_annotations_discrinimatorValue_pmservlet_vehicle_web_war.addClass(ee.jakarta.tck.persistence.core.annotations.discriminatorValue.Client.class);
+    ear.addAsModule(jpa_core_annotations_discrinimatorValue_pmservlet_vehicle_web_war);
+
+    WebArchive jpa_core_annotations_discrinimatorValue_puservlet_vehicle_web_war = ShrinkWrap.create(WebArchive.class, "jpa_core_annotations_discrinimatorValue_puservlet_vehicle_web_war");
+    jpa_core_annotations_discrinimatorValue_puservlet_vehicle_web_war.addAsWebInfResource("web.xml");
+
+    JavaArchive jpa_core_annotations_discrinimatorValue_jar = ShrinkWrap.create(JavaArchive.class, "jpa_core_annotations_discrinimatorValue.jar");
+    jpa_core_annotations_discrinimatorValue_jar.addClass(ee.jakarta.tck.persistence.core.annotations.discriminatorValue.PartProduct.class);
+    jpa_core_annotations_discrinimatorValue_jar.addClass(ee.jakarta.tck.persistence.core.annotations.discriminatorValue.PartProduct2.class);
+    jpa_core_annotations_discrinimatorValue_jar.addClass(ee.jakarta.tck.persistence.core.annotations.discriminatorValue.PricedPartProduct2.class);
+    jpa_core_annotations_discrinimatorValue_jar.addClass(ee.jakarta.tck.persistence.core.annotations.discriminatorValue.Product.class);
+    jpa_core_annotations_discrinimatorValue_jar.addClass(ee.jakarta.tck.persistence.core.annotations.discriminatorValue.Product2.class);
+    jpa_core_annotations_discrinimatorValue_jar.addAsManifestResource("META-INF/MANIFEST.MF");
+    jpa_core_annotations_discrinimatorValue_jar.addAsManifestResource("META-INF/persistence.xml");
+    jpa_core_annotations_discrinimatorValue_puservlet_vehicle_web_war.addAsLibrary(jpa_core_annotations_discrinimatorValue_jar);
+    jpa_core_annotations_discrinimatorValue_puservlet_vehicle_web_war.addClass(ee.jakarta.tck.persistence.common.PMClientBase.class);
+    jpa_core_annotations_discrinimatorValue_puservlet_vehicle_web_war.addClass(ee.jakarta.tck.persistence.core.annotations.discriminatorValue.Client.class);
+    ear.addAsModule(jpa_core_annotations_discrinimatorValue_puservlet_vehicle_web_war);
+
+    JavaArchive jpa_core_annotations_discrinimatorValue_stateful3_vehicle_client_jar = ShrinkWrap.create(JavaArchive.class, "jpa_core_annotations_discrinimatorValue_stateful3_vehicle_client_jar");
+    jpa_core_annotations_discrinimatorValue_stateful3_vehicle_client_jar.addClass(ee.jakarta.tck.persistence.common.PMClientBase.class);
+    ear.addAsModule(jpa_core_annotations_discrinimatorValue_stateful3_vehicle_client_jar);
+
+    JavaArchive jpa_core_annotations_discrinimatorValue_stateful3_vehicle_ejb_jar = ShrinkWrap.create(JavaArchive.class, "jpa_core_annotations_discrinimatorValue_stateful3_vehicle_ejb_jar");
+    jpa_core_annotations_discrinimatorValue_stateful3_vehicle_ejb_jar.addClass(ee.jakarta.tck.persistence.common.PMClientBase.class);
+    jpa_core_annotations_discrinimatorValue_stateful3_vehicle_ejb_jar.addClass(ee.jakarta.tck.persistence.core.annotations.discriminatorValue.Client.class);
+    ear.addAsModule(jpa_core_annotations_discrinimatorValue_stateful3_vehicle_ejb_jar);
+
+    JavaArchive jpa_core_annotations_discrinimatorValue_stateless3_vehicle_client_jar = ShrinkWrap.create(JavaArchive.class, "jpa_core_annotations_discrinimatorValue_stateless3_vehicle_client_jar");
+    jpa_core_annotations_discrinimatorValue_stateless3_vehicle_client_jar.addClass(ee.jakarta.tck.persistence.common.PMClientBase.class);
+    ear.addAsModule(jpa_core_annotations_discrinimatorValue_stateless3_vehicle_client_jar);
+
+    JavaArchive jpa_core_annotations_discrinimatorValue_stateless3_vehicle_ejb_jar = ShrinkWrap.create(JavaArchive.class, "jpa_core_annotations_discrinimatorValue_stateless3_vehicle_ejb_jar");
+    jpa_core_annotations_discrinimatorValue_stateless3_vehicle_ejb_jar.addClass(ee.jakarta.tck.persistence.common.PMClientBase.class);
+    jpa_core_annotations_discrinimatorValue_stateless3_vehicle_ejb_jar.addClass(ee.jakarta.tck.persistence.core.annotations.discriminatorValue.Client.class);
+    ear.addAsModule(jpa_core_annotations_discrinimatorValue_stateless3_vehicle_ejb_jar);
+    return ear;
+  }
+
 	private static final Logger logger = (Logger) System.getLogger(Client.class.getName());
 
 	public JavaArchive createDeployment() throws Exception {
diff --git a/jpa/spec-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/elementcollection/Client1.java b/jpa/spec-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/elementcollection/Client1.java
index f5c589ade..c99fae8c4 100644
--- a/jpa/spec-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/elementcollection/Client1.java
+++ b/jpa/spec-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/elementcollection/Client1.java
@@ -19,8 +19,12 @@ package ee.jakarta.tck.persistence.core.annotations.elementcollection;
 import java.lang.System.Logger;
 import java.util.HashSet;
 import java.util.Set;
-
+import org.jboss.arquillian.container.test.api.Deployment;
+import org.jboss.shrinkwrap.api.Archive;
+import org.jboss.shrinkwrap.api.ShrinkWrap;
+import org.jboss.shrinkwrap.api.spec.EnterpriseArchive;
 import org.jboss.shrinkwrap.api.spec.JavaArchive;
+import org.jboss.shrinkwrap.api.spec.WebArchive;
 import org.junit.jupiter.api.AfterEach;
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
@@ -29,6 +33,91 @@ import ee.jakarta.tck.persistence.common.PMClientBase;
 
 public class Client1 extends PMClientBase {
 
+  @Deployment(testable = false)
+  public static Archive<?> deployment() {
+
+    final EnterpriseArchive ear = ShrinkWrap.create(EnterpriseArchive.class, "jpa_core_annotations_elementcollection_vehicles.ear");
+    // TODO: filter/eliminate the library jar classes that shouldn't be included
+    // Add ear/lib jars
+
+    JavaArchive jpa_core_annotations_elementcollection_jar = ShrinkWrap.create(JavaArchive.class, "jpa_core_annotations_elementcollection_jar");
+    jpa_core_annotations_elementcollection_jar.addClass(ee.jakarta.tck.persistence.core.annotations.elementcollection.A.class);
+    jpa_core_annotations_elementcollection_jar.addClass(ee.jakarta.tck.persistence.core.annotations.elementcollection.Address.class);
+    jpa_core_annotations_elementcollection_jar.addClass(ee.jakarta.tck.persistence.core.annotations.elementcollection.Customer.class);
+    jpa_core_annotations_elementcollection_jar.addClass(ee.jakarta.tck.persistence.core.annotations.elementcollection.CustomerXML.class);
+    ear.addAsLibrary(jpa_core_annotations_elementcollection_jar);
+    // Add ear submodules
+
+    JavaArchive jpa_core_annotations_elementcollection_appmanagedNoTx_vehicle_client_jar = ShrinkWrap.create(JavaArchive.class, "jpa_core_annotations_elementcollection_appmanagedNoTx_vehicle_client_jar");
+    jpa_core_annotations_elementcollection_appmanagedNoTx_vehicle_client_jar.addClass(ee.jakarta.tck.persistence.common.PMClientBase.class);
+    ear.addAsModule(jpa_core_annotations_elementcollection_appmanagedNoTx_vehicle_client_jar);
+
+    JavaArchive jpa_core_annotations_elementcollection_appmanagedNoTx_vehicle_ejb_jar = ShrinkWrap.create(JavaArchive.class, "jpa_core_annotations_elementcollection_appmanagedNoTx_vehicle_ejb_jar");
+    jpa_core_annotations_elementcollection_appmanagedNoTx_vehicle_ejb_jar.addClass(ee.jakarta.tck.persistence.common.PMClientBase.class);
+    jpa_core_annotations_elementcollection_appmanagedNoTx_vehicle_ejb_jar.addClass(ee.jakarta.tck.persistence.core.annotations.elementcollection.Client.class);
+    ear.addAsModule(jpa_core_annotations_elementcollection_appmanagedNoTx_vehicle_ejb_jar);
+
+    JavaArchive jpa_core_annotations_elementcollection_appmanaged_vehicle_client_jar = ShrinkWrap.create(JavaArchive.class, "jpa_core_annotations_elementcollection_appmanaged_vehicle_client_jar");
+    jpa_core_annotations_elementcollection_appmanaged_vehicle_client_jar.addClass(ee.jakarta.tck.persistence.common.PMClientBase.class);
+    ear.addAsModule(jpa_core_annotations_elementcollection_appmanaged_vehicle_client_jar);
+
+    JavaArchive jpa_core_annotations_elementcollection_appmanaged_vehicle_ejb_jar = ShrinkWrap.create(JavaArchive.class, "jpa_core_annotations_elementcollection_appmanaged_vehicle_ejb_jar");
+    jpa_core_annotations_elementcollection_appmanaged_vehicle_ejb_jar.addClass(ee.jakarta.tck.persistence.common.PMClientBase.class);
+    jpa_core_annotations_elementcollection_appmanaged_vehicle_ejb_jar.addClass(ee.jakarta.tck.persistence.core.annotations.elementcollection.Client.class);
+    ear.addAsModule(jpa_core_annotations_elementcollection_appmanaged_vehicle_ejb_jar);
+
+    WebArchive jpa_core_annotations_elementcollection_pmservlet_vehicle_web_war = ShrinkWrap.create(WebArchive.class, "jpa_core_annotations_elementcollection_pmservlet_vehicle_web_war");
+    jpa_core_annotations_elementcollection_pmservlet_vehicle_web_war.addAsWebInfResource("web.xml");
+
+    JavaArchive jpa_core_annotations_elementcollection_jar = ShrinkWrap.create(JavaArchive.class, "jpa_core_annotations_elementcollection.jar");
+    jpa_core_annotations_elementcollection_jar.addClass(ee.jakarta.tck.persistence.core.annotations.elementcollection.A.class);
+    jpa_core_annotations_elementcollection_jar.addClass(ee.jakarta.tck.persistence.core.annotations.elementcollection.Address.class);
+    jpa_core_annotations_elementcollection_jar.addClass(ee.jakarta.tck.persistence.core.annotations.elementcollection.Customer.class);
+    jpa_core_annotations_elementcollection_jar.addClass(ee.jakarta.tck.persistence.core.annotations.elementcollection.CustomerXML.class);
+    jpa_core_annotations_elementcollection_jar.addAsManifestResource("myMappingFile.xml");
+    jpa_core_annotations_elementcollection_jar.addAsManifestResource("META-INF/MANIFEST.MF");
+    jpa_core_annotations_elementcollection_jar.addAsManifestResource("META-INF/persistence.xml");
+    jpa_core_annotations_elementcollection_pmservlet_vehicle_web_war.addAsLibrary(jpa_core_annotations_elementcollection_jar);
+    jpa_core_annotations_elementcollection_pmservlet_vehicle_web_war.addClass(ee.jakarta.tck.persistence.common.PMClientBase.class);
+    jpa_core_annotations_elementcollection_pmservlet_vehicle_web_war.addClass(ee.jakarta.tck.persistence.core.annotations.elementcollection.Client.class);
+    ear.addAsModule(jpa_core_annotations_elementcollection_pmservlet_vehicle_web_war);
+
+    WebArchive jpa_core_annotations_elementcollection_puservlet_vehicle_web_war = ShrinkWrap.create(WebArchive.class, "jpa_core_annotations_elementcollection_puservlet_vehicle_web_war");
+    jpa_core_annotations_elementcollection_puservlet_vehicle_web_war.addAsWebInfResource("web.xml");
+
+    JavaArchive jpa_core_annotations_elementcollection_jar = ShrinkWrap.create(JavaArchive.class, "jpa_core_annotations_elementcollection.jar");
+    jpa_core_annotations_elementcollection_jar.addClass(ee.jakarta.tck.persistence.core.annotations.elementcollection.A.class);
+    jpa_core_annotations_elementcollection_jar.addClass(ee.jakarta.tck.persistence.core.annotations.elementcollection.Address.class);
+    jpa_core_annotations_elementcollection_jar.addClass(ee.jakarta.tck.persistence.core.annotations.elementcollection.Customer.class);
+    jpa_core_annotations_elementcollection_jar.addClass(ee.jakarta.tck.persistence.core.annotations.elementcollection.CustomerXML.class);
+    jpa_core_annotations_elementcollection_jar.addAsManifestResource("myMappingFile.xml");
+    jpa_core_annotations_elementcollection_jar.addAsManifestResource("META-INF/MANIFEST.MF");
+    jpa_core_annotations_elementcollection_jar.addAsManifestResource("META-INF/persistence.xml");
+    jpa_core_annotations_elementcollection_puservlet_vehicle_web_war.addAsLibrary(jpa_core_annotations_elementcollection_jar);
+    jpa_core_annotations_elementcollection_puservlet_vehicle_web_war.addClass(ee.jakarta.tck.persistence.common.PMClientBase.class);
+    jpa_core_annotations_elementcollection_puservlet_vehicle_web_war.addClass(ee.jakarta.tck.persistence.core.annotations.elementcollection.Client.class);
+    ear.addAsModule(jpa_core_annotations_elementcollection_puservlet_vehicle_web_war);
+
+    JavaArchive jpa_core_annotations_elementcollection_stateful3_vehicle_client_jar = ShrinkWrap.create(JavaArchive.class, "jpa_core_annotations_elementcollection_stateful3_vehicle_client_jar");
+    jpa_core_annotations_elementcollection_stateful3_vehicle_client_jar.addClass(ee.jakarta.tck.persistence.common.PMClientBase.class);
+    ear.addAsModule(jpa_core_annotations_elementcollection_stateful3_vehicle_client_jar);
+
+    JavaArchive jpa_core_annotations_elementcollection_stateful3_vehicle_ejb_jar = ShrinkWrap.create(JavaArchive.class, "jpa_core_annotations_elementcollection_stateful3_vehicle_ejb_jar");
+    jpa_core_annotations_elementcollection_stateful3_vehicle_ejb_jar.addClass(ee.jakarta.tck.persistence.common.PMClientBase.class);
+    jpa_core_annotations_elementcollection_stateful3_vehicle_ejb_jar.addClass(ee.jakarta.tck.persistence.core.annotations.elementcollection.Client.class);
+    ear.addAsModule(jpa_core_annotations_elementcollection_stateful3_vehicle_ejb_jar);
+
+    JavaArchive jpa_core_annotations_elementcollection_stateless3_vehicle_client_jar = ShrinkWrap.create(JavaArchive.class, "jpa_core_annotations_elementcollection_stateless3_vehicle_client_jar");
+    jpa_core_annotations_elementcollection_stateless3_vehicle_client_jar.addClass(ee.jakarta.tck.persistence.common.PMClientBase.class);
+    ear.addAsModule(jpa_core_annotations_elementcollection_stateless3_vehicle_client_jar);
+
+    JavaArchive jpa_core_annotations_elementcollection_stateless3_vehicle_ejb_jar = ShrinkWrap.create(JavaArchive.class, "jpa_core_annotations_elementcollection_stateless3_vehicle_ejb_jar");
+    jpa_core_annotations_elementcollection_stateless3_vehicle_ejb_jar.addClass(ee.jakarta.tck.persistence.common.PMClientBase.class);
+    jpa_core_annotations_elementcollection_stateless3_vehicle_ejb_jar.addClass(ee.jakarta.tck.persistence.core.annotations.elementcollection.Client.class);
+    ear.addAsModule(jpa_core_annotations_elementcollection_stateless3_vehicle_ejb_jar);
+    return ear;
+  }
+
 	public Client1() {
 	}
 
diff --git a/jpa/spec-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/elementcollection/Client2.java b/jpa/spec-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/elementcollection/Client2.java
index 5e6fb6042..187edf690 100644
--- a/jpa/spec-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/elementcollection/Client2.java
+++ b/jpa/spec-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/elementcollection/Client2.java
@@ -19,8 +19,12 @@ package ee.jakarta.tck.persistence.core.annotations.elementcollection;
 import java.lang.System.Logger;
 import java.util.ArrayList;
 import java.util.List;
-
+import org.jboss.arquillian.container.test.api.Deployment;
+import org.jboss.shrinkwrap.api.Archive;
+import org.jboss.shrinkwrap.api.ShrinkWrap;
+import org.jboss.shrinkwrap.api.spec.EnterpriseArchive;
 import org.jboss.shrinkwrap.api.spec.JavaArchive;
+import org.jboss.shrinkwrap.api.spec.WebArchive;
 import org.junit.jupiter.api.AfterEach;
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
@@ -29,6 +33,91 @@ import ee.jakarta.tck.persistence.common.PMClientBase;
 
 public class Client2 extends PMClientBase {
 
+  @Deployment(testable = false)
+  public static Archive<?> deployment() {
+
+    final EnterpriseArchive ear = ShrinkWrap.create(EnterpriseArchive.class, "jpa_core_annotations_elementcollection_vehicles.ear");
+    // TODO: filter/eliminate the library jar classes that shouldn't be included
+    // Add ear/lib jars
+
+    JavaArchive jpa_core_annotations_elementcollection_jar = ShrinkWrap.create(JavaArchive.class, "jpa_core_annotations_elementcollection_jar");
+    jpa_core_annotations_elementcollection_jar.addClass(ee.jakarta.tck.persistence.core.annotations.elementcollection.A.class);
+    jpa_core_annotations_elementcollection_jar.addClass(ee.jakarta.tck.persistence.core.annotations.elementcollection.Address.class);
+    jpa_core_annotations_elementcollection_jar.addClass(ee.jakarta.tck.persistence.core.annotations.elementcollection.Customer.class);
+    jpa_core_annotations_elementcollection_jar.addClass(ee.jakarta.tck.persistence.core.annotations.elementcollection.CustomerXML.class);
+    ear.addAsLibrary(jpa_core_annotations_elementcollection_jar);
+    // Add ear submodules
+
+    JavaArchive jpa_core_annotations_elementcollection_appmanagedNoTx_vehicle_client_jar = ShrinkWrap.create(JavaArchive.class, "jpa_core_annotations_elementcollection_appmanagedNoTx_vehicle_client_jar");
+    jpa_core_annotations_elementcollection_appmanagedNoTx_vehicle_client_jar.addClass(ee.jakarta.tck.persistence.common.PMClientBase.class);
+    ear.addAsModule(jpa_core_annotations_elementcollection_appmanagedNoTx_vehicle_client_jar);
+
+    JavaArchive jpa_core_annotations_elementcollection_appmanagedNoTx_vehicle_ejb_jar = ShrinkWrap.create(JavaArchive.class, "jpa_core_annotations_elementcollection_appmanagedNoTx_vehicle_ejb_jar");
+    jpa_core_annotations_elementcollection_appmanagedNoTx_vehicle_ejb_jar.addClass(ee.jakarta.tck.persistence.common.PMClientBase.class);
+    jpa_core_annotations_elementcollection_appmanagedNoTx_vehicle_ejb_jar.addClass(ee.jakarta.tck.persistence.core.annotations.elementcollection.Client.class);
+    ear.addAsModule(jpa_core_annotations_elementcollection_appmanagedNoTx_vehicle_ejb_jar);
+
+    JavaArchive jpa_core_annotations_elementcollection_appmanaged_vehicle_client_jar = ShrinkWrap.create(JavaArchive.class, "jpa_core_annotations_elementcollection_appmanaged_vehicle_client_jar");
+    jpa_core_annotations_elementcollection_appmanaged_vehicle_client_jar.addClass(ee.jakarta.tck.persistence.common.PMClientBase.class);
+    ear.addAsModule(jpa_core_annotations_elementcollection_appmanaged_vehicle_client_jar);
+
+    JavaArchive jpa_core_annotations_elementcollection_appmanaged_vehicle_ejb_jar = ShrinkWrap.create(JavaArchive.class, "jpa_core_annotations_elementcollection_appmanaged_vehicle_ejb_jar");
+    jpa_core_annotations_elementcollection_appmanaged_vehicle_ejb_jar.addClass(ee.jakarta.tck.persistence.common.PMClientBase.class);
+    jpa_core_annotations_elementcollection_appmanaged_vehicle_ejb_jar.addClass(ee.jakarta.tck.persistence.core.annotations.elementcollection.Client.class);
+    ear.addAsModule(jpa_core_annotations_elementcollection_appmanaged_vehicle_ejb_jar);
+
+    WebArchive jpa_core_annotations_elementcollection_pmservlet_vehicle_web_war = ShrinkWrap.create(WebArchive.class, "jpa_core_annotations_elementcollection_pmservlet_vehicle_web_war");
+    jpa_core_annotations_elementcollection_pmservlet_vehicle_web_war.addAsWebInfResource("web.xml");
+
+    JavaArchive jpa_core_annotations_elementcollection_jar = ShrinkWrap.create(JavaArchive.class, "jpa_core_annotations_elementcollection.jar");
+    jpa_core_annotations_elementcollection_jar.addClass(ee.jakarta.tck.persistence.core.annotations.elementcollection.A.class);
+    jpa_core_annotations_elementcollection_jar.addClass(ee.jakarta.tck.persistence.core.annotations.elementcollection.Address.class);
+    jpa_core_annotations_elementcollection_jar.addClass(ee.jakarta.tck.persistence.core.annotations.elementcollection.Customer.class);
+    jpa_core_annotations_elementcollection_jar.addClass(ee.jakarta.tck.persistence.core.annotations.elementcollection.CustomerXML.class);
+    jpa_core_annotations_elementcollection_jar.addAsManifestResource("myMappingFile.xml");
+    jpa_core_annotations_elementcollection_jar.addAsManifestResource("META-INF/MANIFEST.MF");
+    jpa_core_annotations_elementcollection_jar.addAsManifestResource("META-INF/persistence.xml");
+    jpa_core_annotations_elementcollection_pmservlet_vehicle_web_war.addAsLibrary(jpa_core_annotations_elementcollection_jar);
+    jpa_core_annotations_elementcollection_pmservlet_vehicle_web_war.addClass(ee.jakarta.tck.persistence.common.PMClientBase.class);
+    jpa_core_annotations_elementcollection_pmservlet_vehicle_web_war.addClass(ee.jakarta.tck.persistence.core.annotations.elementcollection.Client.class);
+    ear.addAsModule(jpa_core_annotations_elementcollection_pmservlet_vehicle_web_war);
+
+    WebArchive jpa_core_annotations_elementcollection_puservlet_vehicle_web_war = ShrinkWrap.create(WebArchive.class, "jpa_core_annotations_elementcollection_puservlet_vehicle_web_war");
+    jpa_core_annotations_elementcollection_puservlet_vehicle_web_war.addAsWebInfResource("web.xml");
+
+    JavaArchive jpa_core_annotations_elementcollection_jar = ShrinkWrap.create(JavaArchive.class, "jpa_core_annotations_elementcollection.jar");
+    jpa_core_annotations_elementcollection_jar.addClass(ee.jakarta.tck.persistence.core.annotations.elementcollection.A.class);
+    jpa_core_annotations_elementcollection_jar.addClass(ee.jakarta.tck.persistence.core.annotations.elementcollection.Address.class);
+    jpa_core_annotations_elementcollection_jar.addClass(ee.jakarta.tck.persistence.core.annotations.elementcollection.Customer.class);
+    jpa_core_annotations_elementcollection_jar.addClass(ee.jakarta.tck.persistence.core.annotations.elementcollection.CustomerXML.class);
+    jpa_core_annotations_elementcollection_jar.addAsManifestResource("myMappingFile.xml");
+    jpa_core_annotations_elementcollection_jar.addAsManifestResource("META-INF/MANIFEST.MF");
+    jpa_core_annotations_elementcollection_jar.addAsManifestResource("META-INF/persistence.xml");
+    jpa_core_annotations_elementcollection_puservlet_vehicle_web_war.addAsLibrary(jpa_core_annotations_elementcollection_jar);
+    jpa_core_annotations_elementcollection_puservlet_vehicle_web_war.addClass(ee.jakarta.tck.persistence.common.PMClientBase.class);
+    jpa_core_annotations_elementcollection_puservlet_vehicle_web_war.addClass(ee.jakarta.tck.persistence.core.annotations.elementcollection.Client.class);
+    ear.addAsModule(jpa_core_annotations_elementcollection_puservlet_vehicle_web_war);
+
+    JavaArchive jpa_core_annotations_elementcollection_stateful3_vehicle_client_jar = ShrinkWrap.create(JavaArchive.class, "jpa_core_annotations_elementcollection_stateful3_vehicle_client_jar");
+    jpa_core_annotations_elementcollection_stateful3_vehicle_client_jar.addClass(ee.jakarta.tck.persistence.common.PMClientBase.class);
+    ear.addAsModule(jpa_core_annotations_elementcollection_stateful3_vehicle_client_jar);
+
+    JavaArchive jpa_core_annotations_elementcollection_stateful3_vehicle_ejb_jar = ShrinkWrap.create(JavaArchive.class, "jpa_core_annotations_elementcollection_stateful3_vehicle_ejb_jar");
+    jpa_core_annotations_elementcollection_stateful3_vehicle_ejb_jar.addClass(ee.jakarta.tck.persistence.common.PMClientBase.class);
+    jpa_core_annotations_elementcollection_stateful3_vehicle_ejb_jar.addClass(ee.jakarta.tck.persistence.core.annotations.elementcollection.Client.class);
+    ear.addAsModule(jpa_core_annotations_elementcollection_stateful3_vehicle_ejb_jar);
+
+    JavaArchive jpa_core_annotations_elementcollection_stateless3_vehicle_client_jar = ShrinkWrap.create(JavaArchive.class, "jpa_core_annotations_elementcollection_stateless3_vehicle_client_jar");
+    jpa_core_annotations_elementcollection_stateless3_vehicle_client_jar.addClass(ee.jakarta.tck.persistence.common.PMClientBase.class);
+    ear.addAsModule(jpa_core_annotations_elementcollection_stateless3_vehicle_client_jar);
+
+    JavaArchive jpa_core_annotations_elementcollection_stateless3_vehicle_ejb_jar = ShrinkWrap.create(JavaArchive.class, "jpa_core_annotations_elementcollection_stateless3_vehicle_ejb_jar");
+    jpa_core_annotations_elementcollection_stateless3_vehicle_ejb_jar.addClass(ee.jakarta.tck.persistence.common.PMClientBase.class);
+    jpa_core_annotations_elementcollection_stateless3_vehicle_ejb_jar.addClass(ee.jakarta.tck.persistence.core.annotations.elementcollection.Client.class);
+    ear.addAsModule(jpa_core_annotations_elementcollection_stateless3_vehicle_ejb_jar);
+    return ear;
+  }
+
 	public Client2() {
 	}
 
diff --git a/jpa/spec-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/embeddable/Client.java b/jpa/spec-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/embeddable/Client.java
index f8c879e12..2d900c101 100644
--- a/jpa/spec-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/embeddable/Client.java
+++ b/jpa/spec-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/embeddable/Client.java
@@ -17,8 +17,12 @@
 package ee.jakarta.tck.persistence.core.annotations.embeddable;
 
 import java.lang.System.Logger;
-
+import org.jboss.arquillian.container.test.api.Deployment;
+import org.jboss.shrinkwrap.api.Archive;
+import org.jboss.shrinkwrap.api.ShrinkWrap;
+import org.jboss.shrinkwrap.api.spec.EnterpriseArchive;
 import org.jboss.shrinkwrap.api.spec.JavaArchive;
+import org.jboss.shrinkwrap.api.spec.WebArchive;
 import org.junit.jupiter.api.AfterEach;
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
@@ -29,6 +33,86 @@ import jakarta.persistence.EntityTransaction;
 
 public class Client extends PMClientBase {
 
+  @Deployment(testable = false)
+  public static Archive<?> deployment() {
+
+    final EnterpriseArchive ear = ShrinkWrap.create(EnterpriseArchive.class, "jpa_core_annotations_embeddable_vehicles.ear");
+    // TODO: filter/eliminate the library jar classes that shouldn't be included
+    // Add ear/lib jars
+
+    JavaArchive jpa_core_annotations_embeddable_jar = ShrinkWrap.create(JavaArchive.class, "jpa_core_annotations_embeddable_jar");
+    jpa_core_annotations_embeddable_jar.addClass(ee.jakarta.tck.persistence.core.annotations.embeddable.Address.class);
+    jpa_core_annotations_embeddable_jar.addClass(ee.jakarta.tck.persistence.core.annotations.embeddable.B.class);
+    jpa_core_annotations_embeddable_jar.addClass(ee.jakarta.tck.persistence.core.annotations.embeddable.ZipCode.class);
+    ear.addAsLibrary(jpa_core_annotations_embeddable_jar);
+    // Add ear submodules
+
+    JavaArchive jpa_core_annotations_embeddable_appmanagedNoTx_vehicle_client_jar = ShrinkWrap.create(JavaArchive.class, "jpa_core_annotations_embeddable_appmanagedNoTx_vehicle_client_jar");
+    jpa_core_annotations_embeddable_appmanagedNoTx_vehicle_client_jar.addClass(ee.jakarta.tck.persistence.common.PMClientBase.class);
+    ear.addAsModule(jpa_core_annotations_embeddable_appmanagedNoTx_vehicle_client_jar);
+
+    JavaArchive jpa_core_annotations_embeddable_appmanagedNoTx_vehicle_ejb_jar = ShrinkWrap.create(JavaArchive.class, "jpa_core_annotations_embeddable_appmanagedNoTx_vehicle_ejb_jar");
+    jpa_core_annotations_embeddable_appmanagedNoTx_vehicle_ejb_jar.addClass(ee.jakarta.tck.persistence.common.PMClientBase.class);
+    jpa_core_annotations_embeddable_appmanagedNoTx_vehicle_ejb_jar.addClass(ee.jakarta.tck.persistence.core.annotations.embeddable.Client.class);
+    ear.addAsModule(jpa_core_annotations_embeddable_appmanagedNoTx_vehicle_ejb_jar);
+
+    JavaArchive jpa_core_annotations_embeddable_appmanaged_vehicle_client_jar = ShrinkWrap.create(JavaArchive.class, "jpa_core_annotations_embeddable_appmanaged_vehicle_client_jar");
+    jpa_core_annotations_embeddable_appmanaged_vehicle_client_jar.addClass(ee.jakarta.tck.persistence.common.PMClientBase.class);
+    ear.addAsModule(jpa_core_annotations_embeddable_appmanaged_vehicle_client_jar);
+
+    JavaArchive jpa_core_annotations_embeddable_appmanaged_vehicle_ejb_jar = ShrinkWrap.create(JavaArchive.class, "jpa_core_annotations_embeddable_appmanaged_vehicle_ejb_jar");
+    jpa_core_annotations_embeddable_appmanaged_vehicle_ejb_jar.addClass(ee.jakarta.tck.persistence.common.PMClientBase.class);
+    jpa_core_annotations_embeddable_appmanaged_vehicle_ejb_jar.addClass(ee.jakarta.tck.persistence.core.annotations.embeddable.Client.class);
+    ear.addAsModule(jpa_core_annotations_embeddable_appmanaged_vehicle_ejb_jar);
+
+    WebArchive jpa_core_annotations_embeddable_pmservlet_vehicle_web_war = ShrinkWrap.create(WebArchive.class, "jpa_core_annotations_embeddable_pmservlet_vehicle_web_war");
+    jpa_core_annotations_embeddable_pmservlet_vehicle_web_war.addAsWebInfResource("web.xml");
+
+    JavaArchive jpa_core_annotations_embeddable_jar = ShrinkWrap.create(JavaArchive.class, "jpa_core_annotations_embeddable.jar");
+    jpa_core_annotations_embeddable_jar.addClass(ee.jakarta.tck.persistence.core.annotations.embeddable.Address.class);
+    jpa_core_annotations_embeddable_jar.addClass(ee.jakarta.tck.persistence.core.annotations.embeddable.B.class);
+    jpa_core_annotations_embeddable_jar.addClass(ee.jakarta.tck.persistence.core.annotations.embeddable.ZipCode.class);
+    jpa_core_annotations_embeddable_jar.addAsManifestResource("META-INF/MANIFEST.MF");
+    jpa_core_annotations_embeddable_jar.addAsManifestResource("META-INF/persistence.xml");
+    jpa_core_annotations_embeddable_pmservlet_vehicle_web_war.addAsLibrary(jpa_core_annotations_embeddable_jar);
+    jpa_core_annotations_embeddable_pmservlet_vehicle_web_war.addClass(ee.jakarta.tck.persistence.common.PMClientBase.class);
+    jpa_core_annotations_embeddable_pmservlet_vehicle_web_war.addClass(ee.jakarta.tck.persistence.core.annotations.embeddable.Client.class);
+    ear.addAsModule(jpa_core_annotations_embeddable_pmservlet_vehicle_web_war);
+
+    WebArchive jpa_core_annotations_embeddable_puservlet_vehicle_web_war = ShrinkWrap.create(WebArchive.class, "jpa_core_annotations_embeddable_puservlet_vehicle_web_war");
+    jpa_core_annotations_embeddable_puservlet_vehicle_web_war.addAsWebInfResource("web.xml");
+
+    JavaArchive jpa_core_annotations_embeddable_jar = ShrinkWrap.create(JavaArchive.class, "jpa_core_annotations_embeddable.jar");
+    jpa_core_annotations_embeddable_jar.addClass(ee.jakarta.tck.persistence.core.annotations.embeddable.Address.class);
+    jpa_core_annotations_embeddable_jar.addClass(ee.jakarta.tck.persistence.core.annotations.embeddable.B.class);
+    jpa_core_annotations_embeddable_jar.addClass(ee.jakarta.tck.persistence.core.annotations.embeddable.ZipCode.class);
+    jpa_core_annotations_embeddable_jar.addAsManifestResource("META-INF/MANIFEST.MF");
+    jpa_core_annotations_embeddable_jar.addAsManifestResource("META-INF/persistence.xml");
+    jpa_core_annotations_embeddable_puservlet_vehicle_web_war.addAsLibrary(jpa_core_annotations_embeddable_jar);
+    jpa_core_annotations_embeddable_puservlet_vehicle_web_war.addClass(ee.jakarta.tck.persistence.common.PMClientBase.class);
+    jpa_core_annotations_embeddable_puservlet_vehicle_web_war.addClass(ee.jakarta.tck.persistence.core.annotations.embeddable.Client.class);
+    ear.addAsModule(jpa_core_annotations_embeddable_puservlet_vehicle_web_war);
+
+    JavaArchive jpa_core_annotations_embeddable_stateful3_vehicle_client_jar = ShrinkWrap.create(JavaArchive.class, "jpa_core_annotations_embeddable_stateful3_vehicle_client_jar");
+    jpa_core_annotations_embeddable_stateful3_vehicle_client_jar.addClass(ee.jakarta.tck.persistence.common.PMClientBase.class);
+    ear.addAsModule(jpa_core_annotations_embeddable_stateful3_vehicle_client_jar);
+
+    JavaArchive jpa_core_annotations_embeddable_stateful3_vehicle_ejb_jar = ShrinkWrap.create(JavaArchive.class, "jpa_core_annotations_embeddable_stateful3_vehicle_ejb_jar");
+    jpa_core_annotations_embeddable_stateful3_vehicle_ejb_jar.addClass(ee.jakarta.tck.persistence.common.PMClientBase.class);
+    jpa_core_annotations_embeddable_stateful3_vehicle_ejb_jar.addClass(ee.jakarta.tck.persistence.core.annotations.embeddable.Client.class);
+    ear.addAsModule(jpa_core_annotations_embeddable_stateful3_vehicle_ejb_jar);
+
+    JavaArchive jpa_core_annotations_embeddable_stateless3_vehicle_client_jar = ShrinkWrap.create(JavaArchive.class, "jpa_core_annotations_embeddable_stateless3_vehicle_client_jar");
+    jpa_core_annotations_embeddable_stateless3_vehicle_client_jar.addClass(ee.jakarta.tck.persistence.common.PMClientBase.class);
+    ear.addAsModule(jpa_core_annotations_embeddable_stateless3_vehicle_client_jar);
+
+    JavaArchive jpa_core_annotations_embeddable_stateless3_vehicle_ejb_jar = ShrinkWrap.create(JavaArchive.class, "jpa_core_annotations_embeddable_stateless3_vehicle_ejb_jar");
+    jpa_core_annotations_embeddable_stateless3_vehicle_ejb_jar.addClass(ee.jakarta.tck.persistence.common.PMClientBase.class);
+    jpa_core_annotations_embeddable_stateless3_vehicle_ejb_jar.addClass(ee.jakarta.tck.persistence.core.annotations.embeddable.Client.class);
+    ear.addAsModule(jpa_core_annotations_embeddable_stateless3_vehicle_ejb_jar);
+    return ear;
+  }
+
 	public Client() {
 	}
 
diff --git a/jpa/spec-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/embeddableMapValue/Client.java b/jpa/spec-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/embeddableMapValue/Client.java
index e940be89b..eddff082e 100644
--- a/jpa/spec-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/embeddableMapValue/Client.java
+++ b/jpa/spec-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/embeddableMapValue/Client.java
@@ -19,8 +19,12 @@ package ee.jakarta.tck.persistence.core.annotations.embeddableMapValue;
 import java.lang.System.Logger;
 import java.util.HashMap;
 import java.util.Map;
-
+import org.jboss.arquillian.container.test.api.Deployment;
+import org.jboss.shrinkwrap.api.Archive;
+import org.jboss.shrinkwrap.api.ShrinkWrap;
+import org.jboss.shrinkwrap.api.spec.EnterpriseArchive;
 import org.jboss.shrinkwrap.api.spec.JavaArchive;
+import org.jboss.shrinkwrap.api.spec.WebArchive;
 import org.junit.jupiter.api.AfterEach;
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
@@ -31,6 +35,83 @@ import jakarta.persistence.EntityTransaction;
 
 public class Client extends PMClientBase {
 
+  @Deployment(testable = false)
+  public static Archive<?> deployment() {
+
+    final EnterpriseArchive ear = ShrinkWrap.create(EnterpriseArchive.class, "jpa_core_annotations_embeddableMapValue_vehicles.ear");
+    // TODO: filter/eliminate the library jar classes that shouldn't be included
+    // Add ear/lib jars
+
+    JavaArchive jpa_core_annotations_embeddableMapValue_jar = ShrinkWrap.create(JavaArchive.class, "jpa_core_annotations_embeddableMapValue_jar");
+    jpa_core_annotations_embeddableMapValue_jar.addClass(ee.jakarta.tck.persistence.core.annotations.embeddableMapValue.Address.class);
+    jpa_core_annotations_embeddableMapValue_jar.addClass(ee.jakarta.tck.persistence.core.annotations.embeddableMapValue.Employee.class);
+    ear.addAsLibrary(jpa_core_annotations_embeddableMapValue_jar);
+    // Add ear submodules
+
+    JavaArchive jpa_core_annotations_embeddableMapValue_appmanagedNoTx_vehicle_client_jar = ShrinkWrap.create(JavaArchive.class, "jpa_core_annotations_embeddableMapValue_appmanagedNoTx_vehicle_client_jar");
+    jpa_core_annotations_embeddableMapValue_appmanagedNoTx_vehicle_client_jar.addClass(ee.jakarta.tck.persistence.common.PMClientBase.class);
+    ear.addAsModule(jpa_core_annotations_embeddableMapValue_appmanagedNoTx_vehicle_client_jar);
+
+    JavaArchive jpa_core_annotations_embeddableMapValue_appmanagedNoTx_vehicle_ejb_jar = ShrinkWrap.create(JavaArchive.class, "jpa_core_annotations_embeddableMapValue_appmanagedNoTx_vehicle_ejb_jar");
+    jpa_core_annotations_embeddableMapValue_appmanagedNoTx_vehicle_ejb_jar.addClass(ee.jakarta.tck.persistence.common.PMClientBase.class);
+    jpa_core_annotations_embeddableMapValue_appmanagedNoTx_vehicle_ejb_jar.addClass(ee.jakarta.tck.persistence.core.annotations.embeddableMapValue.Client.class);
+    ear.addAsModule(jpa_core_annotations_embeddableMapValue_appmanagedNoTx_vehicle_ejb_jar);
+
+    JavaArchive jpa_core_annotations_embeddableMapValue_appmanaged_vehicle_client_jar = ShrinkWrap.create(JavaArchive.class, "jpa_core_annotations_embeddableMapValue_appmanaged_vehicle_client_jar");
+    jpa_core_annotations_embeddableMapValue_appmanaged_vehicle_client_jar.addClass(ee.jakarta.tck.persistence.common.PMClientBase.class);
+    ear.addAsModule(jpa_core_annotations_embeddableMapValue_appmanaged_vehicle_client_jar);
+
+    JavaArchive jpa_core_annotations_embeddableMapValue_appmanaged_vehicle_ejb_jar = ShrinkWrap.create(JavaArchive.class, "jpa_core_annotations_embeddableMapValue_appmanaged_vehicle_ejb_jar");
+    jpa_core_annotations_embeddableMapValue_appmanaged_vehicle_ejb_jar.addClass(ee.jakarta.tck.persistence.common.PMClientBase.class);
+    jpa_core_annotations_embeddableMapValue_appmanaged_vehicle_ejb_jar.addClass(ee.jakarta.tck.persistence.core.annotations.embeddableMapValue.Client.class);
+    ear.addAsModule(jpa_core_annotations_embeddableMapValue_appmanaged_vehicle_ejb_jar);
+
+    WebArchive jpa_core_annotations_embeddableMapValue_pmservlet_vehicle_web_war = ShrinkWrap.create(WebArchive.class, "jpa_core_annotations_embeddableMapValue_pmservlet_vehicle_web_war");
+    jpa_core_annotations_embeddableMapValue_pmservlet_vehicle_web_war.addAsWebInfResource("web.xml");
+
+    JavaArchive jpa_core_annotations_embeddableMapValue_jar = ShrinkWrap.create(JavaArchive.class, "jpa_core_annotations_embeddableMapValue.jar");
+    jpa_core_annotations_embeddableMapValue_jar.addClass(ee.jakarta.tck.persistence.core.annotations.embeddableMapValue.Address.class);
+    jpa_core_annotations_embeddableMapValue_jar.addClass(ee.jakarta.tck.persistence.core.annotations.embeddableMapValue.Employee.class);
+    jpa_core_annotations_embeddableMapValue_jar.addAsManifestResource("META-INF/MANIFEST.MF");
+    jpa_core_annotations_embeddableMapValue_jar.addAsManifestResource("META-INF/persistence.xml");
+    jpa_core_annotations_embeddableMapValue_pmservlet_vehicle_web_war.addAsLibrary(jpa_core_annotations_embeddableMapValue_jar);
+    jpa_core_annotations_embeddableMapValue_pmservlet_vehicle_web_war.addClass(ee.jakarta.tck.persistence.common.PMClientBase.class);
+    jpa_core_annotations_embeddableMapValue_pmservlet_vehicle_web_war.addClass(ee.jakarta.tck.persistence.core.annotations.embeddableMapValue.Client.class);
+    ear.addAsModule(jpa_core_annotations_embeddableMapValue_pmservlet_vehicle_web_war);
+
+    WebArchive jpa_core_annotations_embeddableMapValue_puservlet_vehicle_web_war = ShrinkWrap.create(WebArchive.class, "jpa_core_annotations_embeddableMapValue_puservlet_vehicle_web_war");
+    jpa_core_annotations_embeddableMapValue_puservlet_vehicle_web_war.addAsWebInfResource("web.xml");
+
+    JavaArchive jpa_core_annotations_embeddableMapValue_jar = ShrinkWrap.create(JavaArchive.class, "jpa_core_annotations_embeddableMapValue.jar");
+    jpa_core_annotations_embeddableMapValue_jar.addClass(ee.jakarta.tck.persistence.core.annotations.embeddableMapValue.Address.class);
+    jpa_core_annotations_embeddableMapValue_jar.addClass(ee.jakarta.tck.persistence.core.annotations.embeddableMapValue.Employee.class);
+    jpa_core_annotations_embeddableMapValue_jar.addAsManifestResource("META-INF/MANIFEST.MF");
+    jpa_core_annotations_embeddableMapValue_jar.addAsManifestResource("META-INF/persistence.xml");
+    jpa_core_annotations_embeddableMapValue_puservlet_vehicle_web_war.addAsLibrary(jpa_core_annotations_embeddableMapValue_jar);
+    jpa_core_annotations_embeddableMapValue_puservlet_vehicle_web_war.addClass(ee.jakarta.tck.persistence.common.PMClientBase.class);
+    jpa_core_annotations_embeddableMapValue_puservlet_vehicle_web_war.addClass(ee.jakarta.tck.persistence.core.annotations.embeddableMapValue.Client.class);
+    ear.addAsModule(jpa_core_annotations_embeddableMapValue_puservlet_vehicle_web_war);
+
+    JavaArchive jpa_core_annotations_embeddableMapValue_stateful3_vehicle_client_jar = ShrinkWrap.create(JavaArchive.class, "jpa_core_annotations_embeddableMapValue_stateful3_vehicle_client_jar");
+    jpa_core_annotations_embeddableMapValue_stateful3_vehicle_client_jar.addClass(ee.jakarta.tck.persistence.common.PMClientBase.class);
+    ear.addAsModule(jpa_core_annotations_embeddableMapValue_stateful3_vehicle_client_jar);
+
+    JavaArchive jpa_core_annotations_embeddableMapValue_stateful3_vehicle_ejb_jar = ShrinkWrap.create(JavaArchive.class, "jpa_core_annotations_embeddableMapValue_stateful3_vehicle_ejb_jar");
+    jpa_core_annotations_embeddableMapValue_stateful3_vehicle_ejb_jar.addClass(ee.jakarta.tck.persistence.common.PMClientBase.class);
+    jpa_core_annotations_embeddableMapValue_stateful3_vehicle_ejb_jar.addClass(ee.jakarta.tck.persistence.core.annotations.embeddableMapValue.Client.class);
+    ear.addAsModule(jpa_core_annotations_embeddableMapValue_stateful3_vehicle_ejb_jar);
+
+    JavaArchive jpa_core_annotations_embeddableMapValue_stateless3_vehicle_client_jar = ShrinkWrap.create(JavaArchive.class, "jpa_core_annotations_embeddableMapValue_stateless3_vehicle_client_jar");
+    jpa_core_annotations_embeddableMapValue_stateless3_vehicle_client_jar.addClass(ee.jakarta.tck.persistence.common.PMClientBase.class);
+    ear.addAsModule(jpa_core_annotations_embeddableMapValue_stateless3_vehicle_client_jar);
+
+    JavaArchive jpa_core_annotations_embeddableMapValue_stateless3_vehicle_ejb_jar = ShrinkWrap.create(JavaArchive.class, "jpa_core_annotations_embeddableMapValue_stateless3_vehicle_ejb_jar");
+    jpa_core_annotations_embeddableMapValue_stateless3_vehicle_ejb_jar.addClass(ee.jakarta.tck.persistence.common.PMClientBase.class);
+    jpa_core_annotations_embeddableMapValue_stateless3_vehicle_ejb_jar.addClass(ee.jakarta.tck.persistence.core.annotations.embeddableMapValue.Client.class);
+    ear.addAsModule(jpa_core_annotations_embeddableMapValue_stateless3_vehicle_ejb_jar);
+    return ear;
+  }
+
 	public Client() {
 	}
 
diff --git a/jpa/spec-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/entity/Client.java b/jpa/spec-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/entity/Client.java
index 6ed641394..cf62de4c9 100644
--- a/jpa/spec-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/entity/Client.java
+++ b/jpa/spec-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/entity/Client.java
@@ -24,8 +24,12 @@ import java.lang.System.Logger;
 import java.util.Arrays;
 import java.util.Iterator;
 import java.util.List;
-
+import org.jboss.arquillian.container.test.api.Deployment;
+import org.jboss.shrinkwrap.api.Archive;
+import org.jboss.shrinkwrap.api.ShrinkWrap;
+import org.jboss.shrinkwrap.api.spec.EnterpriseArchive;
 import org.jboss.shrinkwrap.api.spec.JavaArchive;
+import org.jboss.shrinkwrap.api.spec.WebArchive;
 import org.junit.jupiter.api.AfterEach;
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
@@ -34,6 +38,80 @@ import ee.jakarta.tck.persistence.common.PMClientBase;
 
 public class Client extends PMClientBase {
 
+  @Deployment(testable = false)
+  public static Archive<?> deployment() {
+
+    final EnterpriseArchive ear = ShrinkWrap.create(EnterpriseArchive.class, "jpa_core_annotations_entity_vehicles.ear");
+    // TODO: filter/eliminate the library jar classes that shouldn't be included
+    // Add ear/lib jars
+
+    JavaArchive jpa_core_annotations_entity_jar = ShrinkWrap.create(JavaArchive.class, "jpa_core_annotations_entity_jar");
+    jpa_core_annotations_entity_jar.addClass(ee.jakarta.tck.persistence.core.annotations.entity.Coffee.class);
+    ear.addAsLibrary(jpa_core_annotations_entity_jar);
+    // Add ear submodules
+
+    JavaArchive jpa_core_annotations_entity_appmanagedNoTx_vehicle_client_jar = ShrinkWrap.create(JavaArchive.class, "jpa_core_annotations_entity_appmanagedNoTx_vehicle_client_jar");
+    jpa_core_annotations_entity_appmanagedNoTx_vehicle_client_jar.addClass(ee.jakarta.tck.persistence.common.PMClientBase.class);
+    ear.addAsModule(jpa_core_annotations_entity_appmanagedNoTx_vehicle_client_jar);
+
+    JavaArchive jpa_core_annotations_entity_appmanagedNoTx_vehicle_ejb_jar = ShrinkWrap.create(JavaArchive.class, "jpa_core_annotations_entity_appmanagedNoTx_vehicle_ejb_jar");
+    jpa_core_annotations_entity_appmanagedNoTx_vehicle_ejb_jar.addClass(ee.jakarta.tck.persistence.common.PMClientBase.class);
+    jpa_core_annotations_entity_appmanagedNoTx_vehicle_ejb_jar.addClass(ee.jakarta.tck.persistence.core.annotations.entity.Client.class);
+    ear.addAsModule(jpa_core_annotations_entity_appmanagedNoTx_vehicle_ejb_jar);
+
+    JavaArchive jpa_core_annotations_entity_appmanaged_vehicle_client_jar = ShrinkWrap.create(JavaArchive.class, "jpa_core_annotations_entity_appmanaged_vehicle_client_jar");
+    jpa_core_annotations_entity_appmanaged_vehicle_client_jar.addClass(ee.jakarta.tck.persistence.common.PMClientBase.class);
+    ear.addAsModule(jpa_core_annotations_entity_appmanaged_vehicle_client_jar);
+
+    JavaArchive jpa_core_annotations_entity_appmanaged_vehicle_ejb_jar = ShrinkWrap.create(JavaArchive.class, "jpa_core_annotations_entity_appmanaged_vehicle_ejb_jar");
+    jpa_core_annotations_entity_appmanaged_vehicle_ejb_jar.addClass(ee.jakarta.tck.persistence.common.PMClientBase.class);
+    jpa_core_annotations_entity_appmanaged_vehicle_ejb_jar.addClass(ee.jakarta.tck.persistence.core.annotations.entity.Client.class);
+    ear.addAsModule(jpa_core_annotations_entity_appmanaged_vehicle_ejb_jar);
+
+    WebArchive jpa_core_annotations_entity_pmservlet_vehicle_web_war = ShrinkWrap.create(WebArchive.class, "jpa_core_annotations_entity_pmservlet_vehicle_web_war");
+    jpa_core_annotations_entity_pmservlet_vehicle_web_war.addAsWebInfResource("web.xml");
+
+    JavaArchive jpa_core_annotations_entity_jar = ShrinkWrap.create(JavaArchive.class, "jpa_core_annotations_entity.jar");
+    jpa_core_annotations_entity_jar.addClass(ee.jakarta.tck.persistence.core.annotations.entity.Coffee.class);
+    jpa_core_annotations_entity_jar.addAsManifestResource("META-INF/MANIFEST.MF");
+    jpa_core_annotations_entity_jar.addAsManifestResource("META-INF/persistence.xml");
+    jpa_core_annotations_entity_pmservlet_vehicle_web_war.addAsLibrary(jpa_core_annotations_entity_jar);
+    jpa_core_annotations_entity_pmservlet_vehicle_web_war.addClass(ee.jakarta.tck.persistence.common.PMClientBase.class);
+    jpa_core_annotations_entity_pmservlet_vehicle_web_war.addClass(ee.jakarta.tck.persistence.core.annotations.entity.Client.class);
+    ear.addAsModule(jpa_core_annotations_entity_pmservlet_vehicle_web_war);
+
+    WebArchive jpa_core_annotations_entity_puservlet_vehicle_web_war = ShrinkWrap.create(WebArchive.class, "jpa_core_annotations_entity_puservlet_vehicle_web_war");
+    jpa_core_annotations_entity_puservlet_vehicle_web_war.addAsWebInfResource("web.xml");
+
+    JavaArchive jpa_core_annotations_entity_jar = ShrinkWrap.create(JavaArchive.class, "jpa_core_annotations_entity.jar");
+    jpa_core_annotations_entity_jar.addClass(ee.jakarta.tck.persistence.core.annotations.entity.Coffee.class);
+    jpa_core_annotations_entity_jar.addAsManifestResource("META-INF/MANIFEST.MF");
+    jpa_core_annotations_entity_jar.addAsManifestResource("META-INF/persistence.xml");
+    jpa_core_annotations_entity_puservlet_vehicle_web_war.addAsLibrary(jpa_core_annotations_entity_jar);
+    jpa_core_annotations_entity_puservlet_vehicle_web_war.addClass(ee.jakarta.tck.persistence.common.PMClientBase.class);
+    jpa_core_annotations_entity_puservlet_vehicle_web_war.addClass(ee.jakarta.tck.persistence.core.annotations.entity.Client.class);
+    ear.addAsModule(jpa_core_annotations_entity_puservlet_vehicle_web_war);
+
+    JavaArchive jpa_core_annotations_entity_stateful3_vehicle_client_jar = ShrinkWrap.create(JavaArchive.class, "jpa_core_annotations_entity_stateful3_vehicle_client_jar");
+    jpa_core_annotations_entity_stateful3_vehicle_client_jar.addClass(ee.jakarta.tck.persistence.common.PMClientBase.class);
+    ear.addAsModule(jpa_core_annotations_entity_stateful3_vehicle_client_jar);
+
+    JavaArchive jpa_core_annotations_entity_stateful3_vehicle_ejb_jar = ShrinkWrap.create(JavaArchive.class, "jpa_core_annotations_entity_stateful3_vehicle_ejb_jar");
+    jpa_core_annotations_entity_stateful3_vehicle_ejb_jar.addClass(ee.jakarta.tck.persistence.common.PMClientBase.class);
+    jpa_core_annotations_entity_stateful3_vehicle_ejb_jar.addClass(ee.jakarta.tck.persistence.core.annotations.entity.Client.class);
+    ear.addAsModule(jpa_core_annotations_entity_stateful3_vehicle_ejb_jar);
+
+    JavaArchive jpa_core_annotations_entity_stateless3_vehicle_client_jar = ShrinkWrap.create(JavaArchive.class, "jpa_core_annotations_entity_stateless3_vehicle_client_jar");
+    jpa_core_annotations_entity_stateless3_vehicle_client_jar.addClass(ee.jakarta.tck.persistence.common.PMClientBase.class);
+    ear.addAsModule(jpa_core_annotations_entity_stateless3_vehicle_client_jar);
+
+    JavaArchive jpa_core_annotations_entity_stateless3_vehicle_ejb_jar = ShrinkWrap.create(JavaArchive.class, "jpa_core_annotations_entity_stateless3_vehicle_ejb_jar");
+    jpa_core_annotations_entity_stateless3_vehicle_ejb_jar.addClass(ee.jakarta.tck.persistence.common.PMClientBase.class);
+    jpa_core_annotations_entity_stateless3_vehicle_ejb_jar.addClass(ee.jakarta.tck.persistence.core.annotations.entity.Client.class);
+    ear.addAsModule(jpa_core_annotations_entity_stateless3_vehicle_ejb_jar);
+    return ear;
+  }
+
 	private static Coffee cRef[] = new Coffee[5];
 
 	public Client() {
diff --git a/jpa/spec-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/id/Client.java b/jpa/spec-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/id/Client.java
index 5d75da345..e6481fcf8 100644
--- a/jpa/spec-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/id/Client.java
+++ b/jpa/spec-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/id/Client.java
@@ -19,8 +19,12 @@ package ee.jakarta.tck.persistence.core.annotations.id;
 import java.lang.System.Logger;
 import java.math.BigDecimal;
 import java.math.BigInteger;
-
+import org.jboss.arquillian.container.test.api.Deployment;
+import org.jboss.shrinkwrap.api.Archive;
+import org.jboss.shrinkwrap.api.ShrinkWrap;
+import org.jboss.shrinkwrap.api.spec.EnterpriseArchive;
 import org.jboss.shrinkwrap.api.spec.JavaArchive;
+import org.jboss.shrinkwrap.api.spec.WebArchive;
 import org.junit.jupiter.api.AfterEach;
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
@@ -29,6 +33,119 @@ import ee.jakarta.tck.persistence.common.PMClientBase;
 
 public class Client extends PMClientBase {
 
+  @Deployment(testable = false)
+  public static Archive<?> deployment() {
+
+    final EnterpriseArchive ear = ShrinkWrap.create(EnterpriseArchive.class, "jpa_core_annotations_basic_vehicles.ear");
+    // TODO: filter/eliminate the library jar classes that shouldn't be included
+    // Add ear/lib jars
+
+    JavaArchive jpa_core_annotations_basic_jar = ShrinkWrap.create(JavaArchive.class, "jpa_core_annotations_basic_jar");
+    jpa_core_annotations_basic_jar.addClass(ee.jakarta.tck.persistence.core.annotations.id.FieldBigDecimalId.class);
+    jpa_core_annotations_basic_jar.addClass(ee.jakarta.tck.persistence.core.annotations.id.FieldBigIntegerId.class);
+    jpa_core_annotations_basic_jar.addClass(ee.jakarta.tck.persistence.core.annotations.id.FieldIntId.class);
+    jpa_core_annotations_basic_jar.addClass(ee.jakarta.tck.persistence.core.annotations.id.FieldIntegerId.class);
+    jpa_core_annotations_basic_jar.addClass(ee.jakarta.tck.persistence.core.annotations.id.FieldSQLDateId.class);
+    jpa_core_annotations_basic_jar.addClass(ee.jakarta.tck.persistence.core.annotations.id.FieldStringId.class);
+    jpa_core_annotations_basic_jar.addClass(ee.jakarta.tck.persistence.core.annotations.id.FieldUtilDateId.class);
+    jpa_core_annotations_basic_jar.addClass(ee.jakarta.tck.persistence.core.annotations.id.PropertyBigDecimalId.class);
+    jpa_core_annotations_basic_jar.addClass(ee.jakarta.tck.persistence.core.annotations.id.PropertyBigIntegerId.class);
+    jpa_core_annotations_basic_jar.addClass(ee.jakarta.tck.persistence.core.annotations.id.PropertyIntId.class);
+    jpa_core_annotations_basic_jar.addClass(ee.jakarta.tck.persistence.core.annotations.id.PropertyIntegerId.class);
+    jpa_core_annotations_basic_jar.addClass(ee.jakarta.tck.persistence.core.annotations.id.PropertySQLDateId.class);
+    jpa_core_annotations_basic_jar.addClass(ee.jakarta.tck.persistence.core.annotations.id.PropertyStringId.class);
+    jpa_core_annotations_basic_jar.addClass(ee.jakarta.tck.persistence.core.annotations.id.PropertyUtilDateId.class);
+    ear.addAsLibrary(jpa_core_annotations_basic_jar);
+    // Add ear submodules
+
+    JavaArchive jpa_core_annotations_basic_appmanagedNoTx_vehicle_client_jar = ShrinkWrap.create(JavaArchive.class, "jpa_core_annotations_basic_appmanagedNoTx_vehicle_client_jar");
+    jpa_core_annotations_basic_appmanagedNoTx_vehicle_client_jar.addClass(ee.jakarta.tck.persistence.common.PMClientBase.class);
+    ear.addAsModule(jpa_core_annotations_basic_appmanagedNoTx_vehicle_client_jar);
+
+    JavaArchive jpa_core_annotations_basic_appmanagedNoTx_vehicle_ejb_jar = ShrinkWrap.create(JavaArchive.class, "jpa_core_annotations_basic_appmanagedNoTx_vehicle_ejb_jar");
+    jpa_core_annotations_basic_appmanagedNoTx_vehicle_ejb_jar.addClass(ee.jakarta.tck.persistence.common.PMClientBase.class);
+    jpa_core_annotations_basic_appmanagedNoTx_vehicle_ejb_jar.addClass(ee.jakarta.tck.persistence.core.annotations.id.Client.class);
+    ear.addAsModule(jpa_core_annotations_basic_appmanagedNoTx_vehicle_ejb_jar);
+
+    JavaArchive jpa_core_annotations_basic_appmanaged_vehicle_client_jar = ShrinkWrap.create(JavaArchive.class, "jpa_core_annotations_basic_appmanaged_vehicle_client_jar");
+    jpa_core_annotations_basic_appmanaged_vehicle_client_jar.addClass(ee.jakarta.tck.persistence.common.PMClientBase.class);
+    ear.addAsModule(jpa_core_annotations_basic_appmanaged_vehicle_client_jar);
+
+    JavaArchive jpa_core_annotations_basic_appmanaged_vehicle_ejb_jar = ShrinkWrap.create(JavaArchive.class, "jpa_core_annotations_basic_appmanaged_vehicle_ejb_jar");
+    jpa_core_annotations_basic_appmanaged_vehicle_ejb_jar.addClass(ee.jakarta.tck.persistence.common.PMClientBase.class);
+    jpa_core_annotations_basic_appmanaged_vehicle_ejb_jar.addClass(ee.jakarta.tck.persistence.core.annotations.id.Client.class);
+    ear.addAsModule(jpa_core_annotations_basic_appmanaged_vehicle_ejb_jar);
+
+    WebArchive jpa_core_annotations_basic_pmservlet_vehicle_web_war = ShrinkWrap.create(WebArchive.class, "jpa_core_annotations_basic_pmservlet_vehicle_web_war");
+    jpa_core_annotations_basic_pmservlet_vehicle_web_war.addAsWebInfResource("web.xml");
+
+    JavaArchive jpa_core_annotations_basic_jar = ShrinkWrap.create(JavaArchive.class, "jpa_core_annotations_basic.jar");
+    jpa_core_annotations_basic_jar.addClass(ee.jakarta.tck.persistence.core.annotations.id.FieldBigDecimalId.class);
+    jpa_core_annotations_basic_jar.addClass(ee.jakarta.tck.persistence.core.annotations.id.FieldBigIntegerId.class);
+    jpa_core_annotations_basic_jar.addClass(ee.jakarta.tck.persistence.core.annotations.id.FieldIntId.class);
+    jpa_core_annotations_basic_jar.addClass(ee.jakarta.tck.persistence.core.annotations.id.FieldIntegerId.class);
+    jpa_core_annotations_basic_jar.addClass(ee.jakarta.tck.persistence.core.annotations.id.FieldSQLDateId.class);
+    jpa_core_annotations_basic_jar.addClass(ee.jakarta.tck.persistence.core.annotations.id.FieldStringId.class);
+    jpa_core_annotations_basic_jar.addClass(ee.jakarta.tck.persistence.core.annotations.id.FieldUtilDateId.class);
+    jpa_core_annotations_basic_jar.addClass(ee.jakarta.tck.persistence.core.annotations.id.PropertyBigDecimalId.class);
+    jpa_core_annotations_basic_jar.addClass(ee.jakarta.tck.persistence.core.annotations.id.PropertyBigIntegerId.class);
+    jpa_core_annotations_basic_jar.addClass(ee.jakarta.tck.persistence.core.annotations.id.PropertyIntId.class);
+    jpa_core_annotations_basic_jar.addClass(ee.jakarta.tck.persistence.core.annotations.id.PropertyIntegerId.class);
+    jpa_core_annotations_basic_jar.addClass(ee.jakarta.tck.persistence.core.annotations.id.PropertySQLDateId.class);
+    jpa_core_annotations_basic_jar.addClass(ee.jakarta.tck.persistence.core.annotations.id.PropertyStringId.class);
+    jpa_core_annotations_basic_jar.addClass(ee.jakarta.tck.persistence.core.annotations.id.PropertyUtilDateId.class);
+    jpa_core_annotations_basic_jar.addAsManifestResource("META-INF/MANIFEST.MF");
+    jpa_core_annotations_basic_jar.addAsManifestResource("META-INF/persistence.xml");
+    jpa_core_annotations_basic_pmservlet_vehicle_web_war.addAsLibrary(jpa_core_annotations_basic_jar);
+    jpa_core_annotations_basic_pmservlet_vehicle_web_war.addClass(ee.jakarta.tck.persistence.common.PMClientBase.class);
+    jpa_core_annotations_basic_pmservlet_vehicle_web_war.addClass(ee.jakarta.tck.persistence.core.annotations.id.Client.class);
+    ear.addAsModule(jpa_core_annotations_basic_pmservlet_vehicle_web_war);
+
+    WebArchive jpa_core_annotations_basic_puservlet_vehicle_web_war = ShrinkWrap.create(WebArchive.class, "jpa_core_annotations_basic_puservlet_vehicle_web_war");
+    jpa_core_annotations_basic_puservlet_vehicle_web_war.addAsWebInfResource("web.xml");
+
+    JavaArchive jpa_core_annotations_basic_jar = ShrinkWrap.create(JavaArchive.class, "jpa_core_annotations_basic.jar");
+    jpa_core_annotations_basic_jar.addClass(ee.jakarta.tck.persistence.core.annotations.id.FieldBigDecimalId.class);
+    jpa_core_annotations_basic_jar.addClass(ee.jakarta.tck.persistence.core.annotations.id.FieldBigIntegerId.class);
+    jpa_core_annotations_basic_jar.addClass(ee.jakarta.tck.persistence.core.annotations.id.FieldIntId.class);
+    jpa_core_annotations_basic_jar.addClass(ee.jakarta.tck.persistence.core.annotations.id.FieldIntegerId.class);
+    jpa_core_annotations_basic_jar.addClass(ee.jakarta.tck.persistence.core.annotations.id.FieldSQLDateId.class);
+    jpa_core_annotations_basic_jar.addClass(ee.jakarta.tck.persistence.core.annotations.id.FieldStringId.class);
+    jpa_core_annotations_basic_jar.addClass(ee.jakarta.tck.persistence.core.annotations.id.FieldUtilDateId.class);
+    jpa_core_annotations_basic_jar.addClass(ee.jakarta.tck.persistence.core.annotations.id.PropertyBigDecimalId.class);
+    jpa_core_annotations_basic_jar.addClass(ee.jakarta.tck.persistence.core.annotations.id.PropertyBigIntegerId.class);
+    jpa_core_annotations_basic_jar.addClass(ee.jakarta.tck.persistence.core.annotations.id.PropertyIntId.class);
+    jpa_core_annotations_basic_jar.addClass(ee.jakarta.tck.persistence.core.annotations.id.PropertyIntegerId.class);
+    jpa_core_annotations_basic_jar.addClass(ee.jakarta.tck.persistence.core.annotations.id.PropertySQLDateId.class);
+    jpa_core_annotations_basic_jar.addClass(ee.jakarta.tck.persistence.core.annotations.id.PropertyStringId.class);
+    jpa_core_annotations_basic_jar.addClass(ee.jakarta.tck.persistence.core.annotations.id.PropertyUtilDateId.class);
+    jpa_core_annotations_basic_jar.addAsManifestResource("META-INF/MANIFEST.MF");
+    jpa_core_annotations_basic_jar.addAsManifestResource("META-INF/persistence.xml");
+    jpa_core_annotations_basic_puservlet_vehicle_web_war.addAsLibrary(jpa_core_annotations_basic_jar);
+    jpa_core_annotations_basic_puservlet_vehicle_web_war.addClass(ee.jakarta.tck.persistence.common.PMClientBase.class);
+    jpa_core_annotations_basic_puservlet_vehicle_web_war.addClass(ee.jakarta.tck.persistence.core.annotations.id.Client.class);
+    ear.addAsModule(jpa_core_annotations_basic_puservlet_vehicle_web_war);
+
+    JavaArchive jpa_core_annotations_basic_stateful3_vehicle_client_jar = ShrinkWrap.create(JavaArchive.class, "jpa_core_annotations_basic_stateful3_vehicle_client_jar");
+    jpa_core_annotations_basic_stateful3_vehicle_client_jar.addClass(ee.jakarta.tck.persistence.common.PMClientBase.class);
+    ear.addAsModule(jpa_core_annotations_basic_stateful3_vehicle_client_jar);
+
+    JavaArchive jpa_core_annotations_basic_stateful3_vehicle_ejb_jar = ShrinkWrap.create(JavaArchive.class, "jpa_core_annotations_basic_stateful3_vehicle_ejb_jar");
+    jpa_core_annotations_basic_stateful3_vehicle_ejb_jar.addClass(ee.jakarta.tck.persistence.common.PMClientBase.class);
+    jpa_core_annotations_basic_stateful3_vehicle_ejb_jar.addClass(ee.jakarta.tck.persistence.core.annotations.id.Client.class);
+    ear.addAsModule(jpa_core_annotations_basic_stateful3_vehicle_ejb_jar);
+
+    JavaArchive jpa_core_annotations_basic_stateless3_vehicle_client_jar = ShrinkWrap.create(JavaArchive.class, "jpa_core_annotations_basic_stateless3_vehicle_client_jar");
+    jpa_core_annotations_basic_stateless3_vehicle_client_jar.addClass(ee.jakarta.tck.persistence.common.PMClientBase.class);
+    ear.addAsModule(jpa_core_annotations_basic_stateless3_vehicle_client_jar);
+
+    JavaArchive jpa_core_annotations_basic_stateless3_vehicle_ejb_jar = ShrinkWrap.create(JavaArchive.class, "jpa_core_annotations_basic_stateless3_vehicle_ejb_jar");
+    jpa_core_annotations_basic_stateless3_vehicle_ejb_jar.addClass(ee.jakarta.tck.persistence.common.PMClientBase.class);
+    jpa_core_annotations_basic_stateless3_vehicle_ejb_jar.addClass(ee.jakarta.tck.persistence.core.annotations.id.Client.class);
+    ear.addAsModule(jpa_core_annotations_basic_stateless3_vehicle_ejb_jar);
+    return ear;
+  }
+
 	public Client() {
 	}
 
diff --git a/jpa/spec-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/lob/Client.java b/jpa/spec-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/lob/Client.java
index e1ea0ef4c..45acf6acc 100644
--- a/jpa/spec-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/lob/Client.java
+++ b/jpa/spec-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/lob/Client.java
@@ -18,8 +18,12 @@ package ee.jakarta.tck.persistence.core.annotations.lob;
 
 import java.lang.System.Logger;
 import java.util.Arrays;
-
+import org.jboss.arquillian.container.test.api.Deployment;
+import org.jboss.shrinkwrap.api.Archive;
+import org.jboss.shrinkwrap.api.ShrinkWrap;
+import org.jboss.shrinkwrap.api.spec.EnterpriseArchive;
 import org.jboss.shrinkwrap.api.spec.JavaArchive;
+import org.jboss.shrinkwrap.api.spec.WebArchive;
 import org.junit.jupiter.api.AfterEach;
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
@@ -28,6 +32,80 @@ import ee.jakarta.tck.persistence.common.PMClientBase;
 
 public class Client extends PMClientBase {
 
+  @Deployment(testable = false)
+  public static Archive<?> deployment() {
+
+    final EnterpriseArchive ear = ShrinkWrap.create(EnterpriseArchive.class, "jpa_core_annotations_lob_vehicles.ear");
+    // TODO: filter/eliminate the library jar classes that shouldn't be included
+    // Add ear/lib jars
+
+    JavaArchive jpa_core_annotations_lob_jar = ShrinkWrap.create(JavaArchive.class, "jpa_core_annotations_lob_jar");
+    jpa_core_annotations_lob_jar.addClass(ee.jakarta.tck.persistence.core.annotations.lob.DataTypes.class);
+    ear.addAsLibrary(jpa_core_annotations_lob_jar);
+    // Add ear submodules
+
+    JavaArchive jpa_core_annotations_lob_appmanagedNoTx_vehicle_client_jar = ShrinkWrap.create(JavaArchive.class, "jpa_core_annotations_lob_appmanagedNoTx_vehicle_client_jar");
+    jpa_core_annotations_lob_appmanagedNoTx_vehicle_client_jar.addClass(ee.jakarta.tck.persistence.common.PMClientBase.class);
+    ear.addAsModule(jpa_core_annotations_lob_appmanagedNoTx_vehicle_client_jar);
+
+    JavaArchive jpa_core_annotations_lob_appmanagedNoTx_vehicle_ejb_jar = ShrinkWrap.create(JavaArchive.class, "jpa_core_annotations_lob_appmanagedNoTx_vehicle_ejb_jar");
+    jpa_core_annotations_lob_appmanagedNoTx_vehicle_ejb_jar.addClass(ee.jakarta.tck.persistence.common.PMClientBase.class);
+    jpa_core_annotations_lob_appmanagedNoTx_vehicle_ejb_jar.addClass(ee.jakarta.tck.persistence.core.annotations.lob.Client.class);
+    ear.addAsModule(jpa_core_annotations_lob_appmanagedNoTx_vehicle_ejb_jar);
+
+    JavaArchive jpa_core_annotations_lob_appmanaged_vehicle_client_jar = ShrinkWrap.create(JavaArchive.class, "jpa_core_annotations_lob_appmanaged_vehicle_client_jar");
+    jpa_core_annotations_lob_appmanaged_vehicle_client_jar.addClass(ee.jakarta.tck.persistence.common.PMClientBase.class);
+    ear.addAsModule(jpa_core_annotations_lob_appmanaged_vehicle_client_jar);
+
+    JavaArchive jpa_core_annotations_lob_appmanaged_vehicle_ejb_jar = ShrinkWrap.create(JavaArchive.class, "jpa_core_annotations_lob_appmanaged_vehicle_ejb_jar");
+    jpa_core_annotations_lob_appmanaged_vehicle_ejb_jar.addClass(ee.jakarta.tck.persistence.common.PMClientBase.class);
+    jpa_core_annotations_lob_appmanaged_vehicle_ejb_jar.addClass(ee.jakarta.tck.persistence.core.annotations.lob.Client.class);
+    ear.addAsModule(jpa_core_annotations_lob_appmanaged_vehicle_ejb_jar);
+
+    WebArchive jpa_core_annotations_lob_pmservlet_vehicle_web_war = ShrinkWrap.create(WebArchive.class, "jpa_core_annotations_lob_pmservlet_vehicle_web_war");
+    jpa_core_annotations_lob_pmservlet_vehicle_web_war.addAsWebInfResource("web.xml");
+
+    JavaArchive jpa_core_annotations_lob_jar = ShrinkWrap.create(JavaArchive.class, "jpa_core_annotations_lob.jar");
+    jpa_core_annotations_lob_jar.addClass(ee.jakarta.tck.persistence.core.annotations.lob.DataTypes.class);
+    jpa_core_annotations_lob_jar.addAsManifestResource("META-INF/MANIFEST.MF");
+    jpa_core_annotations_lob_jar.addAsManifestResource("META-INF/persistence.xml");
+    jpa_core_annotations_lob_pmservlet_vehicle_web_war.addAsLibrary(jpa_core_annotations_lob_jar);
+    jpa_core_annotations_lob_pmservlet_vehicle_web_war.addClass(ee.jakarta.tck.persistence.common.PMClientBase.class);
+    jpa_core_annotations_lob_pmservlet_vehicle_web_war.addClass(ee.jakarta.tck.persistence.core.annotations.lob.Client.class);
+    ear.addAsModule(jpa_core_annotations_lob_pmservlet_vehicle_web_war);
+
+    WebArchive jpa_core_annotations_lob_puservlet_vehicle_web_war = ShrinkWrap.create(WebArchive.class, "jpa_core_annotations_lob_puservlet_vehicle_web_war");
+    jpa_core_annotations_lob_puservlet_vehicle_web_war.addAsWebInfResource("web.xml");
+
+    JavaArchive jpa_core_annotations_lob_jar = ShrinkWrap.create(JavaArchive.class, "jpa_core_annotations_lob.jar");
+    jpa_core_annotations_lob_jar.addClass(ee.jakarta.tck.persistence.core.annotations.lob.DataTypes.class);
+    jpa_core_annotations_lob_jar.addAsManifestResource("META-INF/MANIFEST.MF");
+    jpa_core_annotations_lob_jar.addAsManifestResource("META-INF/persistence.xml");
+    jpa_core_annotations_lob_puservlet_vehicle_web_war.addAsLibrary(jpa_core_annotations_lob_jar);
+    jpa_core_annotations_lob_puservlet_vehicle_web_war.addClass(ee.jakarta.tck.persistence.common.PMClientBase.class);
+    jpa_core_annotations_lob_puservlet_vehicle_web_war.addClass(ee.jakarta.tck.persistence.core.annotations.lob.Client.class);
+    ear.addAsModule(jpa_core_annotations_lob_puservlet_vehicle_web_war);
+
+    JavaArchive jpa_core_annotations_lob_stateful3_vehicle_client_jar = ShrinkWrap.create(JavaArchive.class, "jpa_core_annotations_lob_stateful3_vehicle_client_jar");
+    jpa_core_annotations_lob_stateful3_vehicle_client_jar.addClass(ee.jakarta.tck.persistence.common.PMClientBase.class);
+    ear.addAsModule(jpa_core_annotations_lob_stateful3_vehicle_client_jar);
+
+    JavaArchive jpa_core_annotations_lob_stateful3_vehicle_ejb_jar = ShrinkWrap.create(JavaArchive.class, "jpa_core_annotations_lob_stateful3_vehicle_ejb_jar");
+    jpa_core_annotations_lob_stateful3_vehicle_ejb_jar.addClass(ee.jakarta.tck.persistence.common.PMClientBase.class);
+    jpa_core_annotations_lob_stateful3_vehicle_ejb_jar.addClass(ee.jakarta.tck.persistence.core.annotations.lob.Client.class);
+    ear.addAsModule(jpa_core_annotations_lob_stateful3_vehicle_ejb_jar);
+
+    JavaArchive jpa_core_annotations_lob_stateless3_vehicle_client_jar = ShrinkWrap.create(JavaArchive.class, "jpa_core_annotations_lob_stateless3_vehicle_client_jar");
+    jpa_core_annotations_lob_stateless3_vehicle_client_jar.addClass(ee.jakarta.tck.persistence.common.PMClientBase.class);
+    ear.addAsModule(jpa_core_annotations_lob_stateless3_vehicle_client_jar);
+
+    JavaArchive jpa_core_annotations_lob_stateless3_vehicle_ejb_jar = ShrinkWrap.create(JavaArchive.class, "jpa_core_annotations_lob_stateless3_vehicle_ejb_jar");
+    jpa_core_annotations_lob_stateless3_vehicle_ejb_jar.addClass(ee.jakarta.tck.persistence.common.PMClientBase.class);
+    jpa_core_annotations_lob_stateless3_vehicle_ejb_jar.addClass(ee.jakarta.tck.persistence.core.annotations.lob.Client.class);
+    ear.addAsModule(jpa_core_annotations_lob_stateless3_vehicle_ejb_jar);
+    return ear;
+  }
+
 	private static final Logger logger = (Logger) System.getLogger(Client.class.getName());
 
 	private DataTypes dataTypes;
diff --git a/jpa/spec-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/mapkey/Client.java b/jpa/spec-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/mapkey/Client.java
index 7f24ec7c7..abb7d3386 100644
--- a/jpa/spec-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/mapkey/Client.java
+++ b/jpa/spec-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/mapkey/Client.java
@@ -23,13 +23,104 @@ package ee.jakarta.tck.persistence.core.annotations.mapkey;
 import java.lang.System.Logger;
 import java.util.HashMap;
 import java.util.Map;
-
+import org.jboss.arquillian.container.test.api.Deployment;
+import org.jboss.shrinkwrap.api.Archive;
+import org.jboss.shrinkwrap.api.ShrinkWrap;
+import org.jboss.shrinkwrap.api.spec.EnterpriseArchive;
+import org.jboss.shrinkwrap.api.spec.JavaArchive;
+import org.jboss.shrinkwrap.api.spec.WebArchive;
 import org.junit.jupiter.api.AfterEach;
 
 import ee.jakarta.tck.persistence.common.PMClientBase;
 
 public class Client extends PMClientBase {
 
+  @Deployment(testable = false)
+  public static Archive<?> deployment() {
+
+    final EnterpriseArchive ear = ShrinkWrap.create(EnterpriseArchive.class, "jpa_core_annotations_mapkey_vehicles.ear");
+    // TODO: filter/eliminate the library jar classes that shouldn't be included
+    // Add ear/lib jars
+
+    JavaArchive jpa_core_annotations_mapkey_jar = ShrinkWrap.create(JavaArchive.class, "jpa_core_annotations_mapkey_jar");
+    jpa_core_annotations_mapkey_jar.addClass(ee.jakarta.tck.persistence.core.annotations.mapkey.Department.class);
+    jpa_core_annotations_mapkey_jar.addClass(ee.jakarta.tck.persistence.core.annotations.mapkey.Employee.class);
+    jpa_core_annotations_mapkey_jar.addClass(ee.jakarta.tck.persistence.core.annotations.mapkey.Employee2.class);
+    jpa_core_annotations_mapkey_jar.addClass(ee.jakarta.tck.persistence.core.annotations.mapkey.Employee3.class);
+    jpa_core_annotations_mapkey_jar.addClass(ee.jakarta.tck.persistence.core.annotations.mapkey.Employee4.class);
+    ear.addAsLibrary(jpa_core_annotations_mapkey_jar);
+    // Add ear submodules
+
+    JavaArchive jpa_core_annotations_mapkey_appmanagedNoTx_vehicle_client_jar = ShrinkWrap.create(JavaArchive.class, "jpa_core_annotations_mapkey_appmanagedNoTx_vehicle_client_jar");
+    jpa_core_annotations_mapkey_appmanagedNoTx_vehicle_client_jar.addClass(ee.jakarta.tck.persistence.common.PMClientBase.class);
+    ear.addAsModule(jpa_core_annotations_mapkey_appmanagedNoTx_vehicle_client_jar);
+
+    JavaArchive jpa_core_annotations_mapkey_appmanagedNoTx_vehicle_ejb_jar = ShrinkWrap.create(JavaArchive.class, "jpa_core_annotations_mapkey_appmanagedNoTx_vehicle_ejb_jar");
+    jpa_core_annotations_mapkey_appmanagedNoTx_vehicle_ejb_jar.addClass(ee.jakarta.tck.persistence.common.PMClientBase.class);
+    jpa_core_annotations_mapkey_appmanagedNoTx_vehicle_ejb_jar.addClass(ee.jakarta.tck.persistence.core.annotations.mapkey.Client.class);
+    ear.addAsModule(jpa_core_annotations_mapkey_appmanagedNoTx_vehicle_ejb_jar);
+
+    JavaArchive jpa_core_annotations_mapkey_appmanaged_vehicle_client_jar = ShrinkWrap.create(JavaArchive.class, "jpa_core_annotations_mapkey_appmanaged_vehicle_client_jar");
+    jpa_core_annotations_mapkey_appmanaged_vehicle_client_jar.addClass(ee.jakarta.tck.persistence.common.PMClientBase.class);
+    ear.addAsModule(jpa_core_annotations_mapkey_appmanaged_vehicle_client_jar);
+
+    JavaArchive jpa_core_annotations_mapkey_appmanaged_vehicle_ejb_jar = ShrinkWrap.create(JavaArchive.class, "jpa_core_annotations_mapkey_appmanaged_vehicle_ejb_jar");
+    jpa_core_annotations_mapkey_appmanaged_vehicle_ejb_jar.addClass(ee.jakarta.tck.persistence.common.PMClientBase.class);
+    jpa_core_annotations_mapkey_appmanaged_vehicle_ejb_jar.addClass(ee.jakarta.tck.persistence.core.annotations.mapkey.Client.class);
+    ear.addAsModule(jpa_core_annotations_mapkey_appmanaged_vehicle_ejb_jar);
+
+    WebArchive jpa_core_annotations_mapkey_pmservlet_vehicle_web_war = ShrinkWrap.create(WebArchive.class, "jpa_core_annotations_mapkey_pmservlet_vehicle_web_war");
+    jpa_core_annotations_mapkey_pmservlet_vehicle_web_war.addAsWebInfResource("web.xml");
+
+    JavaArchive jpa_core_annotations_mapkey_jar = ShrinkWrap.create(JavaArchive.class, "jpa_core_annotations_mapkey.jar");
+    jpa_core_annotations_mapkey_jar.addClass(ee.jakarta.tck.persistence.core.annotations.mapkey.Department.class);
+    jpa_core_annotations_mapkey_jar.addClass(ee.jakarta.tck.persistence.core.annotations.mapkey.Employee.class);
+    jpa_core_annotations_mapkey_jar.addClass(ee.jakarta.tck.persistence.core.annotations.mapkey.Employee2.class);
+    jpa_core_annotations_mapkey_jar.addClass(ee.jakarta.tck.persistence.core.annotations.mapkey.Employee3.class);
+    jpa_core_annotations_mapkey_jar.addClass(ee.jakarta.tck.persistence.core.annotations.mapkey.Employee4.class);
+    jpa_core_annotations_mapkey_jar.addAsManifestResource("META-INF/MANIFEST.MF");
+    jpa_core_annotations_mapkey_jar.addAsManifestResource("META-INF/persistence.xml");
+    jpa_core_annotations_mapkey_pmservlet_vehicle_web_war.addAsLibrary(jpa_core_annotations_mapkey_jar);
+    jpa_core_annotations_mapkey_pmservlet_vehicle_web_war.addClass(ee.jakarta.tck.persistence.common.PMClientBase.class);
+    jpa_core_annotations_mapkey_pmservlet_vehicle_web_war.addClass(ee.jakarta.tck.persistence.core.annotations.mapkey.Client.class);
+    ear.addAsModule(jpa_core_annotations_mapkey_pmservlet_vehicle_web_war);
+
+    WebArchive jpa_core_annotations_mapkey_puservlet_vehicle_web_war = ShrinkWrap.create(WebArchive.class, "jpa_core_annotations_mapkey_puservlet_vehicle_web_war");
+    jpa_core_annotations_mapkey_puservlet_vehicle_web_war.addAsWebInfResource("web.xml");
+
+    JavaArchive jpa_core_annotations_mapkey_jar = ShrinkWrap.create(JavaArchive.class, "jpa_core_annotations_mapkey.jar");
+    jpa_core_annotations_mapkey_jar.addClass(ee.jakarta.tck.persistence.core.annotations.mapkey.Department.class);
+    jpa_core_annotations_mapkey_jar.addClass(ee.jakarta.tck.persistence.core.annotations.mapkey.Employee.class);
+    jpa_core_annotations_mapkey_jar.addClass(ee.jakarta.tck.persistence.core.annotations.mapkey.Employee2.class);
+    jpa_core_annotations_mapkey_jar.addClass(ee.jakarta.tck.persistence.core.annotations.mapkey.Employee3.class);
+    jpa_core_annotations_mapkey_jar.addClass(ee.jakarta.tck.persistence.core.annotations.mapkey.Employee4.class);
+    jpa_core_annotations_mapkey_jar.addAsManifestResource("META-INF/MANIFEST.MF");
+    jpa_core_annotations_mapkey_jar.addAsManifestResource("META-INF/persistence.xml");
+    jpa_core_annotations_mapkey_puservlet_vehicle_web_war.addAsLibrary(jpa_core_annotations_mapkey_jar);
+    jpa_core_annotations_mapkey_puservlet_vehicle_web_war.addClass(ee.jakarta.tck.persistence.common.PMClientBase.class);
+    jpa_core_annotations_mapkey_puservlet_vehicle_web_war.addClass(ee.jakarta.tck.persistence.core.annotations.mapkey.Client.class);
+    ear.addAsModule(jpa_core_annotations_mapkey_puservlet_vehicle_web_war);
+
+    JavaArchive jpa_core_annotations_mapkey_stateful3_vehicle_client_jar = ShrinkWrap.create(JavaArchive.class, "jpa_core_annotations_mapkey_stateful3_vehicle_client_jar");
+    jpa_core_annotations_mapkey_stateful3_vehicle_client_jar.addClass(ee.jakarta.tck.persistence.common.PMClientBase.class);
+    ear.addAsModule(jpa_core_annotations_mapkey_stateful3_vehicle_client_jar);
+
+    JavaArchive jpa_core_annotations_mapkey_stateful3_vehicle_ejb_jar = ShrinkWrap.create(JavaArchive.class, "jpa_core_annotations_mapkey_stateful3_vehicle_ejb_jar");
+    jpa_core_annotations_mapkey_stateful3_vehicle_ejb_jar.addClass(ee.jakarta.tck.persistence.common.PMClientBase.class);
+    jpa_core_annotations_mapkey_stateful3_vehicle_ejb_jar.addClass(ee.jakarta.tck.persistence.core.annotations.mapkey.Client.class);
+    ear.addAsModule(jpa_core_annotations_mapkey_stateful3_vehicle_ejb_jar);
+
+    JavaArchive jpa_core_annotations_mapkey_stateless3_vehicle_client_jar = ShrinkWrap.create(JavaArchive.class, "jpa_core_annotations_mapkey_stateless3_vehicle_client_jar");
+    jpa_core_annotations_mapkey_stateless3_vehicle_client_jar.addClass(ee.jakarta.tck.persistence.common.PMClientBase.class);
+    ear.addAsModule(jpa_core_annotations_mapkey_stateless3_vehicle_client_jar);
+
+    JavaArchive jpa_core_annotations_mapkey_stateless3_vehicle_ejb_jar = ShrinkWrap.create(JavaArchive.class, "jpa_core_annotations_mapkey_stateless3_vehicle_ejb_jar");
+    jpa_core_annotations_mapkey_stateless3_vehicle_ejb_jar.addClass(ee.jakarta.tck.persistence.common.PMClientBase.class);
+    jpa_core_annotations_mapkey_stateless3_vehicle_ejb_jar.addClass(ee.jakarta.tck.persistence.core.annotations.mapkey.Client.class);
+    ear.addAsModule(jpa_core_annotations_mapkey_stateless3_vehicle_ejb_jar);
+    return ear;
+  }
+
 	public Client() {
 	}
 
diff --git a/jpa/spec-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/mapkey/Client1.java b/jpa/spec-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/mapkey/Client1.java
index b08893af2..c86aed96c 100644
--- a/jpa/spec-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/mapkey/Client1.java
+++ b/jpa/spec-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/mapkey/Client1.java
@@ -25,12 +25,103 @@ import java.util.ArrayList;
 import java.util.Collections;
 import java.util.List;
 
+import org.jboss.arquillian.container.test.api.Deployment;
+import org.jboss.shrinkwrap.api.Archive;
+import org.jboss.shrinkwrap.api.ShrinkWrap;
+import org.jboss.shrinkwrap.api.spec.EnterpriseArchive;
 import org.jboss.shrinkwrap.api.spec.JavaArchive;
+import org.jboss.shrinkwrap.api.spec.WebArchive;
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
 
 public class Client1 extends Client {
 
+  @Deployment(testable = false)
+  public static Archive<?> deployment() {
+
+    final EnterpriseArchive ear = ShrinkWrap.create(EnterpriseArchive.class, "jpa_core_annotations_mapkey_vehicles.ear");
+    // TODO: filter/eliminate the library jar classes that shouldn't be included
+    // Add ear/lib jars
+
+    JavaArchive jpa_core_annotations_mapkey_jar = ShrinkWrap.create(JavaArchive.class, "jpa_core_annotations_mapkey_jar");
+    jpa_core_annotations_mapkey_jar.addClass(ee.jakarta.tck.persistence.core.annotations.mapkey.Department.class);
+    jpa_core_annotations_mapkey_jar.addClass(ee.jakarta.tck.persistence.core.annotations.mapkey.Employee.class);
+    jpa_core_annotations_mapkey_jar.addClass(ee.jakarta.tck.persistence.core.annotations.mapkey.Employee2.class);
+    jpa_core_annotations_mapkey_jar.addClass(ee.jakarta.tck.persistence.core.annotations.mapkey.Employee3.class);
+    jpa_core_annotations_mapkey_jar.addClass(ee.jakarta.tck.persistence.core.annotations.mapkey.Employee4.class);
+    ear.addAsLibrary(jpa_core_annotations_mapkey_jar);
+    // Add ear submodules
+
+    JavaArchive jpa_core_annotations_mapkey_appmanagedNoTx_vehicle_client_jar = ShrinkWrap.create(JavaArchive.class, "jpa_core_annotations_mapkey_appmanagedNoTx_vehicle_client_jar");
+    jpa_core_annotations_mapkey_appmanagedNoTx_vehicle_client_jar.addClass(ee.jakarta.tck.persistence.common.PMClientBase.class);
+    ear.addAsModule(jpa_core_annotations_mapkey_appmanagedNoTx_vehicle_client_jar);
+
+    JavaArchive jpa_core_annotations_mapkey_appmanagedNoTx_vehicle_ejb_jar = ShrinkWrap.create(JavaArchive.class, "jpa_core_annotations_mapkey_appmanagedNoTx_vehicle_ejb_jar");
+    jpa_core_annotations_mapkey_appmanagedNoTx_vehicle_ejb_jar.addClass(ee.jakarta.tck.persistence.common.PMClientBase.class);
+    jpa_core_annotations_mapkey_appmanagedNoTx_vehicle_ejb_jar.addClass(ee.jakarta.tck.persistence.core.annotations.mapkey.Client.class);
+    ear.addAsModule(jpa_core_annotations_mapkey_appmanagedNoTx_vehicle_ejb_jar);
+
+    JavaArchive jpa_core_annotations_mapkey_appmanaged_vehicle_client_jar = ShrinkWrap.create(JavaArchive.class, "jpa_core_annotations_mapkey_appmanaged_vehicle_client_jar");
+    jpa_core_annotations_mapkey_appmanaged_vehicle_client_jar.addClass(ee.jakarta.tck.persistence.common.PMClientBase.class);
+    ear.addAsModule(jpa_core_annotations_mapkey_appmanaged_vehicle_client_jar);
+
+    JavaArchive jpa_core_annotations_mapkey_appmanaged_vehicle_ejb_jar = ShrinkWrap.create(JavaArchive.class, "jpa_core_annotations_mapkey_appmanaged_vehicle_ejb_jar");
+    jpa_core_annotations_mapkey_appmanaged_vehicle_ejb_jar.addClass(ee.jakarta.tck.persistence.common.PMClientBase.class);
+    jpa_core_annotations_mapkey_appmanaged_vehicle_ejb_jar.addClass(ee.jakarta.tck.persistence.core.annotations.mapkey.Client.class);
+    ear.addAsModule(jpa_core_annotations_mapkey_appmanaged_vehicle_ejb_jar);
+
+    WebArchive jpa_core_annotations_mapkey_pmservlet_vehicle_web_war = ShrinkWrap.create(WebArchive.class, "jpa_core_annotations_mapkey_pmservlet_vehicle_web_war");
+    jpa_core_annotations_mapkey_pmservlet_vehicle_web_war.addAsWebInfResource("web.xml");
+
+    JavaArchive jpa_core_annotations_mapkey_jar = ShrinkWrap.create(JavaArchive.class, "jpa_core_annotations_mapkey.jar");
+    jpa_core_annotations_mapkey_jar.addClass(ee.jakarta.tck.persistence.core.annotations.mapkey.Department.class);
+    jpa_core_annotations_mapkey_jar.addClass(ee.jakarta.tck.persistence.core.annotations.mapkey.Employee.class);
+    jpa_core_annotations_mapkey_jar.addClass(ee.jakarta.tck.persistence.core.annotations.mapkey.Employee2.class);
+    jpa_core_annotations_mapkey_jar.addClass(ee.jakarta.tck.persistence.core.annotations.mapkey.Employee3.class);
+    jpa_core_annotations_mapkey_jar.addClass(ee.jakarta.tck.persistence.core.annotations.mapkey.Employee4.class);
+    jpa_core_annotations_mapkey_jar.addAsManifestResource("META-INF/MANIFEST.MF");
+    jpa_core_annotations_mapkey_jar.addAsManifestResource("META-INF/persistence.xml");
+    jpa_core_annotations_mapkey_pmservlet_vehicle_web_war.addAsLibrary(jpa_core_annotations_mapkey_jar);
+    jpa_core_annotations_mapkey_pmservlet_vehicle_web_war.addClass(ee.jakarta.tck.persistence.common.PMClientBase.class);
+    jpa_core_annotations_mapkey_pmservlet_vehicle_web_war.addClass(ee.jakarta.tck.persistence.core.annotations.mapkey.Client.class);
+    ear.addAsModule(jpa_core_annotations_mapkey_pmservlet_vehicle_web_war);
+
+    WebArchive jpa_core_annotations_mapkey_puservlet_vehicle_web_war = ShrinkWrap.create(WebArchive.class, "jpa_core_annotations_mapkey_puservlet_vehicle_web_war");
+    jpa_core_annotations_mapkey_puservlet_vehicle_web_war.addAsWebInfResource("web.xml");
+
+    JavaArchive jpa_core_annotations_mapkey_jar = ShrinkWrap.create(JavaArchive.class, "jpa_core_annotations_mapkey.jar");
+    jpa_core_annotations_mapkey_jar.addClass(ee.jakarta.tck.persistence.core.annotations.mapkey.Department.class);
+    jpa_core_annotations_mapkey_jar.addClass(ee.jakarta.tck.persistence.core.annotations.mapkey.Employee.class);
+    jpa_core_annotations_mapkey_jar.addClass(ee.jakarta.tck.persistence.core.annotations.mapkey.Employee2.class);
+    jpa_core_annotations_mapkey_jar.addClass(ee.jakarta.tck.persistence.core.annotations.mapkey.Employee3.class);
+    jpa_core_annotations_mapkey_jar.addClass(ee.jakarta.tck.persistence.core.annotations.mapkey.Employee4.class);
+    jpa_core_annotations_mapkey_jar.addAsManifestResource("META-INF/MANIFEST.MF");
+    jpa_core_annotations_mapkey_jar.addAsManifestResource("META-INF/persistence.xml");
+    jpa_core_annotations_mapkey_puservlet_vehicle_web_war.addAsLibrary(jpa_core_annotations_mapkey_jar);
+    jpa_core_annotations_mapkey_puservlet_vehicle_web_war.addClass(ee.jakarta.tck.persistence.common.PMClientBase.class);
+    jpa_core_annotations_mapkey_puservlet_vehicle_web_war.addClass(ee.jakarta.tck.persistence.core.annotations.mapkey.Client.class);
+    ear.addAsModule(jpa_core_annotations_mapkey_puservlet_vehicle_web_war);
+
+    JavaArchive jpa_core_annotations_mapkey_stateful3_vehicle_client_jar = ShrinkWrap.create(JavaArchive.class, "jpa_core_annotations_mapkey_stateful3_vehicle_client_jar");
+    jpa_core_annotations_mapkey_stateful3_vehicle_client_jar.addClass(ee.jakarta.tck.persistence.common.PMClientBase.class);
+    ear.addAsModule(jpa_core_annotations_mapkey_stateful3_vehicle_client_jar);
+
+    JavaArchive jpa_core_annotations_mapkey_stateful3_vehicle_ejb_jar = ShrinkWrap.create(JavaArchive.class, "jpa_core_annotations_mapkey_stateful3_vehicle_ejb_jar");
+    jpa_core_annotations_mapkey_stateful3_vehicle_ejb_jar.addClass(ee.jakarta.tck.persistence.common.PMClientBase.class);
+    jpa_core_annotations_mapkey_stateful3_vehicle_ejb_jar.addClass(ee.jakarta.tck.persistence.core.annotations.mapkey.Client.class);
+    ear.addAsModule(jpa_core_annotations_mapkey_stateful3_vehicle_ejb_jar);
+
+    JavaArchive jpa_core_annotations_mapkey_stateless3_vehicle_client_jar = ShrinkWrap.create(JavaArchive.class, "jpa_core_annotations_mapkey_stateless3_vehicle_client_jar");
+    jpa_core_annotations_mapkey_stateless3_vehicle_client_jar.addClass(ee.jakarta.tck.persistence.common.PMClientBase.class);
+    ear.addAsModule(jpa_core_annotations_mapkey_stateless3_vehicle_client_jar);
+
+    JavaArchive jpa_core_annotations_mapkey_stateless3_vehicle_ejb_jar = ShrinkWrap.create(JavaArchive.class, "jpa_core_annotations_mapkey_stateless3_vehicle_ejb_jar");
+    jpa_core_annotations_mapkey_stateless3_vehicle_ejb_jar.addClass(ee.jakarta.tck.persistence.common.PMClientBase.class);
+    jpa_core_annotations_mapkey_stateless3_vehicle_ejb_jar.addClass(ee.jakarta.tck.persistence.core.annotations.mapkey.Client.class);
+    ear.addAsModule(jpa_core_annotations_mapkey_stateless3_vehicle_ejb_jar);
+    return ear;
+  }
+
 	public Client1() {
 	}
 
diff --git a/jpa/spec-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/mapkey/Client2.java b/jpa/spec-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/mapkey/Client2.java
index 8c62598be..c299365d4 100644
--- a/jpa/spec-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/mapkey/Client2.java
+++ b/jpa/spec-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/mapkey/Client2.java
@@ -22,12 +22,103 @@ package ee.jakarta.tck.persistence.core.annotations.mapkey;
 
 import java.lang.System.Logger;
 
+import org.jboss.arquillian.container.test.api.Deployment;
+import org.jboss.shrinkwrap.api.Archive;
+import org.jboss.shrinkwrap.api.ShrinkWrap;
+import org.jboss.shrinkwrap.api.spec.EnterpriseArchive;
 import org.jboss.shrinkwrap.api.spec.JavaArchive;
+import org.jboss.shrinkwrap.api.spec.WebArchive;
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
 
 public class Client2 extends Client {
 
+  @Deployment(testable = false)
+  public static Archive<?> deployment() {
+
+    final EnterpriseArchive ear = ShrinkWrap.create(EnterpriseArchive.class, "jpa_core_annotations_mapkey_vehicles.ear");
+    // TODO: filter/eliminate the library jar classes that shouldn't be included
+    // Add ear/lib jars
+
+    JavaArchive jpa_core_annotations_mapkey_jar = ShrinkWrap.create(JavaArchive.class, "jpa_core_annotations_mapkey_jar");
+    jpa_core_annotations_mapkey_jar.addClass(ee.jakarta.tck.persistence.core.annotations.mapkey.Department.class);
+    jpa_core_annotations_mapkey_jar.addClass(ee.jakarta.tck.persistence.core.annotations.mapkey.Employee.class);
+    jpa_core_annotations_mapkey_jar.addClass(ee.jakarta.tck.persistence.core.annotations.mapkey.Employee2.class);
+    jpa_core_annotations_mapkey_jar.addClass(ee.jakarta.tck.persistence.core.annotations.mapkey.Employee3.class);
+    jpa_core_annotations_mapkey_jar.addClass(ee.jakarta.tck.persistence.core.annotations.mapkey.Employee4.class);
+    ear.addAsLibrary(jpa_core_annotations_mapkey_jar);
+    // Add ear submodules
+
+    JavaArchive jpa_core_annotations_mapkey_appmanagedNoTx_vehicle_client_jar = ShrinkWrap.create(JavaArchive.class, "jpa_core_annotations_mapkey_appmanagedNoTx_vehicle_client_jar");
+    jpa_core_annotations_mapkey_appmanagedNoTx_vehicle_client_jar.addClass(ee.jakarta.tck.persistence.common.PMClientBase.class);
+    ear.addAsModule(jpa_core_annotations_mapkey_appmanagedNoTx_vehicle_client_jar);
+
+    JavaArchive jpa_core_annotations_mapkey_appmanagedNoTx_vehicle_ejb_jar = ShrinkWrap.create(JavaArchive.class, "jpa_core_annotations_mapkey_appmanagedNoTx_vehicle_ejb_jar");
+    jpa_core_annotations_mapkey_appmanagedNoTx_vehicle_ejb_jar.addClass(ee.jakarta.tck.persistence.common.PMClientBase.class);
+    jpa_core_annotations_mapkey_appmanagedNoTx_vehicle_ejb_jar.addClass(ee.jakarta.tck.persistence.core.annotations.mapkey.Client.class);
+    ear.addAsModule(jpa_core_annotations_mapkey_appmanagedNoTx_vehicle_ejb_jar);
+
+    JavaArchive jpa_core_annotations_mapkey_appmanaged_vehicle_client_jar = ShrinkWrap.create(JavaArchive.class, "jpa_core_annotations_mapkey_appmanaged_vehicle_client_jar");
+    jpa_core_annotations_mapkey_appmanaged_vehicle_client_jar.addClass(ee.jakarta.tck.persistence.common.PMClientBase.class);
+    ear.addAsModule(jpa_core_annotations_mapkey_appmanaged_vehicle_client_jar);
+
+    JavaArchive jpa_core_annotations_mapkey_appmanaged_vehicle_ejb_jar = ShrinkWrap.create(JavaArchive.class, "jpa_core_annotations_mapkey_appmanaged_vehicle_ejb_jar");
+    jpa_core_annotations_mapkey_appmanaged_vehicle_ejb_jar.addClass(ee.jakarta.tck.persistence.common.PMClientBase.class);
+    jpa_core_annotations_mapkey_appmanaged_vehicle_ejb_jar.addClass(ee.jakarta.tck.persistence.core.annotations.mapkey.Client.class);
+    ear.addAsModule(jpa_core_annotations_mapkey_appmanaged_vehicle_ejb_jar);
+
+    WebArchive jpa_core_annotations_mapkey_pmservlet_vehicle_web_war = ShrinkWrap.create(WebArchive.class, "jpa_core_annotations_mapkey_pmservlet_vehicle_web_war");
+    jpa_core_annotations_mapkey_pmservlet_vehicle_web_war.addAsWebInfResource("web.xml");
+
+    JavaArchive jpa_core_annotations_mapkey_jar = ShrinkWrap.create(JavaArchive.class, "jpa_core_annotations_mapkey.jar");
+    jpa_core_annotations_mapkey_jar.addClass(ee.jakarta.tck.persistence.core.annotations.mapkey.Department.class);
+    jpa_core_annotations_mapkey_jar.addClass(ee.jakarta.tck.persistence.core.annotations.mapkey.Employee.class);
+    jpa_core_annotations_mapkey_jar.addClass(ee.jakarta.tck.persistence.core.annotations.mapkey.Employee2.class);
+    jpa_core_annotations_mapkey_jar.addClass(ee.jakarta.tck.persistence.core.annotations.mapkey.Employee3.class);
+    jpa_core_annotations_mapkey_jar.addClass(ee.jakarta.tck.persistence.core.annotations.mapkey.Employee4.class);
+    jpa_core_annotations_mapkey_jar.addAsManifestResource("META-INF/MANIFEST.MF");
+    jpa_core_annotations_mapkey_jar.addAsManifestResource("META-INF/persistence.xml");
+    jpa_core_annotations_mapkey_pmservlet_vehicle_web_war.addAsLibrary(jpa_core_annotations_mapkey_jar);
+    jpa_core_annotations_mapkey_pmservlet_vehicle_web_war.addClass(ee.jakarta.tck.persistence.common.PMClientBase.class);
+    jpa_core_annotations_mapkey_pmservlet_vehicle_web_war.addClass(ee.jakarta.tck.persistence.core.annotations.mapkey.Client.class);
+    ear.addAsModule(jpa_core_annotations_mapkey_pmservlet_vehicle_web_war);
+
+    WebArchive jpa_core_annotations_mapkey_puservlet_vehicle_web_war = ShrinkWrap.create(WebArchive.class, "jpa_core_annotations_mapkey_puservlet_vehicle_web_war");
+    jpa_core_annotations_mapkey_puservlet_vehicle_web_war.addAsWebInfResource("web.xml");
+
+    JavaArchive jpa_core_annotations_mapkey_jar = ShrinkWrap.create(JavaArchive.class, "jpa_core_annotations_mapkey.jar");
+    jpa_core_annotations_mapkey_jar.addClass(ee.jakarta.tck.persistence.core.annotations.mapkey.Department.class);
+    jpa_core_annotations_mapkey_jar.addClass(ee.jakarta.tck.persistence.core.annotations.mapkey.Employee.class);
+    jpa_core_annotations_mapkey_jar.addClass(ee.jakarta.tck.persistence.core.annotations.mapkey.Employee2.class);
+    jpa_core_annotations_mapkey_jar.addClass(ee.jakarta.tck.persistence.core.annotations.mapkey.Employee3.class);
+    jpa_core_annotations_mapkey_jar.addClass(ee.jakarta.tck.persistence.core.annotations.mapkey.Employee4.class);
+    jpa_core_annotations_mapkey_jar.addAsManifestResource("META-INF/MANIFEST.MF");
+    jpa_core_annotations_mapkey_jar.addAsManifestResource("META-INF/persistence.xml");
+    jpa_core_annotations_mapkey_puservlet_vehicle_web_war.addAsLibrary(jpa_core_annotations_mapkey_jar);
+    jpa_core_annotations_mapkey_puservlet_vehicle_web_war.addClass(ee.jakarta.tck.persistence.common.PMClientBase.class);
+    jpa_core_annotations_mapkey_puservlet_vehicle_web_war.addClass(ee.jakarta.tck.persistence.core.annotations.mapkey.Client.class);
+    ear.addAsModule(jpa_core_annotations_mapkey_puservlet_vehicle_web_war);
+
+    JavaArchive jpa_core_annotations_mapkey_stateful3_vehicle_client_jar = ShrinkWrap.create(JavaArchive.class, "jpa_core_annotations_mapkey_stateful3_vehicle_client_jar");
+    jpa_core_annotations_mapkey_stateful3_vehicle_client_jar.addClass(ee.jakarta.tck.persistence.common.PMClientBase.class);
+    ear.addAsModule(jpa_core_annotations_mapkey_stateful3_vehicle_client_jar);
+
+    JavaArchive jpa_core_annotations_mapkey_stateful3_vehicle_ejb_jar = ShrinkWrap.create(JavaArchive.class, "jpa_core_annotations_mapkey_stateful3_vehicle_ejb_jar");
+    jpa_core_annotations_mapkey_stateful3_vehicle_ejb_jar.addClass(ee.jakarta.tck.persistence.common.PMClientBase.class);
+    jpa_core_annotations_mapkey_stateful3_vehicle_ejb_jar.addClass(ee.jakarta.tck.persistence.core.annotations.mapkey.Client.class);
+    ear.addAsModule(jpa_core_annotations_mapkey_stateful3_vehicle_ejb_jar);
+
+    JavaArchive jpa_core_annotations_mapkey_stateless3_vehicle_client_jar = ShrinkWrap.create(JavaArchive.class, "jpa_core_annotations_mapkey_stateless3_vehicle_client_jar");
+    jpa_core_annotations_mapkey_stateless3_vehicle_client_jar.addClass(ee.jakarta.tck.persistence.common.PMClientBase.class);
+    ear.addAsModule(jpa_core_annotations_mapkey_stateless3_vehicle_client_jar);
+
+    JavaArchive jpa_core_annotations_mapkey_stateless3_vehicle_ejb_jar = ShrinkWrap.create(JavaArchive.class, "jpa_core_annotations_mapkey_stateless3_vehicle_ejb_jar");
+    jpa_core_annotations_mapkey_stateless3_vehicle_ejb_jar.addClass(ee.jakarta.tck.persistence.common.PMClientBase.class);
+    jpa_core_annotations_mapkey_stateless3_vehicle_ejb_jar.addClass(ee.jakarta.tck.persistence.core.annotations.mapkey.Client.class);
+    ear.addAsModule(jpa_core_annotations_mapkey_stateless3_vehicle_ejb_jar);
+    return ear;
+  }
+
 	public Client2() {
 	}
 
diff --git a/jpa/spec-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/mapkeyclass/Client.java b/jpa/spec-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/mapkeyclass/Client.java
index cc6e41bdf..9e68acd58 100644
--- a/jpa/spec-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/mapkeyclass/Client.java
+++ b/jpa/spec-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/mapkeyclass/Client.java
@@ -20,8 +20,12 @@ import java.lang.System.Logger;
 import java.util.Hashtable;
 import java.util.Map;
 import java.util.Set;
-
+import org.jboss.arquillian.container.test.api.Deployment;
+import org.jboss.shrinkwrap.api.Archive;
+import org.jboss.shrinkwrap.api.ShrinkWrap;
+import org.jboss.shrinkwrap.api.spec.EnterpriseArchive;
 import org.jboss.shrinkwrap.api.spec.JavaArchive;
+import org.jboss.shrinkwrap.api.spec.WebArchive;
 import org.junit.jupiter.api.AfterEach;
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
@@ -31,6 +35,86 @@ import jakarta.persistence.EntityManager;
 
 public class Client extends PMClientBase {
 
+  @Deployment(testable = false)
+  public static Archive<?> deployment() {
+
+    final EnterpriseArchive ear = ShrinkWrap.create(EnterpriseArchive.class, "jpa_core_annotations_mapkeyclass_vehicles.ear");
+    // TODO: filter/eliminate the library jar classes that shouldn't be included
+    // Add ear/lib jars
+
+    JavaArchive jpa_core_annotations_mapkeyclass_jar = ShrinkWrap.create(JavaArchive.class, "jpa_core_annotations_mapkeyclass_jar");
+    jpa_core_annotations_mapkeyclass_jar.addClass(ee.jakarta.tck.persistence.core.annotations.mapkeyclass.Course.class);
+    jpa_core_annotations_mapkeyclass_jar.addClass(ee.jakarta.tck.persistence.core.annotations.mapkeyclass.Semester.class);
+    jpa_core_annotations_mapkeyclass_jar.addClass(ee.jakarta.tck.persistence.core.annotations.mapkeyclass.Student.class);
+    ear.addAsLibrary(jpa_core_annotations_mapkeyclass_jar);
+    // Add ear submodules
+
+    JavaArchive jpa_core_annotations_mapkeyclass_appmanagedNoTx_vehicle_client_jar = ShrinkWrap.create(JavaArchive.class, "jpa_core_annotations_mapkeyclass_appmanagedNoTx_vehicle_client_jar");
+    jpa_core_annotations_mapkeyclass_appmanagedNoTx_vehicle_client_jar.addClass(ee.jakarta.tck.persistence.common.PMClientBase.class);
+    ear.addAsModule(jpa_core_annotations_mapkeyclass_appmanagedNoTx_vehicle_client_jar);
+
+    JavaArchive jpa_core_annotations_mapkeyclass_appmanagedNoTx_vehicle_ejb_jar = ShrinkWrap.create(JavaArchive.class, "jpa_core_annotations_mapkeyclass_appmanagedNoTx_vehicle_ejb_jar");
+    jpa_core_annotations_mapkeyclass_appmanagedNoTx_vehicle_ejb_jar.addClass(ee.jakarta.tck.persistence.common.PMClientBase.class);
+    jpa_core_annotations_mapkeyclass_appmanagedNoTx_vehicle_ejb_jar.addClass(ee.jakarta.tck.persistence.core.annotations.mapkeyclass.Client.class);
+    ear.addAsModule(jpa_core_annotations_mapkeyclass_appmanagedNoTx_vehicle_ejb_jar);
+
+    JavaArchive jpa_core_annotations_mapkeyclass_appmanaged_vehicle_client_jar = ShrinkWrap.create(JavaArchive.class, "jpa_core_annotations_mapkeyclass_appmanaged_vehicle_client_jar");
+    jpa_core_annotations_mapkeyclass_appmanaged_vehicle_client_jar.addClass(ee.jakarta.tck.persistence.common.PMClientBase.class);
+    ear.addAsModule(jpa_core_annotations_mapkeyclass_appmanaged_vehicle_client_jar);
+
+    JavaArchive jpa_core_annotations_mapkeyclass_appmanaged_vehicle_ejb_jar = ShrinkWrap.create(JavaArchive.class, "jpa_core_annotations_mapkeyclass_appmanaged_vehicle_ejb_jar");
+    jpa_core_annotations_mapkeyclass_appmanaged_vehicle_ejb_jar.addClass(ee.jakarta.tck.persistence.common.PMClientBase.class);
+    jpa_core_annotations_mapkeyclass_appmanaged_vehicle_ejb_jar.addClass(ee.jakarta.tck.persistence.core.annotations.mapkeyclass.Client.class);
+    ear.addAsModule(jpa_core_annotations_mapkeyclass_appmanaged_vehicle_ejb_jar);
+
+    WebArchive jpa_core_annotations_mapkeyclass_pmservlet_vehicle_web_war = ShrinkWrap.create(WebArchive.class, "jpa_core_annotations_mapkeyclass_pmservlet_vehicle_web_war");
+    jpa_core_annotations_mapkeyclass_pmservlet_vehicle_web_war.addAsWebInfResource("web.xml");
+
+    JavaArchive jpa_core_annotations_mapkeyclass_jar = ShrinkWrap.create(JavaArchive.class, "jpa_core_annotations_mapkeyclass.jar");
+    jpa_core_annotations_mapkeyclass_jar.addClass(ee.jakarta.tck.persistence.core.annotations.mapkeyclass.Course.class);
+    jpa_core_annotations_mapkeyclass_jar.addClass(ee.jakarta.tck.persistence.core.annotations.mapkeyclass.Semester.class);
+    jpa_core_annotations_mapkeyclass_jar.addClass(ee.jakarta.tck.persistence.core.annotations.mapkeyclass.Student.class);
+    jpa_core_annotations_mapkeyclass_jar.addAsManifestResource("META-INF/MANIFEST.MF");
+    jpa_core_annotations_mapkeyclass_jar.addAsManifestResource("META-INF/persistence.xml");
+    jpa_core_annotations_mapkeyclass_pmservlet_vehicle_web_war.addAsLibrary(jpa_core_annotations_mapkeyclass_jar);
+    jpa_core_annotations_mapkeyclass_pmservlet_vehicle_web_war.addClass(ee.jakarta.tck.persistence.common.PMClientBase.class);
+    jpa_core_annotations_mapkeyclass_pmservlet_vehicle_web_war.addClass(ee.jakarta.tck.persistence.core.annotations.mapkeyclass.Client.class);
+    ear.addAsModule(jpa_core_annotations_mapkeyclass_pmservlet_vehicle_web_war);
+
+    WebArchive jpa_core_annotations_mapkeyclass_puservlet_vehicle_web_war = ShrinkWrap.create(WebArchive.class, "jpa_core_annotations_mapkeyclass_puservlet_vehicle_web_war");
+    jpa_core_annotations_mapkeyclass_puservlet_vehicle_web_war.addAsWebInfResource("web.xml");
+
+    JavaArchive jpa_core_annotations_mapkeyclass_jar = ShrinkWrap.create(JavaArchive.class, "jpa_core_annotations_mapkeyclass.jar");
+    jpa_core_annotations_mapkeyclass_jar.addClass(ee.jakarta.tck.persistence.core.annotations.mapkeyclass.Course.class);
+    jpa_core_annotations_mapkeyclass_jar.addClass(ee.jakarta.tck.persistence.core.annotations.mapkeyclass.Semester.class);
+    jpa_core_annotations_mapkeyclass_jar.addClass(ee.jakarta.tck.persistence.core.annotations.mapkeyclass.Student.class);
+    jpa_core_annotations_mapkeyclass_jar.addAsManifestResource("META-INF/MANIFEST.MF");
+    jpa_core_annotations_mapkeyclass_jar.addAsManifestResource("META-INF/persistence.xml");
+    jpa_core_annotations_mapkeyclass_puservlet_vehicle_web_war.addAsLibrary(jpa_core_annotations_mapkeyclass_jar);
+    jpa_core_annotations_mapkeyclass_puservlet_vehicle_web_war.addClass(ee.jakarta.tck.persistence.common.PMClientBase.class);
+    jpa_core_annotations_mapkeyclass_puservlet_vehicle_web_war.addClass(ee.jakarta.tck.persistence.core.annotations.mapkeyclass.Client.class);
+    ear.addAsModule(jpa_core_annotations_mapkeyclass_puservlet_vehicle_web_war);
+
+    JavaArchive jpa_core_annotations_mapkeyclass_stateful3_vehicle_client_jar = ShrinkWrap.create(JavaArchive.class, "jpa_core_annotations_mapkeyclass_stateful3_vehicle_client_jar");
+    jpa_core_annotations_mapkeyclass_stateful3_vehicle_client_jar.addClass(ee.jakarta.tck.persistence.common.PMClientBase.class);
+    ear.addAsModule(jpa_core_annotations_mapkeyclass_stateful3_vehicle_client_jar);
+
+    JavaArchive jpa_core_annotations_mapkeyclass_stateful3_vehicle_ejb_jar = ShrinkWrap.create(JavaArchive.class, "jpa_core_annotations_mapkeyclass_stateful3_vehicle_ejb_jar");
+    jpa_core_annotations_mapkeyclass_stateful3_vehicle_ejb_jar.addClass(ee.jakarta.tck.persistence.common.PMClientBase.class);
+    jpa_core_annotations_mapkeyclass_stateful3_vehicle_ejb_jar.addClass(ee.jakarta.tck.persistence.core.annotations.mapkeyclass.Client.class);
+    ear.addAsModule(jpa_core_annotations_mapkeyclass_stateful3_vehicle_ejb_jar);
+
+    JavaArchive jpa_core_annotations_mapkeyclass_stateless3_vehicle_client_jar = ShrinkWrap.create(JavaArchive.class, "jpa_core_annotations_mapkeyclass_stateless3_vehicle_client_jar");
+    jpa_core_annotations_mapkeyclass_stateless3_vehicle_client_jar.addClass(ee.jakarta.tck.persistence.common.PMClientBase.class);
+    ear.addAsModule(jpa_core_annotations_mapkeyclass_stateless3_vehicle_client_jar);
+
+    JavaArchive jpa_core_annotations_mapkeyclass_stateless3_vehicle_ejb_jar = ShrinkWrap.create(JavaArchive.class, "jpa_core_annotations_mapkeyclass_stateless3_vehicle_ejb_jar");
+    jpa_core_annotations_mapkeyclass_stateless3_vehicle_ejb_jar.addClass(ee.jakarta.tck.persistence.common.PMClientBase.class);
+    jpa_core_annotations_mapkeyclass_stateless3_vehicle_ejb_jar.addClass(ee.jakarta.tck.persistence.core.annotations.mapkeyclass.Client.class);
+    ear.addAsModule(jpa_core_annotations_mapkeyclass_stateless3_vehicle_ejb_jar);
+    return ear;
+  }
+
 	private Map<Course, Semester> student2EnrollmentMap;
 
 	private static final Logger logger = (Logger) System.getLogger(Client.class.getName());
diff --git a/jpa/spec-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/mapkeycolumn/Client.java b/jpa/spec-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/mapkeycolumn/Client.java
index 17ba629a5..512f2e2a7 100644
--- a/jpa/spec-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/mapkeycolumn/Client.java
+++ b/jpa/spec-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/mapkeycolumn/Client.java
@@ -27,8 +27,12 @@ import java.util.Iterator;
 import java.util.List;
 import java.util.Map;
 import java.util.Set;
-
+import org.jboss.arquillian.container.test.api.Deployment;
+import org.jboss.shrinkwrap.api.Archive;
+import org.jboss.shrinkwrap.api.ShrinkWrap;
+import org.jboss.shrinkwrap.api.spec.EnterpriseArchive;
 import org.jboss.shrinkwrap.api.spec.JavaArchive;
+import org.jboss.shrinkwrap.api.spec.WebArchive;
 import org.junit.jupiter.api.AfterEach;
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
@@ -39,6 +43,86 @@ import ee.jakarta.tck.persistence.common.PMClientBase;
 
 public class Client extends PMClientBase {
 
+  @Deployment(testable = false)
+  public static Archive<?> deployment() {
+
+    final EnterpriseArchive ear = ShrinkWrap.create(EnterpriseArchive.class, "jpa_core_annotations_mapkeycolumn_vehicles.ear");
+    // TODO: filter/eliminate the library jar classes that shouldn't be included
+    // Add ear/lib jars
+
+    JavaArchive jpa_core_annotations_mapkeycolumn_jar = ShrinkWrap.create(JavaArchive.class, "jpa_core_annotations_mapkeycolumn_jar");
+    jpa_core_annotations_mapkeycolumn_jar.addClass(ee.jakarta.tck.persistence.core.annotations.mapkeycolumn.Department.class);
+    jpa_core_annotations_mapkeycolumn_jar.addClass(ee.jakarta.tck.persistence.core.annotations.mapkeycolumn.Department2.class);
+    jpa_core_annotations_mapkeycolumn_jar.addClass(ee.jakarta.tck.persistence.core.annotations.mapkeycolumn.Employee.class);
+    ear.addAsLibrary(jpa_core_annotations_mapkeycolumn_jar);
+    // Add ear submodules
+
+    JavaArchive jpa_core_annotations_mapkeycolumn_appmanagedNoTx_vehicle_client_jar = ShrinkWrap.create(JavaArchive.class, "jpa_core_annotations_mapkeycolumn_appmanagedNoTx_vehicle_client_jar");
+    jpa_core_annotations_mapkeycolumn_appmanagedNoTx_vehicle_client_jar.addClass(ee.jakarta.tck.persistence.common.PMClientBase.class);
+    ear.addAsModule(jpa_core_annotations_mapkeycolumn_appmanagedNoTx_vehicle_client_jar);
+
+    JavaArchive jpa_core_annotations_mapkeycolumn_appmanagedNoTx_vehicle_ejb_jar = ShrinkWrap.create(JavaArchive.class, "jpa_core_annotations_mapkeycolumn_appmanagedNoTx_vehicle_ejb_jar");
+    jpa_core_annotations_mapkeycolumn_appmanagedNoTx_vehicle_ejb_jar.addClass(ee.jakarta.tck.persistence.common.PMClientBase.class);
+    jpa_core_annotations_mapkeycolumn_appmanagedNoTx_vehicle_ejb_jar.addClass(ee.jakarta.tck.persistence.core.annotations.mapkeycolumn.Client.class);
+    ear.addAsModule(jpa_core_annotations_mapkeycolumn_appmanagedNoTx_vehicle_ejb_jar);
+
+    JavaArchive jpa_core_annotations_mapkeycolumn_appmanaged_vehicle_client_jar = ShrinkWrap.create(JavaArchive.class, "jpa_core_annotations_mapkeycolumn_appmanaged_vehicle_client_jar");
+    jpa_core_annotations_mapkeycolumn_appmanaged_vehicle_client_jar.addClass(ee.jakarta.tck.persistence.common.PMClientBase.class);
+    ear.addAsModule(jpa_core_annotations_mapkeycolumn_appmanaged_vehicle_client_jar);
+
+    JavaArchive jpa_core_annotations_mapkeycolumn_appmanaged_vehicle_ejb_jar = ShrinkWrap.create(JavaArchive.class, "jpa_core_annotations_mapkeycolumn_appmanaged_vehicle_ejb_jar");
+    jpa_core_annotations_mapkeycolumn_appmanaged_vehicle_ejb_jar.addClass(ee.jakarta.tck.persistence.common.PMClientBase.class);
+    jpa_core_annotations_mapkeycolumn_appmanaged_vehicle_ejb_jar.addClass(ee.jakarta.tck.persistence.core.annotations.mapkeycolumn.Client.class);
+    ear.addAsModule(jpa_core_annotations_mapkeycolumn_appmanaged_vehicle_ejb_jar);
+
+    WebArchive jpa_core_annotations_mapkeycolumn_pmservlet_vehicle_web_war = ShrinkWrap.create(WebArchive.class, "jpa_core_annotations_mapkeycolumn_pmservlet_vehicle_web_war");
+    jpa_core_annotations_mapkeycolumn_pmservlet_vehicle_web_war.addAsWebInfResource("web.xml");
+
+    JavaArchive jpa_core_annotations_mapkeycolumn_jar = ShrinkWrap.create(JavaArchive.class, "jpa_core_annotations_mapkeycolumn.jar");
+    jpa_core_annotations_mapkeycolumn_jar.addClass(ee.jakarta.tck.persistence.core.annotations.mapkeycolumn.Department.class);
+    jpa_core_annotations_mapkeycolumn_jar.addClass(ee.jakarta.tck.persistence.core.annotations.mapkeycolumn.Department2.class);
+    jpa_core_annotations_mapkeycolumn_jar.addClass(ee.jakarta.tck.persistence.core.annotations.mapkeycolumn.Employee.class);
+    jpa_core_annotations_mapkeycolumn_jar.addAsManifestResource("META-INF/MANIFEST.MF");
+    jpa_core_annotations_mapkeycolumn_jar.addAsManifestResource("META-INF/persistence.xml");
+    jpa_core_annotations_mapkeycolumn_pmservlet_vehicle_web_war.addAsLibrary(jpa_core_annotations_mapkeycolumn_jar);
+    jpa_core_annotations_mapkeycolumn_pmservlet_vehicle_web_war.addClass(ee.jakarta.tck.persistence.common.PMClientBase.class);
+    jpa_core_annotations_mapkeycolumn_pmservlet_vehicle_web_war.addClass(ee.jakarta.tck.persistence.core.annotations.mapkeycolumn.Client.class);
+    ear.addAsModule(jpa_core_annotations_mapkeycolumn_pmservlet_vehicle_web_war);
+
+    WebArchive jpa_core_annotations_mapkeycolumn_puservlet_vehicle_web_war = ShrinkWrap.create(WebArchive.class, "jpa_core_annotations_mapkeycolumn_puservlet_vehicle_web_war");
+    jpa_core_annotations_mapkeycolumn_puservlet_vehicle_web_war.addAsWebInfResource("web.xml");
+
+    JavaArchive jpa_core_annotations_mapkeycolumn_jar = ShrinkWrap.create(JavaArchive.class, "jpa_core_annotations_mapkeycolumn.jar");
+    jpa_core_annotations_mapkeycolumn_jar.addClass(ee.jakarta.tck.persistence.core.annotations.mapkeycolumn.Department.class);
+    jpa_core_annotations_mapkeycolumn_jar.addClass(ee.jakarta.tck.persistence.core.annotations.mapkeycolumn.Department2.class);
+    jpa_core_annotations_mapkeycolumn_jar.addClass(ee.jakarta.tck.persistence.core.annotations.mapkeycolumn.Employee.class);
+    jpa_core_annotations_mapkeycolumn_jar.addAsManifestResource("META-INF/MANIFEST.MF");
+    jpa_core_annotations_mapkeycolumn_jar.addAsManifestResource("META-INF/persistence.xml");
+    jpa_core_annotations_mapkeycolumn_puservlet_vehicle_web_war.addAsLibrary(jpa_core_annotations_mapkeycolumn_jar);
+    jpa_core_annotations_mapkeycolumn_puservlet_vehicle_web_war.addClass(ee.jakarta.tck.persistence.common.PMClientBase.class);
+    jpa_core_annotations_mapkeycolumn_puservlet_vehicle_web_war.addClass(ee.jakarta.tck.persistence.core.annotations.mapkeycolumn.Client.class);
+    ear.addAsModule(jpa_core_annotations_mapkeycolumn_puservlet_vehicle_web_war);
+
+    JavaArchive jpa_core_annotations_mapkeycolumn_stateful3_vehicle_client_jar = ShrinkWrap.create(JavaArchive.class, "jpa_core_annotations_mapkeycolumn_stateful3_vehicle_client_jar");
+    jpa_core_annotations_mapkeycolumn_stateful3_vehicle_client_jar.addClass(ee.jakarta.tck.persistence.common.PMClientBase.class);
+    ear.addAsModule(jpa_core_annotations_mapkeycolumn_stateful3_vehicle_client_jar);
+
+    JavaArchive jpa_core_annotations_mapkeycolumn_stateful3_vehicle_ejb_jar = ShrinkWrap.create(JavaArchive.class, "jpa_core_annotations_mapkeycolumn_stateful3_vehicle_ejb_jar");
+    jpa_core_annotations_mapkeycolumn_stateful3_vehicle_ejb_jar.addClass(ee.jakarta.tck.persistence.common.PMClientBase.class);
+    jpa_core_annotations_mapkeycolumn_stateful3_vehicle_ejb_jar.addClass(ee.jakarta.tck.persistence.core.annotations.mapkeycolumn.Client.class);
+    ear.addAsModule(jpa_core_annotations_mapkeycolumn_stateful3_vehicle_ejb_jar);
+
+    JavaArchive jpa_core_annotations_mapkeycolumn_stateless3_vehicle_client_jar = ShrinkWrap.create(JavaArchive.class, "jpa_core_annotations_mapkeycolumn_stateless3_vehicle_client_jar");
+    jpa_core_annotations_mapkeycolumn_stateless3_vehicle_client_jar.addClass(ee.jakarta.tck.persistence.common.PMClientBase.class);
+    ear.addAsModule(jpa_core_annotations_mapkeycolumn_stateless3_vehicle_client_jar);
+
+    JavaArchive jpa_core_annotations_mapkeycolumn_stateless3_vehicle_ejb_jar = ShrinkWrap.create(JavaArchive.class, "jpa_core_annotations_mapkeycolumn_stateless3_vehicle_ejb_jar");
+    jpa_core_annotations_mapkeycolumn_stateless3_vehicle_ejb_jar.addClass(ee.jakarta.tck.persistence.common.PMClientBase.class);
+    jpa_core_annotations_mapkeycolumn_stateless3_vehicle_ejb_jar.addClass(ee.jakarta.tck.persistence.core.annotations.mapkeycolumn.Client.class);
+    ear.addAsModule(jpa_core_annotations_mapkeycolumn_stateless3_vehicle_ejb_jar);
+    return ear;
+  }
+
 	private static final Logger logger = (Logger) System.getLogger(Client.class.getName());
 
 	public Client() {
diff --git a/jpa/spec-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/mapkeyenumerated/Client.java b/jpa/spec-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/mapkeyenumerated/Client.java
index f3a8fd09f..10b73740f 100644
--- a/jpa/spec-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/mapkeyenumerated/Client.java
+++ b/jpa/spec-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/mapkeyenumerated/Client.java
@@ -24,8 +24,12 @@ import java.util.Map;
 import java.util.Set;
 import java.util.stream.Collectors;
 import java.util.stream.Stream;
-
+import org.jboss.arquillian.container.test.api.Deployment;
+import org.jboss.shrinkwrap.api.Archive;
+import org.jboss.shrinkwrap.api.ShrinkWrap;
+import org.jboss.shrinkwrap.api.spec.EnterpriseArchive;
 import org.jboss.shrinkwrap.api.spec.JavaArchive;
+import org.jboss.shrinkwrap.api.spec.WebArchive;
 import org.junit.jupiter.api.AfterEach;
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
@@ -36,6 +40,110 @@ import ee.jakarta.tck.persistence.common.PMClientBase;
 
 public class Client extends PMClientBase {
 
+  @Deployment(testable = false)
+  public static Archive<?> deployment() {
+
+    final EnterpriseArchive ear = ShrinkWrap.create(EnterpriseArchive.class, "jpa_core_annotations_mapkeyenumerated_vehicles.ear");
+    // TODO: filter/eliminate the library jar classes that shouldn't be included
+    // Add ear/lib jars
+
+    JavaArchive jpa_core_annotations_mapkeyenumerated_jar = ShrinkWrap.create(JavaArchive.class, "jpa_core_annotations_mapkeyenumerated_jar");
+    jpa_core_annotations_mapkeyenumerated_jar.addClass(ee.jakarta.tck.persistence.core.annotations.mapkeyenumerated.Department.class);
+    jpa_core_annotations_mapkeyenumerated_jar.addClass(ee.jakarta.tck.persistence.core.annotations.mapkeyenumerated.Department2.class);
+    jpa_core_annotations_mapkeyenumerated_jar.addClass(ee.jakarta.tck.persistence.core.annotations.mapkeyenumerated.Department3.class);
+    jpa_core_annotations_mapkeyenumerated_jar.addClass(ee.jakarta.tck.persistence.core.annotations.mapkeyenumerated.Department4.class);
+    jpa_core_annotations_mapkeyenumerated_jar.addClass(ee.jakarta.tck.persistence.core.annotations.mapkeyenumerated.EmbeddedEmployee.class);
+    jpa_core_annotations_mapkeyenumerated_jar.addClass(ee.jakarta.tck.persistence.core.annotations.mapkeyenumerated.Employee.class);
+    jpa_core_annotations_mapkeyenumerated_jar.addClass(ee.jakarta.tck.persistence.core.annotations.mapkeyenumerated.Employee2.class);
+    jpa_core_annotations_mapkeyenumerated_jar.addClass(ee.jakarta.tck.persistence.core.annotations.mapkeyenumerated.Employee3.class);
+    jpa_core_annotations_mapkeyenumerated_jar.addClass(ee.jakarta.tck.persistence.core.annotations.mapkeyenumerated.Employee4.class);
+    jpa_core_annotations_mapkeyenumerated_jar.addClass(ee.jakarta.tck.persistence.core.annotations.mapkeyenumerated.Numbers.class);
+    jpa_core_annotations_mapkeyenumerated_jar.addClass(ee.jakarta.tck.persistence.core.annotations.mapkeyenumerated.Offices.class);
+    ear.addAsLibrary(jpa_core_annotations_mapkeyenumerated_jar);
+    // Add ear submodules
+
+    JavaArchive jpa_core_annotations_mapkeyenumerated_appmanagedNoTx_vehicle_client_jar = ShrinkWrap.create(JavaArchive.class, "jpa_core_annotations_mapkeyenumerated_appmanagedNoTx_vehicle_client_jar");
+    jpa_core_annotations_mapkeyenumerated_appmanagedNoTx_vehicle_client_jar.addClass(ee.jakarta.tck.persistence.common.PMClientBase.class);
+    ear.addAsModule(jpa_core_annotations_mapkeyenumerated_appmanagedNoTx_vehicle_client_jar);
+
+    JavaArchive jpa_core_annotations_mapkeyenumerated_appmanagedNoTx_vehicle_ejb_jar = ShrinkWrap.create(JavaArchive.class, "jpa_core_annotations_mapkeyenumerated_appmanagedNoTx_vehicle_ejb_jar");
+    jpa_core_annotations_mapkeyenumerated_appmanagedNoTx_vehicle_ejb_jar.addClass(ee.jakarta.tck.persistence.common.PMClientBase.class);
+    jpa_core_annotations_mapkeyenumerated_appmanagedNoTx_vehicle_ejb_jar.addClass(ee.jakarta.tck.persistence.core.annotations.mapkeyenumerated.Client.class);
+    ear.addAsModule(jpa_core_annotations_mapkeyenumerated_appmanagedNoTx_vehicle_ejb_jar);
+
+    JavaArchive jpa_core_annotations_mapkeyenumerated_appmanaged_vehicle_client_jar = ShrinkWrap.create(JavaArchive.class, "jpa_core_annotations_mapkeyenumerated_appmanaged_vehicle_client_jar");
+    jpa_core_annotations_mapkeyenumerated_appmanaged_vehicle_client_jar.addClass(ee.jakarta.tck.persistence.common.PMClientBase.class);
+    ear.addAsModule(jpa_core_annotations_mapkeyenumerated_appmanaged_vehicle_client_jar);
+
+    JavaArchive jpa_core_annotations_mapkeyenumerated_appmanaged_vehicle_ejb_jar = ShrinkWrap.create(JavaArchive.class, "jpa_core_annotations_mapkeyenumerated_appmanaged_vehicle_ejb_jar");
+    jpa_core_annotations_mapkeyenumerated_appmanaged_vehicle_ejb_jar.addClass(ee.jakarta.tck.persistence.common.PMClientBase.class);
+    jpa_core_annotations_mapkeyenumerated_appmanaged_vehicle_ejb_jar.addClass(ee.jakarta.tck.persistence.core.annotations.mapkeyenumerated.Client.class);
+    ear.addAsModule(jpa_core_annotations_mapkeyenumerated_appmanaged_vehicle_ejb_jar);
+
+    WebArchive jpa_core_annotations_mapkeyenumerated_pmservlet_vehicle_web_war = ShrinkWrap.create(WebArchive.class, "jpa_core_annotations_mapkeyenumerated_pmservlet_vehicle_web_war");
+    jpa_core_annotations_mapkeyenumerated_pmservlet_vehicle_web_war.addAsWebInfResource("web.xml");
+
+    JavaArchive jpa_core_annotations_mapkeyenumerated_jar = ShrinkWrap.create(JavaArchive.class, "jpa_core_annotations_mapkeyenumerated.jar");
+    jpa_core_annotations_mapkeyenumerated_jar.addClass(ee.jakarta.tck.persistence.core.annotations.mapkeyenumerated.Department.class);
+    jpa_core_annotations_mapkeyenumerated_jar.addClass(ee.jakarta.tck.persistence.core.annotations.mapkeyenumerated.Department2.class);
+    jpa_core_annotations_mapkeyenumerated_jar.addClass(ee.jakarta.tck.persistence.core.annotations.mapkeyenumerated.Department3.class);
+    jpa_core_annotations_mapkeyenumerated_jar.addClass(ee.jakarta.tck.persistence.core.annotations.mapkeyenumerated.Department4.class);
+    jpa_core_annotations_mapkeyenumerated_jar.addClass(ee.jakarta.tck.persistence.core.annotations.mapkeyenumerated.EmbeddedEmployee.class);
+    jpa_core_annotations_mapkeyenumerated_jar.addClass(ee.jakarta.tck.persistence.core.annotations.mapkeyenumerated.Employee.class);
+    jpa_core_annotations_mapkeyenumerated_jar.addClass(ee.jakarta.tck.persistence.core.annotations.mapkeyenumerated.Employee2.class);
+    jpa_core_annotations_mapkeyenumerated_jar.addClass(ee.jakarta.tck.persistence.core.annotations.mapkeyenumerated.Employee3.class);
+    jpa_core_annotations_mapkeyenumerated_jar.addClass(ee.jakarta.tck.persistence.core.annotations.mapkeyenumerated.Employee4.class);
+    jpa_core_annotations_mapkeyenumerated_jar.addClass(ee.jakarta.tck.persistence.core.annotations.mapkeyenumerated.Numbers.class);
+    jpa_core_annotations_mapkeyenumerated_jar.addClass(ee.jakarta.tck.persistence.core.annotations.mapkeyenumerated.Offices.class);
+    jpa_core_annotations_mapkeyenumerated_jar.addAsManifestResource("META-INF/MANIFEST.MF");
+    jpa_core_annotations_mapkeyenumerated_jar.addAsManifestResource("META-INF/persistence.xml");
+    jpa_core_annotations_mapkeyenumerated_pmservlet_vehicle_web_war.addAsLibrary(jpa_core_annotations_mapkeyenumerated_jar);
+    jpa_core_annotations_mapkeyenumerated_pmservlet_vehicle_web_war.addClass(ee.jakarta.tck.persistence.common.PMClientBase.class);
+    jpa_core_annotations_mapkeyenumerated_pmservlet_vehicle_web_war.addClass(ee.jakarta.tck.persistence.core.annotations.mapkeyenumerated.Client.class);
+    ear.addAsModule(jpa_core_annotations_mapkeyenumerated_pmservlet_vehicle_web_war);
+
+    WebArchive jpa_core_annotations_mapkeyenumerated_puservlet_vehicle_web_war = ShrinkWrap.create(WebArchive.class, "jpa_core_annotations_mapkeyenumerated_puservlet_vehicle_web_war");
+    jpa_core_annotations_mapkeyenumerated_puservlet_vehicle_web_war.addAsWebInfResource("web.xml");
+
+    JavaArchive jpa_core_annotations_mapkeyenumerated_jar = ShrinkWrap.create(JavaArchive.class, "jpa_core_annotations_mapkeyenumerated.jar");
+    jpa_core_annotations_mapkeyenumerated_jar.addClass(ee.jakarta.tck.persistence.core.annotations.mapkeyenumerated.Department.class);
+    jpa_core_annotations_mapkeyenumerated_jar.addClass(ee.jakarta.tck.persistence.core.annotations.mapkeyenumerated.Department2.class);
+    jpa_core_annotations_mapkeyenumerated_jar.addClass(ee.jakarta.tck.persistence.core.annotations.mapkeyenumerated.Department3.class);
+    jpa_core_annotations_mapkeyenumerated_jar.addClass(ee.jakarta.tck.persistence.core.annotations.mapkeyenumerated.Department4.class);
+    jpa_core_annotations_mapkeyenumerated_jar.addClass(ee.jakarta.tck.persistence.core.annotations.mapkeyenumerated.EmbeddedEmployee.class);
+    jpa_core_annotations_mapkeyenumerated_jar.addClass(ee.jakarta.tck.persistence.core.annotations.mapkeyenumerated.Employee.class);
+    jpa_core_annotations_mapkeyenumerated_jar.addClass(ee.jakarta.tck.persistence.core.annotations.mapkeyenumerated.Employee2.class);
+    jpa_core_annotations_mapkeyenumerated_jar.addClass(ee.jakarta.tck.persistence.core.annotations.mapkeyenumerated.Employee3.class);
+    jpa_core_annotations_mapkeyenumerated_jar.addClass(ee.jakarta.tck.persistence.core.annotations.mapkeyenumerated.Employee4.class);
+    jpa_core_annotations_mapkeyenumerated_jar.addClass(ee.jakarta.tck.persistence.core.annotations.mapkeyenumerated.Numbers.class);
+    jpa_core_annotations_mapkeyenumerated_jar.addClass(ee.jakarta.tck.persistence.core.annotations.mapkeyenumerated.Offices.class);
+    jpa_core_annotations_mapkeyenumerated_jar.addAsManifestResource("META-INF/MANIFEST.MF");
+    jpa_core_annotations_mapkeyenumerated_jar.addAsManifestResource("META-INF/persistence.xml");
+    jpa_core_annotations_mapkeyenumerated_puservlet_vehicle_web_war.addAsLibrary(jpa_core_annotations_mapkeyenumerated_jar);
+    jpa_core_annotations_mapkeyenumerated_puservlet_vehicle_web_war.addClass(ee.jakarta.tck.persistence.common.PMClientBase.class);
+    jpa_core_annotations_mapkeyenumerated_puservlet_vehicle_web_war.addClass(ee.jakarta.tck.persistence.core.annotations.mapkeyenumerated.Client.class);
+    ear.addAsModule(jpa_core_annotations_mapkeyenumerated_puservlet_vehicle_web_war);
+
+    JavaArchive jpa_core_annotations_mapkeyenumerated_stateful3_vehicle_client_jar = ShrinkWrap.create(JavaArchive.class, "jpa_core_annotations_mapkeyenumerated_stateful3_vehicle_client_jar");
+    jpa_core_annotations_mapkeyenumerated_stateful3_vehicle_client_jar.addClass(ee.jakarta.tck.persistence.common.PMClientBase.class);
+    ear.addAsModule(jpa_core_annotations_mapkeyenumerated_stateful3_vehicle_client_jar);
+
+    JavaArchive jpa_core_annotations_mapkeyenumerated_stateful3_vehicle_ejb_jar = ShrinkWrap.create(JavaArchive.class, "jpa_core_annotations_mapkeyenumerated_stateful3_vehicle_ejb_jar");
+    jpa_core_annotations_mapkeyenumerated_stateful3_vehicle_ejb_jar.addClass(ee.jakarta.tck.persistence.common.PMClientBase.class);
+    jpa_core_annotations_mapkeyenumerated_stateful3_vehicle_ejb_jar.addClass(ee.jakarta.tck.persistence.core.annotations.mapkeyenumerated.Client.class);
+    ear.addAsModule(jpa_core_annotations_mapkeyenumerated_stateful3_vehicle_ejb_jar);
+
+    JavaArchive jpa_core_annotations_mapkeyenumerated_stateless3_vehicle_client_jar = ShrinkWrap.create(JavaArchive.class, "jpa_core_annotations_mapkeyenumerated_stateless3_vehicle_client_jar");
+    jpa_core_annotations_mapkeyenumerated_stateless3_vehicle_client_jar.addClass(ee.jakarta.tck.persistence.common.PMClientBase.class);
+    ear.addAsModule(jpa_core_annotations_mapkeyenumerated_stateless3_vehicle_client_jar);
+
+    JavaArchive jpa_core_annotations_mapkeyenumerated_stateless3_vehicle_ejb_jar = ShrinkWrap.create(JavaArchive.class, "jpa_core_annotations_mapkeyenumerated_stateless3_vehicle_ejb_jar");
+    jpa_core_annotations_mapkeyenumerated_stateless3_vehicle_ejb_jar.addClass(ee.jakarta.tck.persistence.common.PMClientBase.class);
+    jpa_core_annotations_mapkeyenumerated_stateless3_vehicle_ejb_jar.addClass(ee.jakarta.tck.persistence.core.annotations.mapkeyenumerated.Client.class);
+    ear.addAsModule(jpa_core_annotations_mapkeyenumerated_stateless3_vehicle_ejb_jar);
+    return ear;
+  }
+
 	private static final Logger logger = (Logger) System.getLogger(Client.class.getName());
 
 	private static final long serialVersionUID = 20L;
diff --git a/jpa/spec-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/mapkeyjoincolumn/Client.java b/jpa/spec-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/mapkeyjoincolumn/Client.java
index 9faef1619..a2a31ff9b 100755
--- a/jpa/spec-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/mapkeyjoincolumn/Client.java
+++ b/jpa/spec-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/mapkeyjoincolumn/Client.java
@@ -20,8 +20,12 @@ import java.lang.System.Logger;
 import java.util.Hashtable;
 import java.util.Map;
 import java.util.Set;
-
+import org.jboss.arquillian.container.test.api.Deployment;
+import org.jboss.shrinkwrap.api.Archive;
+import org.jboss.shrinkwrap.api.ShrinkWrap;
+import org.jboss.shrinkwrap.api.spec.EnterpriseArchive;
 import org.jboss.shrinkwrap.api.spec.JavaArchive;
+import org.jboss.shrinkwrap.api.spec.WebArchive;
 import org.junit.jupiter.api.AfterEach;
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
@@ -31,6 +35,86 @@ import jakarta.persistence.EntityManager;
 
 public class Client extends PMClientBase {
 
+  @Deployment(testable = false)
+  public static Archive<?> deployment() {
+
+    final EnterpriseArchive ear = ShrinkWrap.create(EnterpriseArchive.class, "jpa_core_annotations_mapkeyjoincolumn_vehicles.ear");
+    // TODO: filter/eliminate the library jar classes that shouldn't be included
+    // Add ear/lib jars
+
+    JavaArchive jpa_core_annotations_mapkeyjoincolumn_jar = ShrinkWrap.create(JavaArchive.class, "jpa_core_annotations_mapkeyjoincolumn_jar");
+    jpa_core_annotations_mapkeyjoincolumn_jar.addClass(ee.jakarta.tck.persistence.core.annotations.mapkeyjoincolumn.Course.class);
+    jpa_core_annotations_mapkeyjoincolumn_jar.addClass(ee.jakarta.tck.persistence.core.annotations.mapkeyjoincolumn.Semester.class);
+    jpa_core_annotations_mapkeyjoincolumn_jar.addClass(ee.jakarta.tck.persistence.core.annotations.mapkeyjoincolumn.Student.class);
+    ear.addAsLibrary(jpa_core_annotations_mapkeyjoincolumn_jar);
+    // Add ear submodules
+
+    JavaArchive jpa_core_annotations_mapkeyjoincolumn_appmanagedNoTx_vehicle_client_jar = ShrinkWrap.create(JavaArchive.class, "jpa_core_annotations_mapkeyjoincolumn_appmanagedNoTx_vehicle_client_jar");
+    jpa_core_annotations_mapkeyjoincolumn_appmanagedNoTx_vehicle_client_jar.addClass(ee.jakarta.tck.persistence.common.PMClientBase.class);
+    ear.addAsModule(jpa_core_annotations_mapkeyjoincolumn_appmanagedNoTx_vehicle_client_jar);
+
+    JavaArchive jpa_core_annotations_mapkeyjoincolumn_appmanagedNoTx_vehicle_ejb_jar = ShrinkWrap.create(JavaArchive.class, "jpa_core_annotations_mapkeyjoincolumn_appmanagedNoTx_vehicle_ejb_jar");
+    jpa_core_annotations_mapkeyjoincolumn_appmanagedNoTx_vehicle_ejb_jar.addClass(ee.jakarta.tck.persistence.common.PMClientBase.class);
+    jpa_core_annotations_mapkeyjoincolumn_appmanagedNoTx_vehicle_ejb_jar.addClass(ee.jakarta.tck.persistence.core.annotations.mapkeyjoincolumn.Client.class);
+    ear.addAsModule(jpa_core_annotations_mapkeyjoincolumn_appmanagedNoTx_vehicle_ejb_jar);
+
+    JavaArchive jpa_core_annotations_mapkeyjoincolumn_appmanaged_vehicle_client_jar = ShrinkWrap.create(JavaArchive.class, "jpa_core_annotations_mapkeyjoincolumn_appmanaged_vehicle_client_jar");
+    jpa_core_annotations_mapkeyjoincolumn_appmanaged_vehicle_client_jar.addClass(ee.jakarta.tck.persistence.common.PMClientBase.class);
+    ear.addAsModule(jpa_core_annotations_mapkeyjoincolumn_appmanaged_vehicle_client_jar);
+
+    JavaArchive jpa_core_annotations_mapkeyjoincolumn_appmanaged_vehicle_ejb_jar = ShrinkWrap.create(JavaArchive.class, "jpa_core_annotations_mapkeyjoincolumn_appmanaged_vehicle_ejb_jar");
+    jpa_core_annotations_mapkeyjoincolumn_appmanaged_vehicle_ejb_jar.addClass(ee.jakarta.tck.persistence.common.PMClientBase.class);
+    jpa_core_annotations_mapkeyjoincolumn_appmanaged_vehicle_ejb_jar.addClass(ee.jakarta.tck.persistence.core.annotations.mapkeyjoincolumn.Client.class);
+    ear.addAsModule(jpa_core_annotations_mapkeyjoincolumn_appmanaged_vehicle_ejb_jar);
+
+    WebArchive jpa_core_annotations_mapkeyjoincolumn_pmservlet_vehicle_web_war = ShrinkWrap.create(WebArchive.class, "jpa_core_annotations_mapkeyjoincolumn_pmservlet_vehicle_web_war");
+    jpa_core_annotations_mapkeyjoincolumn_pmservlet_vehicle_web_war.addAsWebInfResource("web.xml");
+
+    JavaArchive jpa_core_annotations_mapkeyjoincolumn_jar = ShrinkWrap.create(JavaArchive.class, "jpa_core_annotations_mapkeyjoincolumn.jar");
+    jpa_core_annotations_mapkeyjoincolumn_jar.addClass(ee.jakarta.tck.persistence.core.annotations.mapkeyjoincolumn.Course.class);
+    jpa_core_annotations_mapkeyjoincolumn_jar.addClass(ee.jakarta.tck.persistence.core.annotations.mapkeyjoincolumn.Semester.class);
+    jpa_core_annotations_mapkeyjoincolumn_jar.addClass(ee.jakarta.tck.persistence.core.annotations.mapkeyjoincolumn.Student.class);
+    jpa_core_annotations_mapkeyjoincolumn_jar.addAsManifestResource("META-INF/MANIFEST.MF");
+    jpa_core_annotations_mapkeyjoincolumn_jar.addAsManifestResource("META-INF/persistence.xml");
+    jpa_core_annotations_mapkeyjoincolumn_pmservlet_vehicle_web_war.addAsLibrary(jpa_core_annotations_mapkeyjoincolumn_jar);
+    jpa_core_annotations_mapkeyjoincolumn_pmservlet_vehicle_web_war.addClass(ee.jakarta.tck.persistence.common.PMClientBase.class);
+    jpa_core_annotations_mapkeyjoincolumn_pmservlet_vehicle_web_war.addClass(ee.jakarta.tck.persistence.core.annotations.mapkeyjoincolumn.Client.class);
+    ear.addAsModule(jpa_core_annotations_mapkeyjoincolumn_pmservlet_vehicle_web_war);
+
+    WebArchive jpa_core_annotations_mapkeyjoincolumn_puservlet_vehicle_web_war = ShrinkWrap.create(WebArchive.class, "jpa_core_annotations_mapkeyjoincolumn_puservlet_vehicle_web_war");
+    jpa_core_annotations_mapkeyjoincolumn_puservlet_vehicle_web_war.addAsWebInfResource("web.xml");
+
+    JavaArchive jpa_core_annotations_mapkeyjoincolumn_jar = ShrinkWrap.create(JavaArchive.class, "jpa_core_annotations_mapkeyjoincolumn.jar");
+    jpa_core_annotations_mapkeyjoincolumn_jar.addClass(ee.jakarta.tck.persistence.core.annotations.mapkeyjoincolumn.Course.class);
+    jpa_core_annotations_mapkeyjoincolumn_jar.addClass(ee.jakarta.tck.persistence.core.annotations.mapkeyjoincolumn.Semester.class);
+    jpa_core_annotations_mapkeyjoincolumn_jar.addClass(ee.jakarta.tck.persistence.core.annotations.mapkeyjoincolumn.Student.class);
+    jpa_core_annotations_mapkeyjoincolumn_jar.addAsManifestResource("META-INF/MANIFEST.MF");
+    jpa_core_annotations_mapkeyjoincolumn_jar.addAsManifestResource("META-INF/persistence.xml");
+    jpa_core_annotations_mapkeyjoincolumn_puservlet_vehicle_web_war.addAsLibrary(jpa_core_annotations_mapkeyjoincolumn_jar);
+    jpa_core_annotations_mapkeyjoincolumn_puservlet_vehicle_web_war.addClass(ee.jakarta.tck.persistence.common.PMClientBase.class);
+    jpa_core_annotations_mapkeyjoincolumn_puservlet_vehicle_web_war.addClass(ee.jakarta.tck.persistence.core.annotations.mapkeyjoincolumn.Client.class);
+    ear.addAsModule(jpa_core_annotations_mapkeyjoincolumn_puservlet_vehicle_web_war);
+
+    JavaArchive jpa_core_annotations_mapkeyjoincolumn_stateful3_vehicle_client_jar = ShrinkWrap.create(JavaArchive.class, "jpa_core_annotations_mapkeyjoincolumn_stateful3_vehicle_client_jar");
+    jpa_core_annotations_mapkeyjoincolumn_stateful3_vehicle_client_jar.addClass(ee.jakarta.tck.persistence.common.PMClientBase.class);
+    ear.addAsModule(jpa_core_annotations_mapkeyjoincolumn_stateful3_vehicle_client_jar);
+
+    JavaArchive jpa_core_annotations_mapkeyjoincolumn_stateful3_vehicle_ejb_jar = ShrinkWrap.create(JavaArchive.class, "jpa_core_annotations_mapkeyjoincolumn_stateful3_vehicle_ejb_jar");
+    jpa_core_annotations_mapkeyjoincolumn_stateful3_vehicle_ejb_jar.addClass(ee.jakarta.tck.persistence.common.PMClientBase.class);
+    jpa_core_annotations_mapkeyjoincolumn_stateful3_vehicle_ejb_jar.addClass(ee.jakarta.tck.persistence.core.annotations.mapkeyjoincolumn.Client.class);
+    ear.addAsModule(jpa_core_annotations_mapkeyjoincolumn_stateful3_vehicle_ejb_jar);
+
+    JavaArchive jpa_core_annotations_mapkeyjoincolumn_stateless3_vehicle_client_jar = ShrinkWrap.create(JavaArchive.class, "jpa_core_annotations_mapkeyjoincolumn_stateless3_vehicle_client_jar");
+    jpa_core_annotations_mapkeyjoincolumn_stateless3_vehicle_client_jar.addClass(ee.jakarta.tck.persistence.common.PMClientBase.class);
+    ear.addAsModule(jpa_core_annotations_mapkeyjoincolumn_stateless3_vehicle_client_jar);
+
+    JavaArchive jpa_core_annotations_mapkeyjoincolumn_stateless3_vehicle_ejb_jar = ShrinkWrap.create(JavaArchive.class, "jpa_core_annotations_mapkeyjoincolumn_stateless3_vehicle_ejb_jar");
+    jpa_core_annotations_mapkeyjoincolumn_stateless3_vehicle_ejb_jar.addClass(ee.jakarta.tck.persistence.common.PMClientBase.class);
+    jpa_core_annotations_mapkeyjoincolumn_stateless3_vehicle_ejb_jar.addClass(ee.jakarta.tck.persistence.core.annotations.mapkeyjoincolumn.Client.class);
+    ear.addAsModule(jpa_core_annotations_mapkeyjoincolumn_stateless3_vehicle_ejb_jar);
+    return ear;
+  }
+
 	private Map<Course, Semester> student7EnrollmentMap;
 
 	private static final Logger logger = (Logger) System.getLogger(Client.class.getName());
diff --git a/jpa/spec-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/mapkeytemporal/Client.java b/jpa/spec-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/mapkeytemporal/Client.java
index c4b7496bd..1ee18eb9c 100644
--- a/jpa/spec-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/mapkeytemporal/Client.java
+++ b/jpa/spec-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/mapkeytemporal/Client.java
@@ -26,8 +26,12 @@ import java.util.Map.Entry;
 import java.util.Set;
 import java.util.stream.Collectors;
 import java.util.stream.Stream;
-
+import org.jboss.arquillian.container.test.api.Deployment;
+import org.jboss.shrinkwrap.api.Archive;
+import org.jboss.shrinkwrap.api.ShrinkWrap;
+import org.jboss.shrinkwrap.api.spec.EnterpriseArchive;
 import org.jboss.shrinkwrap.api.spec.JavaArchive;
+import org.jboss.shrinkwrap.api.spec.WebArchive;
 import org.junit.jupiter.api.AfterEach;
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
@@ -38,6 +42,98 @@ import ee.jakarta.tck.persistence.common.PMClientBase;
 
 public class Client extends PMClientBase {
 
+  @Deployment(testable = false)
+  public static Archive<?> deployment() {
+
+    final EnterpriseArchive ear = ShrinkWrap.create(EnterpriseArchive.class, "jpa_core_annotations_mapKeyTemporal_vehicles.ear");
+    // TODO: filter/eliminate the library jar classes that shouldn't be included
+    // Add ear/lib jars
+
+    JavaArchive jpa_core_annotations_mapKeyTemporal_jar = ShrinkWrap.create(JavaArchive.class, "jpa_core_annotations_mapKeyTemporal_jar");
+    jpa_core_annotations_mapKeyTemporal_jar.addClass(ee.jakarta.tck.persistence.core.annotations.mapkeytemporal.Department.class);
+    jpa_core_annotations_mapKeyTemporal_jar.addClass(ee.jakarta.tck.persistence.core.annotations.mapkeytemporal.Department2.class);
+    jpa_core_annotations_mapKeyTemporal_jar.addClass(ee.jakarta.tck.persistence.core.annotations.mapkeytemporal.Department4.class);
+    jpa_core_annotations_mapKeyTemporal_jar.addClass(ee.jakarta.tck.persistence.core.annotations.mapkeytemporal.EmbeddedEmployee.class);
+    jpa_core_annotations_mapKeyTemporal_jar.addClass(ee.jakarta.tck.persistence.core.annotations.mapkeytemporal.Employee.class);
+    jpa_core_annotations_mapKeyTemporal_jar.addClass(ee.jakarta.tck.persistence.core.annotations.mapkeytemporal.Employee2.class);
+    jpa_core_annotations_mapKeyTemporal_jar.addClass(ee.jakarta.tck.persistence.core.annotations.mapkeytemporal.Employee4.class);
+    ear.addAsLibrary(jpa_core_annotations_mapKeyTemporal_jar);
+    // Add ear submodules
+
+    JavaArchive jpa_core_annotations_mapKeyTemporal_appmanagedNoTx_vehicle_client_jar = ShrinkWrap.create(JavaArchive.class, "jpa_core_annotations_mapKeyTemporal_appmanagedNoTx_vehicle_client_jar");
+    jpa_core_annotations_mapKeyTemporal_appmanagedNoTx_vehicle_client_jar.addClass(ee.jakarta.tck.persistence.common.PMClientBase.class);
+    ear.addAsModule(jpa_core_annotations_mapKeyTemporal_appmanagedNoTx_vehicle_client_jar);
+
+    JavaArchive jpa_core_annotations_mapKeyTemporal_appmanagedNoTx_vehicle_ejb_jar = ShrinkWrap.create(JavaArchive.class, "jpa_core_annotations_mapKeyTemporal_appmanagedNoTx_vehicle_ejb_jar");
+    jpa_core_annotations_mapKeyTemporal_appmanagedNoTx_vehicle_ejb_jar.addClass(ee.jakarta.tck.persistence.common.PMClientBase.class);
+    jpa_core_annotations_mapKeyTemporal_appmanagedNoTx_vehicle_ejb_jar.addClass(ee.jakarta.tck.persistence.core.annotations.mapkeytemporal.Client.class);
+    ear.addAsModule(jpa_core_annotations_mapKeyTemporal_appmanagedNoTx_vehicle_ejb_jar);
+
+    JavaArchive jpa_core_annotations_mapKeyTemporal_appmanaged_vehicle_client_jar = ShrinkWrap.create(JavaArchive.class, "jpa_core_annotations_mapKeyTemporal_appmanaged_vehicle_client_jar");
+    jpa_core_annotations_mapKeyTemporal_appmanaged_vehicle_client_jar.addClass(ee.jakarta.tck.persistence.common.PMClientBase.class);
+    ear.addAsModule(jpa_core_annotations_mapKeyTemporal_appmanaged_vehicle_client_jar);
+
+    JavaArchive jpa_core_annotations_mapKeyTemporal_appmanaged_vehicle_ejb_jar = ShrinkWrap.create(JavaArchive.class, "jpa_core_annotations_mapKeyTemporal_appmanaged_vehicle_ejb_jar");
+    jpa_core_annotations_mapKeyTemporal_appmanaged_vehicle_ejb_jar.addClass(ee.jakarta.tck.persistence.common.PMClientBase.class);
+    jpa_core_annotations_mapKeyTemporal_appmanaged_vehicle_ejb_jar.addClass(ee.jakarta.tck.persistence.core.annotations.mapkeytemporal.Client.class);
+    ear.addAsModule(jpa_core_annotations_mapKeyTemporal_appmanaged_vehicle_ejb_jar);
+
+    WebArchive jpa_core_annotations_mapKeyTemporal_pmservlet_vehicle_web_war = ShrinkWrap.create(WebArchive.class, "jpa_core_annotations_mapKeyTemporal_pmservlet_vehicle_web_war");
+    jpa_core_annotations_mapKeyTemporal_pmservlet_vehicle_web_war.addAsWebInfResource("web.xml");
+
+    JavaArchive jpa_core_annotations_mapKeyTemporal_jar = ShrinkWrap.create(JavaArchive.class, "jpa_core_annotations_mapKeyTemporal.jar");
+    jpa_core_annotations_mapKeyTemporal_jar.addClass(ee.jakarta.tck.persistence.core.annotations.mapkeytemporal.Department.class);
+    jpa_core_annotations_mapKeyTemporal_jar.addClass(ee.jakarta.tck.persistence.core.annotations.mapkeytemporal.Department2.class);
+    jpa_core_annotations_mapKeyTemporal_jar.addClass(ee.jakarta.tck.persistence.core.annotations.mapkeytemporal.Department4.class);
+    jpa_core_annotations_mapKeyTemporal_jar.addClass(ee.jakarta.tck.persistence.core.annotations.mapkeytemporal.EmbeddedEmployee.class);
+    jpa_core_annotations_mapKeyTemporal_jar.addClass(ee.jakarta.tck.persistence.core.annotations.mapkeytemporal.Employee.class);
+    jpa_core_annotations_mapKeyTemporal_jar.addClass(ee.jakarta.tck.persistence.core.annotations.mapkeytemporal.Employee2.class);
+    jpa_core_annotations_mapKeyTemporal_jar.addClass(ee.jakarta.tck.persistence.core.annotations.mapkeytemporal.Employee4.class);
+    jpa_core_annotations_mapKeyTemporal_jar.addAsManifestResource("META-INF/MANIFEST.MF");
+    jpa_core_annotations_mapKeyTemporal_jar.addAsManifestResource("META-INF/persistence.xml");
+    jpa_core_annotations_mapKeyTemporal_pmservlet_vehicle_web_war.addAsLibrary(jpa_core_annotations_mapKeyTemporal_jar);
+    jpa_core_annotations_mapKeyTemporal_pmservlet_vehicle_web_war.addClass(ee.jakarta.tck.persistence.common.PMClientBase.class);
+    jpa_core_annotations_mapKeyTemporal_pmservlet_vehicle_web_war.addClass(ee.jakarta.tck.persistence.core.annotations.mapkeytemporal.Client.class);
+    ear.addAsModule(jpa_core_annotations_mapKeyTemporal_pmservlet_vehicle_web_war);
+
+    WebArchive jpa_core_annotations_mapKeyTemporal_puservlet_vehicle_web_war = ShrinkWrap.create(WebArchive.class, "jpa_core_annotations_mapKeyTemporal_puservlet_vehicle_web_war");
+    jpa_core_annotations_mapKeyTemporal_puservlet_vehicle_web_war.addAsWebInfResource("web.xml");
+
+    JavaArchive jpa_core_annotations_mapKeyTemporal_jar = ShrinkWrap.create(JavaArchive.class, "jpa_core_annotations_mapKeyTemporal.jar");
+    jpa_core_annotations_mapKeyTemporal_jar.addClass(ee.jakarta.tck.persistence.core.annotations.mapkeytemporal.Department.class);
+    jpa_core_annotations_mapKeyTemporal_jar.addClass(ee.jakarta.tck.persistence.core.annotations.mapkeytemporal.Department2.class);
+    jpa_core_annotations_mapKeyTemporal_jar.addClass(ee.jakarta.tck.persistence.core.annotations.mapkeytemporal.Department4.class);
+    jpa_core_annotations_mapKeyTemporal_jar.addClass(ee.jakarta.tck.persistence.core.annotations.mapkeytemporal.EmbeddedEmployee.class);
+    jpa_core_annotations_mapKeyTemporal_jar.addClass(ee.jakarta.tck.persistence.core.annotations.mapkeytemporal.Employee.class);
+    jpa_core_annotations_mapKeyTemporal_jar.addClass(ee.jakarta.tck.persistence.core.annotations.mapkeytemporal.Employee2.class);
+    jpa_core_annotations_mapKeyTemporal_jar.addClass(ee.jakarta.tck.persistence.core.annotations.mapkeytemporal.Employee4.class);
+    jpa_core_annotations_mapKeyTemporal_jar.addAsManifestResource("META-INF/MANIFEST.MF");
+    jpa_core_annotations_mapKeyTemporal_jar.addAsManifestResource("META-INF/persistence.xml");
+    jpa_core_annotations_mapKeyTemporal_puservlet_vehicle_web_war.addAsLibrary(jpa_core_annotations_mapKeyTemporal_jar);
+    jpa_core_annotations_mapKeyTemporal_puservlet_vehicle_web_war.addClass(ee.jakarta.tck.persistence.common.PMClientBase.class);
+    jpa_core_annotations_mapKeyTemporal_puservlet_vehicle_web_war.addClass(ee.jakarta.tck.persistence.core.annotations.mapkeytemporal.Client.class);
+    ear.addAsModule(jpa_core_annotations_mapKeyTemporal_puservlet_vehicle_web_war);
+
+    JavaArchive jpa_core_annotations_mapKeyTemporal_stateful3_vehicle_client_jar = ShrinkWrap.create(JavaArchive.class, "jpa_core_annotations_mapKeyTemporal_stateful3_vehicle_client_jar");
+    jpa_core_annotations_mapKeyTemporal_stateful3_vehicle_client_jar.addClass(ee.jakarta.tck.persistence.common.PMClientBase.class);
+    ear.addAsModule(jpa_core_annotations_mapKeyTemporal_stateful3_vehicle_client_jar);
+
+    JavaArchive jpa_core_annotations_mapKeyTemporal_stateful3_vehicle_ejb_jar = ShrinkWrap.create(JavaArchive.class, "jpa_core_annotations_mapKeyTemporal_stateful3_vehicle_ejb_jar");
+    jpa_core_annotations_mapKeyTemporal_stateful3_vehicle_ejb_jar.addClass(ee.jakarta.tck.persistence.common.PMClientBase.class);
+    jpa_core_annotations_mapKeyTemporal_stateful3_vehicle_ejb_jar.addClass(ee.jakarta.tck.persistence.core.annotations.mapkeytemporal.Client.class);
+    ear.addAsModule(jpa_core_annotations_mapKeyTemporal_stateful3_vehicle_ejb_jar);
+
+    JavaArchive jpa_core_annotations_mapKeyTemporal_stateless3_vehicle_client_jar = ShrinkWrap.create(JavaArchive.class, "jpa_core_annotations_mapKeyTemporal_stateless3_vehicle_client_jar");
+    jpa_core_annotations_mapKeyTemporal_stateless3_vehicle_client_jar.addClass(ee.jakarta.tck.persistence.common.PMClientBase.class);
+    ear.addAsModule(jpa_core_annotations_mapKeyTemporal_stateless3_vehicle_client_jar);
+
+    JavaArchive jpa_core_annotations_mapKeyTemporal_stateless3_vehicle_ejb_jar = ShrinkWrap.create(JavaArchive.class, "jpa_core_annotations_mapKeyTemporal_stateless3_vehicle_ejb_jar");
+    jpa_core_annotations_mapKeyTemporal_stateless3_vehicle_ejb_jar.addClass(ee.jakarta.tck.persistence.common.PMClientBase.class);
+    jpa_core_annotations_mapKeyTemporal_stateless3_vehicle_ejb_jar.addClass(ee.jakarta.tck.persistence.core.annotations.mapkeytemporal.Client.class);
+    ear.addAsModule(jpa_core_annotations_mapKeyTemporal_stateless3_vehicle_ejb_jar);
+    return ear;
+  }
+
 	private static final Logger logger = (Logger) System.getLogger(Client.class.getName());
 
 	public JavaArchive createDeployment() throws Exception {
diff --git a/jpa/spec-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/mapsid/Client.java b/jpa/spec-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/mapsid/Client.java
index 23b29ce5b..b2229a459 100644
--- a/jpa/spec-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/mapsid/Client.java
+++ b/jpa/spec-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/mapsid/Client.java
@@ -18,8 +18,12 @@ package ee.jakarta.tck.persistence.core.annotations.mapsid;
 
 import java.lang.System.Logger;
 import java.util.List;
-
+import org.jboss.arquillian.container.test.api.Deployment;
+import org.jboss.shrinkwrap.api.Archive;
+import org.jboss.shrinkwrap.api.ShrinkWrap;
+import org.jboss.shrinkwrap.api.spec.EnterpriseArchive;
 import org.jboss.shrinkwrap.api.spec.JavaArchive;
+import org.jboss.shrinkwrap.api.spec.WebArchive;
 import org.junit.jupiter.api.AfterEach;
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
@@ -30,6 +34,86 @@ import jakarta.persistence.EntityTransaction;
 
 public class Client extends PMClientBase {
 
+  @Deployment(testable = false)
+  public static Archive<?> deployment() {
+
+    final EnterpriseArchive ear = ShrinkWrap.create(EnterpriseArchive.class, "jpa_core_annotations_mapsid_vehicles.ear");
+    // TODO: filter/eliminate the library jar classes that shouldn't be included
+    // Add ear/lib jars
+
+    JavaArchive jpa_core_annotations_mapsid_jar = ShrinkWrap.create(JavaArchive.class, "jpa_core_annotations_mapsid_jar");
+    jpa_core_annotations_mapsid_jar.addClass(ee.jakarta.tck.persistence.core.annotations.mapsid.DID1bDependent.class);
+    jpa_core_annotations_mapsid_jar.addClass(ee.jakarta.tck.persistence.core.annotations.mapsid.DID1bDependentId.class);
+    jpa_core_annotations_mapsid_jar.addClass(ee.jakarta.tck.persistence.core.annotations.mapsid.DID1bEmployee.class);
+    ear.addAsLibrary(jpa_core_annotations_mapsid_jar);
+    // Add ear submodules
+
+    JavaArchive jpa_core_annotations_mapsid_appmanagedNoTx_vehicle_client_jar = ShrinkWrap.create(JavaArchive.class, "jpa_core_annotations_mapsid_appmanagedNoTx_vehicle_client_jar");
+    jpa_core_annotations_mapsid_appmanagedNoTx_vehicle_client_jar.addClass(ee.jakarta.tck.persistence.common.PMClientBase.class);
+    ear.addAsModule(jpa_core_annotations_mapsid_appmanagedNoTx_vehicle_client_jar);
+
+    JavaArchive jpa_core_annotations_mapsid_appmanagedNoTx_vehicle_ejb_jar = ShrinkWrap.create(JavaArchive.class, "jpa_core_annotations_mapsid_appmanagedNoTx_vehicle_ejb_jar");
+    jpa_core_annotations_mapsid_appmanagedNoTx_vehicle_ejb_jar.addClass(ee.jakarta.tck.persistence.common.PMClientBase.class);
+    jpa_core_annotations_mapsid_appmanagedNoTx_vehicle_ejb_jar.addClass(ee.jakarta.tck.persistence.core.annotations.mapsid.Client.class);
+    ear.addAsModule(jpa_core_annotations_mapsid_appmanagedNoTx_vehicle_ejb_jar);
+
+    JavaArchive jpa_core_annotations_mapsid_appmanaged_vehicle_client_jar = ShrinkWrap.create(JavaArchive.class, "jpa_core_annotations_mapsid_appmanaged_vehicle_client_jar");
+    jpa_core_annotations_mapsid_appmanaged_vehicle_client_jar.addClass(ee.jakarta.tck.persistence.common.PMClientBase.class);
+    ear.addAsModule(jpa_core_annotations_mapsid_appmanaged_vehicle_client_jar);
+
+    JavaArchive jpa_core_annotations_mapsid_appmanaged_vehicle_ejb_jar = ShrinkWrap.create(JavaArchive.class, "jpa_core_annotations_mapsid_appmanaged_vehicle_ejb_jar");
+    jpa_core_annotations_mapsid_appmanaged_vehicle_ejb_jar.addClass(ee.jakarta.tck.persistence.common.PMClientBase.class);
+    jpa_core_annotations_mapsid_appmanaged_vehicle_ejb_jar.addClass(ee.jakarta.tck.persistence.core.annotations.mapsid.Client.class);
+    ear.addAsModule(jpa_core_annotations_mapsid_appmanaged_vehicle_ejb_jar);
+
+    WebArchive jpa_core_annotations_mapsid_pmservlet_vehicle_web_war = ShrinkWrap.create(WebArchive.class, "jpa_core_annotations_mapsid_pmservlet_vehicle_web_war");
+    jpa_core_annotations_mapsid_pmservlet_vehicle_web_war.addAsWebInfResource("web.xml");
+
+    JavaArchive jpa_core_annotations_mapsid_jar = ShrinkWrap.create(JavaArchive.class, "jpa_core_annotations_mapsid.jar");
+    jpa_core_annotations_mapsid_jar.addClass(ee.jakarta.tck.persistence.core.annotations.mapsid.DID1bDependent.class);
+    jpa_core_annotations_mapsid_jar.addClass(ee.jakarta.tck.persistence.core.annotations.mapsid.DID1bDependentId.class);
+    jpa_core_annotations_mapsid_jar.addClass(ee.jakarta.tck.persistence.core.annotations.mapsid.DID1bEmployee.class);
+    jpa_core_annotations_mapsid_jar.addAsManifestResource("META-INF/MANIFEST.MF");
+    jpa_core_annotations_mapsid_jar.addAsManifestResource("META-INF/persistence.xml");
+    jpa_core_annotations_mapsid_pmservlet_vehicle_web_war.addAsLibrary(jpa_core_annotations_mapsid_jar);
+    jpa_core_annotations_mapsid_pmservlet_vehicle_web_war.addClass(ee.jakarta.tck.persistence.common.PMClientBase.class);
+    jpa_core_annotations_mapsid_pmservlet_vehicle_web_war.addClass(ee.jakarta.tck.persistence.core.annotations.mapsid.Client.class);
+    ear.addAsModule(jpa_core_annotations_mapsid_pmservlet_vehicle_web_war);
+
+    WebArchive jpa_core_annotations_mapsid_puservlet_vehicle_web_war = ShrinkWrap.create(WebArchive.class, "jpa_core_annotations_mapsid_puservlet_vehicle_web_war");
+    jpa_core_annotations_mapsid_puservlet_vehicle_web_war.addAsWebInfResource("web.xml");
+
+    JavaArchive jpa_core_annotations_mapsid_jar = ShrinkWrap.create(JavaArchive.class, "jpa_core_annotations_mapsid.jar");
+    jpa_core_annotations_mapsid_jar.addClass(ee.jakarta.tck.persistence.core.annotations.mapsid.DID1bDependent.class);
+    jpa_core_annotations_mapsid_jar.addClass(ee.jakarta.tck.persistence.core.annotations.mapsid.DID1bDependentId.class);
+    jpa_core_annotations_mapsid_jar.addClass(ee.jakarta.tck.persistence.core.annotations.mapsid.DID1bEmployee.class);
+    jpa_core_annotations_mapsid_jar.addAsManifestResource("META-INF/MANIFEST.MF");
+    jpa_core_annotations_mapsid_jar.addAsManifestResource("META-INF/persistence.xml");
+    jpa_core_annotations_mapsid_puservlet_vehicle_web_war.addAsLibrary(jpa_core_annotations_mapsid_jar);
+    jpa_core_annotations_mapsid_puservlet_vehicle_web_war.addClass(ee.jakarta.tck.persistence.common.PMClientBase.class);
+    jpa_core_annotations_mapsid_puservlet_vehicle_web_war.addClass(ee.jakarta.tck.persistence.core.annotations.mapsid.Client.class);
+    ear.addAsModule(jpa_core_annotations_mapsid_puservlet_vehicle_web_war);
+
+    JavaArchive jpa_core_annotations_mapsid_stateful3_vehicle_client_jar = ShrinkWrap.create(JavaArchive.class, "jpa_core_annotations_mapsid_stateful3_vehicle_client_jar");
+    jpa_core_annotations_mapsid_stateful3_vehicle_client_jar.addClass(ee.jakarta.tck.persistence.common.PMClientBase.class);
+    ear.addAsModule(jpa_core_annotations_mapsid_stateful3_vehicle_client_jar);
+
+    JavaArchive jpa_core_annotations_mapsid_stateful3_vehicle_ejb_jar = ShrinkWrap.create(JavaArchive.class, "jpa_core_annotations_mapsid_stateful3_vehicle_ejb_jar");
+    jpa_core_annotations_mapsid_stateful3_vehicle_ejb_jar.addClass(ee.jakarta.tck.persistence.common.PMClientBase.class);
+    jpa_core_annotations_mapsid_stateful3_vehicle_ejb_jar.addClass(ee.jakarta.tck.persistence.core.annotations.mapsid.Client.class);
+    ear.addAsModule(jpa_core_annotations_mapsid_stateful3_vehicle_ejb_jar);
+
+    JavaArchive jpa_core_annotations_mapsid_stateless3_vehicle_client_jar = ShrinkWrap.create(JavaArchive.class, "jpa_core_annotations_mapsid_stateless3_vehicle_client_jar");
+    jpa_core_annotations_mapsid_stateless3_vehicle_client_jar.addClass(ee.jakarta.tck.persistence.common.PMClientBase.class);
+    ear.addAsModule(jpa_core_annotations_mapsid_stateless3_vehicle_client_jar);
+
+    JavaArchive jpa_core_annotations_mapsid_stateless3_vehicle_ejb_jar = ShrinkWrap.create(JavaArchive.class, "jpa_core_annotations_mapsid_stateless3_vehicle_ejb_jar");
+    jpa_core_annotations_mapsid_stateless3_vehicle_ejb_jar.addClass(ee.jakarta.tck.persistence.common.PMClientBase.class);
+    jpa_core_annotations_mapsid_stateless3_vehicle_ejb_jar.addClass(ee.jakarta.tck.persistence.core.annotations.mapsid.Client.class);
+    ear.addAsModule(jpa_core_annotations_mapsid_stateless3_vehicle_ejb_jar);
+    return ear;
+  }
+
 	private static final Logger logger = (Logger) System.getLogger(Client.class.getName());
 
 	public Client() {
diff --git a/jpa/spec-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/nativequery/Client.java b/jpa/spec-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/nativequery/Client.java
index b31919d93..46107c271 100644
--- a/jpa/spec-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/nativequery/Client.java
+++ b/jpa/spec-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/nativequery/Client.java
@@ -23,8 +23,12 @@ package ee.jakarta.tck.persistence.core.annotations.nativequery;
 import java.lang.System.Logger;
 import java.util.ArrayList;
 import java.util.List;
-
+import org.jboss.arquillian.container.test.api.Deployment;
+import org.jboss.shrinkwrap.api.Archive;
+import org.jboss.shrinkwrap.api.ShrinkWrap;
+import org.jboss.shrinkwrap.api.spec.EnterpriseArchive;
 import org.jboss.shrinkwrap.api.spec.JavaArchive;
+import org.jboss.shrinkwrap.api.spec.WebArchive;
 import org.junit.jupiter.api.AfterEach;
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
@@ -34,6 +38,91 @@ import jakarta.persistence.TransactionRequiredException;
 
 public class Client extends PMClientBase {
 
+  @Deployment(testable = false)
+  public static Archive<?> deployment() {
+
+    final EnterpriseArchive ear = ShrinkWrap.create(EnterpriseArchive.class, "jpa_core_annotations_nativequery_vehicles.ear");
+    // TODO: filter/eliminate the library jar classes that shouldn't be included
+    // Add ear/lib jars
+
+    JavaArchive jpa_core_annotations_nativequery_jar = ShrinkWrap.create(JavaArchive.class, "jpa_core_annotations_nativequery_jar");
+    jpa_core_annotations_nativequery_jar.addClass(ee.jakarta.tck.persistence.core.annotations.nativequery.Item.class);
+    jpa_core_annotations_nativequery_jar.addClass(ee.jakarta.tck.persistence.core.annotations.nativequery.Order1.class);
+    jpa_core_annotations_nativequery_jar.addClass(ee.jakarta.tck.persistence.core.annotations.nativequery.Order2.class);
+    jpa_core_annotations_nativequery_jar.addClass(ee.jakarta.tck.persistence.core.annotations.nativequery.PurchaseOrder.class);
+    ear.addAsLibrary(jpa_core_annotations_nativequery_jar);
+    // Add ear submodules
+
+    JavaArchive jpa_core_annotations_nativequery_appmanagedNoTx_vehicle_client_jar = ShrinkWrap.create(JavaArchive.class, "jpa_core_annotations_nativequery_appmanagedNoTx_vehicle_client_jar");
+    jpa_core_annotations_nativequery_appmanagedNoTx_vehicle_client_jar.addClass(ee.jakarta.tck.persistence.common.PMClientBase.class);
+    ear.addAsModule(jpa_core_annotations_nativequery_appmanagedNoTx_vehicle_client_jar);
+
+    JavaArchive jpa_core_annotations_nativequery_appmanagedNoTx_vehicle_ejb_jar = ShrinkWrap.create(JavaArchive.class, "jpa_core_annotations_nativequery_appmanagedNoTx_vehicle_ejb_jar");
+    jpa_core_annotations_nativequery_appmanagedNoTx_vehicle_ejb_jar.addClass(ee.jakarta.tck.persistence.common.PMClientBase.class);
+    jpa_core_annotations_nativequery_appmanagedNoTx_vehicle_ejb_jar.addClass(ee.jakarta.tck.persistence.core.annotations.nativequery.Client.class);
+    ear.addAsModule(jpa_core_annotations_nativequery_appmanagedNoTx_vehicle_ejb_jar);
+
+    JavaArchive jpa_core_annotations_nativequery_appmanaged_vehicle_client_jar = ShrinkWrap.create(JavaArchive.class, "jpa_core_annotations_nativequery_appmanaged_vehicle_client_jar");
+    jpa_core_annotations_nativequery_appmanaged_vehicle_client_jar.addClass(ee.jakarta.tck.persistence.common.PMClientBase.class);
+    ear.addAsModule(jpa_core_annotations_nativequery_appmanaged_vehicle_client_jar);
+
+    JavaArchive jpa_core_annotations_nativequery_appmanaged_vehicle_ejb_jar = ShrinkWrap.create(JavaArchive.class, "jpa_core_annotations_nativequery_appmanaged_vehicle_ejb_jar");
+    jpa_core_annotations_nativequery_appmanaged_vehicle_ejb_jar.addClass(ee.jakarta.tck.persistence.common.PMClientBase.class);
+    jpa_core_annotations_nativequery_appmanaged_vehicle_ejb_jar.addClass(ee.jakarta.tck.persistence.core.annotations.nativequery.Client.class);
+    ear.addAsModule(jpa_core_annotations_nativequery_appmanaged_vehicle_ejb_jar);
+
+    WebArchive jpa_core_annotations_nativequery_pmservlet_vehicle_web_war = ShrinkWrap.create(WebArchive.class, "jpa_core_annotations_nativequery_pmservlet_vehicle_web_war");
+    jpa_core_annotations_nativequery_pmservlet_vehicle_web_war.addAsWebInfResource("web.xml");
+
+    JavaArchive jpa_core_annotations_nativequery_jar = ShrinkWrap.create(JavaArchive.class, "jpa_core_annotations_nativequery.jar");
+    jpa_core_annotations_nativequery_jar.addClass(ee.jakarta.tck.persistence.core.annotations.nativequery.Item.class);
+    jpa_core_annotations_nativequery_jar.addClass(ee.jakarta.tck.persistence.core.annotations.nativequery.Order1.class);
+    jpa_core_annotations_nativequery_jar.addClass(ee.jakarta.tck.persistence.core.annotations.nativequery.Order2.class);
+    jpa_core_annotations_nativequery_jar.addClass(ee.jakarta.tck.persistence.core.annotations.nativequery.PurchaseOrder.class);
+    jpa_core_annotations_nativequery_jar.addAsManifestResource("META-INF/MANIFEST.MF");
+    jpa_core_annotations_nativequery_jar.addAsManifestResource("META-INF/orm.xml");
+    jpa_core_annotations_nativequery_jar.addAsManifestResource("META-INF/persistence.xml");
+    jpa_core_annotations_nativequery_pmservlet_vehicle_web_war.addAsLibrary(jpa_core_annotations_nativequery_jar);
+    jpa_core_annotations_nativequery_pmservlet_vehicle_web_war.addClass(ee.jakarta.tck.persistence.common.PMClientBase.class);
+    jpa_core_annotations_nativequery_pmservlet_vehicle_web_war.addClass(ee.jakarta.tck.persistence.core.annotations.nativequery.Client.class);
+    ear.addAsModule(jpa_core_annotations_nativequery_pmservlet_vehicle_web_war);
+
+    WebArchive jpa_core_annotations_nativequery_puservlet_vehicle_web_war = ShrinkWrap.create(WebArchive.class, "jpa_core_annotations_nativequery_puservlet_vehicle_web_war");
+    jpa_core_annotations_nativequery_puservlet_vehicle_web_war.addAsWebInfResource("web.xml");
+
+    JavaArchive jpa_core_annotations_nativequery_jar = ShrinkWrap.create(JavaArchive.class, "jpa_core_annotations_nativequery.jar");
+    jpa_core_annotations_nativequery_jar.addClass(ee.jakarta.tck.persistence.core.annotations.nativequery.Item.class);
+    jpa_core_annotations_nativequery_jar.addClass(ee.jakarta.tck.persistence.core.annotations.nativequery.Order1.class);
+    jpa_core_annotations_nativequery_jar.addClass(ee.jakarta.tck.persistence.core.annotations.nativequery.Order2.class);
+    jpa_core_annotations_nativequery_jar.addClass(ee.jakarta.tck.persistence.core.annotations.nativequery.PurchaseOrder.class);
+    jpa_core_annotations_nativequery_jar.addAsManifestResource("META-INF/MANIFEST.MF");
+    jpa_core_annotations_nativequery_jar.addAsManifestResource("META-INF/orm.xml");
+    jpa_core_annotations_nativequery_jar.addAsManifestResource("META-INF/persistence.xml");
+    jpa_core_annotations_nativequery_puservlet_vehicle_web_war.addAsLibrary(jpa_core_annotations_nativequery_jar);
+    jpa_core_annotations_nativequery_puservlet_vehicle_web_war.addClass(ee.jakarta.tck.persistence.common.PMClientBase.class);
+    jpa_core_annotations_nativequery_puservlet_vehicle_web_war.addClass(ee.jakarta.tck.persistence.core.annotations.nativequery.Client.class);
+    ear.addAsModule(jpa_core_annotations_nativequery_puservlet_vehicle_web_war);
+
+    JavaArchive jpa_core_annotations_nativequery_stateful3_vehicle_client_jar = ShrinkWrap.create(JavaArchive.class, "jpa_core_annotations_nativequery_stateful3_vehicle_client_jar");
+    jpa_core_annotations_nativequery_stateful3_vehicle_client_jar.addClass(ee.jakarta.tck.persistence.common.PMClientBase.class);
+    ear.addAsModule(jpa_core_annotations_nativequery_stateful3_vehicle_client_jar);
+
+    JavaArchive jpa_core_annotations_nativequery_stateful3_vehicle_ejb_jar = ShrinkWrap.create(JavaArchive.class, "jpa_core_annotations_nativequery_stateful3_vehicle_ejb_jar");
+    jpa_core_annotations_nativequery_stateful3_vehicle_ejb_jar.addClass(ee.jakarta.tck.persistence.common.PMClientBase.class);
+    jpa_core_annotations_nativequery_stateful3_vehicle_ejb_jar.addClass(ee.jakarta.tck.persistence.core.annotations.nativequery.Client.class);
+    ear.addAsModule(jpa_core_annotations_nativequery_stateful3_vehicle_ejb_jar);
+
+    JavaArchive jpa_core_annotations_nativequery_stateless3_vehicle_client_jar = ShrinkWrap.create(JavaArchive.class, "jpa_core_annotations_nativequery_stateless3_vehicle_client_jar");
+    jpa_core_annotations_nativequery_stateless3_vehicle_client_jar.addClass(ee.jakarta.tck.persistence.common.PMClientBase.class);
+    ear.addAsModule(jpa_core_annotations_nativequery_stateless3_vehicle_client_jar);
+
+    JavaArchive jpa_core_annotations_nativequery_stateless3_vehicle_ejb_jar = ShrinkWrap.create(JavaArchive.class, "jpa_core_annotations_nativequery_stateless3_vehicle_ejb_jar");
+    jpa_core_annotations_nativequery_stateless3_vehicle_ejb_jar.addClass(ee.jakarta.tck.persistence.common.PMClientBase.class);
+    jpa_core_annotations_nativequery_stateless3_vehicle_ejb_jar.addClass(ee.jakarta.tck.persistence.core.annotations.nativequery.Client.class);
+    ear.addAsModule(jpa_core_annotations_nativequery_stateless3_vehicle_ejb_jar);
+    return ear;
+  }
+
 	private static final Logger logger = (Logger) System.getLogger(Client.class.getName());
 
 	public Client() {
diff --git a/jpa/spec-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/onexmanyuni/Client.java b/jpa/spec-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/onexmanyuni/Client.java
index dce636c38..a57d3caa2 100644
--- a/jpa/spec-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/onexmanyuni/Client.java
+++ b/jpa/spec-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/onexmanyuni/Client.java
@@ -17,8 +17,12 @@
 package ee.jakarta.tck.persistence.core.annotations.onexmanyuni;
 
 import java.lang.System.Logger;
-
+import org.jboss.arquillian.container.test.api.Deployment;
+import org.jboss.shrinkwrap.api.Archive;
+import org.jboss.shrinkwrap.api.ShrinkWrap;
+import org.jboss.shrinkwrap.api.spec.EnterpriseArchive;
 import org.jboss.shrinkwrap.api.spec.JavaArchive;
+import org.jboss.shrinkwrap.api.spec.WebArchive;
 import org.junit.jupiter.api.AfterEach;
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
@@ -29,6 +33,83 @@ import jakarta.persistence.EntityTransaction;
 
 public class Client extends PMClientBase {
 
+  @Deployment(testable = false)
+  public static Archive<?> deployment() {
+
+    final EnterpriseArchive ear = ShrinkWrap.create(EnterpriseArchive.class, "jpa_core_annotations_onexmanyuni_vehicles.ear");
+    // TODO: filter/eliminate the library jar classes that shouldn't be included
+    // Add ear/lib jars
+
+    JavaArchive jpa_core_annotations_onexmanyuni_jar = ShrinkWrap.create(JavaArchive.class, "jpa_core_annotations_onexmanyuni_jar");
+    jpa_core_annotations_onexmanyuni_jar.addClass(ee.jakarta.tck.persistence.core.annotations.onexmanyuni.Customer1.class);
+    jpa_core_annotations_onexmanyuni_jar.addClass(ee.jakarta.tck.persistence.core.annotations.onexmanyuni.RetailOrder2.class);
+    ear.addAsLibrary(jpa_core_annotations_onexmanyuni_jar);
+    // Add ear submodules
+
+    JavaArchive jpa_core_annotations_onexmanyuni_appmanagedNoTx_vehicle_client_jar = ShrinkWrap.create(JavaArchive.class, "jpa_core_annotations_onexmanyuni_appmanagedNoTx_vehicle_client_jar");
+    jpa_core_annotations_onexmanyuni_appmanagedNoTx_vehicle_client_jar.addClass(ee.jakarta.tck.persistence.common.PMClientBase.class);
+    ear.addAsModule(jpa_core_annotations_onexmanyuni_appmanagedNoTx_vehicle_client_jar);
+
+    JavaArchive jpa_core_annotations_onexmanyuni_appmanagedNoTx_vehicle_ejb_jar = ShrinkWrap.create(JavaArchive.class, "jpa_core_annotations_onexmanyuni_appmanagedNoTx_vehicle_ejb_jar");
+    jpa_core_annotations_onexmanyuni_appmanagedNoTx_vehicle_ejb_jar.addClass(ee.jakarta.tck.persistence.common.PMClientBase.class);
+    jpa_core_annotations_onexmanyuni_appmanagedNoTx_vehicle_ejb_jar.addClass(ee.jakarta.tck.persistence.core.annotations.onexmanyuni.Client.class);
+    ear.addAsModule(jpa_core_annotations_onexmanyuni_appmanagedNoTx_vehicle_ejb_jar);
+
+    JavaArchive jpa_core_annotations_onexmanyuni_appmanaged_vehicle_client_jar = ShrinkWrap.create(JavaArchive.class, "jpa_core_annotations_onexmanyuni_appmanaged_vehicle_client_jar");
+    jpa_core_annotations_onexmanyuni_appmanaged_vehicle_client_jar.addClass(ee.jakarta.tck.persistence.common.PMClientBase.class);
+    ear.addAsModule(jpa_core_annotations_onexmanyuni_appmanaged_vehicle_client_jar);
+
+    JavaArchive jpa_core_annotations_onexmanyuni_appmanaged_vehicle_ejb_jar = ShrinkWrap.create(JavaArchive.class, "jpa_core_annotations_onexmanyuni_appmanaged_vehicle_ejb_jar");
+    jpa_core_annotations_onexmanyuni_appmanaged_vehicle_ejb_jar.addClass(ee.jakarta.tck.persistence.common.PMClientBase.class);
+    jpa_core_annotations_onexmanyuni_appmanaged_vehicle_ejb_jar.addClass(ee.jakarta.tck.persistence.core.annotations.onexmanyuni.Client.class);
+    ear.addAsModule(jpa_core_annotations_onexmanyuni_appmanaged_vehicle_ejb_jar);
+
+    WebArchive jpa_core_annotations_onexmanyuni_pmservlet_vehicle_web_war = ShrinkWrap.create(WebArchive.class, "jpa_core_annotations_onexmanyuni_pmservlet_vehicle_web_war");
+    jpa_core_annotations_onexmanyuni_pmservlet_vehicle_web_war.addAsWebInfResource("web.xml");
+
+    JavaArchive jpa_core_annotations_onexmanyuni_jar = ShrinkWrap.create(JavaArchive.class, "jpa_core_annotations_onexmanyuni.jar");
+    jpa_core_annotations_onexmanyuni_jar.addClass(ee.jakarta.tck.persistence.core.annotations.onexmanyuni.Customer1.class);
+    jpa_core_annotations_onexmanyuni_jar.addClass(ee.jakarta.tck.persistence.core.annotations.onexmanyuni.RetailOrder2.class);
+    jpa_core_annotations_onexmanyuni_jar.addAsManifestResource("META-INF/MANIFEST.MF");
+    jpa_core_annotations_onexmanyuni_jar.addAsManifestResource("META-INF/persistence.xml");
+    jpa_core_annotations_onexmanyuni_pmservlet_vehicle_web_war.addAsLibrary(jpa_core_annotations_onexmanyuni_jar);
+    jpa_core_annotations_onexmanyuni_pmservlet_vehicle_web_war.addClass(ee.jakarta.tck.persistence.common.PMClientBase.class);
+    jpa_core_annotations_onexmanyuni_pmservlet_vehicle_web_war.addClass(ee.jakarta.tck.persistence.core.annotations.onexmanyuni.Client.class);
+    ear.addAsModule(jpa_core_annotations_onexmanyuni_pmservlet_vehicle_web_war);
+
+    WebArchive jpa_core_annotations_onexmanyuni_puservlet_vehicle_web_war = ShrinkWrap.create(WebArchive.class, "jpa_core_annotations_onexmanyuni_puservlet_vehicle_web_war");
+    jpa_core_annotations_onexmanyuni_puservlet_vehicle_web_war.addAsWebInfResource("web.xml");
+
+    JavaArchive jpa_core_annotations_onexmanyuni_jar = ShrinkWrap.create(JavaArchive.class, "jpa_core_annotations_onexmanyuni.jar");
+    jpa_core_annotations_onexmanyuni_jar.addClass(ee.jakarta.tck.persistence.core.annotations.onexmanyuni.Customer1.class);
+    jpa_core_annotations_onexmanyuni_jar.addClass(ee.jakarta.tck.persistence.core.annotations.onexmanyuni.RetailOrder2.class);
+    jpa_core_annotations_onexmanyuni_jar.addAsManifestResource("META-INF/MANIFEST.MF");
+    jpa_core_annotations_onexmanyuni_jar.addAsManifestResource("META-INF/persistence.xml");
+    jpa_core_annotations_onexmanyuni_puservlet_vehicle_web_war.addAsLibrary(jpa_core_annotations_onexmanyuni_jar);
+    jpa_core_annotations_onexmanyuni_puservlet_vehicle_web_war.addClass(ee.jakarta.tck.persistence.common.PMClientBase.class);
+    jpa_core_annotations_onexmanyuni_puservlet_vehicle_web_war.addClass(ee.jakarta.tck.persistence.core.annotations.onexmanyuni.Client.class);
+    ear.addAsModule(jpa_core_annotations_onexmanyuni_puservlet_vehicle_web_war);
+
+    JavaArchive jpa_core_annotations_onexmanyuni_stateful3_vehicle_client_jar = ShrinkWrap.create(JavaArchive.class, "jpa_core_annotations_onexmanyuni_stateful3_vehicle_client_jar");
+    jpa_core_annotations_onexmanyuni_stateful3_vehicle_client_jar.addClass(ee.jakarta.tck.persistence.common.PMClientBase.class);
+    ear.addAsModule(jpa_core_annotations_onexmanyuni_stateful3_vehicle_client_jar);
+
+    JavaArchive jpa_core_annotations_onexmanyuni_stateful3_vehicle_ejb_jar = ShrinkWrap.create(JavaArchive.class, "jpa_core_annotations_onexmanyuni_stateful3_vehicle_ejb_jar");
+    jpa_core_annotations_onexmanyuni_stateful3_vehicle_ejb_jar.addClass(ee.jakarta.tck.persistence.common.PMClientBase.class);
+    jpa_core_annotations_onexmanyuni_stateful3_vehicle_ejb_jar.addClass(ee.jakarta.tck.persistence.core.annotations.onexmanyuni.Client.class);
+    ear.addAsModule(jpa_core_annotations_onexmanyuni_stateful3_vehicle_ejb_jar);
+
+    JavaArchive jpa_core_annotations_onexmanyuni_stateless3_vehicle_client_jar = ShrinkWrap.create(JavaArchive.class, "jpa_core_annotations_onexmanyuni_stateless3_vehicle_client_jar");
+    jpa_core_annotations_onexmanyuni_stateless3_vehicle_client_jar.addClass(ee.jakarta.tck.persistence.common.PMClientBase.class);
+    ear.addAsModule(jpa_core_annotations_onexmanyuni_stateless3_vehicle_client_jar);
+
+    JavaArchive jpa_core_annotations_onexmanyuni_stateless3_vehicle_ejb_jar = ShrinkWrap.create(JavaArchive.class, "jpa_core_annotations_onexmanyuni_stateless3_vehicle_ejb_jar");
+    jpa_core_annotations_onexmanyuni_stateless3_vehicle_ejb_jar.addClass(ee.jakarta.tck.persistence.common.PMClientBase.class);
+    jpa_core_annotations_onexmanyuni_stateless3_vehicle_ejb_jar.addClass(ee.jakarta.tck.persistence.core.annotations.onexmanyuni.Client.class);
+    ear.addAsModule(jpa_core_annotations_onexmanyuni_stateless3_vehicle_ejb_jar);
+    return ear;
+  }
+
 	private static final Logger logger = (Logger) System.getLogger(Client.class.getName());
 
 	final private static long ORDER1_ID = 786l;
diff --git a/jpa/spec-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/orderby/Client1.java b/jpa/spec-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/orderby/Client1.java
index 7a6822a58..ef5e5d5b4 100644
--- a/jpa/spec-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/orderby/Client1.java
+++ b/jpa/spec-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/orderby/Client1.java
@@ -21,8 +21,12 @@ import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.Iterator;
 import java.util.List;
-
+import org.jboss.arquillian.container.test.api.Deployment;
+import org.jboss.shrinkwrap.api.Archive;
+import org.jboss.shrinkwrap.api.ShrinkWrap;
+import org.jboss.shrinkwrap.api.spec.EnterpriseArchive;
 import org.jboss.shrinkwrap.api.spec.JavaArchive;
+import org.jboss.shrinkwrap.api.spec.WebArchive;
 import org.junit.jupiter.api.AfterEach;
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
@@ -31,6 +35,110 @@ import ee.jakarta.tck.persistence.common.PMClientBase;
 
 public class Client1 extends PMClientBase {
 
+  @Deployment(testable = false)
+  public static Archive<?> deployment() {
+
+    final EnterpriseArchive ear = ShrinkWrap.create(EnterpriseArchive.class, "jpa_core_annotations_orderby_vehicles.ear");
+    // TODO: filter/eliminate the library jar classes that shouldn't be included
+    // Add ear/lib jars
+
+    JavaArchive jpa_core_annotations_orderby_jar = ShrinkWrap.create(JavaArchive.class, "jpa_core_annotations_orderby_jar");
+    jpa_core_annotations_orderby_jar.addClass(ee.jakarta.tck.persistence.core.annotations.orderby.A.class);
+    jpa_core_annotations_orderby_jar.addClass(ee.jakarta.tck.persistence.core.annotations.orderby.A2.class);
+    jpa_core_annotations_orderby_jar.addClass(ee.jakarta.tck.persistence.core.annotations.orderby.Address.class);
+    jpa_core_annotations_orderby_jar.addClass(ee.jakarta.tck.persistence.core.annotations.orderby.Address2.class);
+    jpa_core_annotations_orderby_jar.addClass(ee.jakarta.tck.persistence.core.annotations.orderby.Customer.class);
+    jpa_core_annotations_orderby_jar.addClass(ee.jakarta.tck.persistence.core.annotations.orderby.Customer2.class);
+    jpa_core_annotations_orderby_jar.addClass(ee.jakarta.tck.persistence.core.annotations.orderby.Department.class);
+    jpa_core_annotations_orderby_jar.addClass(ee.jakarta.tck.persistence.core.annotations.orderby.Employee.class);
+    jpa_core_annotations_orderby_jar.addClass(ee.jakarta.tck.persistence.core.annotations.orderby.Insurance.class);
+    jpa_core_annotations_orderby_jar.addClass(ee.jakarta.tck.persistence.core.annotations.orderby.ZipCode.class);
+    jpa_core_annotations_orderby_jar.addClass(ee.jakarta.tck.persistence.core.annotations.orderby.ZipCode2.class);
+    ear.addAsLibrary(jpa_core_annotations_orderby_jar);
+    // Add ear submodules
+
+    JavaArchive jpa_core_annotations_orderby_appmanagedNoTx_vehicle_client_jar = ShrinkWrap.create(JavaArchive.class, "jpa_core_annotations_orderby_appmanagedNoTx_vehicle_client_jar");
+    jpa_core_annotations_orderby_appmanagedNoTx_vehicle_client_jar.addClass(ee.jakarta.tck.persistence.common.PMClientBase.class);
+    ear.addAsModule(jpa_core_annotations_orderby_appmanagedNoTx_vehicle_client_jar);
+
+    JavaArchive jpa_core_annotations_orderby_appmanagedNoTx_vehicle_ejb_jar = ShrinkWrap.create(JavaArchive.class, "jpa_core_annotations_orderby_appmanagedNoTx_vehicle_ejb_jar");
+    jpa_core_annotations_orderby_appmanagedNoTx_vehicle_ejb_jar.addClass(ee.jakarta.tck.persistence.common.PMClientBase.class);
+    jpa_core_annotations_orderby_appmanagedNoTx_vehicle_ejb_jar.addClass(ee.jakarta.tck.persistence.core.annotations.orderby.Client.class);
+    ear.addAsModule(jpa_core_annotations_orderby_appmanagedNoTx_vehicle_ejb_jar);
+
+    JavaArchive jpa_core_annotations_orderby_appmanaged_vehicle_client_jar = ShrinkWrap.create(JavaArchive.class, "jpa_core_annotations_orderby_appmanaged_vehicle_client_jar");
+    jpa_core_annotations_orderby_appmanaged_vehicle_client_jar.addClass(ee.jakarta.tck.persistence.common.PMClientBase.class);
+    ear.addAsModule(jpa_core_annotations_orderby_appmanaged_vehicle_client_jar);
+
+    JavaArchive jpa_core_annotations_orderby_appmanaged_vehicle_ejb_jar = ShrinkWrap.create(JavaArchive.class, "jpa_core_annotations_orderby_appmanaged_vehicle_ejb_jar");
+    jpa_core_annotations_orderby_appmanaged_vehicle_ejb_jar.addClass(ee.jakarta.tck.persistence.common.PMClientBase.class);
+    jpa_core_annotations_orderby_appmanaged_vehicle_ejb_jar.addClass(ee.jakarta.tck.persistence.core.annotations.orderby.Client.class);
+    ear.addAsModule(jpa_core_annotations_orderby_appmanaged_vehicle_ejb_jar);
+
+    WebArchive jpa_core_annotations_orderby_pmservlet_vehicle_web_war = ShrinkWrap.create(WebArchive.class, "jpa_core_annotations_orderby_pmservlet_vehicle_web_war");
+    jpa_core_annotations_orderby_pmservlet_vehicle_web_war.addAsWebInfResource("web.xml");
+
+    JavaArchive jpa_core_annotations_orderby_jar = ShrinkWrap.create(JavaArchive.class, "jpa_core_annotations_orderby.jar");
+    jpa_core_annotations_orderby_jar.addClass(ee.jakarta.tck.persistence.core.annotations.orderby.A.class);
+    jpa_core_annotations_orderby_jar.addClass(ee.jakarta.tck.persistence.core.annotations.orderby.A2.class);
+    jpa_core_annotations_orderby_jar.addClass(ee.jakarta.tck.persistence.core.annotations.orderby.Address.class);
+    jpa_core_annotations_orderby_jar.addClass(ee.jakarta.tck.persistence.core.annotations.orderby.Address2.class);
+    jpa_core_annotations_orderby_jar.addClass(ee.jakarta.tck.persistence.core.annotations.orderby.Customer.class);
+    jpa_core_annotations_orderby_jar.addClass(ee.jakarta.tck.persistence.core.annotations.orderby.Customer2.class);
+    jpa_core_annotations_orderby_jar.addClass(ee.jakarta.tck.persistence.core.annotations.orderby.Department.class);
+    jpa_core_annotations_orderby_jar.addClass(ee.jakarta.tck.persistence.core.annotations.orderby.Employee.class);
+    jpa_core_annotations_orderby_jar.addClass(ee.jakarta.tck.persistence.core.annotations.orderby.Insurance.class);
+    jpa_core_annotations_orderby_jar.addClass(ee.jakarta.tck.persistence.core.annotations.orderby.ZipCode.class);
+    jpa_core_annotations_orderby_jar.addClass(ee.jakarta.tck.persistence.core.annotations.orderby.ZipCode2.class);
+    jpa_core_annotations_orderby_jar.addAsManifestResource("META-INF/MANIFEST.MF");
+    jpa_core_annotations_orderby_jar.addAsManifestResource("META-INF/persistence.xml");
+    jpa_core_annotations_orderby_pmservlet_vehicle_web_war.addAsLibrary(jpa_core_annotations_orderby_jar);
+    jpa_core_annotations_orderby_pmservlet_vehicle_web_war.addClass(ee.jakarta.tck.persistence.common.PMClientBase.class);
+    jpa_core_annotations_orderby_pmservlet_vehicle_web_war.addClass(ee.jakarta.tck.persistence.core.annotations.orderby.Client.class);
+    ear.addAsModule(jpa_core_annotations_orderby_pmservlet_vehicle_web_war);
+
+    WebArchive jpa_core_annotations_orderby_puservlet_vehicle_web_war = ShrinkWrap.create(WebArchive.class, "jpa_core_annotations_orderby_puservlet_vehicle_web_war");
+    jpa_core_annotations_orderby_puservlet_vehicle_web_war.addAsWebInfResource("web.xml");
+
+    JavaArchive jpa_core_annotations_orderby_jar = ShrinkWrap.create(JavaArchive.class, "jpa_core_annotations_orderby.jar");
+    jpa_core_annotations_orderby_jar.addClass(ee.jakarta.tck.persistence.core.annotations.orderby.A.class);
+    jpa_core_annotations_orderby_jar.addClass(ee.jakarta.tck.persistence.core.annotations.orderby.A2.class);
+    jpa_core_annotations_orderby_jar.addClass(ee.jakarta.tck.persistence.core.annotations.orderby.Address.class);
+    jpa_core_annotations_orderby_jar.addClass(ee.jakarta.tck.persistence.core.annotations.orderby.Address2.class);
+    jpa_core_annotations_orderby_jar.addClass(ee.jakarta.tck.persistence.core.annotations.orderby.Customer.class);
+    jpa_core_annotations_orderby_jar.addClass(ee.jakarta.tck.persistence.core.annotations.orderby.Customer2.class);
+    jpa_core_annotations_orderby_jar.addClass(ee.jakarta.tck.persistence.core.annotations.orderby.Department.class);
+    jpa_core_annotations_orderby_jar.addClass(ee.jakarta.tck.persistence.core.annotations.orderby.Employee.class);
+    jpa_core_annotations_orderby_jar.addClass(ee.jakarta.tck.persistence.core.annotations.orderby.Insurance.class);
+    jpa_core_annotations_orderby_jar.addClass(ee.jakarta.tck.persistence.core.annotations.orderby.ZipCode.class);
+    jpa_core_annotations_orderby_jar.addClass(ee.jakarta.tck.persistence.core.annotations.orderby.ZipCode2.class);
+    jpa_core_annotations_orderby_jar.addAsManifestResource("META-INF/MANIFEST.MF");
+    jpa_core_annotations_orderby_jar.addAsManifestResource("META-INF/persistence.xml");
+    jpa_core_annotations_orderby_puservlet_vehicle_web_war.addAsLibrary(jpa_core_annotations_orderby_jar);
+    jpa_core_annotations_orderby_puservlet_vehicle_web_war.addClass(ee.jakarta.tck.persistence.common.PMClientBase.class);
+    jpa_core_annotations_orderby_puservlet_vehicle_web_war.addClass(ee.jakarta.tck.persistence.core.annotations.orderby.Client.class);
+    ear.addAsModule(jpa_core_annotations_orderby_puservlet_vehicle_web_war);
+
+    JavaArchive jpa_core_annotations_orderby_stateful3_vehicle_client_jar = ShrinkWrap.create(JavaArchive.class, "jpa_core_annotations_orderby_stateful3_vehicle_client_jar");
+    jpa_core_annotations_orderby_stateful3_vehicle_client_jar.addClass(ee.jakarta.tck.persistence.common.PMClientBase.class);
+    ear.addAsModule(jpa_core_annotations_orderby_stateful3_vehicle_client_jar);
+
+    JavaArchive jpa_core_annotations_orderby_stateful3_vehicle_ejb_jar = ShrinkWrap.create(JavaArchive.class, "jpa_core_annotations_orderby_stateful3_vehicle_ejb_jar");
+    jpa_core_annotations_orderby_stateful3_vehicle_ejb_jar.addClass(ee.jakarta.tck.persistence.common.PMClientBase.class);
+    jpa_core_annotations_orderby_stateful3_vehicle_ejb_jar.addClass(ee.jakarta.tck.persistence.core.annotations.orderby.Client.class);
+    ear.addAsModule(jpa_core_annotations_orderby_stateful3_vehicle_ejb_jar);
+
+    JavaArchive jpa_core_annotations_orderby_stateless3_vehicle_client_jar = ShrinkWrap.create(JavaArchive.class, "jpa_core_annotations_orderby_stateless3_vehicle_client_jar");
+    jpa_core_annotations_orderby_stateless3_vehicle_client_jar.addClass(ee.jakarta.tck.persistence.common.PMClientBase.class);
+    ear.addAsModule(jpa_core_annotations_orderby_stateless3_vehicle_client_jar);
+
+    JavaArchive jpa_core_annotations_orderby_stateless3_vehicle_ejb_jar = ShrinkWrap.create(JavaArchive.class, "jpa_core_annotations_orderby_stateless3_vehicle_ejb_jar");
+    jpa_core_annotations_orderby_stateless3_vehicle_ejb_jar.addClass(ee.jakarta.tck.persistence.common.PMClientBase.class);
+    jpa_core_annotations_orderby_stateless3_vehicle_ejb_jar.addClass(ee.jakarta.tck.persistence.core.annotations.orderby.Client.class);
+    ear.addAsModule(jpa_core_annotations_orderby_stateless3_vehicle_ejb_jar);
+    return ear;
+  }
+
 	private static final Logger logger = (Logger) System.getLogger(Client1.class.getName());
 
 	List<Address> addrRef;
diff --git a/jpa/spec-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/orderby/Client2.java b/jpa/spec-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/orderby/Client2.java
index 060ce2e8a..f024454ae 100644
--- a/jpa/spec-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/orderby/Client2.java
+++ b/jpa/spec-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/orderby/Client2.java
@@ -19,8 +19,12 @@ package ee.jakarta.tck.persistence.core.annotations.orderby;
 import java.lang.System.Logger;
 import java.util.ArrayList;
 import java.util.List;
-
+import org.jboss.arquillian.container.test.api.Deployment;
+import org.jboss.shrinkwrap.api.Archive;
+import org.jboss.shrinkwrap.api.ShrinkWrap;
+import org.jboss.shrinkwrap.api.spec.EnterpriseArchive;
 import org.jboss.shrinkwrap.api.spec.JavaArchive;
+import org.jboss.shrinkwrap.api.spec.WebArchive;
 import org.junit.jupiter.api.AfterEach;
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
@@ -29,6 +33,110 @@ import ee.jakarta.tck.persistence.common.PMClientBase;
 
 public class Client2 extends PMClientBase {
 
+  @Deployment(testable = false)
+  public static Archive<?> deployment() {
+
+    final EnterpriseArchive ear = ShrinkWrap.create(EnterpriseArchive.class, "jpa_core_annotations_orderby_vehicles.ear");
+    // TODO: filter/eliminate the library jar classes that shouldn't be included
+    // Add ear/lib jars
+
+    JavaArchive jpa_core_annotations_orderby_jar = ShrinkWrap.create(JavaArchive.class, "jpa_core_annotations_orderby_jar");
+    jpa_core_annotations_orderby_jar.addClass(ee.jakarta.tck.persistence.core.annotations.orderby.A.class);
+    jpa_core_annotations_orderby_jar.addClass(ee.jakarta.tck.persistence.core.annotations.orderby.A2.class);
+    jpa_core_annotations_orderby_jar.addClass(ee.jakarta.tck.persistence.core.annotations.orderby.Address.class);
+    jpa_core_annotations_orderby_jar.addClass(ee.jakarta.tck.persistence.core.annotations.orderby.Address2.class);
+    jpa_core_annotations_orderby_jar.addClass(ee.jakarta.tck.persistence.core.annotations.orderby.Customer.class);
+    jpa_core_annotations_orderby_jar.addClass(ee.jakarta.tck.persistence.core.annotations.orderby.Customer2.class);
+    jpa_core_annotations_orderby_jar.addClass(ee.jakarta.tck.persistence.core.annotations.orderby.Department.class);
+    jpa_core_annotations_orderby_jar.addClass(ee.jakarta.tck.persistence.core.annotations.orderby.Employee.class);
+    jpa_core_annotations_orderby_jar.addClass(ee.jakarta.tck.persistence.core.annotations.orderby.Insurance.class);
+    jpa_core_annotations_orderby_jar.addClass(ee.jakarta.tck.persistence.core.annotations.orderby.ZipCode.class);
+    jpa_core_annotations_orderby_jar.addClass(ee.jakarta.tck.persistence.core.annotations.orderby.ZipCode2.class);
+    ear.addAsLibrary(jpa_core_annotations_orderby_jar);
+    // Add ear submodules
+
+    JavaArchive jpa_core_annotations_orderby_appmanagedNoTx_vehicle_client_jar = ShrinkWrap.create(JavaArchive.class, "jpa_core_annotations_orderby_appmanagedNoTx_vehicle_client_jar");
+    jpa_core_annotations_orderby_appmanagedNoTx_vehicle_client_jar.addClass(ee.jakarta.tck.persistence.common.PMClientBase.class);
+    ear.addAsModule(jpa_core_annotations_orderby_appmanagedNoTx_vehicle_client_jar);
+
+    JavaArchive jpa_core_annotations_orderby_appmanagedNoTx_vehicle_ejb_jar = ShrinkWrap.create(JavaArchive.class, "jpa_core_annotations_orderby_appmanagedNoTx_vehicle_ejb_jar");
+    jpa_core_annotations_orderby_appmanagedNoTx_vehicle_ejb_jar.addClass(ee.jakarta.tck.persistence.common.PMClientBase.class);
+    jpa_core_annotations_orderby_appmanagedNoTx_vehicle_ejb_jar.addClass(ee.jakarta.tck.persistence.core.annotations.orderby.Client.class);
+    ear.addAsModule(jpa_core_annotations_orderby_appmanagedNoTx_vehicle_ejb_jar);
+
+    JavaArchive jpa_core_annotations_orderby_appmanaged_vehicle_client_jar = ShrinkWrap.create(JavaArchive.class, "jpa_core_annotations_orderby_appmanaged_vehicle_client_jar");
+    jpa_core_annotations_orderby_appmanaged_vehicle_client_jar.addClass(ee.jakarta.tck.persistence.common.PMClientBase.class);
+    ear.addAsModule(jpa_core_annotations_orderby_appmanaged_vehicle_client_jar);
+
+    JavaArchive jpa_core_annotations_orderby_appmanaged_vehicle_ejb_jar = ShrinkWrap.create(JavaArchive.class, "jpa_core_annotations_orderby_appmanaged_vehicle_ejb_jar");
+    jpa_core_annotations_orderby_appmanaged_vehicle_ejb_jar.addClass(ee.jakarta.tck.persistence.common.PMClientBase.class);
+    jpa_core_annotations_orderby_appmanaged_vehicle_ejb_jar.addClass(ee.jakarta.tck.persistence.core.annotations.orderby.Client.class);
+    ear.addAsModule(jpa_core_annotations_orderby_appmanaged_vehicle_ejb_jar);
+
+    WebArchive jpa_core_annotations_orderby_pmservlet_vehicle_web_war = ShrinkWrap.create(WebArchive.class, "jpa_core_annotations_orderby_pmservlet_vehicle_web_war");
+    jpa_core_annotations_orderby_pmservlet_vehicle_web_war.addAsWebInfResource("web.xml");
+
+    JavaArchive jpa_core_annotations_orderby_jar = ShrinkWrap.create(JavaArchive.class, "jpa_core_annotations_orderby.jar");
+    jpa_core_annotations_orderby_jar.addClass(ee.jakarta.tck.persistence.core.annotations.orderby.A.class);
+    jpa_core_annotations_orderby_jar.addClass(ee.jakarta.tck.persistence.core.annotations.orderby.A2.class);
+    jpa_core_annotations_orderby_jar.addClass(ee.jakarta.tck.persistence.core.annotations.orderby.Address.class);
+    jpa_core_annotations_orderby_jar.addClass(ee.jakarta.tck.persistence.core.annotations.orderby.Address2.class);
+    jpa_core_annotations_orderby_jar.addClass(ee.jakarta.tck.persistence.core.annotations.orderby.Customer.class);
+    jpa_core_annotations_orderby_jar.addClass(ee.jakarta.tck.persistence.core.annotations.orderby.Customer2.class);
+    jpa_core_annotations_orderby_jar.addClass(ee.jakarta.tck.persistence.core.annotations.orderby.Department.class);
+    jpa_core_annotations_orderby_jar.addClass(ee.jakarta.tck.persistence.core.annotations.orderby.Employee.class);
+    jpa_core_annotations_orderby_jar.addClass(ee.jakarta.tck.persistence.core.annotations.orderby.Insurance.class);
+    jpa_core_annotations_orderby_jar.addClass(ee.jakarta.tck.persistence.core.annotations.orderby.ZipCode.class);
+    jpa_core_annotations_orderby_jar.addClass(ee.jakarta.tck.persistence.core.annotations.orderby.ZipCode2.class);
+    jpa_core_annotations_orderby_jar.addAsManifestResource("META-INF/MANIFEST.MF");
+    jpa_core_annotations_orderby_jar.addAsManifestResource("META-INF/persistence.xml");
+    jpa_core_annotations_orderby_pmservlet_vehicle_web_war.addAsLibrary(jpa_core_annotations_orderby_jar);
+    jpa_core_annotations_orderby_pmservlet_vehicle_web_war.addClass(ee.jakarta.tck.persistence.common.PMClientBase.class);
+    jpa_core_annotations_orderby_pmservlet_vehicle_web_war.addClass(ee.jakarta.tck.persistence.core.annotations.orderby.Client.class);
+    ear.addAsModule(jpa_core_annotations_orderby_pmservlet_vehicle_web_war);
+
+    WebArchive jpa_core_annotations_orderby_puservlet_vehicle_web_war = ShrinkWrap.create(WebArchive.class, "jpa_core_annotations_orderby_puservlet_vehicle_web_war");
+    jpa_core_annotations_orderby_puservlet_vehicle_web_war.addAsWebInfResource("web.xml");
+
+    JavaArchive jpa_core_annotations_orderby_jar = ShrinkWrap.create(JavaArchive.class, "jpa_core_annotations_orderby.jar");
+    jpa_core_annotations_orderby_jar.addClass(ee.jakarta.tck.persistence.core.annotations.orderby.A.class);
+    jpa_core_annotations_orderby_jar.addClass(ee.jakarta.tck.persistence.core.annotations.orderby.A2.class);
+    jpa_core_annotations_orderby_jar.addClass(ee.jakarta.tck.persistence.core.annotations.orderby.Address.class);
+    jpa_core_annotations_orderby_jar.addClass(ee.jakarta.tck.persistence.core.annotations.orderby.Address2.class);
+    jpa_core_annotations_orderby_jar.addClass(ee.jakarta.tck.persistence.core.annotations.orderby.Customer.class);
+    jpa_core_annotations_orderby_jar.addClass(ee.jakarta.tck.persistence.core.annotations.orderby.Customer2.class);
+    jpa_core_annotations_orderby_jar.addClass(ee.jakarta.tck.persistence.core.annotations.orderby.Department.class);
+    jpa_core_annotations_orderby_jar.addClass(ee.jakarta.tck.persistence.core.annotations.orderby.Employee.class);
+    jpa_core_annotations_orderby_jar.addClass(ee.jakarta.tck.persistence.core.annotations.orderby.Insurance.class);
+    jpa_core_annotations_orderby_jar.addClass(ee.jakarta.tck.persistence.core.annotations.orderby.ZipCode.class);
+    jpa_core_annotations_orderby_jar.addClass(ee.jakarta.tck.persistence.core.annotations.orderby.ZipCode2.class);
+    jpa_core_annotations_orderby_jar.addAsManifestResource("META-INF/MANIFEST.MF");
+    jpa_core_annotations_orderby_jar.addAsManifestResource("META-INF/persistence.xml");
+    jpa_core_annotations_orderby_puservlet_vehicle_web_war.addAsLibrary(jpa_core_annotations_orderby_jar);
+    jpa_core_annotations_orderby_puservlet_vehicle_web_war.addClass(ee.jakarta.tck.persistence.common.PMClientBase.class);
+    jpa_core_annotations_orderby_puservlet_vehicle_web_war.addClass(ee.jakarta.tck.persistence.core.annotations.orderby.Client.class);
+    ear.addAsModule(jpa_core_annotations_orderby_puservlet_vehicle_web_war);
+
+    JavaArchive jpa_core_annotations_orderby_stateful3_vehicle_client_jar = ShrinkWrap.create(JavaArchive.class, "jpa_core_annotations_orderby_stateful3_vehicle_client_jar");
+    jpa_core_annotations_orderby_stateful3_vehicle_client_jar.addClass(ee.jakarta.tck.persistence.common.PMClientBase.class);
+    ear.addAsModule(jpa_core_annotations_orderby_stateful3_vehicle_client_jar);
+
+    JavaArchive jpa_core_annotations_orderby_stateful3_vehicle_ejb_jar = ShrinkWrap.create(JavaArchive.class, "jpa_core_annotations_orderby_stateful3_vehicle_ejb_jar");
+    jpa_core_annotations_orderby_stateful3_vehicle_ejb_jar.addClass(ee.jakarta.tck.persistence.common.PMClientBase.class);
+    jpa_core_annotations_orderby_stateful3_vehicle_ejb_jar.addClass(ee.jakarta.tck.persistence.core.annotations.orderby.Client.class);
+    ear.addAsModule(jpa_core_annotations_orderby_stateful3_vehicle_ejb_jar);
+
+    JavaArchive jpa_core_annotations_orderby_stateless3_vehicle_client_jar = ShrinkWrap.create(JavaArchive.class, "jpa_core_annotations_orderby_stateless3_vehicle_client_jar");
+    jpa_core_annotations_orderby_stateless3_vehicle_client_jar.addClass(ee.jakarta.tck.persistence.common.PMClientBase.class);
+    ear.addAsModule(jpa_core_annotations_orderby_stateless3_vehicle_client_jar);
+
+    JavaArchive jpa_core_annotations_orderby_stateless3_vehicle_ejb_jar = ShrinkWrap.create(JavaArchive.class, "jpa_core_annotations_orderby_stateless3_vehicle_ejb_jar");
+    jpa_core_annotations_orderby_stateless3_vehicle_ejb_jar.addClass(ee.jakarta.tck.persistence.common.PMClientBase.class);
+    jpa_core_annotations_orderby_stateless3_vehicle_ejb_jar.addClass(ee.jakarta.tck.persistence.core.annotations.orderby.Client.class);
+    ear.addAsModule(jpa_core_annotations_orderby_stateless3_vehicle_ejb_jar);
+    return ear;
+  }
+
 	private static final Logger logger = (Logger) System.getLogger(Client2.class.getName());
 
 	List<Address> addrRef;
diff --git a/jpa/spec-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/orderby/Client3.java b/jpa/spec-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/orderby/Client3.java
index 1c6ae29fb..f49946cbc 100644
--- a/jpa/spec-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/orderby/Client3.java
+++ b/jpa/spec-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/orderby/Client3.java
@@ -19,8 +19,12 @@ package ee.jakarta.tck.persistence.core.annotations.orderby;
 import java.lang.System.Logger;
 import java.util.ArrayList;
 import java.util.List;
-
+import org.jboss.arquillian.container.test.api.Deployment;
+import org.jboss.shrinkwrap.api.Archive;
+import org.jboss.shrinkwrap.api.ShrinkWrap;
+import org.jboss.shrinkwrap.api.spec.EnterpriseArchive;
 import org.jboss.shrinkwrap.api.spec.JavaArchive;
+import org.jboss.shrinkwrap.api.spec.WebArchive;
 import org.junit.jupiter.api.AfterEach;
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
@@ -29,6 +33,110 @@ import ee.jakarta.tck.persistence.common.PMClientBase;
 
 public class Client3 extends PMClientBase {
 
+  @Deployment(testable = false)
+  public static Archive<?> deployment() {
+
+    final EnterpriseArchive ear = ShrinkWrap.create(EnterpriseArchive.class, "jpa_core_annotations_orderby_vehicles.ear");
+    // TODO: filter/eliminate the library jar classes that shouldn't be included
+    // Add ear/lib jars
+
+    JavaArchive jpa_core_annotations_orderby_jar = ShrinkWrap.create(JavaArchive.class, "jpa_core_annotations_orderby_jar");
+    jpa_core_annotations_orderby_jar.addClass(ee.jakarta.tck.persistence.core.annotations.orderby.A.class);
+    jpa_core_annotations_orderby_jar.addClass(ee.jakarta.tck.persistence.core.annotations.orderby.A2.class);
+    jpa_core_annotations_orderby_jar.addClass(ee.jakarta.tck.persistence.core.annotations.orderby.Address.class);
+    jpa_core_annotations_orderby_jar.addClass(ee.jakarta.tck.persistence.core.annotations.orderby.Address2.class);
+    jpa_core_annotations_orderby_jar.addClass(ee.jakarta.tck.persistence.core.annotations.orderby.Customer.class);
+    jpa_core_annotations_orderby_jar.addClass(ee.jakarta.tck.persistence.core.annotations.orderby.Customer2.class);
+    jpa_core_annotations_orderby_jar.addClass(ee.jakarta.tck.persistence.core.annotations.orderby.Department.class);
+    jpa_core_annotations_orderby_jar.addClass(ee.jakarta.tck.persistence.core.annotations.orderby.Employee.class);
+    jpa_core_annotations_orderby_jar.addClass(ee.jakarta.tck.persistence.core.annotations.orderby.Insurance.class);
+    jpa_core_annotations_orderby_jar.addClass(ee.jakarta.tck.persistence.core.annotations.orderby.ZipCode.class);
+    jpa_core_annotations_orderby_jar.addClass(ee.jakarta.tck.persistence.core.annotations.orderby.ZipCode2.class);
+    ear.addAsLibrary(jpa_core_annotations_orderby_jar);
+    // Add ear submodules
+
+    JavaArchive jpa_core_annotations_orderby_appmanagedNoTx_vehicle_client_jar = ShrinkWrap.create(JavaArchive.class, "jpa_core_annotations_orderby_appmanagedNoTx_vehicle_client_jar");
+    jpa_core_annotations_orderby_appmanagedNoTx_vehicle_client_jar.addClass(ee.jakarta.tck.persistence.common.PMClientBase.class);
+    ear.addAsModule(jpa_core_annotations_orderby_appmanagedNoTx_vehicle_client_jar);
+
+    JavaArchive jpa_core_annotations_orderby_appmanagedNoTx_vehicle_ejb_jar = ShrinkWrap.create(JavaArchive.class, "jpa_core_annotations_orderby_appmanagedNoTx_vehicle_ejb_jar");
+    jpa_core_annotations_orderby_appmanagedNoTx_vehicle_ejb_jar.addClass(ee.jakarta.tck.persistence.common.PMClientBase.class);
+    jpa_core_annotations_orderby_appmanagedNoTx_vehicle_ejb_jar.addClass(ee.jakarta.tck.persistence.core.annotations.orderby.Client.class);
+    ear.addAsModule(jpa_core_annotations_orderby_appmanagedNoTx_vehicle_ejb_jar);
+
+    JavaArchive jpa_core_annotations_orderby_appmanaged_vehicle_client_jar = ShrinkWrap.create(JavaArchive.class, "jpa_core_annotations_orderby_appmanaged_vehicle_client_jar");
+    jpa_core_annotations_orderby_appmanaged_vehicle_client_jar.addClass(ee.jakarta.tck.persistence.common.PMClientBase.class);
+    ear.addAsModule(jpa_core_annotations_orderby_appmanaged_vehicle_client_jar);
+
+    JavaArchive jpa_core_annotations_orderby_appmanaged_vehicle_ejb_jar = ShrinkWrap.create(JavaArchive.class, "jpa_core_annotations_orderby_appmanaged_vehicle_ejb_jar");
+    jpa_core_annotations_orderby_appmanaged_vehicle_ejb_jar.addClass(ee.jakarta.tck.persistence.common.PMClientBase.class);
+    jpa_core_annotations_orderby_appmanaged_vehicle_ejb_jar.addClass(ee.jakarta.tck.persistence.core.annotations.orderby.Client.class);
+    ear.addAsModule(jpa_core_annotations_orderby_appmanaged_vehicle_ejb_jar);
+
+    WebArchive jpa_core_annotations_orderby_pmservlet_vehicle_web_war = ShrinkWrap.create(WebArchive.class, "jpa_core_annotations_orderby_pmservlet_vehicle_web_war");
+    jpa_core_annotations_orderby_pmservlet_vehicle_web_war.addAsWebInfResource("web.xml");
+
+    JavaArchive jpa_core_annotations_orderby_jar = ShrinkWrap.create(JavaArchive.class, "jpa_core_annotations_orderby.jar");
+    jpa_core_annotations_orderby_jar.addClass(ee.jakarta.tck.persistence.core.annotations.orderby.A.class);
+    jpa_core_annotations_orderby_jar.addClass(ee.jakarta.tck.persistence.core.annotations.orderby.A2.class);
+    jpa_core_annotations_orderby_jar.addClass(ee.jakarta.tck.persistence.core.annotations.orderby.Address.class);
+    jpa_core_annotations_orderby_jar.addClass(ee.jakarta.tck.persistence.core.annotations.orderby.Address2.class);
+    jpa_core_annotations_orderby_jar.addClass(ee.jakarta.tck.persistence.core.annotations.orderby.Customer.class);
+    jpa_core_annotations_orderby_jar.addClass(ee.jakarta.tck.persistence.core.annotations.orderby.Customer2.class);
+    jpa_core_annotations_orderby_jar.addClass(ee.jakarta.tck.persistence.core.annotations.orderby.Department.class);
+    jpa_core_annotations_orderby_jar.addClass(ee.jakarta.tck.persistence.core.annotations.orderby.Employee.class);
+    jpa_core_annotations_orderby_jar.addClass(ee.jakarta.tck.persistence.core.annotations.orderby.Insurance.class);
+    jpa_core_annotations_orderby_jar.addClass(ee.jakarta.tck.persistence.core.annotations.orderby.ZipCode.class);
+    jpa_core_annotations_orderby_jar.addClass(ee.jakarta.tck.persistence.core.annotations.orderby.ZipCode2.class);
+    jpa_core_annotations_orderby_jar.addAsManifestResource("META-INF/MANIFEST.MF");
+    jpa_core_annotations_orderby_jar.addAsManifestResource("META-INF/persistence.xml");
+    jpa_core_annotations_orderby_pmservlet_vehicle_web_war.addAsLibrary(jpa_core_annotations_orderby_jar);
+    jpa_core_annotations_orderby_pmservlet_vehicle_web_war.addClass(ee.jakarta.tck.persistence.common.PMClientBase.class);
+    jpa_core_annotations_orderby_pmservlet_vehicle_web_war.addClass(ee.jakarta.tck.persistence.core.annotations.orderby.Client.class);
+    ear.addAsModule(jpa_core_annotations_orderby_pmservlet_vehicle_web_war);
+
+    WebArchive jpa_core_annotations_orderby_puservlet_vehicle_web_war = ShrinkWrap.create(WebArchive.class, "jpa_core_annotations_orderby_puservlet_vehicle_web_war");
+    jpa_core_annotations_orderby_puservlet_vehicle_web_war.addAsWebInfResource("web.xml");
+
+    JavaArchive jpa_core_annotations_orderby_jar = ShrinkWrap.create(JavaArchive.class, "jpa_core_annotations_orderby.jar");
+    jpa_core_annotations_orderby_jar.addClass(ee.jakarta.tck.persistence.core.annotations.orderby.A.class);
+    jpa_core_annotations_orderby_jar.addClass(ee.jakarta.tck.persistence.core.annotations.orderby.A2.class);
+    jpa_core_annotations_orderby_jar.addClass(ee.jakarta.tck.persistence.core.annotations.orderby.Address.class);
+    jpa_core_annotations_orderby_jar.addClass(ee.jakarta.tck.persistence.core.annotations.orderby.Address2.class);
+    jpa_core_annotations_orderby_jar.addClass(ee.jakarta.tck.persistence.core.annotations.orderby.Customer.class);
+    jpa_core_annotations_orderby_jar.addClass(ee.jakarta.tck.persistence.core.annotations.orderby.Customer2.class);
+    jpa_core_annotations_orderby_jar.addClass(ee.jakarta.tck.persistence.core.annotations.orderby.Department.class);
+    jpa_core_annotations_orderby_jar.addClass(ee.jakarta.tck.persistence.core.annotations.orderby.Employee.class);
+    jpa_core_annotations_orderby_jar.addClass(ee.jakarta.tck.persistence.core.annotations.orderby.Insurance.class);
+    jpa_core_annotations_orderby_jar.addClass(ee.jakarta.tck.persistence.core.annotations.orderby.ZipCode.class);
+    jpa_core_annotations_orderby_jar.addClass(ee.jakarta.tck.persistence.core.annotations.orderby.ZipCode2.class);
+    jpa_core_annotations_orderby_jar.addAsManifestResource("META-INF/MANIFEST.MF");
+    jpa_core_annotations_orderby_jar.addAsManifestResource("META-INF/persistence.xml");
+    jpa_core_annotations_orderby_puservlet_vehicle_web_war.addAsLibrary(jpa_core_annotations_orderby_jar);
+    jpa_core_annotations_orderby_puservlet_vehicle_web_war.addClass(ee.jakarta.tck.persistence.common.PMClientBase.class);
+    jpa_core_annotations_orderby_puservlet_vehicle_web_war.addClass(ee.jakarta.tck.persistence.core.annotations.orderby.Client.class);
+    ear.addAsModule(jpa_core_annotations_orderby_puservlet_vehicle_web_war);
+
+    JavaArchive jpa_core_annotations_orderby_stateful3_vehicle_client_jar = ShrinkWrap.create(JavaArchive.class, "jpa_core_annotations_orderby_stateful3_vehicle_client_jar");
+    jpa_core_annotations_orderby_stateful3_vehicle_client_jar.addClass(ee.jakarta.tck.persistence.common.PMClientBase.class);
+    ear.addAsModule(jpa_core_annotations_orderby_stateful3_vehicle_client_jar);
+
+    JavaArchive jpa_core_annotations_orderby_stateful3_vehicle_ejb_jar = ShrinkWrap.create(JavaArchive.class, "jpa_core_annotations_orderby_stateful3_vehicle_ejb_jar");
+    jpa_core_annotations_orderby_stateful3_vehicle_ejb_jar.addClass(ee.jakarta.tck.persistence.common.PMClientBase.class);
+    jpa_core_annotations_orderby_stateful3_vehicle_ejb_jar.addClass(ee.jakarta.tck.persistence.core.annotations.orderby.Client.class);
+    ear.addAsModule(jpa_core_annotations_orderby_stateful3_vehicle_ejb_jar);
+
+    JavaArchive jpa_core_annotations_orderby_stateless3_vehicle_client_jar = ShrinkWrap.create(JavaArchive.class, "jpa_core_annotations_orderby_stateless3_vehicle_client_jar");
+    jpa_core_annotations_orderby_stateless3_vehicle_client_jar.addClass(ee.jakarta.tck.persistence.common.PMClientBase.class);
+    ear.addAsModule(jpa_core_annotations_orderby_stateless3_vehicle_client_jar);
+
+    JavaArchive jpa_core_annotations_orderby_stateless3_vehicle_ejb_jar = ShrinkWrap.create(JavaArchive.class, "jpa_core_annotations_orderby_stateless3_vehicle_ejb_jar");
+    jpa_core_annotations_orderby_stateless3_vehicle_ejb_jar.addClass(ee.jakarta.tck.persistence.common.PMClientBase.class);
+    jpa_core_annotations_orderby_stateless3_vehicle_ejb_jar.addClass(ee.jakarta.tck.persistence.core.annotations.orderby.Client.class);
+    ear.addAsModule(jpa_core_annotations_orderby_stateless3_vehicle_ejb_jar);
+    return ear;
+  }
+
 	private static final Logger logger = (Logger) System.getLogger(Client3.class.getName());
 
 	List<Address> addrRef;
diff --git a/jpa/spec-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/ordercolumn/Client1.java b/jpa/spec-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/ordercolumn/Client1.java
index 0f0adb63e..5c766418b 100755
--- a/jpa/spec-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/ordercolumn/Client1.java
+++ b/jpa/spec-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/ordercolumn/Client1.java
@@ -19,8 +19,12 @@ package ee.jakarta.tck.persistence.core.annotations.ordercolumn;
 import java.lang.System.Logger;
 import java.util.ArrayList;
 import java.util.List;
-
+import org.jboss.arquillian.container.test.api.Deployment;
+import org.jboss.shrinkwrap.api.Archive;
+import org.jboss.shrinkwrap.api.ShrinkWrap;
+import org.jboss.shrinkwrap.api.spec.EnterpriseArchive;
 import org.jboss.shrinkwrap.api.spec.JavaArchive;
+import org.jboss.shrinkwrap.api.spec.WebArchive;
 import org.junit.jupiter.api.AfterEach;
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
@@ -31,6 +35,95 @@ import jakarta.persistence.Query;
 
 public class Client1 extends PMClientBase {
 
+  @Deployment(testable = false)
+  public static Archive<?> deployment() {
+
+    final EnterpriseArchive ear = ShrinkWrap.create(EnterpriseArchive.class, "jpa_core_annotations_ordercolumn_vehicles.ear");
+    // TODO: filter/eliminate the library jar classes that shouldn't be included
+    // Add ear/lib jars
+
+    JavaArchive jpa_core_annotations_ordercolumn_jar = ShrinkWrap.create(JavaArchive.class, "jpa_core_annotations_ordercolumn_jar");
+    jpa_core_annotations_ordercolumn_jar.addClass(ee.jakarta.tck.persistence.core.annotations.ordercolumn.Course.class);
+    jpa_core_annotations_ordercolumn_jar.addClass(ee.jakarta.tck.persistence.core.annotations.ordercolumn.Department.class);
+    jpa_core_annotations_ordercolumn_jar.addClass(ee.jakarta.tck.persistence.core.annotations.ordercolumn.Department2.class);
+    jpa_core_annotations_ordercolumn_jar.addClass(ee.jakarta.tck.persistence.core.annotations.ordercolumn.Employee.class);
+    jpa_core_annotations_ordercolumn_jar.addClass(ee.jakarta.tck.persistence.core.annotations.ordercolumn.Employee2.class);
+    jpa_core_annotations_ordercolumn_jar.addClass(ee.jakarta.tck.persistence.core.annotations.ordercolumn.Student.class);
+    ear.addAsLibrary(jpa_core_annotations_ordercolumn_jar);
+    // Add ear submodules
+
+    JavaArchive jpa_core_annotations_ordercolumn_appmanagedNoTx_vehicle_client_jar = ShrinkWrap.create(JavaArchive.class, "jpa_core_annotations_ordercolumn_appmanagedNoTx_vehicle_client_jar");
+    jpa_core_annotations_ordercolumn_appmanagedNoTx_vehicle_client_jar.addClass(ee.jakarta.tck.persistence.common.PMClientBase.class);
+    ear.addAsModule(jpa_core_annotations_ordercolumn_appmanagedNoTx_vehicle_client_jar);
+
+    JavaArchive jpa_core_annotations_ordercolumn_appmanagedNoTx_vehicle_ejb_jar = ShrinkWrap.create(JavaArchive.class, "jpa_core_annotations_ordercolumn_appmanagedNoTx_vehicle_ejb_jar");
+    jpa_core_annotations_ordercolumn_appmanagedNoTx_vehicle_ejb_jar.addClass(ee.jakarta.tck.persistence.common.PMClientBase.class);
+    jpa_core_annotations_ordercolumn_appmanagedNoTx_vehicle_ejb_jar.addClass(ee.jakarta.tck.persistence.core.annotations.ordercolumn.Client.class);
+    ear.addAsModule(jpa_core_annotations_ordercolumn_appmanagedNoTx_vehicle_ejb_jar);
+
+    JavaArchive jpa_core_annotations_ordercolumn_appmanaged_vehicle_client_jar = ShrinkWrap.create(JavaArchive.class, "jpa_core_annotations_ordercolumn_appmanaged_vehicle_client_jar");
+    jpa_core_annotations_ordercolumn_appmanaged_vehicle_client_jar.addClass(ee.jakarta.tck.persistence.common.PMClientBase.class);
+    ear.addAsModule(jpa_core_annotations_ordercolumn_appmanaged_vehicle_client_jar);
+
+    JavaArchive jpa_core_annotations_ordercolumn_appmanaged_vehicle_ejb_jar = ShrinkWrap.create(JavaArchive.class, "jpa_core_annotations_ordercolumn_appmanaged_vehicle_ejb_jar");
+    jpa_core_annotations_ordercolumn_appmanaged_vehicle_ejb_jar.addClass(ee.jakarta.tck.persistence.common.PMClientBase.class);
+    jpa_core_annotations_ordercolumn_appmanaged_vehicle_ejb_jar.addClass(ee.jakarta.tck.persistence.core.annotations.ordercolumn.Client.class);
+    ear.addAsModule(jpa_core_annotations_ordercolumn_appmanaged_vehicle_ejb_jar);
+
+    WebArchive jpa_core_annotations_ordercolumn_pmservlet_vehicle_web_war = ShrinkWrap.create(WebArchive.class, "jpa_core_annotations_ordercolumn_pmservlet_vehicle_web_war");
+    jpa_core_annotations_ordercolumn_pmservlet_vehicle_web_war.addAsWebInfResource("web.xml");
+
+    JavaArchive jpa_core_annotations_ordercolumn_jar = ShrinkWrap.create(JavaArchive.class, "jpa_core_annotations_ordercolumn.jar");
+    jpa_core_annotations_ordercolumn_jar.addClass(ee.jakarta.tck.persistence.core.annotations.ordercolumn.Course.class);
+    jpa_core_annotations_ordercolumn_jar.addClass(ee.jakarta.tck.persistence.core.annotations.ordercolumn.Department.class);
+    jpa_core_annotations_ordercolumn_jar.addClass(ee.jakarta.tck.persistence.core.annotations.ordercolumn.Department2.class);
+    jpa_core_annotations_ordercolumn_jar.addClass(ee.jakarta.tck.persistence.core.annotations.ordercolumn.Employee.class);
+    jpa_core_annotations_ordercolumn_jar.addClass(ee.jakarta.tck.persistence.core.annotations.ordercolumn.Employee2.class);
+    jpa_core_annotations_ordercolumn_jar.addClass(ee.jakarta.tck.persistence.core.annotations.ordercolumn.Student.class);
+    jpa_core_annotations_ordercolumn_jar.addAsManifestResource("META-INF/MANIFEST.MF");
+    jpa_core_annotations_ordercolumn_jar.addAsManifestResource("META-INF/persistence.xml");
+    jpa_core_annotations_ordercolumn_pmservlet_vehicle_web_war.addAsLibrary(jpa_core_annotations_ordercolumn_jar);
+    jpa_core_annotations_ordercolumn_pmservlet_vehicle_web_war.addClass(ee.jakarta.tck.persistence.common.PMClientBase.class);
+    jpa_core_annotations_ordercolumn_pmservlet_vehicle_web_war.addClass(ee.jakarta.tck.persistence.core.annotations.ordercolumn.Client.class);
+    ear.addAsModule(jpa_core_annotations_ordercolumn_pmservlet_vehicle_web_war);
+
+    WebArchive jpa_core_annotations_ordercolumn_puservlet_vehicle_web_war = ShrinkWrap.create(WebArchive.class, "jpa_core_annotations_ordercolumn_puservlet_vehicle_web_war");
+    jpa_core_annotations_ordercolumn_puservlet_vehicle_web_war.addAsWebInfResource("web.xml");
+
+    JavaArchive jpa_core_annotations_ordercolumn_jar = ShrinkWrap.create(JavaArchive.class, "jpa_core_annotations_ordercolumn.jar");
+    jpa_core_annotations_ordercolumn_jar.addClass(ee.jakarta.tck.persistence.core.annotations.ordercolumn.Course.class);
+    jpa_core_annotations_ordercolumn_jar.addClass(ee.jakarta.tck.persistence.core.annotations.ordercolumn.Department.class);
+    jpa_core_annotations_ordercolumn_jar.addClass(ee.jakarta.tck.persistence.core.annotations.ordercolumn.Department2.class);
+    jpa_core_annotations_ordercolumn_jar.addClass(ee.jakarta.tck.persistence.core.annotations.ordercolumn.Employee.class);
+    jpa_core_annotations_ordercolumn_jar.addClass(ee.jakarta.tck.persistence.core.annotations.ordercolumn.Employee2.class);
+    jpa_core_annotations_ordercolumn_jar.addClass(ee.jakarta.tck.persistence.core.annotations.ordercolumn.Student.class);
+    jpa_core_annotations_ordercolumn_jar.addAsManifestResource("META-INF/MANIFEST.MF");
+    jpa_core_annotations_ordercolumn_jar.addAsManifestResource("META-INF/persistence.xml");
+    jpa_core_annotations_ordercolumn_puservlet_vehicle_web_war.addAsLibrary(jpa_core_annotations_ordercolumn_jar);
+    jpa_core_annotations_ordercolumn_puservlet_vehicle_web_war.addClass(ee.jakarta.tck.persistence.common.PMClientBase.class);
+    jpa_core_annotations_ordercolumn_puservlet_vehicle_web_war.addClass(ee.jakarta.tck.persistence.core.annotations.ordercolumn.Client.class);
+    ear.addAsModule(jpa_core_annotations_ordercolumn_puservlet_vehicle_web_war);
+
+    JavaArchive jpa_core_annotations_ordercolumn_stateful3_vehicle_client_jar = ShrinkWrap.create(JavaArchive.class, "jpa_core_annotations_ordercolumn_stateful3_vehicle_client_jar");
+    jpa_core_annotations_ordercolumn_stateful3_vehicle_client_jar.addClass(ee.jakarta.tck.persistence.common.PMClientBase.class);
+    ear.addAsModule(jpa_core_annotations_ordercolumn_stateful3_vehicle_client_jar);
+
+    JavaArchive jpa_core_annotations_ordercolumn_stateful3_vehicle_ejb_jar = ShrinkWrap.create(JavaArchive.class, "jpa_core_annotations_ordercolumn_stateful3_vehicle_ejb_jar");
+    jpa_core_annotations_ordercolumn_stateful3_vehicle_ejb_jar.addClass(ee.jakarta.tck.persistence.common.PMClientBase.class);
+    jpa_core_annotations_ordercolumn_stateful3_vehicle_ejb_jar.addClass(ee.jakarta.tck.persistence.core.annotations.ordercolumn.Client.class);
+    ear.addAsModule(jpa_core_annotations_ordercolumn_stateful3_vehicle_ejb_jar);
+
+    JavaArchive jpa_core_annotations_ordercolumn_stateless3_vehicle_client_jar = ShrinkWrap.create(JavaArchive.class, "jpa_core_annotations_ordercolumn_stateless3_vehicle_client_jar");
+    jpa_core_annotations_ordercolumn_stateless3_vehicle_client_jar.addClass(ee.jakarta.tck.persistence.common.PMClientBase.class);
+    ear.addAsModule(jpa_core_annotations_ordercolumn_stateless3_vehicle_client_jar);
+
+    JavaArchive jpa_core_annotations_ordercolumn_stateless3_vehicle_ejb_jar = ShrinkWrap.create(JavaArchive.class, "jpa_core_annotations_ordercolumn_stateless3_vehicle_ejb_jar");
+    jpa_core_annotations_ordercolumn_stateless3_vehicle_ejb_jar.addClass(ee.jakarta.tck.persistence.common.PMClientBase.class);
+    jpa_core_annotations_ordercolumn_stateless3_vehicle_ejb_jar.addClass(ee.jakarta.tck.persistence.core.annotations.ordercolumn.Client.class);
+    ear.addAsModule(jpa_core_annotations_ordercolumn_stateless3_vehicle_ejb_jar);
+    return ear;
+  }
+
 	private List<Student> expectedResults;
 	private static final Logger logger = (Logger) System.getLogger(Client1.class.getName());
 
diff --git a/jpa/spec-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/ordercolumn/Client2.java b/jpa/spec-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/ordercolumn/Client2.java
index 307e6883e..08e115422 100644
--- a/jpa/spec-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/ordercolumn/Client2.java
+++ b/jpa/spec-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/ordercolumn/Client2.java
@@ -19,8 +19,12 @@ package ee.jakarta.tck.persistence.core.annotations.ordercolumn;
 import java.lang.System.Logger;
 import java.util.ArrayList;
 import java.util.List;
-
+import org.jboss.arquillian.container.test.api.Deployment;
+import org.jboss.shrinkwrap.api.Archive;
+import org.jboss.shrinkwrap.api.ShrinkWrap;
+import org.jboss.shrinkwrap.api.spec.EnterpriseArchive;
 import org.jboss.shrinkwrap.api.spec.JavaArchive;
+import org.jboss.shrinkwrap.api.spec.WebArchive;
 import org.junit.jupiter.api.AfterEach;
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
@@ -31,6 +35,95 @@ import jakarta.persistence.TypedQuery;
 
 public class Client2 extends PMClientBase {
 
+  @Deployment(testable = false)
+  public static Archive<?> deployment() {
+
+    final EnterpriseArchive ear = ShrinkWrap.create(EnterpriseArchive.class, "jpa_core_annotations_ordercolumn_vehicles.ear");
+    // TODO: filter/eliminate the library jar classes that shouldn't be included
+    // Add ear/lib jars
+
+    JavaArchive jpa_core_annotations_ordercolumn_jar = ShrinkWrap.create(JavaArchive.class, "jpa_core_annotations_ordercolumn_jar");
+    jpa_core_annotations_ordercolumn_jar.addClass(ee.jakarta.tck.persistence.core.annotations.ordercolumn.Course.class);
+    jpa_core_annotations_ordercolumn_jar.addClass(ee.jakarta.tck.persistence.core.annotations.ordercolumn.Department.class);
+    jpa_core_annotations_ordercolumn_jar.addClass(ee.jakarta.tck.persistence.core.annotations.ordercolumn.Department2.class);
+    jpa_core_annotations_ordercolumn_jar.addClass(ee.jakarta.tck.persistence.core.annotations.ordercolumn.Employee.class);
+    jpa_core_annotations_ordercolumn_jar.addClass(ee.jakarta.tck.persistence.core.annotations.ordercolumn.Employee2.class);
+    jpa_core_annotations_ordercolumn_jar.addClass(ee.jakarta.tck.persistence.core.annotations.ordercolumn.Student.class);
+    ear.addAsLibrary(jpa_core_annotations_ordercolumn_jar);
+    // Add ear submodules
+
+    JavaArchive jpa_core_annotations_ordercolumn_appmanagedNoTx_vehicle_client_jar = ShrinkWrap.create(JavaArchive.class, "jpa_core_annotations_ordercolumn_appmanagedNoTx_vehicle_client_jar");
+    jpa_core_annotations_ordercolumn_appmanagedNoTx_vehicle_client_jar.addClass(ee.jakarta.tck.persistence.common.PMClientBase.class);
+    ear.addAsModule(jpa_core_annotations_ordercolumn_appmanagedNoTx_vehicle_client_jar);
+
+    JavaArchive jpa_core_annotations_ordercolumn_appmanagedNoTx_vehicle_ejb_jar = ShrinkWrap.create(JavaArchive.class, "jpa_core_annotations_ordercolumn_appmanagedNoTx_vehicle_ejb_jar");
+    jpa_core_annotations_ordercolumn_appmanagedNoTx_vehicle_ejb_jar.addClass(ee.jakarta.tck.persistence.common.PMClientBase.class);
+    jpa_core_annotations_ordercolumn_appmanagedNoTx_vehicle_ejb_jar.addClass(ee.jakarta.tck.persistence.core.annotations.ordercolumn.Client.class);
+    ear.addAsModule(jpa_core_annotations_ordercolumn_appmanagedNoTx_vehicle_ejb_jar);
+
+    JavaArchive jpa_core_annotations_ordercolumn_appmanaged_vehicle_client_jar = ShrinkWrap.create(JavaArchive.class, "jpa_core_annotations_ordercolumn_appmanaged_vehicle_client_jar");
+    jpa_core_annotations_ordercolumn_appmanaged_vehicle_client_jar.addClass(ee.jakarta.tck.persistence.common.PMClientBase.class);
+    ear.addAsModule(jpa_core_annotations_ordercolumn_appmanaged_vehicle_client_jar);
+
+    JavaArchive jpa_core_annotations_ordercolumn_appmanaged_vehicle_ejb_jar = ShrinkWrap.create(JavaArchive.class, "jpa_core_annotations_ordercolumn_appmanaged_vehicle_ejb_jar");
+    jpa_core_annotations_ordercolumn_appmanaged_vehicle_ejb_jar.addClass(ee.jakarta.tck.persistence.common.PMClientBase.class);
+    jpa_core_annotations_ordercolumn_appmanaged_vehicle_ejb_jar.addClass(ee.jakarta.tck.persistence.core.annotations.ordercolumn.Client.class);
+    ear.addAsModule(jpa_core_annotations_ordercolumn_appmanaged_vehicle_ejb_jar);
+
+    WebArchive jpa_core_annotations_ordercolumn_pmservlet_vehicle_web_war = ShrinkWrap.create(WebArchive.class, "jpa_core_annotations_ordercolumn_pmservlet_vehicle_web_war");
+    jpa_core_annotations_ordercolumn_pmservlet_vehicle_web_war.addAsWebInfResource("web.xml");
+
+    JavaArchive jpa_core_annotations_ordercolumn_jar = ShrinkWrap.create(JavaArchive.class, "jpa_core_annotations_ordercolumn.jar");
+    jpa_core_annotations_ordercolumn_jar.addClass(ee.jakarta.tck.persistence.core.annotations.ordercolumn.Course.class);
+    jpa_core_annotations_ordercolumn_jar.addClass(ee.jakarta.tck.persistence.core.annotations.ordercolumn.Department.class);
+    jpa_core_annotations_ordercolumn_jar.addClass(ee.jakarta.tck.persistence.core.annotations.ordercolumn.Department2.class);
+    jpa_core_annotations_ordercolumn_jar.addClass(ee.jakarta.tck.persistence.core.annotations.ordercolumn.Employee.class);
+    jpa_core_annotations_ordercolumn_jar.addClass(ee.jakarta.tck.persistence.core.annotations.ordercolumn.Employee2.class);
+    jpa_core_annotations_ordercolumn_jar.addClass(ee.jakarta.tck.persistence.core.annotations.ordercolumn.Student.class);
+    jpa_core_annotations_ordercolumn_jar.addAsManifestResource("META-INF/MANIFEST.MF");
+    jpa_core_annotations_ordercolumn_jar.addAsManifestResource("META-INF/persistence.xml");
+    jpa_core_annotations_ordercolumn_pmservlet_vehicle_web_war.addAsLibrary(jpa_core_annotations_ordercolumn_jar);
+    jpa_core_annotations_ordercolumn_pmservlet_vehicle_web_war.addClass(ee.jakarta.tck.persistence.common.PMClientBase.class);
+    jpa_core_annotations_ordercolumn_pmservlet_vehicle_web_war.addClass(ee.jakarta.tck.persistence.core.annotations.ordercolumn.Client.class);
+    ear.addAsModule(jpa_core_annotations_ordercolumn_pmservlet_vehicle_web_war);
+
+    WebArchive jpa_core_annotations_ordercolumn_puservlet_vehicle_web_war = ShrinkWrap.create(WebArchive.class, "jpa_core_annotations_ordercolumn_puservlet_vehicle_web_war");
+    jpa_core_annotations_ordercolumn_puservlet_vehicle_web_war.addAsWebInfResource("web.xml");
+
+    JavaArchive jpa_core_annotations_ordercolumn_jar = ShrinkWrap.create(JavaArchive.class, "jpa_core_annotations_ordercolumn.jar");
+    jpa_core_annotations_ordercolumn_jar.addClass(ee.jakarta.tck.persistence.core.annotations.ordercolumn.Course.class);
+    jpa_core_annotations_ordercolumn_jar.addClass(ee.jakarta.tck.persistence.core.annotations.ordercolumn.Department.class);
+    jpa_core_annotations_ordercolumn_jar.addClass(ee.jakarta.tck.persistence.core.annotations.ordercolumn.Department2.class);
+    jpa_core_annotations_ordercolumn_jar.addClass(ee.jakarta.tck.persistence.core.annotations.ordercolumn.Employee.class);
+    jpa_core_annotations_ordercolumn_jar.addClass(ee.jakarta.tck.persistence.core.annotations.ordercolumn.Employee2.class);
+    jpa_core_annotations_ordercolumn_jar.addClass(ee.jakarta.tck.persistence.core.annotations.ordercolumn.Student.class);
+    jpa_core_annotations_ordercolumn_jar.addAsManifestResource("META-INF/MANIFEST.MF");
+    jpa_core_annotations_ordercolumn_jar.addAsManifestResource("META-INF/persistence.xml");
+    jpa_core_annotations_ordercolumn_puservlet_vehicle_web_war.addAsLibrary(jpa_core_annotations_ordercolumn_jar);
+    jpa_core_annotations_ordercolumn_puservlet_vehicle_web_war.addClass(ee.jakarta.tck.persistence.common.PMClientBase.class);
+    jpa_core_annotations_ordercolumn_puservlet_vehicle_web_war.addClass(ee.jakarta.tck.persistence.core.annotations.ordercolumn.Client.class);
+    ear.addAsModule(jpa_core_annotations_ordercolumn_puservlet_vehicle_web_war);
+
+    JavaArchive jpa_core_annotations_ordercolumn_stateful3_vehicle_client_jar = ShrinkWrap.create(JavaArchive.class, "jpa_core_annotations_ordercolumn_stateful3_vehicle_client_jar");
+    jpa_core_annotations_ordercolumn_stateful3_vehicle_client_jar.addClass(ee.jakarta.tck.persistence.common.PMClientBase.class);
+    ear.addAsModule(jpa_core_annotations_ordercolumn_stateful3_vehicle_client_jar);
+
+    JavaArchive jpa_core_annotations_ordercolumn_stateful3_vehicle_ejb_jar = ShrinkWrap.create(JavaArchive.class, "jpa_core_annotations_ordercolumn_stateful3_vehicle_ejb_jar");
+    jpa_core_annotations_ordercolumn_stateful3_vehicle_ejb_jar.addClass(ee.jakarta.tck.persistence.common.PMClientBase.class);
+    jpa_core_annotations_ordercolumn_stateful3_vehicle_ejb_jar.addClass(ee.jakarta.tck.persistence.core.annotations.ordercolumn.Client.class);
+    ear.addAsModule(jpa_core_annotations_ordercolumn_stateful3_vehicle_ejb_jar);
+
+    JavaArchive jpa_core_annotations_ordercolumn_stateless3_vehicle_client_jar = ShrinkWrap.create(JavaArchive.class, "jpa_core_annotations_ordercolumn_stateless3_vehicle_client_jar");
+    jpa_core_annotations_ordercolumn_stateless3_vehicle_client_jar.addClass(ee.jakarta.tck.persistence.common.PMClientBase.class);
+    ear.addAsModule(jpa_core_annotations_ordercolumn_stateless3_vehicle_client_jar);
+
+    JavaArchive jpa_core_annotations_ordercolumn_stateless3_vehicle_ejb_jar = ShrinkWrap.create(JavaArchive.class, "jpa_core_annotations_ordercolumn_stateless3_vehicle_ejb_jar");
+    jpa_core_annotations_ordercolumn_stateless3_vehicle_ejb_jar.addClass(ee.jakarta.tck.persistence.common.PMClientBase.class);
+    jpa_core_annotations_ordercolumn_stateless3_vehicle_ejb_jar.addClass(ee.jakarta.tck.persistence.core.annotations.ordercolumn.Client.class);
+    ear.addAsModule(jpa_core_annotations_ordercolumn_stateless3_vehicle_ejb_jar);
+    return ear;
+  }
+
 	private List<Student> expectedResults;
 
 	private List<Employee> expectedEmployees;
diff --git a/jpa/spec-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/tableGenerator/Client.java b/jpa/spec-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/tableGenerator/Client.java
index ecd4082f8..daf79cce5 100644
--- a/jpa/spec-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/tableGenerator/Client.java
+++ b/jpa/spec-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/tableGenerator/Client.java
@@ -17,13 +17,101 @@
 package ee.jakarta.tck.persistence.core.annotations.tableGenerator;
 
 import java.lang.System.Logger;
-
+import org.jboss.arquillian.container.test.api.Deployment;
+import org.jboss.shrinkwrap.api.Archive;
+import org.jboss.shrinkwrap.api.ShrinkWrap;
+import org.jboss.shrinkwrap.api.spec.EnterpriseArchive;
+import org.jboss.shrinkwrap.api.spec.JavaArchive;
+import org.jboss.shrinkwrap.api.spec.WebArchive;
 import org.junit.jupiter.api.AfterEach;
 
 import ee.jakarta.tck.persistence.common.PMClientBase;
 
 public class Client extends PMClientBase {
 
+  @Deployment(testable = false)
+  public static Archive<?> deployment() {
+
+    final EnterpriseArchive ear = ShrinkWrap.create(EnterpriseArchive.class, "jpa_core_annotations_tableGenerator_vehicles.ear");
+    // TODO: filter/eliminate the library jar classes that shouldn't be included
+    // Add ear/lib jars
+
+    JavaArchive jpa_core_annotations_tableGenerator_jar = ShrinkWrap.create(JavaArchive.class, "jpa_core_annotations_tableGenerator_jar");
+    jpa_core_annotations_tableGenerator_jar.addClass(ee.jakarta.tck.persistence.core.annotations.tableGenerator.DataTypes.class);
+    jpa_core_annotations_tableGenerator_jar.addClass(ee.jakarta.tck.persistence.core.annotations.tableGenerator.DataTypes2.class);
+    jpa_core_annotations_tableGenerator_jar.addClass(ee.jakarta.tck.persistence.core.annotations.tableGenerator.DataTypes3.class);
+    jpa_core_annotations_tableGenerator_jar.addClass(ee.jakarta.tck.persistence.core.annotations.tableGenerator.DataTypes4.class);
+    ear.addAsLibrary(jpa_core_annotations_tableGenerator_jar);
+    // Add ear submodules
+
+    JavaArchive jpa_core_annotations_tableGenerator_appmanagedNoTx_vehicle_client_jar = ShrinkWrap.create(JavaArchive.class, "jpa_core_annotations_tableGenerator_appmanagedNoTx_vehicle_client_jar");
+    jpa_core_annotations_tableGenerator_appmanagedNoTx_vehicle_client_jar.addClass(ee.jakarta.tck.persistence.common.PMClientBase.class);
+    ear.addAsModule(jpa_core_annotations_tableGenerator_appmanagedNoTx_vehicle_client_jar);
+
+    JavaArchive jpa_core_annotations_tableGenerator_appmanagedNoTx_vehicle_ejb_jar = ShrinkWrap.create(JavaArchive.class, "jpa_core_annotations_tableGenerator_appmanagedNoTx_vehicle_ejb_jar");
+    jpa_core_annotations_tableGenerator_appmanagedNoTx_vehicle_ejb_jar.addClass(ee.jakarta.tck.persistence.common.PMClientBase.class);
+    jpa_core_annotations_tableGenerator_appmanagedNoTx_vehicle_ejb_jar.addClass(ee.jakarta.tck.persistence.core.annotations.tableGenerator.Client.class);
+    ear.addAsModule(jpa_core_annotations_tableGenerator_appmanagedNoTx_vehicle_ejb_jar);
+
+    JavaArchive jpa_core_annotations_tableGenerator_appmanaged_vehicle_client_jar = ShrinkWrap.create(JavaArchive.class, "jpa_core_annotations_tableGenerator_appmanaged_vehicle_client_jar");
+    jpa_core_annotations_tableGenerator_appmanaged_vehicle_client_jar.addClass(ee.jakarta.tck.persistence.common.PMClientBase.class);
+    ear.addAsModule(jpa_core_annotations_tableGenerator_appmanaged_vehicle_client_jar);
+
+    JavaArchive jpa_core_annotations_tableGenerator_appmanaged_vehicle_ejb_jar = ShrinkWrap.create(JavaArchive.class, "jpa_core_annotations_tableGenerator_appmanaged_vehicle_ejb_jar");
+    jpa_core_annotations_tableGenerator_appmanaged_vehicle_ejb_jar.addClass(ee.jakarta.tck.persistence.common.PMClientBase.class);
+    jpa_core_annotations_tableGenerator_appmanaged_vehicle_ejb_jar.addClass(ee.jakarta.tck.persistence.core.annotations.tableGenerator.Client.class);
+    ear.addAsModule(jpa_core_annotations_tableGenerator_appmanaged_vehicle_ejb_jar);
+
+    WebArchive jpa_core_annotations_tableGenerator_pmservlet_vehicle_web_war = ShrinkWrap.create(WebArchive.class, "jpa_core_annotations_tableGenerator_pmservlet_vehicle_web_war");
+    jpa_core_annotations_tableGenerator_pmservlet_vehicle_web_war.addAsWebInfResource("web.xml");
+
+    JavaArchive jpa_core_annotations_tableGenerator_jar = ShrinkWrap.create(JavaArchive.class, "jpa_core_annotations_tableGenerator.jar");
+    jpa_core_annotations_tableGenerator_jar.addClass(ee.jakarta.tck.persistence.core.annotations.tableGenerator.DataTypes.class);
+    jpa_core_annotations_tableGenerator_jar.addClass(ee.jakarta.tck.persistence.core.annotations.tableGenerator.DataTypes2.class);
+    jpa_core_annotations_tableGenerator_jar.addClass(ee.jakarta.tck.persistence.core.annotations.tableGenerator.DataTypes3.class);
+    jpa_core_annotations_tableGenerator_jar.addClass(ee.jakarta.tck.persistence.core.annotations.tableGenerator.DataTypes4.class);
+    jpa_core_annotations_tableGenerator_jar.addAsManifestResource("META-INF/MANIFEST.MF");
+    jpa_core_annotations_tableGenerator_jar.addAsManifestResource("META-INF/persistence.xml");
+    jpa_core_annotations_tableGenerator_pmservlet_vehicle_web_war.addAsLibrary(jpa_core_annotations_tableGenerator_jar);
+    jpa_core_annotations_tableGenerator_pmservlet_vehicle_web_war.addClass(ee.jakarta.tck.persistence.common.PMClientBase.class);
+    jpa_core_annotations_tableGenerator_pmservlet_vehicle_web_war.addClass(ee.jakarta.tck.persistence.core.annotations.tableGenerator.Client.class);
+    ear.addAsModule(jpa_core_annotations_tableGenerator_pmservlet_vehicle_web_war);
+
+    WebArchive jpa_core_annotations_tableGenerator_puservlet_vehicle_web_war = ShrinkWrap.create(WebArchive.class, "jpa_core_annotations_tableGenerator_puservlet_vehicle_web_war");
+    jpa_core_annotations_tableGenerator_puservlet_vehicle_web_war.addAsWebInfResource("web.xml");
+
+    JavaArchive jpa_core_annotations_tableGenerator_jar = ShrinkWrap.create(JavaArchive.class, "jpa_core_annotations_tableGenerator.jar");
+    jpa_core_annotations_tableGenerator_jar.addClass(ee.jakarta.tck.persistence.core.annotations.tableGenerator.DataTypes.class);
+    jpa_core_annotations_tableGenerator_jar.addClass(ee.jakarta.tck.persistence.core.annotations.tableGenerator.DataTypes2.class);
+    jpa_core_annotations_tableGenerator_jar.addClass(ee.jakarta.tck.persistence.core.annotations.tableGenerator.DataTypes3.class);
+    jpa_core_annotations_tableGenerator_jar.addClass(ee.jakarta.tck.persistence.core.annotations.tableGenerator.DataTypes4.class);
+    jpa_core_annotations_tableGenerator_jar.addAsManifestResource("META-INF/MANIFEST.MF");
+    jpa_core_annotations_tableGenerator_jar.addAsManifestResource("META-INF/persistence.xml");
+    jpa_core_annotations_tableGenerator_puservlet_vehicle_web_war.addAsLibrary(jpa_core_annotations_tableGenerator_jar);
+    jpa_core_annotations_tableGenerator_puservlet_vehicle_web_war.addClass(ee.jakarta.tck.persistence.common.PMClientBase.class);
+    jpa_core_annotations_tableGenerator_puservlet_vehicle_web_war.addClass(ee.jakarta.tck.persistence.core.annotations.tableGenerator.Client.class);
+    ear.addAsModule(jpa_core_annotations_tableGenerator_puservlet_vehicle_web_war);
+
+    JavaArchive jpa_core_annotations_tableGenerator_stateful3_vehicle_client_jar = ShrinkWrap.create(JavaArchive.class, "jpa_core_annotations_tableGenerator_stateful3_vehicle_client_jar");
+    jpa_core_annotations_tableGenerator_stateful3_vehicle_client_jar.addClass(ee.jakarta.tck.persistence.common.PMClientBase.class);
+    ear.addAsModule(jpa_core_annotations_tableGenerator_stateful3_vehicle_client_jar);
+
+    JavaArchive jpa_core_annotations_tableGenerator_stateful3_vehicle_ejb_jar = ShrinkWrap.create(JavaArchive.class, "jpa_core_annotations_tableGenerator_stateful3_vehicle_ejb_jar");
+    jpa_core_annotations_tableGenerator_stateful3_vehicle_ejb_jar.addClass(ee.jakarta.tck.persistence.common.PMClientBase.class);
+    jpa_core_annotations_tableGenerator_stateful3_vehicle_ejb_jar.addClass(ee.jakarta.tck.persistence.core.annotations.tableGenerator.Client.class);
+    ear.addAsModule(jpa_core_annotations_tableGenerator_stateful3_vehicle_ejb_jar);
+
+    JavaArchive jpa_core_annotations_tableGenerator_stateless3_vehicle_client_jar = ShrinkWrap.create(JavaArchive.class, "jpa_core_annotations_tableGenerator_stateless3_vehicle_client_jar");
+    jpa_core_annotations_tableGenerator_stateless3_vehicle_client_jar.addClass(ee.jakarta.tck.persistence.common.PMClientBase.class);
+    ear.addAsModule(jpa_core_annotations_tableGenerator_stateless3_vehicle_client_jar);
+
+    JavaArchive jpa_core_annotations_tableGenerator_stateless3_vehicle_ejb_jar = ShrinkWrap.create(JavaArchive.class, "jpa_core_annotations_tableGenerator_stateless3_vehicle_ejb_jar");
+    jpa_core_annotations_tableGenerator_stateless3_vehicle_ejb_jar.addClass(ee.jakarta.tck.persistence.common.PMClientBase.class);
+    jpa_core_annotations_tableGenerator_stateless3_vehicle_ejb_jar.addClass(ee.jakarta.tck.persistence.core.annotations.tableGenerator.Client.class);
+    ear.addAsModule(jpa_core_annotations_tableGenerator_stateless3_vehicle_ejb_jar);
+    return ear;
+  }
+
 	private static final Logger logger = (Logger) System.getLogger(Client.class.getName());
 
 	public Client() {
diff --git a/jpa/spec-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/tableGenerator/Client1.java b/jpa/spec-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/tableGenerator/Client1.java
index d58ddbeae..e50a77425 100644
--- a/jpa/spec-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/tableGenerator/Client1.java
+++ b/jpa/spec-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/tableGenerator/Client1.java
@@ -18,12 +18,100 @@ package ee.jakarta.tck.persistence.core.annotations.tableGenerator;
 
 import java.lang.System.Logger;
 
+import org.jboss.arquillian.container.test.api.Deployment;
+import org.jboss.shrinkwrap.api.Archive;
+import org.jboss.shrinkwrap.api.ShrinkWrap;
+import org.jboss.shrinkwrap.api.spec.EnterpriseArchive;
 import org.jboss.shrinkwrap.api.spec.JavaArchive;
+import org.jboss.shrinkwrap.api.spec.WebArchive;
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
 
 public class Client1 extends Client {
 
+  @Deployment(testable = false)
+  public static Archive<?> deployment() {
+
+    final EnterpriseArchive ear = ShrinkWrap.create(EnterpriseArchive.class, "jpa_core_annotations_tableGenerator_vehicles.ear");
+    // TODO: filter/eliminate the library jar classes that shouldn't be included
+    // Add ear/lib jars
+
+    JavaArchive jpa_core_annotations_tableGenerator_jar = ShrinkWrap.create(JavaArchive.class, "jpa_core_annotations_tableGenerator_jar");
+    jpa_core_annotations_tableGenerator_jar.addClass(ee.jakarta.tck.persistence.core.annotations.tableGenerator.DataTypes.class);
+    jpa_core_annotations_tableGenerator_jar.addClass(ee.jakarta.tck.persistence.core.annotations.tableGenerator.DataTypes2.class);
+    jpa_core_annotations_tableGenerator_jar.addClass(ee.jakarta.tck.persistence.core.annotations.tableGenerator.DataTypes3.class);
+    jpa_core_annotations_tableGenerator_jar.addClass(ee.jakarta.tck.persistence.core.annotations.tableGenerator.DataTypes4.class);
+    ear.addAsLibrary(jpa_core_annotations_tableGenerator_jar);
+    // Add ear submodules
+
+    JavaArchive jpa_core_annotations_tableGenerator_appmanagedNoTx_vehicle_client_jar = ShrinkWrap.create(JavaArchive.class, "jpa_core_annotations_tableGenerator_appmanagedNoTx_vehicle_client_jar");
+    jpa_core_annotations_tableGenerator_appmanagedNoTx_vehicle_client_jar.addClass(ee.jakarta.tck.persistence.common.PMClientBase.class);
+    ear.addAsModule(jpa_core_annotations_tableGenerator_appmanagedNoTx_vehicle_client_jar);
+
+    JavaArchive jpa_core_annotations_tableGenerator_appmanagedNoTx_vehicle_ejb_jar = ShrinkWrap.create(JavaArchive.class, "jpa_core_annotations_tableGenerator_appmanagedNoTx_vehicle_ejb_jar");
+    jpa_core_annotations_tableGenerator_appmanagedNoTx_vehicle_ejb_jar.addClass(ee.jakarta.tck.persistence.common.PMClientBase.class);
+    jpa_core_annotations_tableGenerator_appmanagedNoTx_vehicle_ejb_jar.addClass(ee.jakarta.tck.persistence.core.annotations.tableGenerator.Client.class);
+    ear.addAsModule(jpa_core_annotations_tableGenerator_appmanagedNoTx_vehicle_ejb_jar);
+
+    JavaArchive jpa_core_annotations_tableGenerator_appmanaged_vehicle_client_jar = ShrinkWrap.create(JavaArchive.class, "jpa_core_annotations_tableGenerator_appmanaged_vehicle_client_jar");
+    jpa_core_annotations_tableGenerator_appmanaged_vehicle_client_jar.addClass(ee.jakarta.tck.persistence.common.PMClientBase.class);
+    ear.addAsModule(jpa_core_annotations_tableGenerator_appmanaged_vehicle_client_jar);
+
+    JavaArchive jpa_core_annotations_tableGenerator_appmanaged_vehicle_ejb_jar = ShrinkWrap.create(JavaArchive.class, "jpa_core_annotations_tableGenerator_appmanaged_vehicle_ejb_jar");
+    jpa_core_annotations_tableGenerator_appmanaged_vehicle_ejb_jar.addClass(ee.jakarta.tck.persistence.common.PMClientBase.class);
+    jpa_core_annotations_tableGenerator_appmanaged_vehicle_ejb_jar.addClass(ee.jakarta.tck.persistence.core.annotations.tableGenerator.Client.class);
+    ear.addAsModule(jpa_core_annotations_tableGenerator_appmanaged_vehicle_ejb_jar);
+
+    WebArchive jpa_core_annotations_tableGenerator_pmservlet_vehicle_web_war = ShrinkWrap.create(WebArchive.class, "jpa_core_annotations_tableGenerator_pmservlet_vehicle_web_war");
+    jpa_core_annotations_tableGenerator_pmservlet_vehicle_web_war.addAsWebInfResource("web.xml");
+
+    JavaArchive jpa_core_annotations_tableGenerator_jar = ShrinkWrap.create(JavaArchive.class, "jpa_core_annotations_tableGenerator.jar");
+    jpa_core_annotations_tableGenerator_jar.addClass(ee.jakarta.tck.persistence.core.annotations.tableGenerator.DataTypes.class);
+    jpa_core_annotations_tableGenerator_jar.addClass(ee.jakarta.tck.persistence.core.annotations.tableGenerator.DataTypes2.class);
+    jpa_core_annotations_tableGenerator_jar.addClass(ee.jakarta.tck.persistence.core.annotations.tableGenerator.DataTypes3.class);
+    jpa_core_annotations_tableGenerator_jar.addClass(ee.jakarta.tck.persistence.core.annotations.tableGenerator.DataTypes4.class);
+    jpa_core_annotations_tableGenerator_jar.addAsManifestResource("META-INF/MANIFEST.MF");
+    jpa_core_annotations_tableGenerator_jar.addAsManifestResource("META-INF/persistence.xml");
+    jpa_core_annotations_tableGenerator_pmservlet_vehicle_web_war.addAsLibrary(jpa_core_annotations_tableGenerator_jar);
+    jpa_core_annotations_tableGenerator_pmservlet_vehicle_web_war.addClass(ee.jakarta.tck.persistence.common.PMClientBase.class);
+    jpa_core_annotations_tableGenerator_pmservlet_vehicle_web_war.addClass(ee.jakarta.tck.persistence.core.annotations.tableGenerator.Client.class);
+    ear.addAsModule(jpa_core_annotations_tableGenerator_pmservlet_vehicle_web_war);
+
+    WebArchive jpa_core_annotations_tableGenerator_puservlet_vehicle_web_war = ShrinkWrap.create(WebArchive.class, "jpa_core_annotations_tableGenerator_puservlet_vehicle_web_war");
+    jpa_core_annotations_tableGenerator_puservlet_vehicle_web_war.addAsWebInfResource("web.xml");
+
+    JavaArchive jpa_core_annotations_tableGenerator_jar = ShrinkWrap.create(JavaArchive.class, "jpa_core_annotations_tableGenerator.jar");
+    jpa_core_annotations_tableGenerator_jar.addClass(ee.jakarta.tck.persistence.core.annotations.tableGenerator.DataTypes.class);
+    jpa_core_annotations_tableGenerator_jar.addClass(ee.jakarta.tck.persistence.core.annotations.tableGenerator.DataTypes2.class);
+    jpa_core_annotations_tableGenerator_jar.addClass(ee.jakarta.tck.persistence.core.annotations.tableGenerator.DataTypes3.class);
+    jpa_core_annotations_tableGenerator_jar.addClass(ee.jakarta.tck.persistence.core.annotations.tableGenerator.DataTypes4.class);
+    jpa_core_annotations_tableGenerator_jar.addAsManifestResource("META-INF/MANIFEST.MF");
+    jpa_core_annotations_tableGenerator_jar.addAsManifestResource("META-INF/persistence.xml");
+    jpa_core_annotations_tableGenerator_puservlet_vehicle_web_war.addAsLibrary(jpa_core_annotations_tableGenerator_jar);
+    jpa_core_annotations_tableGenerator_puservlet_vehicle_web_war.addClass(ee.jakarta.tck.persistence.common.PMClientBase.class);
+    jpa_core_annotations_tableGenerator_puservlet_vehicle_web_war.addClass(ee.jakarta.tck.persistence.core.annotations.tableGenerator.Client.class);
+    ear.addAsModule(jpa_core_annotations_tableGenerator_puservlet_vehicle_web_war);
+
+    JavaArchive jpa_core_annotations_tableGenerator_stateful3_vehicle_client_jar = ShrinkWrap.create(JavaArchive.class, "jpa_core_annotations_tableGenerator_stateful3_vehicle_client_jar");
+    jpa_core_annotations_tableGenerator_stateful3_vehicle_client_jar.addClass(ee.jakarta.tck.persistence.common.PMClientBase.class);
+    ear.addAsModule(jpa_core_annotations_tableGenerator_stateful3_vehicle_client_jar);
+
+    JavaArchive jpa_core_annotations_tableGenerator_stateful3_vehicle_ejb_jar = ShrinkWrap.create(JavaArchive.class, "jpa_core_annotations_tableGenerator_stateful3_vehicle_ejb_jar");
+    jpa_core_annotations_tableGenerator_stateful3_vehicle_ejb_jar.addClass(ee.jakarta.tck.persistence.common.PMClientBase.class);
+    jpa_core_annotations_tableGenerator_stateful3_vehicle_ejb_jar.addClass(ee.jakarta.tck.persistence.core.annotations.tableGenerator.Client.class);
+    ear.addAsModule(jpa_core_annotations_tableGenerator_stateful3_vehicle_ejb_jar);
+
+    JavaArchive jpa_core_annotations_tableGenerator_stateless3_vehicle_client_jar = ShrinkWrap.create(JavaArchive.class, "jpa_core_annotations_tableGenerator_stateless3_vehicle_client_jar");
+    jpa_core_annotations_tableGenerator_stateless3_vehicle_client_jar.addClass(ee.jakarta.tck.persistence.common.PMClientBase.class);
+    ear.addAsModule(jpa_core_annotations_tableGenerator_stateless3_vehicle_client_jar);
+
+    JavaArchive jpa_core_annotations_tableGenerator_stateless3_vehicle_ejb_jar = ShrinkWrap.create(JavaArchive.class, "jpa_core_annotations_tableGenerator_stateless3_vehicle_ejb_jar");
+    jpa_core_annotations_tableGenerator_stateless3_vehicle_ejb_jar.addClass(ee.jakarta.tck.persistence.common.PMClientBase.class);
+    jpa_core_annotations_tableGenerator_stateless3_vehicle_ejb_jar.addClass(ee.jakarta.tck.persistence.core.annotations.tableGenerator.Client.class);
+    ear.addAsModule(jpa_core_annotations_tableGenerator_stateless3_vehicle_ejb_jar);
+    return ear;
+  }
+
 	private DataTypes d0;
 
 	private static final Logger logger = (Logger) System.getLogger(Client1.class.getName());
diff --git a/jpa/spec-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/tableGenerator/Client2.java b/jpa/spec-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/tableGenerator/Client2.java
index dd4548f12..8821528fd 100644
--- a/jpa/spec-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/tableGenerator/Client2.java
+++ b/jpa/spec-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/tableGenerator/Client2.java
@@ -18,12 +18,100 @@ package ee.jakarta.tck.persistence.core.annotations.tableGenerator;
 
 import java.lang.System.Logger;
 
+import org.jboss.arquillian.container.test.api.Deployment;
+import org.jboss.shrinkwrap.api.Archive;
+import org.jboss.shrinkwrap.api.ShrinkWrap;
+import org.jboss.shrinkwrap.api.spec.EnterpriseArchive;
 import org.jboss.shrinkwrap.api.spec.JavaArchive;
+import org.jboss.shrinkwrap.api.spec.WebArchive;
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
 
 public class Client2 extends Client {
 
+  @Deployment(testable = false)
+  public static Archive<?> deployment() {
+
+    final EnterpriseArchive ear = ShrinkWrap.create(EnterpriseArchive.class, "jpa_core_annotations_tableGenerator_vehicles.ear");
+    // TODO: filter/eliminate the library jar classes that shouldn't be included
+    // Add ear/lib jars
+
+    JavaArchive jpa_core_annotations_tableGenerator_jar = ShrinkWrap.create(JavaArchive.class, "jpa_core_annotations_tableGenerator_jar");
+    jpa_core_annotations_tableGenerator_jar.addClass(ee.jakarta.tck.persistence.core.annotations.tableGenerator.DataTypes.class);
+    jpa_core_annotations_tableGenerator_jar.addClass(ee.jakarta.tck.persistence.core.annotations.tableGenerator.DataTypes2.class);
+    jpa_core_annotations_tableGenerator_jar.addClass(ee.jakarta.tck.persistence.core.annotations.tableGenerator.DataTypes3.class);
+    jpa_core_annotations_tableGenerator_jar.addClass(ee.jakarta.tck.persistence.core.annotations.tableGenerator.DataTypes4.class);
+    ear.addAsLibrary(jpa_core_annotations_tableGenerator_jar);
+    // Add ear submodules
+
+    JavaArchive jpa_core_annotations_tableGenerator_appmanagedNoTx_vehicle_client_jar = ShrinkWrap.create(JavaArchive.class, "jpa_core_annotations_tableGenerator_appmanagedNoTx_vehicle_client_jar");
+    jpa_core_annotations_tableGenerator_appmanagedNoTx_vehicle_client_jar.addClass(ee.jakarta.tck.persistence.common.PMClientBase.class);
+    ear.addAsModule(jpa_core_annotations_tableGenerator_appmanagedNoTx_vehicle_client_jar);
+
+    JavaArchive jpa_core_annotations_tableGenerator_appmanagedNoTx_vehicle_ejb_jar = ShrinkWrap.create(JavaArchive.class, "jpa_core_annotations_tableGenerator_appmanagedNoTx_vehicle_ejb_jar");
+    jpa_core_annotations_tableGenerator_appmanagedNoTx_vehicle_ejb_jar.addClass(ee.jakarta.tck.persistence.common.PMClientBase.class);
+    jpa_core_annotations_tableGenerator_appmanagedNoTx_vehicle_ejb_jar.addClass(ee.jakarta.tck.persistence.core.annotations.tableGenerator.Client.class);
+    ear.addAsModule(jpa_core_annotations_tableGenerator_appmanagedNoTx_vehicle_ejb_jar);
+
+    JavaArchive jpa_core_annotations_tableGenerator_appmanaged_vehicle_client_jar = ShrinkWrap.create(JavaArchive.class, "jpa_core_annotations_tableGenerator_appmanaged_vehicle_client_jar");
+    jpa_core_annotations_tableGenerator_appmanaged_vehicle_client_jar.addClass(ee.jakarta.tck.persistence.common.PMClientBase.class);
+    ear.addAsModule(jpa_core_annotations_tableGenerator_appmanaged_vehicle_client_jar);
+
+    JavaArchive jpa_core_annotations_tableGenerator_appmanaged_vehicle_ejb_jar = ShrinkWrap.create(JavaArchive.class, "jpa_core_annotations_tableGenerator_appmanaged_vehicle_ejb_jar");
+    jpa_core_annotations_tableGenerator_appmanaged_vehicle_ejb_jar.addClass(ee.jakarta.tck.persistence.common.PMClientBase.class);
+    jpa_core_annotations_tableGenerator_appmanaged_vehicle_ejb_jar.addClass(ee.jakarta.tck.persistence.core.annotations.tableGenerator.Client.class);
+    ear.addAsModule(jpa_core_annotations_tableGenerator_appmanaged_vehicle_ejb_jar);
+
+    WebArchive jpa_core_annotations_tableGenerator_pmservlet_vehicle_web_war = ShrinkWrap.create(WebArchive.class, "jpa_core_annotations_tableGenerator_pmservlet_vehicle_web_war");
+    jpa_core_annotations_tableGenerator_pmservlet_vehicle_web_war.addAsWebInfResource("web.xml");
+
+    JavaArchive jpa_core_annotations_tableGenerator_jar = ShrinkWrap.create(JavaArchive.class, "jpa_core_annotations_tableGenerator.jar");
+    jpa_core_annotations_tableGenerator_jar.addClass(ee.jakarta.tck.persistence.core.annotations.tableGenerator.DataTypes.class);
+    jpa_core_annotations_tableGenerator_jar.addClass(ee.jakarta.tck.persistence.core.annotations.tableGenerator.DataTypes2.class);
+    jpa_core_annotations_tableGenerator_jar.addClass(ee.jakarta.tck.persistence.core.annotations.tableGenerator.DataTypes3.class);
+    jpa_core_annotations_tableGenerator_jar.addClass(ee.jakarta.tck.persistence.core.annotations.tableGenerator.DataTypes4.class);
+    jpa_core_annotations_tableGenerator_jar.addAsManifestResource("META-INF/MANIFEST.MF");
+    jpa_core_annotations_tableGenerator_jar.addAsManifestResource("META-INF/persistence.xml");
+    jpa_core_annotations_tableGenerator_pmservlet_vehicle_web_war.addAsLibrary(jpa_core_annotations_tableGenerator_jar);
+    jpa_core_annotations_tableGenerator_pmservlet_vehicle_web_war.addClass(ee.jakarta.tck.persistence.common.PMClientBase.class);
+    jpa_core_annotations_tableGenerator_pmservlet_vehicle_web_war.addClass(ee.jakarta.tck.persistence.core.annotations.tableGenerator.Client.class);
+    ear.addAsModule(jpa_core_annotations_tableGenerator_pmservlet_vehicle_web_war);
+
+    WebArchive jpa_core_annotations_tableGenerator_puservlet_vehicle_web_war = ShrinkWrap.create(WebArchive.class, "jpa_core_annotations_tableGenerator_puservlet_vehicle_web_war");
+    jpa_core_annotations_tableGenerator_puservlet_vehicle_web_war.addAsWebInfResource("web.xml");
+
+    JavaArchive jpa_core_annotations_tableGenerator_jar = ShrinkWrap.create(JavaArchive.class, "jpa_core_annotations_tableGenerator.jar");
+    jpa_core_annotations_tableGenerator_jar.addClass(ee.jakarta.tck.persistence.core.annotations.tableGenerator.DataTypes.class);
+    jpa_core_annotations_tableGenerator_jar.addClass(ee.jakarta.tck.persistence.core.annotations.tableGenerator.DataTypes2.class);
+    jpa_core_annotations_tableGenerator_jar.addClass(ee.jakarta.tck.persistence.core.annotations.tableGenerator.DataTypes3.class);
+    jpa_core_annotations_tableGenerator_jar.addClass(ee.jakarta.tck.persistence.core.annotations.tableGenerator.DataTypes4.class);
+    jpa_core_annotations_tableGenerator_jar.addAsManifestResource("META-INF/MANIFEST.MF");
+    jpa_core_annotations_tableGenerator_jar.addAsManifestResource("META-INF/persistence.xml");
+    jpa_core_annotations_tableGenerator_puservlet_vehicle_web_war.addAsLibrary(jpa_core_annotations_tableGenerator_jar);
+    jpa_core_annotations_tableGenerator_puservlet_vehicle_web_war.addClass(ee.jakarta.tck.persistence.common.PMClientBase.class);
+    jpa_core_annotations_tableGenerator_puservlet_vehicle_web_war.addClass(ee.jakarta.tck.persistence.core.annotations.tableGenerator.Client.class);
+    ear.addAsModule(jpa_core_annotations_tableGenerator_puservlet_vehicle_web_war);
+
+    JavaArchive jpa_core_annotations_tableGenerator_stateful3_vehicle_client_jar = ShrinkWrap.create(JavaArchive.class, "jpa_core_annotations_tableGenerator_stateful3_vehicle_client_jar");
+    jpa_core_annotations_tableGenerator_stateful3_vehicle_client_jar.addClass(ee.jakarta.tck.persistence.common.PMClientBase.class);
+    ear.addAsModule(jpa_core_annotations_tableGenerator_stateful3_vehicle_client_jar);
+
+    JavaArchive jpa_core_annotations_tableGenerator_stateful3_vehicle_ejb_jar = ShrinkWrap.create(JavaArchive.class, "jpa_core_annotations_tableGenerator_stateful3_vehicle_ejb_jar");
+    jpa_core_annotations_tableGenerator_stateful3_vehicle_ejb_jar.addClass(ee.jakarta.tck.persistence.common.PMClientBase.class);
+    jpa_core_annotations_tableGenerator_stateful3_vehicle_ejb_jar.addClass(ee.jakarta.tck.persistence.core.annotations.tableGenerator.Client.class);
+    ear.addAsModule(jpa_core_annotations_tableGenerator_stateful3_vehicle_ejb_jar);
+
+    JavaArchive jpa_core_annotations_tableGenerator_stateless3_vehicle_client_jar = ShrinkWrap.create(JavaArchive.class, "jpa_core_annotations_tableGenerator_stateless3_vehicle_client_jar");
+    jpa_core_annotations_tableGenerator_stateless3_vehicle_client_jar.addClass(ee.jakarta.tck.persistence.common.PMClientBase.class);
+    ear.addAsModule(jpa_core_annotations_tableGenerator_stateless3_vehicle_client_jar);
+
+    JavaArchive jpa_core_annotations_tableGenerator_stateless3_vehicle_ejb_jar = ShrinkWrap.create(JavaArchive.class, "jpa_core_annotations_tableGenerator_stateless3_vehicle_ejb_jar");
+    jpa_core_annotations_tableGenerator_stateless3_vehicle_ejb_jar.addClass(ee.jakarta.tck.persistence.common.PMClientBase.class);
+    jpa_core_annotations_tableGenerator_stateless3_vehicle_ejb_jar.addClass(ee.jakarta.tck.persistence.core.annotations.tableGenerator.Client.class);
+    ear.addAsModule(jpa_core_annotations_tableGenerator_stateless3_vehicle_ejb_jar);
+    return ear;
+  }
+
 	private DataTypes2 d2;
 
 	private static final Logger logger = (Logger) System.getLogger(Client2.class.getName());
diff --git a/jpa/spec-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/tableGenerator/Client3.java b/jpa/spec-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/tableGenerator/Client3.java
index 2ff78440d..af5311f79 100644
--- a/jpa/spec-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/tableGenerator/Client3.java
+++ b/jpa/spec-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/tableGenerator/Client3.java
@@ -18,12 +18,100 @@ package ee.jakarta.tck.persistence.core.annotations.tableGenerator;
 
 import java.lang.System.Logger;
 
+import org.jboss.arquillian.container.test.api.Deployment;
+import org.jboss.shrinkwrap.api.Archive;
+import org.jboss.shrinkwrap.api.ShrinkWrap;
+import org.jboss.shrinkwrap.api.spec.EnterpriseArchive;
 import org.jboss.shrinkwrap.api.spec.JavaArchive;
+import org.jboss.shrinkwrap.api.spec.WebArchive;
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
 
 public class Client3 extends Client {
 
+  @Deployment(testable = false)
+  public static Archive<?> deployment() {
+
+    final EnterpriseArchive ear = ShrinkWrap.create(EnterpriseArchive.class, "jpa_core_annotations_tableGenerator_vehicles.ear");
+    // TODO: filter/eliminate the library jar classes that shouldn't be included
+    // Add ear/lib jars
+
+    JavaArchive jpa_core_annotations_tableGenerator_jar = ShrinkWrap.create(JavaArchive.class, "jpa_core_annotations_tableGenerator_jar");
+    jpa_core_annotations_tableGenerator_jar.addClass(ee.jakarta.tck.persistence.core.annotations.tableGenerator.DataTypes.class);
+    jpa_core_annotations_tableGenerator_jar.addClass(ee.jakarta.tck.persistence.core.annotations.tableGenerator.DataTypes2.class);
+    jpa_core_annotations_tableGenerator_jar.addClass(ee.jakarta.tck.persistence.core.annotations.tableGenerator.DataTypes3.class);
+    jpa_core_annotations_tableGenerator_jar.addClass(ee.jakarta.tck.persistence.core.annotations.tableGenerator.DataTypes4.class);
+    ear.addAsLibrary(jpa_core_annotations_tableGenerator_jar);
+    // Add ear submodules
+
+    JavaArchive jpa_core_annotations_tableGenerator_appmanagedNoTx_vehicle_client_jar = ShrinkWrap.create(JavaArchive.class, "jpa_core_annotations_tableGenerator_appmanagedNoTx_vehicle_client_jar");
+    jpa_core_annotations_tableGenerator_appmanagedNoTx_vehicle_client_jar.addClass(ee.jakarta.tck.persistence.common.PMClientBase.class);
+    ear.addAsModule(jpa_core_annotations_tableGenerator_appmanagedNoTx_vehicle_client_jar);
+
+    JavaArchive jpa_core_annotations_tableGenerator_appmanagedNoTx_vehicle_ejb_jar = ShrinkWrap.create(JavaArchive.class, "jpa_core_annotations_tableGenerator_appmanagedNoTx_vehicle_ejb_jar");
+    jpa_core_annotations_tableGenerator_appmanagedNoTx_vehicle_ejb_jar.addClass(ee.jakarta.tck.persistence.common.PMClientBase.class);
+    jpa_core_annotations_tableGenerator_appmanagedNoTx_vehicle_ejb_jar.addClass(ee.jakarta.tck.persistence.core.annotations.tableGenerator.Client.class);
+    ear.addAsModule(jpa_core_annotations_tableGenerator_appmanagedNoTx_vehicle_ejb_jar);
+
+    JavaArchive jpa_core_annotations_tableGenerator_appmanaged_vehicle_client_jar = ShrinkWrap.create(JavaArchive.class, "jpa_core_annotations_tableGenerator_appmanaged_vehicle_client_jar");
+    jpa_core_annotations_tableGenerator_appmanaged_vehicle_client_jar.addClass(ee.jakarta.tck.persistence.common.PMClientBase.class);
+    ear.addAsModule(jpa_core_annotations_tableGenerator_appmanaged_vehicle_client_jar);
+
+    JavaArchive jpa_core_annotations_tableGenerator_appmanaged_vehicle_ejb_jar = ShrinkWrap.create(JavaArchive.class, "jpa_core_annotations_tableGenerator_appmanaged_vehicle_ejb_jar");
+    jpa_core_annotations_tableGenerator_appmanaged_vehicle_ejb_jar.addClass(ee.jakarta.tck.persistence.common.PMClientBase.class);
+    jpa_core_annotations_tableGenerator_appmanaged_vehicle_ejb_jar.addClass(ee.jakarta.tck.persistence.core.annotations.tableGenerator.Client.class);
+    ear.addAsModule(jpa_core_annotations_tableGenerator_appmanaged_vehicle_ejb_jar);
+
+    WebArchive jpa_core_annotations_tableGenerator_pmservlet_vehicle_web_war = ShrinkWrap.create(WebArchive.class, "jpa_core_annotations_tableGenerator_pmservlet_vehicle_web_war");
+    jpa_core_annotations_tableGenerator_pmservlet_vehicle_web_war.addAsWebInfResource("web.xml");
+
+    JavaArchive jpa_core_annotations_tableGenerator_jar = ShrinkWrap.create(JavaArchive.class, "jpa_core_annotations_tableGenerator.jar");
+    jpa_core_annotations_tableGenerator_jar.addClass(ee.jakarta.tck.persistence.core.annotations.tableGenerator.DataTypes.class);
+    jpa_core_annotations_tableGenerator_jar.addClass(ee.jakarta.tck.persistence.core.annotations.tableGenerator.DataTypes2.class);
+    jpa_core_annotations_tableGenerator_jar.addClass(ee.jakarta.tck.persistence.core.annotations.tableGenerator.DataTypes3.class);
+    jpa_core_annotations_tableGenerator_jar.addClass(ee.jakarta.tck.persistence.core.annotations.tableGenerator.DataTypes4.class);
+    jpa_core_annotations_tableGenerator_jar.addAsManifestResource("META-INF/MANIFEST.MF");
+    jpa_core_annotations_tableGenerator_jar.addAsManifestResource("META-INF/persistence.xml");
+    jpa_core_annotations_tableGenerator_pmservlet_vehicle_web_war.addAsLibrary(jpa_core_annotations_tableGenerator_jar);
+    jpa_core_annotations_tableGenerator_pmservlet_vehicle_web_war.addClass(ee.jakarta.tck.persistence.common.PMClientBase.class);
+    jpa_core_annotations_tableGenerator_pmservlet_vehicle_web_war.addClass(ee.jakarta.tck.persistence.core.annotations.tableGenerator.Client.class);
+    ear.addAsModule(jpa_core_annotations_tableGenerator_pmservlet_vehicle_web_war);
+
+    WebArchive jpa_core_annotations_tableGenerator_puservlet_vehicle_web_war = ShrinkWrap.create(WebArchive.class, "jpa_core_annotations_tableGenerator_puservlet_vehicle_web_war");
+    jpa_core_annotations_tableGenerator_puservlet_vehicle_web_war.addAsWebInfResource("web.xml");
+
+    JavaArchive jpa_core_annotations_tableGenerator_jar = ShrinkWrap.create(JavaArchive.class, "jpa_core_annotations_tableGenerator.jar");
+    jpa_core_annotations_tableGenerator_jar.addClass(ee.jakarta.tck.persistence.core.annotations.tableGenerator.DataTypes.class);
+    jpa_core_annotations_tableGenerator_jar.addClass(ee.jakarta.tck.persistence.core.annotations.tableGenerator.DataTypes2.class);
+    jpa_core_annotations_tableGenerator_jar.addClass(ee.jakarta.tck.persistence.core.annotations.tableGenerator.DataTypes3.class);
+    jpa_core_annotations_tableGenerator_jar.addClass(ee.jakarta.tck.persistence.core.annotations.tableGenerator.DataTypes4.class);
+    jpa_core_annotations_tableGenerator_jar.addAsManifestResource("META-INF/MANIFEST.MF");
+    jpa_core_annotations_tableGenerator_jar.addAsManifestResource("META-INF/persistence.xml");
+    jpa_core_annotations_tableGenerator_puservlet_vehicle_web_war.addAsLibrary(jpa_core_annotations_tableGenerator_jar);
+    jpa_core_annotations_tableGenerator_puservlet_vehicle_web_war.addClass(ee.jakarta.tck.persistence.common.PMClientBase.class);
+    jpa_core_annotations_tableGenerator_puservlet_vehicle_web_war.addClass(ee.jakarta.tck.persistence.core.annotations.tableGenerator.Client.class);
+    ear.addAsModule(jpa_core_annotations_tableGenerator_puservlet_vehicle_web_war);
+
+    JavaArchive jpa_core_annotations_tableGenerator_stateful3_vehicle_client_jar = ShrinkWrap.create(JavaArchive.class, "jpa_core_annotations_tableGenerator_stateful3_vehicle_client_jar");
+    jpa_core_annotations_tableGenerator_stateful3_vehicle_client_jar.addClass(ee.jakarta.tck.persistence.common.PMClientBase.class);
+    ear.addAsModule(jpa_core_annotations_tableGenerator_stateful3_vehicle_client_jar);
+
+    JavaArchive jpa_core_annotations_tableGenerator_stateful3_vehicle_ejb_jar = ShrinkWrap.create(JavaArchive.class, "jpa_core_annotations_tableGenerator_stateful3_vehicle_ejb_jar");
+    jpa_core_annotations_tableGenerator_stateful3_vehicle_ejb_jar.addClass(ee.jakarta.tck.persistence.common.PMClientBase.class);
+    jpa_core_annotations_tableGenerator_stateful3_vehicle_ejb_jar.addClass(ee.jakarta.tck.persistence.core.annotations.tableGenerator.Client.class);
+    ear.addAsModule(jpa_core_annotations_tableGenerator_stateful3_vehicle_ejb_jar);
+
+    JavaArchive jpa_core_annotations_tableGenerator_stateless3_vehicle_client_jar = ShrinkWrap.create(JavaArchive.class, "jpa_core_annotations_tableGenerator_stateless3_vehicle_client_jar");
+    jpa_core_annotations_tableGenerator_stateless3_vehicle_client_jar.addClass(ee.jakarta.tck.persistence.common.PMClientBase.class);
+    ear.addAsModule(jpa_core_annotations_tableGenerator_stateless3_vehicle_client_jar);
+
+    JavaArchive jpa_core_annotations_tableGenerator_stateless3_vehicle_ejb_jar = ShrinkWrap.create(JavaArchive.class, "jpa_core_annotations_tableGenerator_stateless3_vehicle_ejb_jar");
+    jpa_core_annotations_tableGenerator_stateless3_vehicle_ejb_jar.addClass(ee.jakarta.tck.persistence.common.PMClientBase.class);
+    jpa_core_annotations_tableGenerator_stateless3_vehicle_ejb_jar.addClass(ee.jakarta.tck.persistence.core.annotations.tableGenerator.Client.class);
+    ear.addAsModule(jpa_core_annotations_tableGenerator_stateless3_vehicle_ejb_jar);
+    return ear;
+  }
+
 	private DataTypes3 d3;
 
 	public Client3() {
diff --git a/jpa/spec-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/tableGenerator/Client4.java b/jpa/spec-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/tableGenerator/Client4.java
index a4cbd62f9..95c859386 100644
--- a/jpa/spec-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/tableGenerator/Client4.java
+++ b/jpa/spec-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/tableGenerator/Client4.java
@@ -18,12 +18,100 @@ package ee.jakarta.tck.persistence.core.annotations.tableGenerator;
 
 import java.lang.System.Logger;
 
+import org.jboss.arquillian.container.test.api.Deployment;
+import org.jboss.shrinkwrap.api.Archive;
+import org.jboss.shrinkwrap.api.ShrinkWrap;
+import org.jboss.shrinkwrap.api.spec.EnterpriseArchive;
 import org.jboss.shrinkwrap.api.spec.JavaArchive;
+import org.jboss.shrinkwrap.api.spec.WebArchive;
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
 
 public class Client4 extends Client {
 
+  @Deployment(testable = false)
+  public static Archive<?> deployment() {
+
+    final EnterpriseArchive ear = ShrinkWrap.create(EnterpriseArchive.class, "jpa_core_annotations_tableGenerator_vehicles.ear");
+    // TODO: filter/eliminate the library jar classes that shouldn't be included
+    // Add ear/lib jars
+
+    JavaArchive jpa_core_annotations_tableGenerator_jar = ShrinkWrap.create(JavaArchive.class, "jpa_core_annotations_tableGenerator_jar");
+    jpa_core_annotations_tableGenerator_jar.addClass(ee.jakarta.tck.persistence.core.annotations.tableGenerator.DataTypes.class);
+    jpa_core_annotations_tableGenerator_jar.addClass(ee.jakarta.tck.persistence.core.annotations.tableGenerator.DataTypes2.class);
+    jpa_core_annotations_tableGenerator_jar.addClass(ee.jakarta.tck.persistence.core.annotations.tableGenerator.DataTypes3.class);
+    jpa_core_annotations_tableGenerator_jar.addClass(ee.jakarta.tck.persistence.core.annotations.tableGenerator.DataTypes4.class);
+    ear.addAsLibrary(jpa_core_annotations_tableGenerator_jar);
+    // Add ear submodules
+
+    JavaArchive jpa_core_annotations_tableGenerator_appmanagedNoTx_vehicle_client_jar = ShrinkWrap.create(JavaArchive.class, "jpa_core_annotations_tableGenerator_appmanagedNoTx_vehicle_client_jar");
+    jpa_core_annotations_tableGenerator_appmanagedNoTx_vehicle_client_jar.addClass(ee.jakarta.tck.persistence.common.PMClientBase.class);
+    ear.addAsModule(jpa_core_annotations_tableGenerator_appmanagedNoTx_vehicle_client_jar);
+
+    JavaArchive jpa_core_annotations_tableGenerator_appmanagedNoTx_vehicle_ejb_jar = ShrinkWrap.create(JavaArchive.class, "jpa_core_annotations_tableGenerator_appmanagedNoTx_vehicle_ejb_jar");
+    jpa_core_annotations_tableGenerator_appmanagedNoTx_vehicle_ejb_jar.addClass(ee.jakarta.tck.persistence.common.PMClientBase.class);
+    jpa_core_annotations_tableGenerator_appmanagedNoTx_vehicle_ejb_jar.addClass(ee.jakarta.tck.persistence.core.annotations.tableGenerator.Client.class);
+    ear.addAsModule(jpa_core_annotations_tableGenerator_appmanagedNoTx_vehicle_ejb_jar);
+
+    JavaArchive jpa_core_annotations_tableGenerator_appmanaged_vehicle_client_jar = ShrinkWrap.create(JavaArchive.class, "jpa_core_annotations_tableGenerator_appmanaged_vehicle_client_jar");
+    jpa_core_annotations_tableGenerator_appmanaged_vehicle_client_jar.addClass(ee.jakarta.tck.persistence.common.PMClientBase.class);
+    ear.addAsModule(jpa_core_annotations_tableGenerator_appmanaged_vehicle_client_jar);
+
+    JavaArchive jpa_core_annotations_tableGenerator_appmanaged_vehicle_ejb_jar = ShrinkWrap.create(JavaArchive.class, "jpa_core_annotations_tableGenerator_appmanaged_vehicle_ejb_jar");
+    jpa_core_annotations_tableGenerator_appmanaged_vehicle_ejb_jar.addClass(ee.jakarta.tck.persistence.common.PMClientBase.class);
+    jpa_core_annotations_tableGenerator_appmanaged_vehicle_ejb_jar.addClass(ee.jakarta.tck.persistence.core.annotations.tableGenerator.Client.class);
+    ear.addAsModule(jpa_core_annotations_tableGenerator_appmanaged_vehicle_ejb_jar);
+
+    WebArchive jpa_core_annotations_tableGenerator_pmservlet_vehicle_web_war = ShrinkWrap.create(WebArchive.class, "jpa_core_annotations_tableGenerator_pmservlet_vehicle_web_war");
+    jpa_core_annotations_tableGenerator_pmservlet_vehicle_web_war.addAsWebInfResource("web.xml");
+
+    JavaArchive jpa_core_annotations_tableGenerator_jar = ShrinkWrap.create(JavaArchive.class, "jpa_core_annotations_tableGenerator.jar");
+    jpa_core_annotations_tableGenerator_jar.addClass(ee.jakarta.tck.persistence.core.annotations.tableGenerator.DataTypes.class);
+    jpa_core_annotations_tableGenerator_jar.addClass(ee.jakarta.tck.persistence.core.annotations.tableGenerator.DataTypes2.class);
+    jpa_core_annotations_tableGenerator_jar.addClass(ee.jakarta.tck.persistence.core.annotations.tableGenerator.DataTypes3.class);
+    jpa_core_annotations_tableGenerator_jar.addClass(ee.jakarta.tck.persistence.core.annotations.tableGenerator.DataTypes4.class);
+    jpa_core_annotations_tableGenerator_jar.addAsManifestResource("META-INF/MANIFEST.MF");
+    jpa_core_annotations_tableGenerator_jar.addAsManifestResource("META-INF/persistence.xml");
+    jpa_core_annotations_tableGenerator_pmservlet_vehicle_web_war.addAsLibrary(jpa_core_annotations_tableGenerator_jar);
+    jpa_core_annotations_tableGenerator_pmservlet_vehicle_web_war.addClass(ee.jakarta.tck.persistence.common.PMClientBase.class);
+    jpa_core_annotations_tableGenerator_pmservlet_vehicle_web_war.addClass(ee.jakarta.tck.persistence.core.annotations.tableGenerator.Client.class);
+    ear.addAsModule(jpa_core_annotations_tableGenerator_pmservlet_vehicle_web_war);
+
+    WebArchive jpa_core_annotations_tableGenerator_puservlet_vehicle_web_war = ShrinkWrap.create(WebArchive.class, "jpa_core_annotations_tableGenerator_puservlet_vehicle_web_war");
+    jpa_core_annotations_tableGenerator_puservlet_vehicle_web_war.addAsWebInfResource("web.xml");
+
+    JavaArchive jpa_core_annotations_tableGenerator_jar = ShrinkWrap.create(JavaArchive.class, "jpa_core_annotations_tableGenerator.jar");
+    jpa_core_annotations_tableGenerator_jar.addClass(ee.jakarta.tck.persistence.core.annotations.tableGenerator.DataTypes.class);
+    jpa_core_annotations_tableGenerator_jar.addClass(ee.jakarta.tck.persistence.core.annotations.tableGenerator.DataTypes2.class);
+    jpa_core_annotations_tableGenerator_jar.addClass(ee.jakarta.tck.persistence.core.annotations.tableGenerator.DataTypes3.class);
+    jpa_core_annotations_tableGenerator_jar.addClass(ee.jakarta.tck.persistence.core.annotations.tableGenerator.DataTypes4.class);
+    jpa_core_annotations_tableGenerator_jar.addAsManifestResource("META-INF/MANIFEST.MF");
+    jpa_core_annotations_tableGenerator_jar.addAsManifestResource("META-INF/persistence.xml");
+    jpa_core_annotations_tableGenerator_puservlet_vehicle_web_war.addAsLibrary(jpa_core_annotations_tableGenerator_jar);
+    jpa_core_annotations_tableGenerator_puservlet_vehicle_web_war.addClass(ee.jakarta.tck.persistence.common.PMClientBase.class);
+    jpa_core_annotations_tableGenerator_puservlet_vehicle_web_war.addClass(ee.jakarta.tck.persistence.core.annotations.tableGenerator.Client.class);
+    ear.addAsModule(jpa_core_annotations_tableGenerator_puservlet_vehicle_web_war);
+
+    JavaArchive jpa_core_annotations_tableGenerator_stateful3_vehicle_client_jar = ShrinkWrap.create(JavaArchive.class, "jpa_core_annotations_tableGenerator_stateful3_vehicle_client_jar");
+    jpa_core_annotations_tableGenerator_stateful3_vehicle_client_jar.addClass(ee.jakarta.tck.persistence.common.PMClientBase.class);
+    ear.addAsModule(jpa_core_annotations_tableGenerator_stateful3_vehicle_client_jar);
+
+    JavaArchive jpa_core_annotations_tableGenerator_stateful3_vehicle_ejb_jar = ShrinkWrap.create(JavaArchive.class, "jpa_core_annotations_tableGenerator_stateful3_vehicle_ejb_jar");
+    jpa_core_annotations_tableGenerator_stateful3_vehicle_ejb_jar.addClass(ee.jakarta.tck.persistence.common.PMClientBase.class);
+    jpa_core_annotations_tableGenerator_stateful3_vehicle_ejb_jar.addClass(ee.jakarta.tck.persistence.core.annotations.tableGenerator.Client.class);
+    ear.addAsModule(jpa_core_annotations_tableGenerator_stateful3_vehicle_ejb_jar);
+
+    JavaArchive jpa_core_annotations_tableGenerator_stateless3_vehicle_client_jar = ShrinkWrap.create(JavaArchive.class, "jpa_core_annotations_tableGenerator_stateless3_vehicle_client_jar");
+    jpa_core_annotations_tableGenerator_stateless3_vehicle_client_jar.addClass(ee.jakarta.tck.persistence.common.PMClientBase.class);
+    ear.addAsModule(jpa_core_annotations_tableGenerator_stateless3_vehicle_client_jar);
+
+    JavaArchive jpa_core_annotations_tableGenerator_stateless3_vehicle_ejb_jar = ShrinkWrap.create(JavaArchive.class, "jpa_core_annotations_tableGenerator_stateless3_vehicle_ejb_jar");
+    jpa_core_annotations_tableGenerator_stateless3_vehicle_ejb_jar.addClass(ee.jakarta.tck.persistence.common.PMClientBase.class);
+    jpa_core_annotations_tableGenerator_stateless3_vehicle_ejb_jar.addClass(ee.jakarta.tck.persistence.core.annotations.tableGenerator.Client.class);
+    ear.addAsModule(jpa_core_annotations_tableGenerator_stateless3_vehicle_ejb_jar);
+    return ear;
+  }
+
 	private DataTypes4 d4;
 
 	private static final Logger logger = (Logger) System.getLogger(Client4.class.getName());
diff --git a/jpa/spec-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/temporal/Client.java b/jpa/spec-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/temporal/Client.java
index c3fc9ff4e..8dad4c51f 100644
--- a/jpa/spec-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/temporal/Client.java
+++ b/jpa/spec-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/temporal/Client.java
@@ -22,8 +22,12 @@ import java.util.ArrayList;
 import java.util.Calendar;
 import java.util.Date;
 import java.util.List;
-
+import org.jboss.arquillian.container.test.api.Deployment;
+import org.jboss.shrinkwrap.api.Archive;
+import org.jboss.shrinkwrap.api.ShrinkWrap;
+import org.jboss.shrinkwrap.api.spec.EnterpriseArchive;
 import org.jboss.shrinkwrap.api.spec.JavaArchive;
+import org.jboss.shrinkwrap.api.spec.WebArchive;
 import org.junit.jupiter.api.AfterEach;
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
@@ -32,6 +36,89 @@ import ee.jakarta.tck.persistence.common.PMClientBase;
 
 public class Client extends PMClientBase {
 
+  @Deployment(testable = false)
+  public static Archive<?> deployment() {
+
+    final EnterpriseArchive ear = ShrinkWrap.create(EnterpriseArchive.class, "jpa_core_annotations_temporal_vehicles.ear");
+    // TODO: filter/eliminate the library jar classes that shouldn't be included
+    // Add ear/lib jars
+
+    JavaArchive jpa_core_annotations_temporal_jar = ShrinkWrap.create(JavaArchive.class, "jpa_core_annotations_temporal_jar");
+    jpa_core_annotations_temporal_jar.addClass(ee.jakarta.tck.persistence.core.annotations.temporal.A2_Field.class);
+    jpa_core_annotations_temporal_jar.addClass(ee.jakarta.tck.persistence.core.annotations.temporal.A2_Property.class);
+    jpa_core_annotations_temporal_jar.addClass(ee.jakarta.tck.persistence.core.annotations.temporal.A_Field.class);
+    jpa_core_annotations_temporal_jar.addClass(ee.jakarta.tck.persistence.core.annotations.temporal.A_Property.class);
+    ear.addAsLibrary(jpa_core_annotations_temporal_jar);
+    // Add ear submodules
+
+    JavaArchive jpa_core_annotations_temporal_appmanagedNoTx_vehicle_client_jar = ShrinkWrap.create(JavaArchive.class, "jpa_core_annotations_temporal_appmanagedNoTx_vehicle_client_jar");
+    jpa_core_annotations_temporal_appmanagedNoTx_vehicle_client_jar.addClass(ee.jakarta.tck.persistence.common.PMClientBase.class);
+    ear.addAsModule(jpa_core_annotations_temporal_appmanagedNoTx_vehicle_client_jar);
+
+    JavaArchive jpa_core_annotations_temporal_appmanagedNoTx_vehicle_ejb_jar = ShrinkWrap.create(JavaArchive.class, "jpa_core_annotations_temporal_appmanagedNoTx_vehicle_ejb_jar");
+    jpa_core_annotations_temporal_appmanagedNoTx_vehicle_ejb_jar.addClass(ee.jakarta.tck.persistence.common.PMClientBase.class);
+    jpa_core_annotations_temporal_appmanagedNoTx_vehicle_ejb_jar.addClass(ee.jakarta.tck.persistence.core.annotations.temporal.Client.class);
+    ear.addAsModule(jpa_core_annotations_temporal_appmanagedNoTx_vehicle_ejb_jar);
+
+    JavaArchive jpa_core_annotations_temporal_appmanaged_vehicle_client_jar = ShrinkWrap.create(JavaArchive.class, "jpa_core_annotations_temporal_appmanaged_vehicle_client_jar");
+    jpa_core_annotations_temporal_appmanaged_vehicle_client_jar.addClass(ee.jakarta.tck.persistence.common.PMClientBase.class);
+    ear.addAsModule(jpa_core_annotations_temporal_appmanaged_vehicle_client_jar);
+
+    JavaArchive jpa_core_annotations_temporal_appmanaged_vehicle_ejb_jar = ShrinkWrap.create(JavaArchive.class, "jpa_core_annotations_temporal_appmanaged_vehicle_ejb_jar");
+    jpa_core_annotations_temporal_appmanaged_vehicle_ejb_jar.addClass(ee.jakarta.tck.persistence.common.PMClientBase.class);
+    jpa_core_annotations_temporal_appmanaged_vehicle_ejb_jar.addClass(ee.jakarta.tck.persistence.core.annotations.temporal.Client.class);
+    ear.addAsModule(jpa_core_annotations_temporal_appmanaged_vehicle_ejb_jar);
+
+    WebArchive jpa_core_annotations_temporal_pmservlet_vehicle_web_war = ShrinkWrap.create(WebArchive.class, "jpa_core_annotations_temporal_pmservlet_vehicle_web_war");
+    jpa_core_annotations_temporal_pmservlet_vehicle_web_war.addAsWebInfResource("web.xml");
+
+    JavaArchive jpa_core_annotations_temporal_jar = ShrinkWrap.create(JavaArchive.class, "jpa_core_annotations_temporal.jar");
+    jpa_core_annotations_temporal_jar.addClass(ee.jakarta.tck.persistence.core.annotations.temporal.A2_Field.class);
+    jpa_core_annotations_temporal_jar.addClass(ee.jakarta.tck.persistence.core.annotations.temporal.A2_Property.class);
+    jpa_core_annotations_temporal_jar.addClass(ee.jakarta.tck.persistence.core.annotations.temporal.A_Field.class);
+    jpa_core_annotations_temporal_jar.addClass(ee.jakarta.tck.persistence.core.annotations.temporal.A_Property.class);
+    jpa_core_annotations_temporal_jar.addAsManifestResource("META-INF/MANIFEST.MF");
+    jpa_core_annotations_temporal_jar.addAsManifestResource("META-INF/persistence.xml");
+    jpa_core_annotations_temporal_pmservlet_vehicle_web_war.addAsLibrary(jpa_core_annotations_temporal_jar);
+    jpa_core_annotations_temporal_pmservlet_vehicle_web_war.addClass(ee.jakarta.tck.persistence.common.PMClientBase.class);
+    jpa_core_annotations_temporal_pmservlet_vehicle_web_war.addClass(ee.jakarta.tck.persistence.core.annotations.temporal.Client.class);
+    ear.addAsModule(jpa_core_annotations_temporal_pmservlet_vehicle_web_war);
+
+    WebArchive jpa_core_annotations_temporal_puservlet_vehicle_web_war = ShrinkWrap.create(WebArchive.class, "jpa_core_annotations_temporal_puservlet_vehicle_web_war");
+    jpa_core_annotations_temporal_puservlet_vehicle_web_war.addAsWebInfResource("web.xml");
+
+    JavaArchive jpa_core_annotations_temporal_jar = ShrinkWrap.create(JavaArchive.class, "jpa_core_annotations_temporal.jar");
+    jpa_core_annotations_temporal_jar.addClass(ee.jakarta.tck.persistence.core.annotations.temporal.A2_Field.class);
+    jpa_core_annotations_temporal_jar.addClass(ee.jakarta.tck.persistence.core.annotations.temporal.A2_Property.class);
+    jpa_core_annotations_temporal_jar.addClass(ee.jakarta.tck.persistence.core.annotations.temporal.A_Field.class);
+    jpa_core_annotations_temporal_jar.addClass(ee.jakarta.tck.persistence.core.annotations.temporal.A_Property.class);
+    jpa_core_annotations_temporal_jar.addAsManifestResource("META-INF/MANIFEST.MF");
+    jpa_core_annotations_temporal_jar.addAsManifestResource("META-INF/persistence.xml");
+    jpa_core_annotations_temporal_puservlet_vehicle_web_war.addAsLibrary(jpa_core_annotations_temporal_jar);
+    jpa_core_annotations_temporal_puservlet_vehicle_web_war.addClass(ee.jakarta.tck.persistence.common.PMClientBase.class);
+    jpa_core_annotations_temporal_puservlet_vehicle_web_war.addClass(ee.jakarta.tck.persistence.core.annotations.temporal.Client.class);
+    ear.addAsModule(jpa_core_annotations_temporal_puservlet_vehicle_web_war);
+
+    JavaArchive jpa_core_annotations_temporal_stateful3_vehicle_client_jar = ShrinkWrap.create(JavaArchive.class, "jpa_core_annotations_temporal_stateful3_vehicle_client_jar");
+    jpa_core_annotations_temporal_stateful3_vehicle_client_jar.addClass(ee.jakarta.tck.persistence.common.PMClientBase.class);
+    ear.addAsModule(jpa_core_annotations_temporal_stateful3_vehicle_client_jar);
+
+    JavaArchive jpa_core_annotations_temporal_stateful3_vehicle_ejb_jar = ShrinkWrap.create(JavaArchive.class, "jpa_core_annotations_temporal_stateful3_vehicle_ejb_jar");
+    jpa_core_annotations_temporal_stateful3_vehicle_ejb_jar.addClass(ee.jakarta.tck.persistence.common.PMClientBase.class);
+    jpa_core_annotations_temporal_stateful3_vehicle_ejb_jar.addClass(ee.jakarta.tck.persistence.core.annotations.temporal.Client.class);
+    ear.addAsModule(jpa_core_annotations_temporal_stateful3_vehicle_ejb_jar);
+
+    JavaArchive jpa_core_annotations_temporal_stateless3_vehicle_client_jar = ShrinkWrap.create(JavaArchive.class, "jpa_core_annotations_temporal_stateless3_vehicle_client_jar");
+    jpa_core_annotations_temporal_stateless3_vehicle_client_jar.addClass(ee.jakarta.tck.persistence.common.PMClientBase.class);
+    ear.addAsModule(jpa_core_annotations_temporal_stateless3_vehicle_client_jar);
+
+    JavaArchive jpa_core_annotations_temporal_stateless3_vehicle_ejb_jar = ShrinkWrap.create(JavaArchive.class, "jpa_core_annotations_temporal_stateless3_vehicle_ejb_jar");
+    jpa_core_annotations_temporal_stateless3_vehicle_ejb_jar.addClass(ee.jakarta.tck.persistence.common.PMClientBase.class);
+    jpa_core_annotations_temporal_stateless3_vehicle_ejb_jar.addClass(ee.jakarta.tck.persistence.core.annotations.temporal.Client.class);
+    ear.addAsModule(jpa_core_annotations_temporal_stateless3_vehicle_ejb_jar);
+    return ear;
+  }
+
 	private static final Logger logger = (Logger) System.getLogger(Client.class.getName());
 
 	private static final long serialVersionUID = 21L;
diff --git a/jpa/spec-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/version/Client.java b/jpa/spec-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/version/Client.java
index 50cce0254..854bc6ece 100644
--- a/jpa/spec-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/version/Client.java
+++ b/jpa/spec-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/version/Client.java
@@ -17,13 +17,131 @@
 package ee.jakarta.tck.persistence.core.annotations.version;
 
 import java.lang.System.Logger;
-
+import org.jboss.arquillian.container.test.api.Deployment;
+import org.jboss.shrinkwrap.api.Archive;
+import org.jboss.shrinkwrap.api.ShrinkWrap;
+import org.jboss.shrinkwrap.api.spec.EnterpriseArchive;
+import org.jboss.shrinkwrap.api.spec.JavaArchive;
+import org.jboss.shrinkwrap.api.spec.WebArchive;
 import org.junit.jupiter.api.AfterEach;
 
 import ee.jakarta.tck.persistence.common.PMClientBase;
 
 public class Client extends PMClientBase {
 
+  @Deployment(testable = false)
+  public static Archive<?> deployment() {
+
+    final EnterpriseArchive ear = ShrinkWrap.create(EnterpriseArchive.class, "jpa_core_annotations_version_vehicles.ear");
+    // TODO: filter/eliminate the library jar classes that shouldn't be included
+    // Add ear/lib jars
+
+    JavaArchive jpa_core_annotations_version_jar = ShrinkWrap.create(JavaArchive.class, "jpa_core_annotations_version_jar");
+    jpa_core_annotations_version_jar.addClass(ee.jakarta.tck.persistence.core.annotations.version.Int_Field.class);
+    jpa_core_annotations_version_jar.addClass(ee.jakarta.tck.persistence.core.annotations.version.Int_Property.class);
+    jpa_core_annotations_version_jar.addClass(ee.jakarta.tck.persistence.core.annotations.version.Integer_Field.class);
+    jpa_core_annotations_version_jar.addClass(ee.jakarta.tck.persistence.core.annotations.version.Integer_Property.class);
+    jpa_core_annotations_version_jar.addClass(ee.jakarta.tck.persistence.core.annotations.version.LongClass_Field.class);
+    jpa_core_annotations_version_jar.addClass(ee.jakarta.tck.persistence.core.annotations.version.LongClass_Property.class);
+    jpa_core_annotations_version_jar.addClass(ee.jakarta.tck.persistence.core.annotations.version.Long_Field.class);
+    jpa_core_annotations_version_jar.addClass(ee.jakarta.tck.persistence.core.annotations.version.Long_Property.class);
+    jpa_core_annotations_version_jar.addClass(ee.jakarta.tck.persistence.core.annotations.version.ShortClass_Field.class);
+    jpa_core_annotations_version_jar.addClass(ee.jakarta.tck.persistence.core.annotations.version.ShortClass_Property.class);
+    jpa_core_annotations_version_jar.addClass(ee.jakarta.tck.persistence.core.annotations.version.Short_Field.class);
+    jpa_core_annotations_version_jar.addClass(ee.jakarta.tck.persistence.core.annotations.version.Short_Property.class);
+    jpa_core_annotations_version_jar.addClass(ee.jakarta.tck.persistence.core.annotations.version.Timestamp_Field.class);
+    jpa_core_annotations_version_jar.addClass(ee.jakarta.tck.persistence.core.annotations.version.Timestamp_Property.class);
+    ear.addAsLibrary(jpa_core_annotations_version_jar);
+    // Add ear submodules
+
+    JavaArchive jpa_core_annotations_version_appmanagedNoTx_vehicle_client_jar = ShrinkWrap.create(JavaArchive.class, "jpa_core_annotations_version_appmanagedNoTx_vehicle_client_jar");
+    jpa_core_annotations_version_appmanagedNoTx_vehicle_client_jar.addClass(ee.jakarta.tck.persistence.common.PMClientBase.class);
+    ear.addAsModule(jpa_core_annotations_version_appmanagedNoTx_vehicle_client_jar);
+
+    JavaArchive jpa_core_annotations_version_appmanagedNoTx_vehicle_ejb_jar = ShrinkWrap.create(JavaArchive.class, "jpa_core_annotations_version_appmanagedNoTx_vehicle_ejb_jar");
+    jpa_core_annotations_version_appmanagedNoTx_vehicle_ejb_jar.addClass(ee.jakarta.tck.persistence.common.PMClientBase.class);
+    jpa_core_annotations_version_appmanagedNoTx_vehicle_ejb_jar.addClass(ee.jakarta.tck.persistence.core.annotations.version.Client.class);
+    ear.addAsModule(jpa_core_annotations_version_appmanagedNoTx_vehicle_ejb_jar);
+
+    JavaArchive jpa_core_annotations_version_appmanaged_vehicle_client_jar = ShrinkWrap.create(JavaArchive.class, "jpa_core_annotations_version_appmanaged_vehicle_client_jar");
+    jpa_core_annotations_version_appmanaged_vehicle_client_jar.addClass(ee.jakarta.tck.persistence.common.PMClientBase.class);
+    ear.addAsModule(jpa_core_annotations_version_appmanaged_vehicle_client_jar);
+
+    JavaArchive jpa_core_annotations_version_appmanaged_vehicle_ejb_jar = ShrinkWrap.create(JavaArchive.class, "jpa_core_annotations_version_appmanaged_vehicle_ejb_jar");
+    jpa_core_annotations_version_appmanaged_vehicle_ejb_jar.addClass(ee.jakarta.tck.persistence.common.PMClientBase.class);
+    jpa_core_annotations_version_appmanaged_vehicle_ejb_jar.addClass(ee.jakarta.tck.persistence.core.annotations.version.Client.class);
+    ear.addAsModule(jpa_core_annotations_version_appmanaged_vehicle_ejb_jar);
+
+    WebArchive jpa_core_annotations_version_pmservlet_vehicle_web_war = ShrinkWrap.create(WebArchive.class, "jpa_core_annotations_version_pmservlet_vehicle_web_war");
+    jpa_core_annotations_version_pmservlet_vehicle_web_war.addAsWebInfResource("web.xml");
+
+    JavaArchive jpa_core_annotations_version_jar = ShrinkWrap.create(JavaArchive.class, "jpa_core_annotations_version.jar");
+    jpa_core_annotations_version_jar.addClass(ee.jakarta.tck.persistence.core.annotations.version.Int_Field.class);
+    jpa_core_annotations_version_jar.addClass(ee.jakarta.tck.persistence.core.annotations.version.Int_Property.class);
+    jpa_core_annotations_version_jar.addClass(ee.jakarta.tck.persistence.core.annotations.version.Integer_Field.class);
+    jpa_core_annotations_version_jar.addClass(ee.jakarta.tck.persistence.core.annotations.version.Integer_Property.class);
+    jpa_core_annotations_version_jar.addClass(ee.jakarta.tck.persistence.core.annotations.version.LongClass_Field.class);
+    jpa_core_annotations_version_jar.addClass(ee.jakarta.tck.persistence.core.annotations.version.LongClass_Property.class);
+    jpa_core_annotations_version_jar.addClass(ee.jakarta.tck.persistence.core.annotations.version.Long_Field.class);
+    jpa_core_annotations_version_jar.addClass(ee.jakarta.tck.persistence.core.annotations.version.Long_Property.class);
+    jpa_core_annotations_version_jar.addClass(ee.jakarta.tck.persistence.core.annotations.version.ShortClass_Field.class);
+    jpa_core_annotations_version_jar.addClass(ee.jakarta.tck.persistence.core.annotations.version.ShortClass_Property.class);
+    jpa_core_annotations_version_jar.addClass(ee.jakarta.tck.persistence.core.annotations.version.Short_Field.class);
+    jpa_core_annotations_version_jar.addClass(ee.jakarta.tck.persistence.core.annotations.version.Short_Property.class);
+    jpa_core_annotations_version_jar.addClass(ee.jakarta.tck.persistence.core.annotations.version.Timestamp_Field.class);
+    jpa_core_annotations_version_jar.addClass(ee.jakarta.tck.persistence.core.annotations.version.Timestamp_Property.class);
+    jpa_core_annotations_version_jar.addAsManifestResource("META-INF/MANIFEST.MF");
+    jpa_core_annotations_version_jar.addAsManifestResource("META-INF/persistence.xml");
+    jpa_core_annotations_version_pmservlet_vehicle_web_war.addAsLibrary(jpa_core_annotations_version_jar);
+    jpa_core_annotations_version_pmservlet_vehicle_web_war.addClass(ee.jakarta.tck.persistence.common.PMClientBase.class);
+    jpa_core_annotations_version_pmservlet_vehicle_web_war.addClass(ee.jakarta.tck.persistence.core.annotations.version.Client.class);
+    ear.addAsModule(jpa_core_annotations_version_pmservlet_vehicle_web_war);
+
+    WebArchive jpa_core_annotations_version_puservlet_vehicle_web_war = ShrinkWrap.create(WebArchive.class, "jpa_core_annotations_version_puservlet_vehicle_web_war");
+    jpa_core_annotations_version_puservlet_vehicle_web_war.addAsWebInfResource("web.xml");
+
+    JavaArchive jpa_core_annotations_version_jar = ShrinkWrap.create(JavaArchive.class, "jpa_core_annotations_version.jar");
+    jpa_core_annotations_version_jar.addClass(ee.jakarta.tck.persistence.core.annotations.version.Int_Field.class);
+    jpa_core_annotations_version_jar.addClass(ee.jakarta.tck.persistence.core.annotations.version.Int_Property.class);
+    jpa_core_annotations_version_jar.addClass(ee.jakarta.tck.persistence.core.annotations.version.Integer_Field.class);
+    jpa_core_annotations_version_jar.addClass(ee.jakarta.tck.persistence.core.annotations.version.Integer_Property.class);
+    jpa_core_annotations_version_jar.addClass(ee.jakarta.tck.persistence.core.annotations.version.LongClass_Field.class);
+    jpa_core_annotations_version_jar.addClass(ee.jakarta.tck.persistence.core.annotations.version.LongClass_Property.class);
+    jpa_core_annotations_version_jar.addClass(ee.jakarta.tck.persistence.core.annotations.version.Long_Field.class);
+    jpa_core_annotations_version_jar.addClass(ee.jakarta.tck.persistence.core.annotations.version.Long_Property.class);
+    jpa_core_annotations_version_jar.addClass(ee.jakarta.tck.persistence.core.annotations.version.ShortClass_Field.class);
+    jpa_core_annotations_version_jar.addClass(ee.jakarta.tck.persistence.core.annotations.version.ShortClass_Property.class);
+    jpa_core_annotations_version_jar.addClass(ee.jakarta.tck.persistence.core.annotations.version.Short_Field.class);
+    jpa_core_annotations_version_jar.addClass(ee.jakarta.tck.persistence.core.annotations.version.Short_Property.class);
+    jpa_core_annotations_version_jar.addClass(ee.jakarta.tck.persistence.core.annotations.version.Timestamp_Field.class);
+    jpa_core_annotations_version_jar.addClass(ee.jakarta.tck.persistence.core.annotations.version.Timestamp_Property.class);
+    jpa_core_annotations_version_jar.addAsManifestResource("META-INF/MANIFEST.MF");
+    jpa_core_annotations_version_jar.addAsManifestResource("META-INF/persistence.xml");
+    jpa_core_annotations_version_puservlet_vehicle_web_war.addAsLibrary(jpa_core_annotations_version_jar);
+    jpa_core_annotations_version_puservlet_vehicle_web_war.addClass(ee.jakarta.tck.persistence.common.PMClientBase.class);
+    jpa_core_annotations_version_puservlet_vehicle_web_war.addClass(ee.jakarta.tck.persistence.core.annotations.version.Client.class);
+    ear.addAsModule(jpa_core_annotations_version_puservlet_vehicle_web_war);
+
+    JavaArchive jpa_core_annotations_version_stateful3_vehicle_client_jar = ShrinkWrap.create(JavaArchive.class, "jpa_core_annotations_version_stateful3_vehicle_client_jar");
+    jpa_core_annotations_version_stateful3_vehicle_client_jar.addClass(ee.jakarta.tck.persistence.common.PMClientBase.class);
+    ear.addAsModule(jpa_core_annotations_version_stateful3_vehicle_client_jar);
+
+    JavaArchive jpa_core_annotations_version_stateful3_vehicle_ejb_jar = ShrinkWrap.create(JavaArchive.class, "jpa_core_annotations_version_stateful3_vehicle_ejb_jar");
+    jpa_core_annotations_version_stateful3_vehicle_ejb_jar.addClass(ee.jakarta.tck.persistence.common.PMClientBase.class);
+    jpa_core_annotations_version_stateful3_vehicle_ejb_jar.addClass(ee.jakarta.tck.persistence.core.annotations.version.Client.class);
+    ear.addAsModule(jpa_core_annotations_version_stateful3_vehicle_ejb_jar);
+
+    JavaArchive jpa_core_annotations_version_stateless3_vehicle_client_jar = ShrinkWrap.create(JavaArchive.class, "jpa_core_annotations_version_stateless3_vehicle_client_jar");
+    jpa_core_annotations_version_stateless3_vehicle_client_jar.addClass(ee.jakarta.tck.persistence.common.PMClientBase.class);
+    ear.addAsModule(jpa_core_annotations_version_stateless3_vehicle_client_jar);
+
+    JavaArchive jpa_core_annotations_version_stateless3_vehicle_ejb_jar = ShrinkWrap.create(JavaArchive.class, "jpa_core_annotations_version_stateless3_vehicle_ejb_jar");
+    jpa_core_annotations_version_stateless3_vehicle_ejb_jar.addClass(ee.jakarta.tck.persistence.common.PMClientBase.class);
+    jpa_core_annotations_version_stateless3_vehicle_ejb_jar.addClass(ee.jakarta.tck.persistence.core.annotations.version.Client.class);
+    ear.addAsModule(jpa_core_annotations_version_stateless3_vehicle_ejb_jar);
+    return ear;
+  }
+
 	private static final Logger logger = (Logger) System.getLogger(Client.class.getName());
 
 	public Client() {
diff --git a/jpa/spec-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/version/Client1.java b/jpa/spec-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/version/Client1.java
index 363777046..05fb4fdb6 100644
--- a/jpa/spec-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/version/Client1.java
+++ b/jpa/spec-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/version/Client1.java
@@ -18,12 +18,130 @@ package ee.jakarta.tck.persistence.core.annotations.version;
 
 import java.lang.System.Logger;
 
+import org.jboss.arquillian.container.test.api.Deployment;
+import org.jboss.shrinkwrap.api.Archive;
+import org.jboss.shrinkwrap.api.ShrinkWrap;
+import org.jboss.shrinkwrap.api.spec.EnterpriseArchive;
 import org.jboss.shrinkwrap.api.spec.JavaArchive;
+import org.jboss.shrinkwrap.api.spec.WebArchive;
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
 
 public class Client1 extends Client {
 
+  @Deployment(testable = false)
+  public static Archive<?> deployment() {
+
+    final EnterpriseArchive ear = ShrinkWrap.create(EnterpriseArchive.class, "jpa_core_annotations_version_vehicles.ear");
+    // TODO: filter/eliminate the library jar classes that shouldn't be included
+    // Add ear/lib jars
+
+    JavaArchive jpa_core_annotations_version_jar = ShrinkWrap.create(JavaArchive.class, "jpa_core_annotations_version_jar");
+    jpa_core_annotations_version_jar.addClass(ee.jakarta.tck.persistence.core.annotations.version.Int_Field.class);
+    jpa_core_annotations_version_jar.addClass(ee.jakarta.tck.persistence.core.annotations.version.Int_Property.class);
+    jpa_core_annotations_version_jar.addClass(ee.jakarta.tck.persistence.core.annotations.version.Integer_Field.class);
+    jpa_core_annotations_version_jar.addClass(ee.jakarta.tck.persistence.core.annotations.version.Integer_Property.class);
+    jpa_core_annotations_version_jar.addClass(ee.jakarta.tck.persistence.core.annotations.version.LongClass_Field.class);
+    jpa_core_annotations_version_jar.addClass(ee.jakarta.tck.persistence.core.annotations.version.LongClass_Property.class);
+    jpa_core_annotations_version_jar.addClass(ee.jakarta.tck.persistence.core.annotations.version.Long_Field.class);
+    jpa_core_annotations_version_jar.addClass(ee.jakarta.tck.persistence.core.annotations.version.Long_Property.class);
+    jpa_core_annotations_version_jar.addClass(ee.jakarta.tck.persistence.core.annotations.version.ShortClass_Field.class);
+    jpa_core_annotations_version_jar.addClass(ee.jakarta.tck.persistence.core.annotations.version.ShortClass_Property.class);
+    jpa_core_annotations_version_jar.addClass(ee.jakarta.tck.persistence.core.annotations.version.Short_Field.class);
+    jpa_core_annotations_version_jar.addClass(ee.jakarta.tck.persistence.core.annotations.version.Short_Property.class);
+    jpa_core_annotations_version_jar.addClass(ee.jakarta.tck.persistence.core.annotations.version.Timestamp_Field.class);
+    jpa_core_annotations_version_jar.addClass(ee.jakarta.tck.persistence.core.annotations.version.Timestamp_Property.class);
+    ear.addAsLibrary(jpa_core_annotations_version_jar);
+    // Add ear submodules
+
+    JavaArchive jpa_core_annotations_version_appmanagedNoTx_vehicle_client_jar = ShrinkWrap.create(JavaArchive.class, "jpa_core_annotations_version_appmanagedNoTx_vehicle_client_jar");
+    jpa_core_annotations_version_appmanagedNoTx_vehicle_client_jar.addClass(ee.jakarta.tck.persistence.common.PMClientBase.class);
+    ear.addAsModule(jpa_core_annotations_version_appmanagedNoTx_vehicle_client_jar);
+
+    JavaArchive jpa_core_annotations_version_appmanagedNoTx_vehicle_ejb_jar = ShrinkWrap.create(JavaArchive.class, "jpa_core_annotations_version_appmanagedNoTx_vehicle_ejb_jar");
+    jpa_core_annotations_version_appmanagedNoTx_vehicle_ejb_jar.addClass(ee.jakarta.tck.persistence.common.PMClientBase.class);
+    jpa_core_annotations_version_appmanagedNoTx_vehicle_ejb_jar.addClass(ee.jakarta.tck.persistence.core.annotations.version.Client.class);
+    ear.addAsModule(jpa_core_annotations_version_appmanagedNoTx_vehicle_ejb_jar);
+
+    JavaArchive jpa_core_annotations_version_appmanaged_vehicle_client_jar = ShrinkWrap.create(JavaArchive.class, "jpa_core_annotations_version_appmanaged_vehicle_client_jar");
+    jpa_core_annotations_version_appmanaged_vehicle_client_jar.addClass(ee.jakarta.tck.persistence.common.PMClientBase.class);
+    ear.addAsModule(jpa_core_annotations_version_appmanaged_vehicle_client_jar);
+
+    JavaArchive jpa_core_annotations_version_appmanaged_vehicle_ejb_jar = ShrinkWrap.create(JavaArchive.class, "jpa_core_annotations_version_appmanaged_vehicle_ejb_jar");
+    jpa_core_annotations_version_appmanaged_vehicle_ejb_jar.addClass(ee.jakarta.tck.persistence.common.PMClientBase.class);
+    jpa_core_annotations_version_appmanaged_vehicle_ejb_jar.addClass(ee.jakarta.tck.persistence.core.annotations.version.Client.class);
+    ear.addAsModule(jpa_core_annotations_version_appmanaged_vehicle_ejb_jar);
+
+    WebArchive jpa_core_annotations_version_pmservlet_vehicle_web_war = ShrinkWrap.create(WebArchive.class, "jpa_core_annotations_version_pmservlet_vehicle_web_war");
+    jpa_core_annotations_version_pmservlet_vehicle_web_war.addAsWebInfResource("web.xml");
+
+    JavaArchive jpa_core_annotations_version_jar = ShrinkWrap.create(JavaArchive.class, "jpa_core_annotations_version.jar");
+    jpa_core_annotations_version_jar.addClass(ee.jakarta.tck.persistence.core.annotations.version.Int_Field.class);
+    jpa_core_annotations_version_jar.addClass(ee.jakarta.tck.persistence.core.annotations.version.Int_Property.class);
+    jpa_core_annotations_version_jar.addClass(ee.jakarta.tck.persistence.core.annotations.version.Integer_Field.class);
+    jpa_core_annotations_version_jar.addClass(ee.jakarta.tck.persistence.core.annotations.version.Integer_Property.class);
+    jpa_core_annotations_version_jar.addClass(ee.jakarta.tck.persistence.core.annotations.version.LongClass_Field.class);
+    jpa_core_annotations_version_jar.addClass(ee.jakarta.tck.persistence.core.annotations.version.LongClass_Property.class);
+    jpa_core_annotations_version_jar.addClass(ee.jakarta.tck.persistence.core.annotations.version.Long_Field.class);
+    jpa_core_annotations_version_jar.addClass(ee.jakarta.tck.persistence.core.annotations.version.Long_Property.class);
+    jpa_core_annotations_version_jar.addClass(ee.jakarta.tck.persistence.core.annotations.version.ShortClass_Field.class);
+    jpa_core_annotations_version_jar.addClass(ee.jakarta.tck.persistence.core.annotations.version.ShortClass_Property.class);
+    jpa_core_annotations_version_jar.addClass(ee.jakarta.tck.persistence.core.annotations.version.Short_Field.class);
+    jpa_core_annotations_version_jar.addClass(ee.jakarta.tck.persistence.core.annotations.version.Short_Property.class);
+    jpa_core_annotations_version_jar.addClass(ee.jakarta.tck.persistence.core.annotations.version.Timestamp_Field.class);
+    jpa_core_annotations_version_jar.addClass(ee.jakarta.tck.persistence.core.annotations.version.Timestamp_Property.class);
+    jpa_core_annotations_version_jar.addAsManifestResource("META-INF/MANIFEST.MF");
+    jpa_core_annotations_version_jar.addAsManifestResource("META-INF/persistence.xml");
+    jpa_core_annotations_version_pmservlet_vehicle_web_war.addAsLibrary(jpa_core_annotations_version_jar);
+    jpa_core_annotations_version_pmservlet_vehicle_web_war.addClass(ee.jakarta.tck.persistence.common.PMClientBase.class);
+    jpa_core_annotations_version_pmservlet_vehicle_web_war.addClass(ee.jakarta.tck.persistence.core.annotations.version.Client.class);
+    ear.addAsModule(jpa_core_annotations_version_pmservlet_vehicle_web_war);
+
+    WebArchive jpa_core_annotations_version_puservlet_vehicle_web_war = ShrinkWrap.create(WebArchive.class, "jpa_core_annotations_version_puservlet_vehicle_web_war");
+    jpa_core_annotations_version_puservlet_vehicle_web_war.addAsWebInfResource("web.xml");
+
+    JavaArchive jpa_core_annotations_version_jar = ShrinkWrap.create(JavaArchive.class, "jpa_core_annotations_version.jar");
+    jpa_core_annotations_version_jar.addClass(ee.jakarta.tck.persistence.core.annotations.version.Int_Field.class);
+    jpa_core_annotations_version_jar.addClass(ee.jakarta.tck.persistence.core.annotations.version.Int_Property.class);
+    jpa_core_annotations_version_jar.addClass(ee.jakarta.tck.persistence.core.annotations.version.Integer_Field.class);
+    jpa_core_annotations_version_jar.addClass(ee.jakarta.tck.persistence.core.annotations.version.Integer_Property.class);
+    jpa_core_annotations_version_jar.addClass(ee.jakarta.tck.persistence.core.annotations.version.LongClass_Field.class);
+    jpa_core_annotations_version_jar.addClass(ee.jakarta.tck.persistence.core.annotations.version.LongClass_Property.class);
+    jpa_core_annotations_version_jar.addClass(ee.jakarta.tck.persistence.core.annotations.version.Long_Field.class);
+    jpa_core_annotations_version_jar.addClass(ee.jakarta.tck.persistence.core.annotations.version.Long_Property.class);
+    jpa_core_annotations_version_jar.addClass(ee.jakarta.tck.persistence.core.annotations.version.ShortClass_Field.class);
+    jpa_core_annotations_version_jar.addClass(ee.jakarta.tck.persistence.core.annotations.version.ShortClass_Property.class);
+    jpa_core_annotations_version_jar.addClass(ee.jakarta.tck.persistence.core.annotations.version.Short_Field.class);
+    jpa_core_annotations_version_jar.addClass(ee.jakarta.tck.persistence.core.annotations.version.Short_Property.class);
+    jpa_core_annotations_version_jar.addClass(ee.jakarta.tck.persistence.core.annotations.version.Timestamp_Field.class);
+    jpa_core_annotations_version_jar.addClass(ee.jakarta.tck.persistence.core.annotations.version.Timestamp_Property.class);
+    jpa_core_annotations_version_jar.addAsManifestResource("META-INF/MANIFEST.MF");
+    jpa_core_annotations_version_jar.addAsManifestResource("META-INF/persistence.xml");
+    jpa_core_annotations_version_puservlet_vehicle_web_war.addAsLibrary(jpa_core_annotations_version_jar);
+    jpa_core_annotations_version_puservlet_vehicle_web_war.addClass(ee.jakarta.tck.persistence.common.PMClientBase.class);
+    jpa_core_annotations_version_puservlet_vehicle_web_war.addClass(ee.jakarta.tck.persistence.core.annotations.version.Client.class);
+    ear.addAsModule(jpa_core_annotations_version_puservlet_vehicle_web_war);
+
+    JavaArchive jpa_core_annotations_version_stateful3_vehicle_client_jar = ShrinkWrap.create(JavaArchive.class, "jpa_core_annotations_version_stateful3_vehicle_client_jar");
+    jpa_core_annotations_version_stateful3_vehicle_client_jar.addClass(ee.jakarta.tck.persistence.common.PMClientBase.class);
+    ear.addAsModule(jpa_core_annotations_version_stateful3_vehicle_client_jar);
+
+    JavaArchive jpa_core_annotations_version_stateful3_vehicle_ejb_jar = ShrinkWrap.create(JavaArchive.class, "jpa_core_annotations_version_stateful3_vehicle_ejb_jar");
+    jpa_core_annotations_version_stateful3_vehicle_ejb_jar.addClass(ee.jakarta.tck.persistence.common.PMClientBase.class);
+    jpa_core_annotations_version_stateful3_vehicle_ejb_jar.addClass(ee.jakarta.tck.persistence.core.annotations.version.Client.class);
+    ear.addAsModule(jpa_core_annotations_version_stateful3_vehicle_ejb_jar);
+
+    JavaArchive jpa_core_annotations_version_stateless3_vehicle_client_jar = ShrinkWrap.create(JavaArchive.class, "jpa_core_annotations_version_stateless3_vehicle_client_jar");
+    jpa_core_annotations_version_stateless3_vehicle_client_jar.addClass(ee.jakarta.tck.persistence.common.PMClientBase.class);
+    ear.addAsModule(jpa_core_annotations_version_stateless3_vehicle_client_jar);
+
+    JavaArchive jpa_core_annotations_version_stateless3_vehicle_ejb_jar = ShrinkWrap.create(JavaArchive.class, "jpa_core_annotations_version_stateless3_vehicle_ejb_jar");
+    jpa_core_annotations_version_stateless3_vehicle_ejb_jar.addClass(ee.jakarta.tck.persistence.common.PMClientBase.class);
+    jpa_core_annotations_version_stateless3_vehicle_ejb_jar.addClass(ee.jakarta.tck.persistence.core.annotations.version.Client.class);
+    ear.addAsModule(jpa_core_annotations_version_stateless3_vehicle_ejb_jar);
+    return ear;
+  }
+
 	private static final Logger logger = (Logger) System.getLogger(Client1.class.getName());
 
 	public Client1() {
diff --git a/jpa/spec-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/version/Client2.java b/jpa/spec-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/version/Client2.java
index 0aab00e14..6b1d2a53a 100644
--- a/jpa/spec-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/version/Client2.java
+++ b/jpa/spec-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/version/Client2.java
@@ -18,12 +18,130 @@ package ee.jakarta.tck.persistence.core.annotations.version;
 
 import java.lang.System.Logger;
 
+import org.jboss.arquillian.container.test.api.Deployment;
+import org.jboss.shrinkwrap.api.Archive;
+import org.jboss.shrinkwrap.api.ShrinkWrap;
+import org.jboss.shrinkwrap.api.spec.EnterpriseArchive;
 import org.jboss.shrinkwrap.api.spec.JavaArchive;
+import org.jboss.shrinkwrap.api.spec.WebArchive;
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
 
 public class Client2 extends Client {
 
+  @Deployment(testable = false)
+  public static Archive<?> deployment() {
+
+    final EnterpriseArchive ear = ShrinkWrap.create(EnterpriseArchive.class, "jpa_core_annotations_version_vehicles.ear");
+    // TODO: filter/eliminate the library jar classes that shouldn't be included
+    // Add ear/lib jars
+
+    JavaArchive jpa_core_annotations_version_jar = ShrinkWrap.create(JavaArchive.class, "jpa_core_annotations_version_jar");
+    jpa_core_annotations_version_jar.addClass(ee.jakarta.tck.persistence.core.annotations.version.Int_Field.class);
+    jpa_core_annotations_version_jar.addClass(ee.jakarta.tck.persistence.core.annotations.version.Int_Property.class);
+    jpa_core_annotations_version_jar.addClass(ee.jakarta.tck.persistence.core.annotations.version.Integer_Field.class);
+    jpa_core_annotations_version_jar.addClass(ee.jakarta.tck.persistence.core.annotations.version.Integer_Property.class);
+    jpa_core_annotations_version_jar.addClass(ee.jakarta.tck.persistence.core.annotations.version.LongClass_Field.class);
+    jpa_core_annotations_version_jar.addClass(ee.jakarta.tck.persistence.core.annotations.version.LongClass_Property.class);
+    jpa_core_annotations_version_jar.addClass(ee.jakarta.tck.persistence.core.annotations.version.Long_Field.class);
+    jpa_core_annotations_version_jar.addClass(ee.jakarta.tck.persistence.core.annotations.version.Long_Property.class);
+    jpa_core_annotations_version_jar.addClass(ee.jakarta.tck.persistence.core.annotations.version.ShortClass_Field.class);
+    jpa_core_annotations_version_jar.addClass(ee.jakarta.tck.persistence.core.annotations.version.ShortClass_Property.class);
+    jpa_core_annotations_version_jar.addClass(ee.jakarta.tck.persistence.core.annotations.version.Short_Field.class);
+    jpa_core_annotations_version_jar.addClass(ee.jakarta.tck.persistence.core.annotations.version.Short_Property.class);
+    jpa_core_annotations_version_jar.addClass(ee.jakarta.tck.persistence.core.annotations.version.Timestamp_Field.class);
+    jpa_core_annotations_version_jar.addClass(ee.jakarta.tck.persistence.core.annotations.version.Timestamp_Property.class);
+    ear.addAsLibrary(jpa_core_annotations_version_jar);
+    // Add ear submodules
+
+    JavaArchive jpa_core_annotations_version_appmanagedNoTx_vehicle_client_jar = ShrinkWrap.create(JavaArchive.class, "jpa_core_annotations_version_appmanagedNoTx_vehicle_client_jar");
+    jpa_core_annotations_version_appmanagedNoTx_vehicle_client_jar.addClass(ee.jakarta.tck.persistence.common.PMClientBase.class);
+    ear.addAsModule(jpa_core_annotations_version_appmanagedNoTx_vehicle_client_jar);
+
+    JavaArchive jpa_core_annotations_version_appmanagedNoTx_vehicle_ejb_jar = ShrinkWrap.create(JavaArchive.class, "jpa_core_annotations_version_appmanagedNoTx_vehicle_ejb_jar");
+    jpa_core_annotations_version_appmanagedNoTx_vehicle_ejb_jar.addClass(ee.jakarta.tck.persistence.common.PMClientBase.class);
+    jpa_core_annotations_version_appmanagedNoTx_vehicle_ejb_jar.addClass(ee.jakarta.tck.persistence.core.annotations.version.Client.class);
+    ear.addAsModule(jpa_core_annotations_version_appmanagedNoTx_vehicle_ejb_jar);
+
+    JavaArchive jpa_core_annotations_version_appmanaged_vehicle_client_jar = ShrinkWrap.create(JavaArchive.class, "jpa_core_annotations_version_appmanaged_vehicle_client_jar");
+    jpa_core_annotations_version_appmanaged_vehicle_client_jar.addClass(ee.jakarta.tck.persistence.common.PMClientBase.class);
+    ear.addAsModule(jpa_core_annotations_version_appmanaged_vehicle_client_jar);
+
+    JavaArchive jpa_core_annotations_version_appmanaged_vehicle_ejb_jar = ShrinkWrap.create(JavaArchive.class, "jpa_core_annotations_version_appmanaged_vehicle_ejb_jar");
+    jpa_core_annotations_version_appmanaged_vehicle_ejb_jar.addClass(ee.jakarta.tck.persistence.common.PMClientBase.class);
+    jpa_core_annotations_version_appmanaged_vehicle_ejb_jar.addClass(ee.jakarta.tck.persistence.core.annotations.version.Client.class);
+    ear.addAsModule(jpa_core_annotations_version_appmanaged_vehicle_ejb_jar);
+
+    WebArchive jpa_core_annotations_version_pmservlet_vehicle_web_war = ShrinkWrap.create(WebArchive.class, "jpa_core_annotations_version_pmservlet_vehicle_web_war");
+    jpa_core_annotations_version_pmservlet_vehicle_web_war.addAsWebInfResource("web.xml");
+
+    JavaArchive jpa_core_annotations_version_jar = ShrinkWrap.create(JavaArchive.class, "jpa_core_annotations_version.jar");
+    jpa_core_annotations_version_jar.addClass(ee.jakarta.tck.persistence.core.annotations.version.Int_Field.class);
+    jpa_core_annotations_version_jar.addClass(ee.jakarta.tck.persistence.core.annotations.version.Int_Property.class);
+    jpa_core_annotations_version_jar.addClass(ee.jakarta.tck.persistence.core.annotations.version.Integer_Field.class);
+    jpa_core_annotations_version_jar.addClass(ee.jakarta.tck.persistence.core.annotations.version.Integer_Property.class);
+    jpa_core_annotations_version_jar.addClass(ee.jakarta.tck.persistence.core.annotations.version.LongClass_Field.class);
+    jpa_core_annotations_version_jar.addClass(ee.jakarta.tck.persistence.core.annotations.version.LongClass_Property.class);
+    jpa_core_annotations_version_jar.addClass(ee.jakarta.tck.persistence.core.annotations.version.Long_Field.class);
+    jpa_core_annotations_version_jar.addClass(ee.jakarta.tck.persistence.core.annotations.version.Long_Property.class);
+    jpa_core_annotations_version_jar.addClass(ee.jakarta.tck.persistence.core.annotations.version.ShortClass_Field.class);
+    jpa_core_annotations_version_jar.addClass(ee.jakarta.tck.persistence.core.annotations.version.ShortClass_Property.class);
+    jpa_core_annotations_version_jar.addClass(ee.jakarta.tck.persistence.core.annotations.version.Short_Field.class);
+    jpa_core_annotations_version_jar.addClass(ee.jakarta.tck.persistence.core.annotations.version.Short_Property.class);
+    jpa_core_annotations_version_jar.addClass(ee.jakarta.tck.persistence.core.annotations.version.Timestamp_Field.class);
+    jpa_core_annotations_version_jar.addClass(ee.jakarta.tck.persistence.core.annotations.version.Timestamp_Property.class);
+    jpa_core_annotations_version_jar.addAsManifestResource("META-INF/MANIFEST.MF");
+    jpa_core_annotations_version_jar.addAsManifestResource("META-INF/persistence.xml");
+    jpa_core_annotations_version_pmservlet_vehicle_web_war.addAsLibrary(jpa_core_annotations_version_jar);
+    jpa_core_annotations_version_pmservlet_vehicle_web_war.addClass(ee.jakarta.tck.persistence.common.PMClientBase.class);
+    jpa_core_annotations_version_pmservlet_vehicle_web_war.addClass(ee.jakarta.tck.persistence.core.annotations.version.Client.class);
+    ear.addAsModule(jpa_core_annotations_version_pmservlet_vehicle_web_war);
+
+    WebArchive jpa_core_annotations_version_puservlet_vehicle_web_war = ShrinkWrap.create(WebArchive.class, "jpa_core_annotations_version_puservlet_vehicle_web_war");
+    jpa_core_annotations_version_puservlet_vehicle_web_war.addAsWebInfResource("web.xml");
+
+    JavaArchive jpa_core_annotations_version_jar = ShrinkWrap.create(JavaArchive.class, "jpa_core_annotations_version.jar");
+    jpa_core_annotations_version_jar.addClass(ee.jakarta.tck.persistence.core.annotations.version.Int_Field.class);
+    jpa_core_annotations_version_jar.addClass(ee.jakarta.tck.persistence.core.annotations.version.Int_Property.class);
+    jpa_core_annotations_version_jar.addClass(ee.jakarta.tck.persistence.core.annotations.version.Integer_Field.class);
+    jpa_core_annotations_version_jar.addClass(ee.jakarta.tck.persistence.core.annotations.version.Integer_Property.class);
+    jpa_core_annotations_version_jar.addClass(ee.jakarta.tck.persistence.core.annotations.version.LongClass_Field.class);
+    jpa_core_annotations_version_jar.addClass(ee.jakarta.tck.persistence.core.annotations.version.LongClass_Property.class);
+    jpa_core_annotations_version_jar.addClass(ee.jakarta.tck.persistence.core.annotations.version.Long_Field.class);
+    jpa_core_annotations_version_jar.addClass(ee.jakarta.tck.persistence.core.annotations.version.Long_Property.class);
+    jpa_core_annotations_version_jar.addClass(ee.jakarta.tck.persistence.core.annotations.version.ShortClass_Field.class);
+    jpa_core_annotations_version_jar.addClass(ee.jakarta.tck.persistence.core.annotations.version.ShortClass_Property.class);
+    jpa_core_annotations_version_jar.addClass(ee.jakarta.tck.persistence.core.annotations.version.Short_Field.class);
+    jpa_core_annotations_version_jar.addClass(ee.jakarta.tck.persistence.core.annotations.version.Short_Property.class);
+    jpa_core_annotations_version_jar.addClass(ee.jakarta.tck.persistence.core.annotations.version.Timestamp_Field.class);
+    jpa_core_annotations_version_jar.addClass(ee.jakarta.tck.persistence.core.annotations.version.Timestamp_Property.class);
+    jpa_core_annotations_version_jar.addAsManifestResource("META-INF/MANIFEST.MF");
+    jpa_core_annotations_version_jar.addAsManifestResource("META-INF/persistence.xml");
+    jpa_core_annotations_version_puservlet_vehicle_web_war.addAsLibrary(jpa_core_annotations_version_jar);
+    jpa_core_annotations_version_puservlet_vehicle_web_war.addClass(ee.jakarta.tck.persistence.common.PMClientBase.class);
+    jpa_core_annotations_version_puservlet_vehicle_web_war.addClass(ee.jakarta.tck.persistence.core.annotations.version.Client.class);
+    ear.addAsModule(jpa_core_annotations_version_puservlet_vehicle_web_war);
+
+    JavaArchive jpa_core_annotations_version_stateful3_vehicle_client_jar = ShrinkWrap.create(JavaArchive.class, "jpa_core_annotations_version_stateful3_vehicle_client_jar");
+    jpa_core_annotations_version_stateful3_vehicle_client_jar.addClass(ee.jakarta.tck.persistence.common.PMClientBase.class);
+    ear.addAsModule(jpa_core_annotations_version_stateful3_vehicle_client_jar);
+
+    JavaArchive jpa_core_annotations_version_stateful3_vehicle_ejb_jar = ShrinkWrap.create(JavaArchive.class, "jpa_core_annotations_version_stateful3_vehicle_ejb_jar");
+    jpa_core_annotations_version_stateful3_vehicle_ejb_jar.addClass(ee.jakarta.tck.persistence.common.PMClientBase.class);
+    jpa_core_annotations_version_stateful3_vehicle_ejb_jar.addClass(ee.jakarta.tck.persistence.core.annotations.version.Client.class);
+    ear.addAsModule(jpa_core_annotations_version_stateful3_vehicle_ejb_jar);
+
+    JavaArchive jpa_core_annotations_version_stateless3_vehicle_client_jar = ShrinkWrap.create(JavaArchive.class, "jpa_core_annotations_version_stateless3_vehicle_client_jar");
+    jpa_core_annotations_version_stateless3_vehicle_client_jar.addClass(ee.jakarta.tck.persistence.common.PMClientBase.class);
+    ear.addAsModule(jpa_core_annotations_version_stateless3_vehicle_client_jar);
+
+    JavaArchive jpa_core_annotations_version_stateless3_vehicle_ejb_jar = ShrinkWrap.create(JavaArchive.class, "jpa_core_annotations_version_stateless3_vehicle_ejb_jar");
+    jpa_core_annotations_version_stateless3_vehicle_ejb_jar.addClass(ee.jakarta.tck.persistence.common.PMClientBase.class);
+    jpa_core_annotations_version_stateless3_vehicle_ejb_jar.addClass(ee.jakarta.tck.persistence.core.annotations.version.Client.class);
+    ear.addAsModule(jpa_core_annotations_version_stateless3_vehicle_ejb_jar);
+    return ear;
+  }
+
 	private static final Logger logger = (Logger) System.getLogger(Client2.class.getName());
 
 	public Client2() {
diff --git a/jpa/spec-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/version/Client3.java b/jpa/spec-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/version/Client3.java
index da437cb0e..43d874789 100644
--- a/jpa/spec-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/version/Client3.java
+++ b/jpa/spec-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/version/Client3.java
@@ -18,12 +18,130 @@ package ee.jakarta.tck.persistence.core.annotations.version;
 
 import java.lang.System.Logger;
 
+import org.jboss.arquillian.container.test.api.Deployment;
+import org.jboss.shrinkwrap.api.Archive;
+import org.jboss.shrinkwrap.api.ShrinkWrap;
+import org.jboss.shrinkwrap.api.spec.EnterpriseArchive;
 import org.jboss.shrinkwrap.api.spec.JavaArchive;
+import org.jboss.shrinkwrap.api.spec.WebArchive;
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
 
 public class Client3 extends Client {
 
+  @Deployment(testable = false)
+  public static Archive<?> deployment() {
+
+    final EnterpriseArchive ear = ShrinkWrap.create(EnterpriseArchive.class, "jpa_core_annotations_version_vehicles.ear");
+    // TODO: filter/eliminate the library jar classes that shouldn't be included
+    // Add ear/lib jars
+
+    JavaArchive jpa_core_annotations_version_jar = ShrinkWrap.create(JavaArchive.class, "jpa_core_annotations_version_jar");
+    jpa_core_annotations_version_jar.addClass(ee.jakarta.tck.persistence.core.annotations.version.Int_Field.class);
+    jpa_core_annotations_version_jar.addClass(ee.jakarta.tck.persistence.core.annotations.version.Int_Property.class);
+    jpa_core_annotations_version_jar.addClass(ee.jakarta.tck.persistence.core.annotations.version.Integer_Field.class);
+    jpa_core_annotations_version_jar.addClass(ee.jakarta.tck.persistence.core.annotations.version.Integer_Property.class);
+    jpa_core_annotations_version_jar.addClass(ee.jakarta.tck.persistence.core.annotations.version.LongClass_Field.class);
+    jpa_core_annotations_version_jar.addClass(ee.jakarta.tck.persistence.core.annotations.version.LongClass_Property.class);
+    jpa_core_annotations_version_jar.addClass(ee.jakarta.tck.persistence.core.annotations.version.Long_Field.class);
+    jpa_core_annotations_version_jar.addClass(ee.jakarta.tck.persistence.core.annotations.version.Long_Property.class);
+    jpa_core_annotations_version_jar.addClass(ee.jakarta.tck.persistence.core.annotations.version.ShortClass_Field.class);
+    jpa_core_annotations_version_jar.addClass(ee.jakarta.tck.persistence.core.annotations.version.ShortClass_Property.class);
+    jpa_core_annotations_version_jar.addClass(ee.jakarta.tck.persistence.core.annotations.version.Short_Field.class);
+    jpa_core_annotations_version_jar.addClass(ee.jakarta.tck.persistence.core.annotations.version.Short_Property.class);
+    jpa_core_annotations_version_jar.addClass(ee.jakarta.tck.persistence.core.annotations.version.Timestamp_Field.class);
+    jpa_core_annotations_version_jar.addClass(ee.jakarta.tck.persistence.core.annotations.version.Timestamp_Property.class);
+    ear.addAsLibrary(jpa_core_annotations_version_jar);
+    // Add ear submodules
+
+    JavaArchive jpa_core_annotations_version_appmanagedNoTx_vehicle_client_jar = ShrinkWrap.create(JavaArchive.class, "jpa_core_annotations_version_appmanagedNoTx_vehicle_client_jar");
+    jpa_core_annotations_version_appmanagedNoTx_vehicle_client_jar.addClass(ee.jakarta.tck.persistence.common.PMClientBase.class);
+    ear.addAsModule(jpa_core_annotations_version_appmanagedNoTx_vehicle_client_jar);
+
+    JavaArchive jpa_core_annotations_version_appmanagedNoTx_vehicle_ejb_jar = ShrinkWrap.create(JavaArchive.class, "jpa_core_annotations_version_appmanagedNoTx_vehicle_ejb_jar");
+    jpa_core_annotations_version_appmanagedNoTx_vehicle_ejb_jar.addClass(ee.jakarta.tck.persistence.common.PMClientBase.class);
+    jpa_core_annotations_version_appmanagedNoTx_vehicle_ejb_jar.addClass(ee.jakarta.tck.persistence.core.annotations.version.Client.class);
+    ear.addAsModule(jpa_core_annotations_version_appmanagedNoTx_vehicle_ejb_jar);
+
+    JavaArchive jpa_core_annotations_version_appmanaged_vehicle_client_jar = ShrinkWrap.create(JavaArchive.class, "jpa_core_annotations_version_appmanaged_vehicle_client_jar");
+    jpa_core_annotations_version_appmanaged_vehicle_client_jar.addClass(ee.jakarta.tck.persistence.common.PMClientBase.class);
+    ear.addAsModule(jpa_core_annotations_version_appmanaged_vehicle_client_jar);
+
+    JavaArchive jpa_core_annotations_version_appmanaged_vehicle_ejb_jar = ShrinkWrap.create(JavaArchive.class, "jpa_core_annotations_version_appmanaged_vehicle_ejb_jar");
+    jpa_core_annotations_version_appmanaged_vehicle_ejb_jar.addClass(ee.jakarta.tck.persistence.common.PMClientBase.class);
+    jpa_core_annotations_version_appmanaged_vehicle_ejb_jar.addClass(ee.jakarta.tck.persistence.core.annotations.version.Client.class);
+    ear.addAsModule(jpa_core_annotations_version_appmanaged_vehicle_ejb_jar);
+
+    WebArchive jpa_core_annotations_version_pmservlet_vehicle_web_war = ShrinkWrap.create(WebArchive.class, "jpa_core_annotations_version_pmservlet_vehicle_web_war");
+    jpa_core_annotations_version_pmservlet_vehicle_web_war.addAsWebInfResource("web.xml");
+
+    JavaArchive jpa_core_annotations_version_jar = ShrinkWrap.create(JavaArchive.class, "jpa_core_annotations_version.jar");
+    jpa_core_annotations_version_jar.addClass(ee.jakarta.tck.persistence.core.annotations.version.Int_Field.class);
+    jpa_core_annotations_version_jar.addClass(ee.jakarta.tck.persistence.core.annotations.version.Int_Property.class);
+    jpa_core_annotations_version_jar.addClass(ee.jakarta.tck.persistence.core.annotations.version.Integer_Field.class);
+    jpa_core_annotations_version_jar.addClass(ee.jakarta.tck.persistence.core.annotations.version.Integer_Property.class);
+    jpa_core_annotations_version_jar.addClass(ee.jakarta.tck.persistence.core.annotations.version.LongClass_Field.class);
+    jpa_core_annotations_version_jar.addClass(ee.jakarta.tck.persistence.core.annotations.version.LongClass_Property.class);
+    jpa_core_annotations_version_jar.addClass(ee.jakarta.tck.persistence.core.annotations.version.Long_Field.class);
+    jpa_core_annotations_version_jar.addClass(ee.jakarta.tck.persistence.core.annotations.version.Long_Property.class);
+    jpa_core_annotations_version_jar.addClass(ee.jakarta.tck.persistence.core.annotations.version.ShortClass_Field.class);
+    jpa_core_annotations_version_jar.addClass(ee.jakarta.tck.persistence.core.annotations.version.ShortClass_Property.class);
+    jpa_core_annotations_version_jar.addClass(ee.jakarta.tck.persistence.core.annotations.version.Short_Field.class);
+    jpa_core_annotations_version_jar.addClass(ee.jakarta.tck.persistence.core.annotations.version.Short_Property.class);
+    jpa_core_annotations_version_jar.addClass(ee.jakarta.tck.persistence.core.annotations.version.Timestamp_Field.class);
+    jpa_core_annotations_version_jar.addClass(ee.jakarta.tck.persistence.core.annotations.version.Timestamp_Property.class);
+    jpa_core_annotations_version_jar.addAsManifestResource("META-INF/MANIFEST.MF");
+    jpa_core_annotations_version_jar.addAsManifestResource("META-INF/persistence.xml");
+    jpa_core_annotations_version_pmservlet_vehicle_web_war.addAsLibrary(jpa_core_annotations_version_jar);
+    jpa_core_annotations_version_pmservlet_vehicle_web_war.addClass(ee.jakarta.tck.persistence.common.PMClientBase.class);
+    jpa_core_annotations_version_pmservlet_vehicle_web_war.addClass(ee.jakarta.tck.persistence.core.annotations.version.Client.class);
+    ear.addAsModule(jpa_core_annotations_version_pmservlet_vehicle_web_war);
+
+    WebArchive jpa_core_annotations_version_puservlet_vehicle_web_war = ShrinkWrap.create(WebArchive.class, "jpa_core_annotations_version_puservlet_vehicle_web_war");
+    jpa_core_annotations_version_puservlet_vehicle_web_war.addAsWebInfResource("web.xml");
+
+    JavaArchive jpa_core_annotations_version_jar = ShrinkWrap.create(JavaArchive.class, "jpa_core_annotations_version.jar");
+    jpa_core_annotations_version_jar.addClass(ee.jakarta.tck.persistence.core.annotations.version.Int_Field.class);
+    jpa_core_annotations_version_jar.addClass(ee.jakarta.tck.persistence.core.annotations.version.Int_Property.class);
+    jpa_core_annotations_version_jar.addClass(ee.jakarta.tck.persistence.core.annotations.version.Integer_Field.class);
+    jpa_core_annotations_version_jar.addClass(ee.jakarta.tck.persistence.core.annotations.version.Integer_Property.class);
+    jpa_core_annotations_version_jar.addClass(ee.jakarta.tck.persistence.core.annotations.version.LongClass_Field.class);
+    jpa_core_annotations_version_jar.addClass(ee.jakarta.tck.persistence.core.annotations.version.LongClass_Property.class);
+    jpa_core_annotations_version_jar.addClass(ee.jakarta.tck.persistence.core.annotations.version.Long_Field.class);
+    jpa_core_annotations_version_jar.addClass(ee.jakarta.tck.persistence.core.annotations.version.Long_Property.class);
+    jpa_core_annotations_version_jar.addClass(ee.jakarta.tck.persistence.core.annotations.version.ShortClass_Field.class);
+    jpa_core_annotations_version_jar.addClass(ee.jakarta.tck.persistence.core.annotations.version.ShortClass_Property.class);
+    jpa_core_annotations_version_jar.addClass(ee.jakarta.tck.persistence.core.annotations.version.Short_Field.class);
+    jpa_core_annotations_version_jar.addClass(ee.jakarta.tck.persistence.core.annotations.version.Short_Property.class);
+    jpa_core_annotations_version_jar.addClass(ee.jakarta.tck.persistence.core.annotations.version.Timestamp_Field.class);
+    jpa_core_annotations_version_jar.addClass(ee.jakarta.tck.persistence.core.annotations.version.Timestamp_Property.class);
+    jpa_core_annotations_version_jar.addAsManifestResource("META-INF/MANIFEST.MF");
+    jpa_core_annotations_version_jar.addAsManifestResource("META-INF/persistence.xml");
+    jpa_core_annotations_version_puservlet_vehicle_web_war.addAsLibrary(jpa_core_annotations_version_jar);
+    jpa_core_annotations_version_puservlet_vehicle_web_war.addClass(ee.jakarta.tck.persistence.common.PMClientBase.class);
+    jpa_core_annotations_version_puservlet_vehicle_web_war.addClass(ee.jakarta.tck.persistence.core.annotations.version.Client.class);
+    ear.addAsModule(jpa_core_annotations_version_puservlet_vehicle_web_war);
+
+    JavaArchive jpa_core_annotations_version_stateful3_vehicle_client_jar = ShrinkWrap.create(JavaArchive.class, "jpa_core_annotations_version_stateful3_vehicle_client_jar");
+    jpa_core_annotations_version_stateful3_vehicle_client_jar.addClass(ee.jakarta.tck.persistence.common.PMClientBase.class);
+    ear.addAsModule(jpa_core_annotations_version_stateful3_vehicle_client_jar);
+
+    JavaArchive jpa_core_annotations_version_stateful3_vehicle_ejb_jar = ShrinkWrap.create(JavaArchive.class, "jpa_core_annotations_version_stateful3_vehicle_ejb_jar");
+    jpa_core_annotations_version_stateful3_vehicle_ejb_jar.addClass(ee.jakarta.tck.persistence.common.PMClientBase.class);
+    jpa_core_annotations_version_stateful3_vehicle_ejb_jar.addClass(ee.jakarta.tck.persistence.core.annotations.version.Client.class);
+    ear.addAsModule(jpa_core_annotations_version_stateful3_vehicle_ejb_jar);
+
+    JavaArchive jpa_core_annotations_version_stateless3_vehicle_client_jar = ShrinkWrap.create(JavaArchive.class, "jpa_core_annotations_version_stateless3_vehicle_client_jar");
+    jpa_core_annotations_version_stateless3_vehicle_client_jar.addClass(ee.jakarta.tck.persistence.common.PMClientBase.class);
+    ear.addAsModule(jpa_core_annotations_version_stateless3_vehicle_client_jar);
+
+    JavaArchive jpa_core_annotations_version_stateless3_vehicle_ejb_jar = ShrinkWrap.create(JavaArchive.class, "jpa_core_annotations_version_stateless3_vehicle_ejb_jar");
+    jpa_core_annotations_version_stateless3_vehicle_ejb_jar.addClass(ee.jakarta.tck.persistence.common.PMClientBase.class);
+    jpa_core_annotations_version_stateless3_vehicle_ejb_jar.addClass(ee.jakarta.tck.persistence.core.annotations.version.Client.class);
+    ear.addAsModule(jpa_core_annotations_version_stateless3_vehicle_ejb_jar);
+    return ear;
+  }
+
 	private static final Logger logger = (Logger) System.getLogger(Client3.class.getName());
 
 	public Client3() {
diff --git a/jpa/spec-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/version/Client4.java b/jpa/spec-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/version/Client4.java
index 177590f92..fc2fe6d0a 100644
--- a/jpa/spec-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/version/Client4.java
+++ b/jpa/spec-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/version/Client4.java
@@ -20,12 +20,130 @@ import java.lang.System.Logger;
 import java.sql.Timestamp;
 import java.util.Date;
 
+import org.jboss.arquillian.container.test.api.Deployment;
+import org.jboss.shrinkwrap.api.Archive;
+import org.jboss.shrinkwrap.api.ShrinkWrap;
+import org.jboss.shrinkwrap.api.spec.EnterpriseArchive;
 import org.jboss.shrinkwrap.api.spec.JavaArchive;
+import org.jboss.shrinkwrap.api.spec.WebArchive;
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
 
 public class Client4 extends Client {
 
+  @Deployment(testable = false)
+  public static Archive<?> deployment() {
+
+    final EnterpriseArchive ear = ShrinkWrap.create(EnterpriseArchive.class, "jpa_core_annotations_version_vehicles.ear");
+    // TODO: filter/eliminate the library jar classes that shouldn't be included
+    // Add ear/lib jars
+
+    JavaArchive jpa_core_annotations_version_jar = ShrinkWrap.create(JavaArchive.class, "jpa_core_annotations_version_jar");
+    jpa_core_annotations_version_jar.addClass(ee.jakarta.tck.persistence.core.annotations.version.Int_Field.class);
+    jpa_core_annotations_version_jar.addClass(ee.jakarta.tck.persistence.core.annotations.version.Int_Property.class);
+    jpa_core_annotations_version_jar.addClass(ee.jakarta.tck.persistence.core.annotations.version.Integer_Field.class);
+    jpa_core_annotations_version_jar.addClass(ee.jakarta.tck.persistence.core.annotations.version.Integer_Property.class);
+    jpa_core_annotations_version_jar.addClass(ee.jakarta.tck.persistence.core.annotations.version.LongClass_Field.class);
+    jpa_core_annotations_version_jar.addClass(ee.jakarta.tck.persistence.core.annotations.version.LongClass_Property.class);
+    jpa_core_annotations_version_jar.addClass(ee.jakarta.tck.persistence.core.annotations.version.Long_Field.class);
+    jpa_core_annotations_version_jar.addClass(ee.jakarta.tck.persistence.core.annotations.version.Long_Property.class);
+    jpa_core_annotations_version_jar.addClass(ee.jakarta.tck.persistence.core.annotations.version.ShortClass_Field.class);
+    jpa_core_annotations_version_jar.addClass(ee.jakarta.tck.persistence.core.annotations.version.ShortClass_Property.class);
+    jpa_core_annotations_version_jar.addClass(ee.jakarta.tck.persistence.core.annotations.version.Short_Field.class);
+    jpa_core_annotations_version_jar.addClass(ee.jakarta.tck.persistence.core.annotations.version.Short_Property.class);
+    jpa_core_annotations_version_jar.addClass(ee.jakarta.tck.persistence.core.annotations.version.Timestamp_Field.class);
+    jpa_core_annotations_version_jar.addClass(ee.jakarta.tck.persistence.core.annotations.version.Timestamp_Property.class);
+    ear.addAsLibrary(jpa_core_annotations_version_jar);
+    // Add ear submodules
+
+    JavaArchive jpa_core_annotations_version_appmanagedNoTx_vehicle_client_jar = ShrinkWrap.create(JavaArchive.class, "jpa_core_annotations_version_appmanagedNoTx_vehicle_client_jar");
+    jpa_core_annotations_version_appmanagedNoTx_vehicle_client_jar.addClass(ee.jakarta.tck.persistence.common.PMClientBase.class);
+    ear.addAsModule(jpa_core_annotations_version_appmanagedNoTx_vehicle_client_jar);
+
+    JavaArchive jpa_core_annotations_version_appmanagedNoTx_vehicle_ejb_jar = ShrinkWrap.create(JavaArchive.class, "jpa_core_annotations_version_appmanagedNoTx_vehicle_ejb_jar");
+    jpa_core_annotations_version_appmanagedNoTx_vehicle_ejb_jar.addClass(ee.jakarta.tck.persistence.common.PMClientBase.class);
+    jpa_core_annotations_version_appmanagedNoTx_vehicle_ejb_jar.addClass(ee.jakarta.tck.persistence.core.annotations.version.Client.class);
+    ear.addAsModule(jpa_core_annotations_version_appmanagedNoTx_vehicle_ejb_jar);
+
+    JavaArchive jpa_core_annotations_version_appmanaged_vehicle_client_jar = ShrinkWrap.create(JavaArchive.class, "jpa_core_annotations_version_appmanaged_vehicle_client_jar");
+    jpa_core_annotations_version_appmanaged_vehicle_client_jar.addClass(ee.jakarta.tck.persistence.common.PMClientBase.class);
+    ear.addAsModule(jpa_core_annotations_version_appmanaged_vehicle_client_jar);
+
+    JavaArchive jpa_core_annotations_version_appmanaged_vehicle_ejb_jar = ShrinkWrap.create(JavaArchive.class, "jpa_core_annotations_version_appmanaged_vehicle_ejb_jar");
+    jpa_core_annotations_version_appmanaged_vehicle_ejb_jar.addClass(ee.jakarta.tck.persistence.common.PMClientBase.class);
+    jpa_core_annotations_version_appmanaged_vehicle_ejb_jar.addClass(ee.jakarta.tck.persistence.core.annotations.version.Client.class);
+    ear.addAsModule(jpa_core_annotations_version_appmanaged_vehicle_ejb_jar);
+
+    WebArchive jpa_core_annotations_version_pmservlet_vehicle_web_war = ShrinkWrap.create(WebArchive.class, "jpa_core_annotations_version_pmservlet_vehicle_web_war");
+    jpa_core_annotations_version_pmservlet_vehicle_web_war.addAsWebInfResource("web.xml");
+
+    JavaArchive jpa_core_annotations_version_jar = ShrinkWrap.create(JavaArchive.class, "jpa_core_annotations_version.jar");
+    jpa_core_annotations_version_jar.addClass(ee.jakarta.tck.persistence.core.annotations.version.Int_Field.class);
+    jpa_core_annotations_version_jar.addClass(ee.jakarta.tck.persistence.core.annotations.version.Int_Property.class);
+    jpa_core_annotations_version_jar.addClass(ee.jakarta.tck.persistence.core.annotations.version.Integer_Field.class);
+    jpa_core_annotations_version_jar.addClass(ee.jakarta.tck.persistence.core.annotations.version.Integer_Property.class);
+    jpa_core_annotations_version_jar.addClass(ee.jakarta.tck.persistence.core.annotations.version.LongClass_Field.class);
+    jpa_core_annotations_version_jar.addClass(ee.jakarta.tck.persistence.core.annotations.version.LongClass_Property.class);
+    jpa_core_annotations_version_jar.addClass(ee.jakarta.tck.persistence.core.annotations.version.Long_Field.class);
+    jpa_core_annotations_version_jar.addClass(ee.jakarta.tck.persistence.core.annotations.version.Long_Property.class);
+    jpa_core_annotations_version_jar.addClass(ee.jakarta.tck.persistence.core.annotations.version.ShortClass_Field.class);
+    jpa_core_annotations_version_jar.addClass(ee.jakarta.tck.persistence.core.annotations.version.ShortClass_Property.class);
+    jpa_core_annotations_version_jar.addClass(ee.jakarta.tck.persistence.core.annotations.version.Short_Field.class);
+    jpa_core_annotations_version_jar.addClass(ee.jakarta.tck.persistence.core.annotations.version.Short_Property.class);
+    jpa_core_annotations_version_jar.addClass(ee.jakarta.tck.persistence.core.annotations.version.Timestamp_Field.class);
+    jpa_core_annotations_version_jar.addClass(ee.jakarta.tck.persistence.core.annotations.version.Timestamp_Property.class);
+    jpa_core_annotations_version_jar.addAsManifestResource("META-INF/MANIFEST.MF");
+    jpa_core_annotations_version_jar.addAsManifestResource("META-INF/persistence.xml");
+    jpa_core_annotations_version_pmservlet_vehicle_web_war.addAsLibrary(jpa_core_annotations_version_jar);
+    jpa_core_annotations_version_pmservlet_vehicle_web_war.addClass(ee.jakarta.tck.persistence.common.PMClientBase.class);
+    jpa_core_annotations_version_pmservlet_vehicle_web_war.addClass(ee.jakarta.tck.persistence.core.annotations.version.Client.class);
+    ear.addAsModule(jpa_core_annotations_version_pmservlet_vehicle_web_war);
+
+    WebArchive jpa_core_annotations_version_puservlet_vehicle_web_war = ShrinkWrap.create(WebArchive.class, "jpa_core_annotations_version_puservlet_vehicle_web_war");
+    jpa_core_annotations_version_puservlet_vehicle_web_war.addAsWebInfResource("web.xml");
+
+    JavaArchive jpa_core_annotations_version_jar = ShrinkWrap.create(JavaArchive.class, "jpa_core_annotations_version.jar");
+    jpa_core_annotations_version_jar.addClass(ee.jakarta.tck.persistence.core.annotations.version.Int_Field.class);
+    jpa_core_annotations_version_jar.addClass(ee.jakarta.tck.persistence.core.annotations.version.Int_Property.class);
+    jpa_core_annotations_version_jar.addClass(ee.jakarta.tck.persistence.core.annotations.version.Integer_Field.class);
+    jpa_core_annotations_version_jar.addClass(ee.jakarta.tck.persistence.core.annotations.version.Integer_Property.class);
+    jpa_core_annotations_version_jar.addClass(ee.jakarta.tck.persistence.core.annotations.version.LongClass_Field.class);
+    jpa_core_annotations_version_jar.addClass(ee.jakarta.tck.persistence.core.annotations.version.LongClass_Property.class);
+    jpa_core_annotations_version_jar.addClass(ee.jakarta.tck.persistence.core.annotations.version.Long_Field.class);
+    jpa_core_annotations_version_jar.addClass(ee.jakarta.tck.persistence.core.annotations.version.Long_Property.class);
+    jpa_core_annotations_version_jar.addClass(ee.jakarta.tck.persistence.core.annotations.version.ShortClass_Field.class);
+    jpa_core_annotations_version_jar.addClass(ee.jakarta.tck.persistence.core.annotations.version.ShortClass_Property.class);
+    jpa_core_annotations_version_jar.addClass(ee.jakarta.tck.persistence.core.annotations.version.Short_Field.class);
+    jpa_core_annotations_version_jar.addClass(ee.jakarta.tck.persistence.core.annotations.version.Short_Property.class);
+    jpa_core_annotations_version_jar.addClass(ee.jakarta.tck.persistence.core.annotations.version.Timestamp_Field.class);
+    jpa_core_annotations_version_jar.addClass(ee.jakarta.tck.persistence.core.annotations.version.Timestamp_Property.class);
+    jpa_core_annotations_version_jar.addAsManifestResource("META-INF/MANIFEST.MF");
+    jpa_core_annotations_version_jar.addAsManifestResource("META-INF/persistence.xml");
+    jpa_core_annotations_version_puservlet_vehicle_web_war.addAsLibrary(jpa_core_annotations_version_jar);
+    jpa_core_annotations_version_puservlet_vehicle_web_war.addClass(ee.jakarta.tck.persistence.common.PMClientBase.class);
+    jpa_core_annotations_version_puservlet_vehicle_web_war.addClass(ee.jakarta.tck.persistence.core.annotations.version.Client.class);
+    ear.addAsModule(jpa_core_annotations_version_puservlet_vehicle_web_war);
+
+    JavaArchive jpa_core_annotations_version_stateful3_vehicle_client_jar = ShrinkWrap.create(JavaArchive.class, "jpa_core_annotations_version_stateful3_vehicle_client_jar");
+    jpa_core_annotations_version_stateful3_vehicle_client_jar.addClass(ee.jakarta.tck.persistence.common.PMClientBase.class);
+    ear.addAsModule(jpa_core_annotations_version_stateful3_vehicle_client_jar);
+
+    JavaArchive jpa_core_annotations_version_stateful3_vehicle_ejb_jar = ShrinkWrap.create(JavaArchive.class, "jpa_core_annotations_version_stateful3_vehicle_ejb_jar");
+    jpa_core_annotations_version_stateful3_vehicle_ejb_jar.addClass(ee.jakarta.tck.persistence.common.PMClientBase.class);
+    jpa_core_annotations_version_stateful3_vehicle_ejb_jar.addClass(ee.jakarta.tck.persistence.core.annotations.version.Client.class);
+    ear.addAsModule(jpa_core_annotations_version_stateful3_vehicle_ejb_jar);
+
+    JavaArchive jpa_core_annotations_version_stateless3_vehicle_client_jar = ShrinkWrap.create(JavaArchive.class, "jpa_core_annotations_version_stateless3_vehicle_client_jar");
+    jpa_core_annotations_version_stateless3_vehicle_client_jar.addClass(ee.jakarta.tck.persistence.common.PMClientBase.class);
+    ear.addAsModule(jpa_core_annotations_version_stateless3_vehicle_client_jar);
+
+    JavaArchive jpa_core_annotations_version_stateless3_vehicle_ejb_jar = ShrinkWrap.create(JavaArchive.class, "jpa_core_annotations_version_stateless3_vehicle_ejb_jar");
+    jpa_core_annotations_version_stateless3_vehicle_ejb_jar.addClass(ee.jakarta.tck.persistence.common.PMClientBase.class);
+    jpa_core_annotations_version_stateless3_vehicle_ejb_jar.addClass(ee.jakarta.tck.persistence.core.annotations.version.Client.class);
+    ear.addAsModule(jpa_core_annotations_version_stateless3_vehicle_ejb_jar);
+    return ear;
+  }
+
 	private static final Logger logger = (Logger) System.getLogger(Client4.class.getName());
 
 	public Client4() {
diff --git a/jpa/spec-tests/src/main/java/ee/jakarta/tck/persistence/core/basic/Client.java b/jpa/spec-tests/src/main/java/ee/jakarta/tck/persistence/core/basic/Client.java
index e88f594cd..a6c4ec728 100644
--- a/jpa/spec-tests/src/main/java/ee/jakarta/tck/persistence/core/basic/Client.java
+++ b/jpa/spec-tests/src/main/java/ee/jakarta/tck/persistence/core/basic/Client.java
@@ -21,8 +21,12 @@
 package ee.jakarta.tck.persistence.core.basic;
 
 import java.lang.System.Logger;
-
+import org.jboss.arquillian.container.test.api.Deployment;
+import org.jboss.shrinkwrap.api.Archive;
+import org.jboss.shrinkwrap.api.ShrinkWrap;
+import org.jboss.shrinkwrap.api.spec.EnterpriseArchive;
 import org.jboss.shrinkwrap.api.spec.JavaArchive;
+import org.jboss.shrinkwrap.api.spec.WebArchive;
 import org.junit.jupiter.api.AfterEach;
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
@@ -31,6 +35,80 @@ import ee.jakarta.tck.persistence.common.PMClientBase;
 
 public class Client extends PMClientBase {
 
+  @Deployment(testable = false)
+  public static Archive<?> deployment() {
+
+    final EnterpriseArchive ear = ShrinkWrap.create(EnterpriseArchive.class, "jpa_core_basic_vehicles.ear");
+    // TODO: filter/eliminate the library jar classes that shouldn't be included
+    // Add ear/lib jars
+
+    JavaArchive jpa_core_basic_jar = ShrinkWrap.create(JavaArchive.class, "jpa_core_basic_jar");
+    jpa_core_basic_jar.addClass(ee.jakarta.tck.persistence.core.basic.Order.class);
+    ear.addAsLibrary(jpa_core_basic_jar);
+    // Add ear submodules
+
+    JavaArchive jpa_core_basic_appmanagedNoTx_vehicle_client_jar = ShrinkWrap.create(JavaArchive.class, "jpa_core_basic_appmanagedNoTx_vehicle_client_jar");
+    jpa_core_basic_appmanagedNoTx_vehicle_client_jar.addClass(ee.jakarta.tck.persistence.common.PMClientBase.class);
+    ear.addAsModule(jpa_core_basic_appmanagedNoTx_vehicle_client_jar);
+
+    JavaArchive jpa_core_basic_appmanagedNoTx_vehicle_ejb_jar = ShrinkWrap.create(JavaArchive.class, "jpa_core_basic_appmanagedNoTx_vehicle_ejb_jar");
+    jpa_core_basic_appmanagedNoTx_vehicle_ejb_jar.addClass(ee.jakarta.tck.persistence.common.PMClientBase.class);
+    jpa_core_basic_appmanagedNoTx_vehicle_ejb_jar.addClass(ee.jakarta.tck.persistence.core.basic.Client.class);
+    ear.addAsModule(jpa_core_basic_appmanagedNoTx_vehicle_ejb_jar);
+
+    JavaArchive jpa_core_basic_appmanaged_vehicle_client_jar = ShrinkWrap.create(JavaArchive.class, "jpa_core_basic_appmanaged_vehicle_client_jar");
+    jpa_core_basic_appmanaged_vehicle_client_jar.addClass(ee.jakarta.tck.persistence.common.PMClientBase.class);
+    ear.addAsModule(jpa_core_basic_appmanaged_vehicle_client_jar);
+
+    JavaArchive jpa_core_basic_appmanaged_vehicle_ejb_jar = ShrinkWrap.create(JavaArchive.class, "jpa_core_basic_appmanaged_vehicle_ejb_jar");
+    jpa_core_basic_appmanaged_vehicle_ejb_jar.addClass(ee.jakarta.tck.persistence.common.PMClientBase.class);
+    jpa_core_basic_appmanaged_vehicle_ejb_jar.addClass(ee.jakarta.tck.persistence.core.basic.Client.class);
+    ear.addAsModule(jpa_core_basic_appmanaged_vehicle_ejb_jar);
+
+    WebArchive jpa_core_basic_pmservlet_vehicle_web_war = ShrinkWrap.create(WebArchive.class, "jpa_core_basic_pmservlet_vehicle_web_war");
+    jpa_core_basic_pmservlet_vehicle_web_war.addAsWebInfResource("web.xml");
+
+    JavaArchive jpa_core_basic_jar = ShrinkWrap.create(JavaArchive.class, "jpa_core_basic.jar");
+    jpa_core_basic_jar.addClass(ee.jakarta.tck.persistence.core.basic.Order.class);
+    jpa_core_basic_jar.addAsManifestResource("META-INF/MANIFEST.MF");
+    jpa_core_basic_jar.addAsManifestResource("META-INF/persistence.xml");
+    jpa_core_basic_pmservlet_vehicle_web_war.addAsLibrary(jpa_core_basic_jar);
+    jpa_core_basic_pmservlet_vehicle_web_war.addClass(ee.jakarta.tck.persistence.common.PMClientBase.class);
+    jpa_core_basic_pmservlet_vehicle_web_war.addClass(ee.jakarta.tck.persistence.core.basic.Client.class);
+    ear.addAsModule(jpa_core_basic_pmservlet_vehicle_web_war);
+
+    WebArchive jpa_core_basic_puservlet_vehicle_web_war = ShrinkWrap.create(WebArchive.class, "jpa_core_basic_puservlet_vehicle_web_war");
+    jpa_core_basic_puservlet_vehicle_web_war.addAsWebInfResource("web.xml");
+
+    JavaArchive jpa_core_basic_jar = ShrinkWrap.create(JavaArchive.class, "jpa_core_basic.jar");
+    jpa_core_basic_jar.addClass(ee.jakarta.tck.persistence.core.basic.Order.class);
+    jpa_core_basic_jar.addAsManifestResource("META-INF/MANIFEST.MF");
+    jpa_core_basic_jar.addAsManifestResource("META-INF/persistence.xml");
+    jpa_core_basic_puservlet_vehicle_web_war.addAsLibrary(jpa_core_basic_jar);
+    jpa_core_basic_puservlet_vehicle_web_war.addClass(ee.jakarta.tck.persistence.common.PMClientBase.class);
+    jpa_core_basic_puservlet_vehicle_web_war.addClass(ee.jakarta.tck.persistence.core.basic.Client.class);
+    ear.addAsModule(jpa_core_basic_puservlet_vehicle_web_war);
+
+    JavaArchive jpa_core_basic_stateful3_vehicle_client_jar = ShrinkWrap.create(JavaArchive.class, "jpa_core_basic_stateful3_vehicle_client_jar");
+    jpa_core_basic_stateful3_vehicle_client_jar.addClass(ee.jakarta.tck.persistence.common.PMClientBase.class);
+    ear.addAsModule(jpa_core_basic_stateful3_vehicle_client_jar);
+
+    JavaArchive jpa_core_basic_stateful3_vehicle_ejb_jar = ShrinkWrap.create(JavaArchive.class, "jpa_core_basic_stateful3_vehicle_ejb_jar");
+    jpa_core_basic_stateful3_vehicle_ejb_jar.addClass(ee.jakarta.tck.persistence.common.PMClientBase.class);
+    jpa_core_basic_stateful3_vehicle_ejb_jar.addClass(ee.jakarta.tck.persistence.core.basic.Client.class);
+    ear.addAsModule(jpa_core_basic_stateful3_vehicle_ejb_jar);
+
+    JavaArchive jpa_core_basic_stateless3_vehicle_client_jar = ShrinkWrap.create(JavaArchive.class, "jpa_core_basic_stateless3_vehicle_client_jar");
+    jpa_core_basic_stateless3_vehicle_client_jar.addClass(ee.jakarta.tck.persistence.common.PMClientBase.class);
+    ear.addAsModule(jpa_core_basic_stateless3_vehicle_client_jar);
+
+    JavaArchive jpa_core_basic_stateless3_vehicle_ejb_jar = ShrinkWrap.create(JavaArchive.class, "jpa_core_basic_stateless3_vehicle_ejb_jar");
+    jpa_core_basic_stateless3_vehicle_ejb_jar.addClass(ee.jakarta.tck.persistence.common.PMClientBase.class);
+    jpa_core_basic_stateless3_vehicle_ejb_jar.addClass(ee.jakarta.tck.persistence.core.basic.Client.class);
+    ear.addAsModule(jpa_core_basic_stateless3_vehicle_ejb_jar);
+    return ear;
+  }
+
 	private static final Logger logger = (Logger) System.getLogger(Client.class.getName());
 
 	public Client() {
diff --git a/jpa/spec-tests/src/main/java/ee/jakarta/tck/persistence/core/cache/basicTests/Client.java b/jpa/spec-tests/src/main/java/ee/jakarta/tck/persistence/core/cache/basicTests/Client.java
index 559b77ecb..8461e4b7a 100644
--- a/jpa/spec-tests/src/main/java/ee/jakarta/tck/persistence/core/cache/basicTests/Client.java
+++ b/jpa/spec-tests/src/main/java/ee/jakarta/tck/persistence/core/cache/basicTests/Client.java
@@ -17,8 +17,12 @@
 package ee.jakarta.tck.persistence.core.cache.basicTests;
 
 import java.lang.System.Logger;
-
+import org.jboss.arquillian.container.test.api.Deployment;
+import org.jboss.shrinkwrap.api.Archive;
+import org.jboss.shrinkwrap.api.ShrinkWrap;
+import org.jboss.shrinkwrap.api.spec.EnterpriseArchive;
 import org.jboss.shrinkwrap.api.spec.JavaArchive;
+import org.jboss.shrinkwrap.api.spec.WebArchive;
 import org.junit.jupiter.api.AfterEach;
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
@@ -31,6 +35,80 @@ import jakarta.persistence.EntityTransaction;
 
 public class Client extends PMClientBase {
 
+  @Deployment(testable = false)
+  public static Archive<?> deployment() {
+
+    final EnterpriseArchive ear = ShrinkWrap.create(EnterpriseArchive.class, "jpa_core_cache_basicTests_vehicles.ear");
+    // TODO: filter/eliminate the library jar classes that shouldn't be included
+    // Add ear/lib jars
+
+    JavaArchive jpa_core_cache_basicTests_jar = ShrinkWrap.create(JavaArchive.class, "jpa_core_cache_basicTests_jar");
+    jpa_core_cache_basicTests_jar.addClass(ee.jakarta.tck.persistence.core.cache.basicTests.Order.class);
+    ear.addAsLibrary(jpa_core_cache_basicTests_jar);
+    // Add ear submodules
+
+    JavaArchive jpa_core_cache_basicTests_appmanagedNoTx_vehicle_client_jar = ShrinkWrap.create(JavaArchive.class, "jpa_core_cache_basicTests_appmanagedNoTx_vehicle_client_jar");
+    jpa_core_cache_basicTests_appmanagedNoTx_vehicle_client_jar.addClass(ee.jakarta.tck.persistence.common.PMClientBase.class);
+    ear.addAsModule(jpa_core_cache_basicTests_appmanagedNoTx_vehicle_client_jar);
+
+    JavaArchive jpa_core_cache_basicTests_appmanagedNoTx_vehicle_ejb_jar = ShrinkWrap.create(JavaArchive.class, "jpa_core_cache_basicTests_appmanagedNoTx_vehicle_ejb_jar");
+    jpa_core_cache_basicTests_appmanagedNoTx_vehicle_ejb_jar.addClass(ee.jakarta.tck.persistence.common.PMClientBase.class);
+    jpa_core_cache_basicTests_appmanagedNoTx_vehicle_ejb_jar.addClass(ee.jakarta.tck.persistence.core.cache.basicTests.Client.class);
+    ear.addAsModule(jpa_core_cache_basicTests_appmanagedNoTx_vehicle_ejb_jar);
+
+    JavaArchive jpa_core_cache_basicTests_appmanaged_vehicle_client_jar = ShrinkWrap.create(JavaArchive.class, "jpa_core_cache_basicTests_appmanaged_vehicle_client_jar");
+    jpa_core_cache_basicTests_appmanaged_vehicle_client_jar.addClass(ee.jakarta.tck.persistence.common.PMClientBase.class);
+    ear.addAsModule(jpa_core_cache_basicTests_appmanaged_vehicle_client_jar);
+
+    JavaArchive jpa_core_cache_basicTests_appmanaged_vehicle_ejb_jar = ShrinkWrap.create(JavaArchive.class, "jpa_core_cache_basicTests_appmanaged_vehicle_ejb_jar");
+    jpa_core_cache_basicTests_appmanaged_vehicle_ejb_jar.addClass(ee.jakarta.tck.persistence.common.PMClientBase.class);
+    jpa_core_cache_basicTests_appmanaged_vehicle_ejb_jar.addClass(ee.jakarta.tck.persistence.core.cache.basicTests.Client.class);
+    ear.addAsModule(jpa_core_cache_basicTests_appmanaged_vehicle_ejb_jar);
+
+    WebArchive jpa_core_cache_basicTests_pmservlet_vehicle_web_war = ShrinkWrap.create(WebArchive.class, "jpa_core_cache_basicTests_pmservlet_vehicle_web_war");
+    jpa_core_cache_basicTests_pmservlet_vehicle_web_war.addAsWebInfResource("web.xml");
+
+    JavaArchive jpa_core_cache_basicTests_jar = ShrinkWrap.create(JavaArchive.class, "jpa_core_cache_basicTests.jar");
+    jpa_core_cache_basicTests_jar.addClass(ee.jakarta.tck.persistence.core.cache.basicTests.Order.class);
+    jpa_core_cache_basicTests_jar.addAsManifestResource("META-INF/MANIFEST.MF");
+    jpa_core_cache_basicTests_jar.addAsManifestResource("META-INF/persistence.xml");
+    jpa_core_cache_basicTests_pmservlet_vehicle_web_war.addAsLibrary(jpa_core_cache_basicTests_jar);
+    jpa_core_cache_basicTests_pmservlet_vehicle_web_war.addClass(ee.jakarta.tck.persistence.common.PMClientBase.class);
+    jpa_core_cache_basicTests_pmservlet_vehicle_web_war.addClass(ee.jakarta.tck.persistence.core.cache.basicTests.Client.class);
+    ear.addAsModule(jpa_core_cache_basicTests_pmservlet_vehicle_web_war);
+
+    WebArchive jpa_core_cache_basicTests_puservlet_vehicle_web_war = ShrinkWrap.create(WebArchive.class, "jpa_core_cache_basicTests_puservlet_vehicle_web_war");
+    jpa_core_cache_basicTests_puservlet_vehicle_web_war.addAsWebInfResource("web.xml");
+
+    JavaArchive jpa_core_cache_basicTests_jar = ShrinkWrap.create(JavaArchive.class, "jpa_core_cache_basicTests.jar");
+    jpa_core_cache_basicTests_jar.addClass(ee.jakarta.tck.persistence.core.cache.basicTests.Order.class);
+    jpa_core_cache_basicTests_jar.addAsManifestResource("META-INF/MANIFEST.MF");
+    jpa_core_cache_basicTests_jar.addAsManifestResource("META-INF/persistence.xml");
+    jpa_core_cache_basicTests_puservlet_vehicle_web_war.addAsLibrary(jpa_core_cache_basicTests_jar);
+    jpa_core_cache_basicTests_puservlet_vehicle_web_war.addClass(ee.jakarta.tck.persistence.common.PMClientBase.class);
+    jpa_core_cache_basicTests_puservlet_vehicle_web_war.addClass(ee.jakarta.tck.persistence.core.cache.basicTests.Client.class);
+    ear.addAsModule(jpa_core_cache_basicTests_puservlet_vehicle_web_war);
+
+    JavaArchive jpa_core_cache_basicTests_stateful3_vehicle_client_jar = ShrinkWrap.create(JavaArchive.class, "jpa_core_cache_basicTests_stateful3_vehicle_client_jar");
+    jpa_core_cache_basicTests_stateful3_vehicle_client_jar.addClass(ee.jakarta.tck.persistence.common.PMClientBase.class);
+    ear.addAsModule(jpa_core_cache_basicTests_stateful3_vehicle_client_jar);
+
+    JavaArchive jpa_core_cache_basicTests_stateful3_vehicle_ejb_jar = ShrinkWrap.create(JavaArchive.class, "jpa_core_cache_basicTests_stateful3_vehicle_ejb_jar");
+    jpa_core_cache_basicTests_stateful3_vehicle_ejb_jar.addClass(ee.jakarta.tck.persistence.common.PMClientBase.class);
+    jpa_core_cache_basicTests_stateful3_vehicle_ejb_jar.addClass(ee.jakarta.tck.persistence.core.cache.basicTests.Client.class);
+    ear.addAsModule(jpa_core_cache_basicTests_stateful3_vehicle_ejb_jar);
+
+    JavaArchive jpa_core_cache_basicTests_stateless3_vehicle_client_jar = ShrinkWrap.create(JavaArchive.class, "jpa_core_cache_basicTests_stateless3_vehicle_client_jar");
+    jpa_core_cache_basicTests_stateless3_vehicle_client_jar.addClass(ee.jakarta.tck.persistence.common.PMClientBase.class);
+    ear.addAsModule(jpa_core_cache_basicTests_stateless3_vehicle_client_jar);
+
+    JavaArchive jpa_core_cache_basicTests_stateless3_vehicle_ejb_jar = ShrinkWrap.create(JavaArchive.class, "jpa_core_cache_basicTests_stateless3_vehicle_ejb_jar");
+    jpa_core_cache_basicTests_stateless3_vehicle_ejb_jar.addClass(ee.jakarta.tck.persistence.common.PMClientBase.class);
+    jpa_core_cache_basicTests_stateless3_vehicle_ejb_jar.addClass(ee.jakarta.tck.persistence.core.cache.basicTests.Client.class);
+    ear.addAsModule(jpa_core_cache_basicTests_stateless3_vehicle_ejb_jar);
+    return ear;
+  }
+
 	private static final Logger logger = (Logger) System.getLogger(Client.class.getName());
 
 	public Client() {
diff --git a/jpa/spec-tests/src/main/java/ee/jakarta/tck/persistence/core/callback/inheritance/Client.java b/jpa/spec-tests/src/main/java/ee/jakarta/tck/persistence/core/callback/inheritance/Client.java
index 311dae2b0..7503350d1 100644
--- a/jpa/spec-tests/src/main/java/ee/jakarta/tck/persistence/core/callback/inheritance/Client.java
+++ b/jpa/spec-tests/src/main/java/ee/jakarta/tck/persistence/core/callback/inheritance/Client.java
@@ -21,8 +21,12 @@
 package ee.jakarta.tck.persistence.core.callback.inheritance;
 
 import java.lang.System.Logger;
-
+import org.jboss.arquillian.container.test.api.Deployment;
+import org.jboss.shrinkwrap.api.Archive;
+import org.jboss.shrinkwrap.api.ShrinkWrap;
+import org.jboss.shrinkwrap.api.spec.EnterpriseArchive;
 import org.jboss.shrinkwrap.api.spec.JavaArchive;
+import org.jboss.shrinkwrap.api.spec.WebArchive;
 import org.junit.jupiter.api.AfterEach;
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
@@ -32,6 +36,149 @@ import ee.jakarta.tck.persistence.core.callback.common.EntityCallbackClientBase;
 import jakarta.persistence.Query;
 
 public class Client extends EntityCallbackClientBase {
+
+  @Deployment(testable = false)
+  public static Archive<?> deployment() {
+
+    final EnterpriseArchive ear = ShrinkWrap.create(EnterpriseArchive.class, "jpa_core_callback_inheritance_vehicles.ear");
+    // TODO: filter/eliminate the library jar classes that shouldn't be included
+    // Add ear/lib jars
+
+    JavaArchive jpa_core_callback_inheritance_jar = ShrinkWrap.create(JavaArchive.class, "jpa_core_callback_inheritance_jar");
+    jpa_core_callback_inheritance_jar.addClass(ee.jakarta.tck.persistence.core.callback.common.CallbackStatusIF.class);
+    jpa_core_callback_inheritance_jar.addClass(ee.jakarta.tck.persistence.core.callback.common.CallbackStatusImpl.class);
+    jpa_core_callback_inheritance_jar.addClass(ee.jakarta.tck.persistence.core.callback.common.Constants.class);
+    jpa_core_callback_inheritance_jar.addClass(ee.jakarta.tck.persistence.core.callback.common.GenerictListener.class);
+    jpa_core_callback_inheritance_jar.addClass(ee.jakarta.tck.persistence.core.callback.common.GenerictListenerImpl.class);
+    jpa_core_callback_inheritance_jar.addClass(ee.jakarta.tck.persistence.core.callback.common.ListenerA.class);
+    jpa_core_callback_inheritance_jar.addClass(ee.jakarta.tck.persistence.core.callback.common.ListenerAA.class);
+    jpa_core_callback_inheritance_jar.addClass(ee.jakarta.tck.persistence.core.callback.common.ListenerB.class);
+    jpa_core_callback_inheritance_jar.addClass(ee.jakarta.tck.persistence.core.callback.common.ListenerBB.class);
+    jpa_core_callback_inheritance_jar.addClass(ee.jakarta.tck.persistence.core.callback.common.ListenerBase.class);
+    jpa_core_callback_inheritance_jar.addClass(ee.jakarta.tck.persistence.core.callback.common.ListenerC.class);
+    jpa_core_callback_inheritance_jar.addClass(ee.jakarta.tck.persistence.core.callback.common.ListenerCC.class);
+    jpa_core_callback_inheritance_jar.addClass(ee.jakarta.tck.persistence.core.callback.inheritance.PartProduct.class);
+    jpa_core_callback_inheritance_jar.addClass(ee.jakarta.tck.persistence.core.callback.inheritance.PartProductListener.class);
+    jpa_core_callback_inheritance_jar.addClass(ee.jakarta.tck.persistence.core.callback.inheritance.PricedPartProduct.class);
+    jpa_core_callback_inheritance_jar.addClass(ee.jakarta.tck.persistence.core.callback.inheritance.PricedPartProductCallback.class);
+    jpa_core_callback_inheritance_jar.addClass(ee.jakarta.tck.persistence.core.callback.inheritance.PricedPartProductListener.class);
+    jpa_core_callback_inheritance_jar.addClass(ee.jakarta.tck.persistence.core.callback.inheritance.PricedPartProduct_2.class);
+    jpa_core_callback_inheritance_jar.addClass(ee.jakarta.tck.persistence.core.callback.inheritance.Product.class);
+    jpa_core_callback_inheritance_jar.addClass(ee.jakarta.tck.persistence.core.callback.inheritance.ProductListener.class);
+    ear.addAsLibrary(jpa_core_callback_inheritance_jar);
+    // Add ear submodules
+
+    JavaArchive jpa_core_callback_inheritance_appmanagedNoTx_vehicle_client_jar = ShrinkWrap.create(JavaArchive.class, "jpa_core_callback_inheritance_appmanagedNoTx_vehicle_client_jar");
+    jpa_core_callback_inheritance_appmanagedNoTx_vehicle_client_jar.addClass(ee.jakarta.tck.persistence.common.PMClientBase.class);
+    ear.addAsModule(jpa_core_callback_inheritance_appmanagedNoTx_vehicle_client_jar);
+
+    JavaArchive jpa_core_callback_inheritance_appmanagedNoTx_vehicle_ejb_jar = ShrinkWrap.create(JavaArchive.class, "jpa_core_callback_inheritance_appmanagedNoTx_vehicle_ejb_jar");
+    jpa_core_callback_inheritance_appmanagedNoTx_vehicle_ejb_jar.addClass(ee.jakarta.tck.persistence.common.PMClientBase.class);
+    jpa_core_callback_inheritance_appmanagedNoTx_vehicle_ejb_jar.addClass(ee.jakarta.tck.persistence.core.callback.inheritance.Client.class);
+    jpa_core_callback_inheritance_appmanagedNoTx_vehicle_ejb_jar.addClass(ee.jakarta.tck.persistence.core.callback.common.Constants.class);
+    jpa_core_callback_inheritance_appmanagedNoTx_vehicle_ejb_jar.addClass(ee.jakarta.tck.persistence.core.callback.common.EntityCallbackClientBase.class);
+    ear.addAsModule(jpa_core_callback_inheritance_appmanagedNoTx_vehicle_ejb_jar);
+
+    JavaArchive jpa_core_callback_inheritance_appmanaged_vehicle_client_jar = ShrinkWrap.create(JavaArchive.class, "jpa_core_callback_inheritance_appmanaged_vehicle_client_jar");
+    jpa_core_callback_inheritance_appmanaged_vehicle_client_jar.addClass(ee.jakarta.tck.persistence.common.PMClientBase.class);
+    ear.addAsModule(jpa_core_callback_inheritance_appmanaged_vehicle_client_jar);
+
+    JavaArchive jpa_core_callback_inheritance_appmanaged_vehicle_ejb_jar = ShrinkWrap.create(JavaArchive.class, "jpa_core_callback_inheritance_appmanaged_vehicle_ejb_jar");
+    jpa_core_callback_inheritance_appmanaged_vehicle_ejb_jar.addClass(ee.jakarta.tck.persistence.common.PMClientBase.class);
+    jpa_core_callback_inheritance_appmanaged_vehicle_ejb_jar.addClass(ee.jakarta.tck.persistence.core.callback.inheritance.Client.class);
+    jpa_core_callback_inheritance_appmanaged_vehicle_ejb_jar.addClass(ee.jakarta.tck.persistence.core.callback.common.Constants.class);
+    jpa_core_callback_inheritance_appmanaged_vehicle_ejb_jar.addClass(ee.jakarta.tck.persistence.core.callback.common.EntityCallbackClientBase.class);
+    ear.addAsModule(jpa_core_callback_inheritance_appmanaged_vehicle_ejb_jar);
+
+    WebArchive jpa_core_callback_inheritance_pmservlet_vehicle_web_war = ShrinkWrap.create(WebArchive.class, "jpa_core_callback_inheritance_pmservlet_vehicle_web_war");
+    jpa_core_callback_inheritance_pmservlet_vehicle_web_war.addAsWebInfResource("web.xml");
+
+    JavaArchive jpa_core_callback_inheritance_jar = ShrinkWrap.create(JavaArchive.class, "jpa_core_callback_inheritance.jar");
+    jpa_core_callback_inheritance_jar.addClass(ee.jakarta.tck.persistence.core.callback.common.CallbackStatusIF.class);
+    jpa_core_callback_inheritance_jar.addClass(ee.jakarta.tck.persistence.core.callback.common.CallbackStatusImpl.class);
+    jpa_core_callback_inheritance_jar.addClass(ee.jakarta.tck.persistence.core.callback.common.Constants.class);
+    jpa_core_callback_inheritance_jar.addClass(ee.jakarta.tck.persistence.core.callback.common.GenerictListener.class);
+    jpa_core_callback_inheritance_jar.addClass(ee.jakarta.tck.persistence.core.callback.common.GenerictListenerImpl.class);
+    jpa_core_callback_inheritance_jar.addClass(ee.jakarta.tck.persistence.core.callback.common.ListenerA.class);
+    jpa_core_callback_inheritance_jar.addClass(ee.jakarta.tck.persistence.core.callback.common.ListenerAA.class);
+    jpa_core_callback_inheritance_jar.addClass(ee.jakarta.tck.persistence.core.callback.common.ListenerB.class);
+    jpa_core_callback_inheritance_jar.addClass(ee.jakarta.tck.persistence.core.callback.common.ListenerBB.class);
+    jpa_core_callback_inheritance_jar.addClass(ee.jakarta.tck.persistence.core.callback.common.ListenerBase.class);
+    jpa_core_callback_inheritance_jar.addClass(ee.jakarta.tck.persistence.core.callback.common.ListenerC.class);
+    jpa_core_callback_inheritance_jar.addClass(ee.jakarta.tck.persistence.core.callback.common.ListenerCC.class);
+    jpa_core_callback_inheritance_jar.addClass(ee.jakarta.tck.persistence.core.callback.inheritance.PartProduct.class);
+    jpa_core_callback_inheritance_jar.addClass(ee.jakarta.tck.persistence.core.callback.inheritance.PartProductListener.class);
+    jpa_core_callback_inheritance_jar.addClass(ee.jakarta.tck.persistence.core.callback.inheritance.PricedPartProduct.class);
+    jpa_core_callback_inheritance_jar.addClass(ee.jakarta.tck.persistence.core.callback.inheritance.PricedPartProductCallback.class);
+    jpa_core_callback_inheritance_jar.addClass(ee.jakarta.tck.persistence.core.callback.inheritance.PricedPartProductListener.class);
+    jpa_core_callback_inheritance_jar.addClass(ee.jakarta.tck.persistence.core.callback.inheritance.PricedPartProduct_2.class);
+    jpa_core_callback_inheritance_jar.addClass(ee.jakarta.tck.persistence.core.callback.inheritance.Product.class);
+    jpa_core_callback_inheritance_jar.addClass(ee.jakarta.tck.persistence.core.callback.inheritance.ProductListener.class);
+    jpa_core_callback_inheritance_jar.addAsManifestResource("META-INF/MANIFEST.MF");
+    jpa_core_callback_inheritance_jar.addAsManifestResource("META-INF/persistence.xml");
+    jpa_core_callback_inheritance_pmservlet_vehicle_web_war.addAsLibrary(jpa_core_callback_inheritance_jar);
+    jpa_core_callback_inheritance_pmservlet_vehicle_web_war.addClass(ee.jakarta.tck.persistence.common.PMClientBase.class);
+    jpa_core_callback_inheritance_pmservlet_vehicle_web_war.addClass(ee.jakarta.tck.persistence.core.callback.inheritance.Client.class);
+    jpa_core_callback_inheritance_pmservlet_vehicle_web_war.addClass(ee.jakarta.tck.persistence.core.callback.common.Constants.class);
+    jpa_core_callback_inheritance_pmservlet_vehicle_web_war.addClass(ee.jakarta.tck.persistence.core.callback.common.EntityCallbackClientBase.class);
+    ear.addAsModule(jpa_core_callback_inheritance_pmservlet_vehicle_web_war);
+
+    WebArchive jpa_core_callback_inheritance_puservlet_vehicle_web_war = ShrinkWrap.create(WebArchive.class, "jpa_core_callback_inheritance_puservlet_vehicle_web_war");
+    jpa_core_callback_inheritance_puservlet_vehicle_web_war.addAsWebInfResource("web.xml");
+
+    JavaArchive jpa_core_callback_inheritance_jar = ShrinkWrap.create(JavaArchive.class, "jpa_core_callback_inheritance.jar");
+    jpa_core_callback_inheritance_jar.addClass(ee.jakarta.tck.persistence.core.callback.common.CallbackStatusIF.class);
+    jpa_core_callback_inheritance_jar.addClass(ee.jakarta.tck.persistence.core.callback.common.CallbackStatusImpl.class);
+    jpa_core_callback_inheritance_jar.addClass(ee.jakarta.tck.persistence.core.callback.common.Constants.class);
+    jpa_core_callback_inheritance_jar.addClass(ee.jakarta.tck.persistence.core.callback.common.GenerictListener.class);
+    jpa_core_callback_inheritance_jar.addClass(ee.jakarta.tck.persistence.core.callback.common.GenerictListenerImpl.class);
+    jpa_core_callback_inheritance_jar.addClass(ee.jakarta.tck.persistence.core.callback.common.ListenerA.class);
+    jpa_core_callback_inheritance_jar.addClass(ee.jakarta.tck.persistence.core.callback.common.ListenerAA.class);
+    jpa_core_callback_inheritance_jar.addClass(ee.jakarta.tck.persistence.core.callback.common.ListenerB.class);
+    jpa_core_callback_inheritance_jar.addClass(ee.jakarta.tck.persistence.core.callback.common.ListenerBB.class);
+    jpa_core_callback_inheritance_jar.addClass(ee.jakarta.tck.persistence.core.callback.common.ListenerBase.class);
+    jpa_core_callback_inheritance_jar.addClass(ee.jakarta.tck.persistence.core.callback.common.ListenerC.class);
+    jpa_core_callback_inheritance_jar.addClass(ee.jakarta.tck.persistence.core.callback.common.ListenerCC.class);
+    jpa_core_callback_inheritance_jar.addClass(ee.jakarta.tck.persistence.core.callback.inheritance.PartProduct.class);
+    jpa_core_callback_inheritance_jar.addClass(ee.jakarta.tck.persistence.core.callback.inheritance.PartProductListener.class);
+    jpa_core_callback_inheritance_jar.addClass(ee.jakarta.tck.persistence.core.callback.inheritance.PricedPartProduct.class);
+    jpa_core_callback_inheritance_jar.addClass(ee.jakarta.tck.persistence.core.callback.inheritance.PricedPartProductCallback.class);
+    jpa_core_callback_inheritance_jar.addClass(ee.jakarta.tck.persistence.core.callback.inheritance.PricedPartProductListener.class);
+    jpa_core_callback_inheritance_jar.addClass(ee.jakarta.tck.persistence.core.callback.inheritance.PricedPartProduct_2.class);
+    jpa_core_callback_inheritance_jar.addClass(ee.jakarta.tck.persistence.core.callback.inheritance.Product.class);
+    jpa_core_callback_inheritance_jar.addClass(ee.jakarta.tck.persistence.core.callback.inheritance.ProductListener.class);
+    jpa_core_callback_inheritance_jar.addAsManifestResource("META-INF/MANIFEST.MF");
+    jpa_core_callback_inheritance_jar.addAsManifestResource("META-INF/persistence.xml");
+    jpa_core_callback_inheritance_puservlet_vehicle_web_war.addAsLibrary(jpa_core_callback_inheritance_jar);
+    jpa_core_callback_inheritance_puservlet_vehicle_web_war.addClass(ee.jakarta.tck.persistence.common.PMClientBase.class);
+    jpa_core_callback_inheritance_puservlet_vehicle_web_war.addClass(ee.jakarta.tck.persistence.core.callback.inheritance.Client.class);
+    jpa_core_callback_inheritance_puservlet_vehicle_web_war.addClass(ee.jakarta.tck.persistence.core.callback.common.Constants.class);
+    jpa_core_callback_inheritance_puservlet_vehicle_web_war.addClass(ee.jakarta.tck.persistence.core.callback.common.EntityCallbackClientBase.class);
+    ear.addAsModule(jpa_core_callback_inheritance_puservlet_vehicle_web_war);
+
+    JavaArchive jpa_core_callback_inheritance_stateful3_vehicle_client_jar = ShrinkWrap.create(JavaArchive.class, "jpa_core_callback_inheritance_stateful3_vehicle_client_jar");
+    jpa_core_callback_inheritance_stateful3_vehicle_client_jar.addClass(ee.jakarta.tck.persistence.common.PMClientBase.class);
+    ear.addAsModule(jpa_core_callback_inheritance_stateful3_vehicle_client_jar);
+
+    JavaArchive jpa_core_callback_inheritance_stateful3_vehicle_ejb_jar = ShrinkWrap.create(JavaArchive.class, "jpa_core_callback_inheritance_stateful3_vehicle_ejb_jar");
+    jpa_core_callback_inheritance_stateful3_vehicle_ejb_jar.addClass(ee.jakarta.tck.persistence.common.PMClientBase.class);
+    jpa_core_callback_inheritance_stateful3_vehicle_ejb_jar.addClass(ee.jakarta.tck.persistence.core.callback.inheritance.Client.class);
+    jpa_core_callback_inheritance_stateful3_vehicle_ejb_jar.addClass(ee.jakarta.tck.persistence.core.callback.common.Constants.class);
+    jpa_core_callback_inheritance_stateful3_vehicle_ejb_jar.addClass(ee.jakarta.tck.persistence.core.callback.common.EntityCallbackClientBase.class);
+    ear.addAsModule(jpa_core_callback_inheritance_stateful3_vehicle_ejb_jar);
+
+    JavaArchive jpa_core_callback_inheritance_stateless3_vehicle_client_jar = ShrinkWrap.create(JavaArchive.class, "jpa_core_callback_inheritance_stateless3_vehicle_client_jar");
+    jpa_core_callback_inheritance_stateless3_vehicle_client_jar.addClass(ee.jakarta.tck.persistence.common.PMClientBase.class);
+    ear.addAsModule(jpa_core_callback_inheritance_stateless3_vehicle_client_jar);
+
+    JavaArchive jpa_core_callback_inheritance_stateless3_vehicle_ejb_jar = ShrinkWrap.create(JavaArchive.class, "jpa_core_callback_inheritance_stateless3_vehicle_ejb_jar");
+    jpa_core_callback_inheritance_stateless3_vehicle_ejb_jar.addClass(ee.jakarta.tck.persistence.common.PMClientBase.class);
+    jpa_core_callback_inheritance_stateless3_vehicle_ejb_jar.addClass(ee.jakarta.tck.persistence.core.callback.inheritance.Client.class);
+    jpa_core_callback_inheritance_stateless3_vehicle_ejb_jar.addClass(ee.jakarta.tck.persistence.core.callback.common.Constants.class);
+    jpa_core_callback_inheritance_stateless3_vehicle_ejb_jar.addClass(ee.jakarta.tck.persistence.core.callback.common.EntityCallbackClientBase.class);
+    ear.addAsModule(jpa_core_callback_inheritance_stateless3_vehicle_ejb_jar);
+    return ear;
+  }
 	private PricedPartProduct p1;
 
 	private PricedPartProduct_2 p2;
diff --git a/jpa/spec-tests/src/main/java/ee/jakarta/tck/persistence/core/callback/listener/Client.java b/jpa/spec-tests/src/main/java/ee/jakarta/tck/persistence/core/callback/listener/Client.java
index a92e15f19..537c0ed81 100644
--- a/jpa/spec-tests/src/main/java/ee/jakarta/tck/persistence/core/callback/listener/Client.java
+++ b/jpa/spec-tests/src/main/java/ee/jakarta/tck/persistence/core/callback/listener/Client.java
@@ -22,8 +22,12 @@ package ee.jakarta.tck.persistence.core.callback.listener;
 
 import java.lang.System.Logger;
 import java.util.List;
-
+import org.jboss.arquillian.container.test.api.Deployment;
+import org.jboss.shrinkwrap.api.Archive;
+import org.jboss.shrinkwrap.api.ShrinkWrap;
+import org.jboss.shrinkwrap.api.spec.EnterpriseArchive;
 import org.jboss.shrinkwrap.api.spec.JavaArchive;
+import org.jboss.shrinkwrap.api.spec.WebArchive;
 import org.junit.jupiter.api.AfterEach;
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
@@ -34,6 +38,139 @@ import jakarta.persistence.Query;
 
 public class Client extends EntityCallbackClientBase {
 
+  @Deployment(testable = false)
+  public static Archive<?> deployment() {
+
+    final EnterpriseArchive ear = ShrinkWrap.create(EnterpriseArchive.class, "jpa_core_callback_listener_vehicles.ear");
+    // TODO: filter/eliminate the library jar classes that shouldn't be included
+    // Add ear/lib jars
+
+    JavaArchive jpa_core_callback_listener_jar = ShrinkWrap.create(JavaArchive.class, "jpa_core_callback_listener_jar");
+    jpa_core_callback_listener_jar.addClass(ee.jakarta.tck.persistence.core.callback.common.CallbackStatusIF.class);
+    jpa_core_callback_listener_jar.addClass(ee.jakarta.tck.persistence.core.callback.common.CallbackStatusImpl.class);
+    jpa_core_callback_listener_jar.addClass(ee.jakarta.tck.persistence.core.callback.common.Constants.class);
+    jpa_core_callback_listener_jar.addClass(ee.jakarta.tck.persistence.core.callback.common.GenerictListener.class);
+    jpa_core_callback_listener_jar.addClass(ee.jakarta.tck.persistence.core.callback.common.GenerictListenerImpl.class);
+    jpa_core_callback_listener_jar.addClass(ee.jakarta.tck.persistence.core.callback.common.ListenerA.class);
+    jpa_core_callback_listener_jar.addClass(ee.jakarta.tck.persistence.core.callback.common.ListenerAA.class);
+    jpa_core_callback_listener_jar.addClass(ee.jakarta.tck.persistence.core.callback.common.ListenerB.class);
+    jpa_core_callback_listener_jar.addClass(ee.jakarta.tck.persistence.core.callback.common.ListenerBB.class);
+    jpa_core_callback_listener_jar.addClass(ee.jakarta.tck.persistence.core.callback.common.ListenerBase.class);
+    jpa_core_callback_listener_jar.addClass(ee.jakarta.tck.persistence.core.callback.common.ListenerC.class);
+    jpa_core_callback_listener_jar.addClass(ee.jakarta.tck.persistence.core.callback.common.ListenerCC.class);
+    jpa_core_callback_listener_jar.addClass(ee.jakarta.tck.persistence.core.callback.listener.LineItem.class);
+    jpa_core_callback_listener_jar.addClass(ee.jakarta.tck.persistence.core.callback.listener.LineItemSuper.class);
+    jpa_core_callback_listener_jar.addClass(ee.jakarta.tck.persistence.core.callback.listener.Order.class);
+    jpa_core_callback_listener_jar.addClass(ee.jakarta.tck.persistence.core.callback.listener.Product.class);
+    ear.addAsLibrary(jpa_core_callback_listener_jar);
+    // Add ear submodules
+
+    JavaArchive jpa_core_callback_listener_appmanagedNoTx_vehicle_client_jar = ShrinkWrap.create(JavaArchive.class, "jpa_core_callback_listener_appmanagedNoTx_vehicle_client_jar");
+    jpa_core_callback_listener_appmanagedNoTx_vehicle_client_jar.addClass(ee.jakarta.tck.persistence.common.PMClientBase.class);
+    ear.addAsModule(jpa_core_callback_listener_appmanagedNoTx_vehicle_client_jar);
+
+    JavaArchive jpa_core_callback_listener_appmanagedNoTx_vehicle_ejb_jar = ShrinkWrap.create(JavaArchive.class, "jpa_core_callback_listener_appmanagedNoTx_vehicle_ejb_jar");
+    jpa_core_callback_listener_appmanagedNoTx_vehicle_ejb_jar.addClass(ee.jakarta.tck.persistence.common.PMClientBase.class);
+    jpa_core_callback_listener_appmanagedNoTx_vehicle_ejb_jar.addClass(ee.jakarta.tck.persistence.core.callback.listener.Client.class);
+    jpa_core_callback_listener_appmanagedNoTx_vehicle_ejb_jar.addClass(ee.jakarta.tck.persistence.core.callback.common.Constants.class);
+    jpa_core_callback_listener_appmanagedNoTx_vehicle_ejb_jar.addClass(ee.jakarta.tck.persistence.core.callback.common.EntityCallbackClientBase.class);
+    ear.addAsModule(jpa_core_callback_listener_appmanagedNoTx_vehicle_ejb_jar);
+
+    JavaArchive jpa_core_callback_listener_appmanaged_vehicle_client_jar = ShrinkWrap.create(JavaArchive.class, "jpa_core_callback_listener_appmanaged_vehicle_client_jar");
+    jpa_core_callback_listener_appmanaged_vehicle_client_jar.addClass(ee.jakarta.tck.persistence.common.PMClientBase.class);
+    ear.addAsModule(jpa_core_callback_listener_appmanaged_vehicle_client_jar);
+
+    JavaArchive jpa_core_callback_listener_appmanaged_vehicle_ejb_jar = ShrinkWrap.create(JavaArchive.class, "jpa_core_callback_listener_appmanaged_vehicle_ejb_jar");
+    jpa_core_callback_listener_appmanaged_vehicle_ejb_jar.addClass(ee.jakarta.tck.persistence.common.PMClientBase.class);
+    jpa_core_callback_listener_appmanaged_vehicle_ejb_jar.addClass(ee.jakarta.tck.persistence.core.callback.listener.Client.class);
+    jpa_core_callback_listener_appmanaged_vehicle_ejb_jar.addClass(ee.jakarta.tck.persistence.core.callback.common.Constants.class);
+    jpa_core_callback_listener_appmanaged_vehicle_ejb_jar.addClass(ee.jakarta.tck.persistence.core.callback.common.EntityCallbackClientBase.class);
+    ear.addAsModule(jpa_core_callback_listener_appmanaged_vehicle_ejb_jar);
+
+    WebArchive jpa_core_callback_listener_pmservlet_vehicle_web_war = ShrinkWrap.create(WebArchive.class, "jpa_core_callback_listener_pmservlet_vehicle_web_war");
+    jpa_core_callback_listener_pmservlet_vehicle_web_war.addAsWebInfResource("web.xml");
+
+    JavaArchive jpa_core_callback_listener_jar = ShrinkWrap.create(JavaArchive.class, "jpa_core_callback_listener.jar");
+    jpa_core_callback_listener_jar.addClass(ee.jakarta.tck.persistence.core.callback.common.CallbackStatusIF.class);
+    jpa_core_callback_listener_jar.addClass(ee.jakarta.tck.persistence.core.callback.common.CallbackStatusImpl.class);
+    jpa_core_callback_listener_jar.addClass(ee.jakarta.tck.persistence.core.callback.common.Constants.class);
+    jpa_core_callback_listener_jar.addClass(ee.jakarta.tck.persistence.core.callback.common.GenerictListener.class);
+    jpa_core_callback_listener_jar.addClass(ee.jakarta.tck.persistence.core.callback.common.GenerictListenerImpl.class);
+    jpa_core_callback_listener_jar.addClass(ee.jakarta.tck.persistence.core.callback.common.ListenerA.class);
+    jpa_core_callback_listener_jar.addClass(ee.jakarta.tck.persistence.core.callback.common.ListenerAA.class);
+    jpa_core_callback_listener_jar.addClass(ee.jakarta.tck.persistence.core.callback.common.ListenerB.class);
+    jpa_core_callback_listener_jar.addClass(ee.jakarta.tck.persistence.core.callback.common.ListenerBB.class);
+    jpa_core_callback_listener_jar.addClass(ee.jakarta.tck.persistence.core.callback.common.ListenerBase.class);
+    jpa_core_callback_listener_jar.addClass(ee.jakarta.tck.persistence.core.callback.common.ListenerC.class);
+    jpa_core_callback_listener_jar.addClass(ee.jakarta.tck.persistence.core.callback.common.ListenerCC.class);
+    jpa_core_callback_listener_jar.addClass(ee.jakarta.tck.persistence.core.callback.listener.LineItem.class);
+    jpa_core_callback_listener_jar.addClass(ee.jakarta.tck.persistence.core.callback.listener.LineItemSuper.class);
+    jpa_core_callback_listener_jar.addClass(ee.jakarta.tck.persistence.core.callback.listener.Order.class);
+    jpa_core_callback_listener_jar.addClass(ee.jakarta.tck.persistence.core.callback.listener.Product.class);
+    jpa_core_callback_listener_jar.addAsManifestResource("META-INF/MANIFEST.MF");
+    jpa_core_callback_listener_jar.addAsManifestResource("META-INF/orm.xml");
+    jpa_core_callback_listener_jar.addAsManifestResource("META-INF/persistence.xml");
+    jpa_core_callback_listener_pmservlet_vehicle_web_war.addAsLibrary(jpa_core_callback_listener_jar);
+    jpa_core_callback_listener_pmservlet_vehicle_web_war.addClass(ee.jakarta.tck.persistence.common.PMClientBase.class);
+    jpa_core_callback_listener_pmservlet_vehicle_web_war.addClass(ee.jakarta.tck.persistence.core.callback.listener.Client.class);
+    jpa_core_callback_listener_pmservlet_vehicle_web_war.addClass(ee.jakarta.tck.persistence.core.callback.common.Constants.class);
+    jpa_core_callback_listener_pmservlet_vehicle_web_war.addClass(ee.jakarta.tck.persistence.core.callback.common.EntityCallbackClientBase.class);
+    ear.addAsModule(jpa_core_callback_listener_pmservlet_vehicle_web_war);
+
+    WebArchive jpa_core_callback_listener_puservlet_vehicle_web_war = ShrinkWrap.create(WebArchive.class, "jpa_core_callback_listener_puservlet_vehicle_web_war");
+    jpa_core_callback_listener_puservlet_vehicle_web_war.addAsWebInfResource("web.xml");
+
+    JavaArchive jpa_core_callback_listener_jar = ShrinkWrap.create(JavaArchive.class, "jpa_core_callback_listener.jar");
+    jpa_core_callback_listener_jar.addClass(ee.jakarta.tck.persistence.core.callback.common.CallbackStatusIF.class);
+    jpa_core_callback_listener_jar.addClass(ee.jakarta.tck.persistence.core.callback.common.CallbackStatusImpl.class);
+    jpa_core_callback_listener_jar.addClass(ee.jakarta.tck.persistence.core.callback.common.Constants.class);
+    jpa_core_callback_listener_jar.addClass(ee.jakarta.tck.persistence.core.callback.common.GenerictListener.class);
+    jpa_core_callback_listener_jar.addClass(ee.jakarta.tck.persistence.core.callback.common.GenerictListenerImpl.class);
+    jpa_core_callback_listener_jar.addClass(ee.jakarta.tck.persistence.core.callback.common.ListenerA.class);
+    jpa_core_callback_listener_jar.addClass(ee.jakarta.tck.persistence.core.callback.common.ListenerAA.class);
+    jpa_core_callback_listener_jar.addClass(ee.jakarta.tck.persistence.core.callback.common.ListenerB.class);
+    jpa_core_callback_listener_jar.addClass(ee.jakarta.tck.persistence.core.callback.common.ListenerBB.class);
+    jpa_core_callback_listener_jar.addClass(ee.jakarta.tck.persistence.core.callback.common.ListenerBase.class);
+    jpa_core_callback_listener_jar.addClass(ee.jakarta.tck.persistence.core.callback.common.ListenerC.class);
+    jpa_core_callback_listener_jar.addClass(ee.jakarta.tck.persistence.core.callback.common.ListenerCC.class);
+    jpa_core_callback_listener_jar.addClass(ee.jakarta.tck.persistence.core.callback.listener.LineItem.class);
+    jpa_core_callback_listener_jar.addClass(ee.jakarta.tck.persistence.core.callback.listener.LineItemSuper.class);
+    jpa_core_callback_listener_jar.addClass(ee.jakarta.tck.persistence.core.callback.listener.Order.class);
+    jpa_core_callback_listener_jar.addClass(ee.jakarta.tck.persistence.core.callback.listener.Product.class);
+    jpa_core_callback_listener_jar.addAsManifestResource("META-INF/MANIFEST.MF");
+    jpa_core_callback_listener_jar.addAsManifestResource("META-INF/orm.xml");
+    jpa_core_callback_listener_jar.addAsManifestResource("META-INF/persistence.xml");
+    jpa_core_callback_listener_puservlet_vehicle_web_war.addAsLibrary(jpa_core_callback_listener_jar);
+    jpa_core_callback_listener_puservlet_vehicle_web_war.addClass(ee.jakarta.tck.persistence.common.PMClientBase.class);
+    jpa_core_callback_listener_puservlet_vehicle_web_war.addClass(ee.jakarta.tck.persistence.core.callback.listener.Client.class);
+    jpa_core_callback_listener_puservlet_vehicle_web_war.addClass(ee.jakarta.tck.persistence.core.callback.common.Constants.class);
+    jpa_core_callback_listener_puservlet_vehicle_web_war.addClass(ee.jakarta.tck.persistence.core.callback.common.EntityCallbackClientBase.class);
+    ear.addAsModule(jpa_core_callback_listener_puservlet_vehicle_web_war);
+
+    JavaArchive jpa_core_callback_listener_stateful3_vehicle_client_jar = ShrinkWrap.create(JavaArchive.class, "jpa_core_callback_listener_stateful3_vehicle_client_jar");
+    jpa_core_callback_listener_stateful3_vehicle_client_jar.addClass(ee.jakarta.tck.persistence.common.PMClientBase.class);
+    ear.addAsModule(jpa_core_callback_listener_stateful3_vehicle_client_jar);
+
+    JavaArchive jpa_core_callback_listener_stateful3_vehicle_ejb_jar = ShrinkWrap.create(JavaArchive.class, "jpa_core_callback_listener_stateful3_vehicle_ejb_jar");
+    jpa_core_callback_listener_stateful3_vehicle_ejb_jar.addClass(ee.jakarta.tck.persistence.common.PMClientBase.class);
+    jpa_core_callback_listener_stateful3_vehicle_ejb_jar.addClass(ee.jakarta.tck.persistence.core.callback.listener.Client.class);
+    jpa_core_callback_listener_stateful3_vehicle_ejb_jar.addClass(ee.jakarta.tck.persistence.core.callback.common.Constants.class);
+    jpa_core_callback_listener_stateful3_vehicle_ejb_jar.addClass(ee.jakarta.tck.persistence.core.callback.common.EntityCallbackClientBase.class);
+    ear.addAsModule(jpa_core_callback_listener_stateful3_vehicle_ejb_jar);
+
+    JavaArchive jpa_core_callback_listener_stateless3_vehicle_client_jar = ShrinkWrap.create(JavaArchive.class, "jpa_core_callback_listener_stateless3_vehicle_client_jar");
+    jpa_core_callback_listener_stateless3_vehicle_client_jar.addClass(ee.jakarta.tck.persistence.common.PMClientBase.class);
+    ear.addAsModule(jpa_core_callback_listener_stateless3_vehicle_client_jar);
+
+    JavaArchive jpa_core_callback_listener_stateless3_vehicle_ejb_jar = ShrinkWrap.create(JavaArchive.class, "jpa_core_callback_listener_stateless3_vehicle_ejb_jar");
+    jpa_core_callback_listener_stateless3_vehicle_ejb_jar.addClass(ee.jakarta.tck.persistence.common.PMClientBase.class);
+    jpa_core_callback_listener_stateless3_vehicle_ejb_jar.addClass(ee.jakarta.tck.persistence.core.callback.listener.Client.class);
+    jpa_core_callback_listener_stateless3_vehicle_ejb_jar.addClass(ee.jakarta.tck.persistence.core.callback.common.Constants.class);
+    jpa_core_callback_listener_stateless3_vehicle_ejb_jar.addClass(ee.jakarta.tck.persistence.core.callback.common.EntityCallbackClientBase.class);
+    ear.addAsModule(jpa_core_callback_listener_stateless3_vehicle_ejb_jar);
+    return ear;
+  }
+
 	private static final Logger logger = (Logger) System.getLogger(Client.class.getName());
 
 	private static final long serialVersionUID = 1L;
diff --git a/jpa/spec-tests/src/main/java/ee/jakarta/tck/persistence/core/callback/listeneroverride/Client.java b/jpa/spec-tests/src/main/java/ee/jakarta/tck/persistence/core/callback/listeneroverride/Client.java
index fe0deb970..c5a401e27 100644
--- a/jpa/spec-tests/src/main/java/ee/jakarta/tck/persistence/core/callback/listeneroverride/Client.java
+++ b/jpa/spec-tests/src/main/java/ee/jakarta/tck/persistence/core/callback/listeneroverride/Client.java
@@ -22,8 +22,12 @@ package ee.jakarta.tck.persistence.core.callback.listeneroverride;
 
 import java.lang.System.Logger;
 import java.util.List;
-
+import org.jboss.arquillian.container.test.api.Deployment;
+import org.jboss.shrinkwrap.api.Archive;
+import org.jboss.shrinkwrap.api.ShrinkWrap;
+import org.jboss.shrinkwrap.api.spec.EnterpriseArchive;
 import org.jboss.shrinkwrap.api.spec.JavaArchive;
+import org.jboss.shrinkwrap.api.spec.WebArchive;
 import org.junit.jupiter.api.AfterEach;
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
@@ -34,6 +38,139 @@ import jakarta.persistence.Query;
 
 public class Client extends EntityCallbackClientBase {
 
+  @Deployment(testable = false)
+  public static Archive<?> deployment() {
+
+    final EnterpriseArchive ear = ShrinkWrap.create(EnterpriseArchive.class, "jpa_core_callback_listeneroverride_vehicles.ear");
+    // TODO: filter/eliminate the library jar classes that shouldn't be included
+    // Add ear/lib jars
+
+    JavaArchive jpa_core_callback_listeneroverride_jar = ShrinkWrap.create(JavaArchive.class, "jpa_core_callback_listeneroverride_jar");
+    jpa_core_callback_listeneroverride_jar.addClass(ee.jakarta.tck.persistence.core.callback.common.CallbackStatusIF.class);
+    jpa_core_callback_listeneroverride_jar.addClass(ee.jakarta.tck.persistence.core.callback.common.CallbackStatusImpl.class);
+    jpa_core_callback_listeneroverride_jar.addClass(ee.jakarta.tck.persistence.core.callback.common.Constants.class);
+    jpa_core_callback_listeneroverride_jar.addClass(ee.jakarta.tck.persistence.core.callback.common.GenerictListener.class);
+    jpa_core_callback_listeneroverride_jar.addClass(ee.jakarta.tck.persistence.core.callback.common.GenerictListenerImpl.class);
+    jpa_core_callback_listeneroverride_jar.addClass(ee.jakarta.tck.persistence.core.callback.common.ListenerA.class);
+    jpa_core_callback_listeneroverride_jar.addClass(ee.jakarta.tck.persistence.core.callback.common.ListenerAA.class);
+    jpa_core_callback_listeneroverride_jar.addClass(ee.jakarta.tck.persistence.core.callback.common.ListenerB.class);
+    jpa_core_callback_listeneroverride_jar.addClass(ee.jakarta.tck.persistence.core.callback.common.ListenerBB.class);
+    jpa_core_callback_listeneroverride_jar.addClass(ee.jakarta.tck.persistence.core.callback.common.ListenerBase.class);
+    jpa_core_callback_listeneroverride_jar.addClass(ee.jakarta.tck.persistence.core.callback.common.ListenerC.class);
+    jpa_core_callback_listeneroverride_jar.addClass(ee.jakarta.tck.persistence.core.callback.common.ListenerCC.class);
+    jpa_core_callback_listeneroverride_jar.addClass(ee.jakarta.tck.persistence.core.callback.listeneroverride.LineItem.class);
+    jpa_core_callback_listeneroverride_jar.addClass(ee.jakarta.tck.persistence.core.callback.listeneroverride.LineItemSuper.class);
+    jpa_core_callback_listeneroverride_jar.addClass(ee.jakarta.tck.persistence.core.callback.listeneroverride.Order.class);
+    jpa_core_callback_listeneroverride_jar.addClass(ee.jakarta.tck.persistence.core.callback.listeneroverride.Product.class);
+    ear.addAsLibrary(jpa_core_callback_listeneroverride_jar);
+    // Add ear submodules
+
+    JavaArchive jpa_core_callback_listeneroverride_appmanagedNoTx_vehicle_client_jar = ShrinkWrap.create(JavaArchive.class, "jpa_core_callback_listeneroverride_appmanagedNoTx_vehicle_client_jar");
+    jpa_core_callback_listeneroverride_appmanagedNoTx_vehicle_client_jar.addClass(ee.jakarta.tck.persistence.common.PMClientBase.class);
+    ear.addAsModule(jpa_core_callback_listeneroverride_appmanagedNoTx_vehicle_client_jar);
+
+    JavaArchive jpa_core_callback_listeneroverride_appmanagedNoTx_vehicle_ejb_jar = ShrinkWrap.create(JavaArchive.class, "jpa_core_callback_listeneroverride_appmanagedNoTx_vehicle_ejb_jar");
+    jpa_core_callback_listeneroverride_appmanagedNoTx_vehicle_ejb_jar.addClass(ee.jakarta.tck.persistence.common.PMClientBase.class);
+    jpa_core_callback_listeneroverride_appmanagedNoTx_vehicle_ejb_jar.addClass(ee.jakarta.tck.persistence.core.callback.listeneroverride.Client.class);
+    jpa_core_callback_listeneroverride_appmanagedNoTx_vehicle_ejb_jar.addClass(ee.jakarta.tck.persistence.core.callback.common.Constants.class);
+    jpa_core_callback_listeneroverride_appmanagedNoTx_vehicle_ejb_jar.addClass(ee.jakarta.tck.persistence.core.callback.common.EntityCallbackClientBase.class);
+    ear.addAsModule(jpa_core_callback_listeneroverride_appmanagedNoTx_vehicle_ejb_jar);
+
+    JavaArchive jpa_core_callback_listeneroverride_appmanaged_vehicle_client_jar = ShrinkWrap.create(JavaArchive.class, "jpa_core_callback_listeneroverride_appmanaged_vehicle_client_jar");
+    jpa_core_callback_listeneroverride_appmanaged_vehicle_client_jar.addClass(ee.jakarta.tck.persistence.common.PMClientBase.class);
+    ear.addAsModule(jpa_core_callback_listeneroverride_appmanaged_vehicle_client_jar);
+
+    JavaArchive jpa_core_callback_listeneroverride_appmanaged_vehicle_ejb_jar = ShrinkWrap.create(JavaArchive.class, "jpa_core_callback_listeneroverride_appmanaged_vehicle_ejb_jar");
+    jpa_core_callback_listeneroverride_appmanaged_vehicle_ejb_jar.addClass(ee.jakarta.tck.persistence.common.PMClientBase.class);
+    jpa_core_callback_listeneroverride_appmanaged_vehicle_ejb_jar.addClass(ee.jakarta.tck.persistence.core.callback.listeneroverride.Client.class);
+    jpa_core_callback_listeneroverride_appmanaged_vehicle_ejb_jar.addClass(ee.jakarta.tck.persistence.core.callback.common.Constants.class);
+    jpa_core_callback_listeneroverride_appmanaged_vehicle_ejb_jar.addClass(ee.jakarta.tck.persistence.core.callback.common.EntityCallbackClientBase.class);
+    ear.addAsModule(jpa_core_callback_listeneroverride_appmanaged_vehicle_ejb_jar);
+
+    WebArchive jpa_core_callback_listeneroverride_pmservlet_vehicle_web_war = ShrinkWrap.create(WebArchive.class, "jpa_core_callback_listeneroverride_pmservlet_vehicle_web_war");
+    jpa_core_callback_listeneroverride_pmservlet_vehicle_web_war.addAsWebInfResource("web.xml");
+
+    JavaArchive jpa_core_callback_listeneroverride_jar = ShrinkWrap.create(JavaArchive.class, "jpa_core_callback_listeneroverride.jar");
+    jpa_core_callback_listeneroverride_jar.addClass(ee.jakarta.tck.persistence.core.callback.common.CallbackStatusIF.class);
+    jpa_core_callback_listeneroverride_jar.addClass(ee.jakarta.tck.persistence.core.callback.common.CallbackStatusImpl.class);
+    jpa_core_callback_listeneroverride_jar.addClass(ee.jakarta.tck.persistence.core.callback.common.Constants.class);
+    jpa_core_callback_listeneroverride_jar.addClass(ee.jakarta.tck.persistence.core.callback.common.GenerictListener.class);
+    jpa_core_callback_listeneroverride_jar.addClass(ee.jakarta.tck.persistence.core.callback.common.GenerictListenerImpl.class);
+    jpa_core_callback_listeneroverride_jar.addClass(ee.jakarta.tck.persistence.core.callback.common.ListenerA.class);
+    jpa_core_callback_listeneroverride_jar.addClass(ee.jakarta.tck.persistence.core.callback.common.ListenerAA.class);
+    jpa_core_callback_listeneroverride_jar.addClass(ee.jakarta.tck.persistence.core.callback.common.ListenerB.class);
+    jpa_core_callback_listeneroverride_jar.addClass(ee.jakarta.tck.persistence.core.callback.common.ListenerBB.class);
+    jpa_core_callback_listeneroverride_jar.addClass(ee.jakarta.tck.persistence.core.callback.common.ListenerBase.class);
+    jpa_core_callback_listeneroverride_jar.addClass(ee.jakarta.tck.persistence.core.callback.common.ListenerC.class);
+    jpa_core_callback_listeneroverride_jar.addClass(ee.jakarta.tck.persistence.core.callback.common.ListenerCC.class);
+    jpa_core_callback_listeneroverride_jar.addClass(ee.jakarta.tck.persistence.core.callback.listeneroverride.LineItem.class);
+    jpa_core_callback_listeneroverride_jar.addClass(ee.jakarta.tck.persistence.core.callback.listeneroverride.LineItemSuper.class);
+    jpa_core_callback_listeneroverride_jar.addClass(ee.jakarta.tck.persistence.core.callback.listeneroverride.Order.class);
+    jpa_core_callback_listeneroverride_jar.addClass(ee.jakarta.tck.persistence.core.callback.listeneroverride.Product.class);
+    jpa_core_callback_listeneroverride_jar.addAsManifestResource("META-INF/MANIFEST.MF");
+    jpa_core_callback_listeneroverride_jar.addAsManifestResource("META-INF/orm.xml");
+    jpa_core_callback_listeneroverride_jar.addAsManifestResource("META-INF/persistence.xml");
+    jpa_core_callback_listeneroverride_pmservlet_vehicle_web_war.addAsLibrary(jpa_core_callback_listeneroverride_jar);
+    jpa_core_callback_listeneroverride_pmservlet_vehicle_web_war.addClass(ee.jakarta.tck.persistence.common.PMClientBase.class);
+    jpa_core_callback_listeneroverride_pmservlet_vehicle_web_war.addClass(ee.jakarta.tck.persistence.core.callback.listeneroverride.Client.class);
+    jpa_core_callback_listeneroverride_pmservlet_vehicle_web_war.addClass(ee.jakarta.tck.persistence.core.callback.common.Constants.class);
+    jpa_core_callback_listeneroverride_pmservlet_vehicle_web_war.addClass(ee.jakarta.tck.persistence.core.callback.common.EntityCallbackClientBase.class);
+    ear.addAsModule(jpa_core_callback_listeneroverride_pmservlet_vehicle_web_war);
+
+    WebArchive jpa_core_callback_listeneroverride_puservlet_vehicle_web_war = ShrinkWrap.create(WebArchive.class, "jpa_core_callback_listeneroverride_puservlet_vehicle_web_war");
+    jpa_core_callback_listeneroverride_puservlet_vehicle_web_war.addAsWebInfResource("web.xml");
+
+    JavaArchive jpa_core_callback_listeneroverride_jar = ShrinkWrap.create(JavaArchive.class, "jpa_core_callback_listeneroverride.jar");
+    jpa_core_callback_listeneroverride_jar.addClass(ee.jakarta.tck.persistence.core.callback.common.CallbackStatusIF.class);
+    jpa_core_callback_listeneroverride_jar.addClass(ee.jakarta.tck.persistence.core.callback.common.CallbackStatusImpl.class);
+    jpa_core_callback_listeneroverride_jar.addClass(ee.jakarta.tck.persistence.core.callback.common.Constants.class);
+    jpa_core_callback_listeneroverride_jar.addClass(ee.jakarta.tck.persistence.core.callback.common.GenerictListener.class);
+    jpa_core_callback_listeneroverride_jar.addClass(ee.jakarta.tck.persistence.core.callback.common.GenerictListenerImpl.class);
+    jpa_core_callback_listeneroverride_jar.addClass(ee.jakarta.tck.persistence.core.callback.common.ListenerA.class);
+    jpa_core_callback_listeneroverride_jar.addClass(ee.jakarta.tck.persistence.core.callback.common.ListenerAA.class);
+    jpa_core_callback_listeneroverride_jar.addClass(ee.jakarta.tck.persistence.core.callback.common.ListenerB.class);
+    jpa_core_callback_listeneroverride_jar.addClass(ee.jakarta.tck.persistence.core.callback.common.ListenerBB.class);
+    jpa_core_callback_listeneroverride_jar.addClass(ee.jakarta.tck.persistence.core.callback.common.ListenerBase.class);
+    jpa_core_callback_listeneroverride_jar.addClass(ee.jakarta.tck.persistence.core.callback.common.ListenerC.class);
+    jpa_core_callback_listeneroverride_jar.addClass(ee.jakarta.tck.persistence.core.callback.common.ListenerCC.class);
+    jpa_core_callback_listeneroverride_jar.addClass(ee.jakarta.tck.persistence.core.callback.listeneroverride.LineItem.class);
+    jpa_core_callback_listeneroverride_jar.addClass(ee.jakarta.tck.persistence.core.callback.listeneroverride.LineItemSuper.class);
+    jpa_core_callback_listeneroverride_jar.addClass(ee.jakarta.tck.persistence.core.callback.listeneroverride.Order.class);
+    jpa_core_callback_listeneroverride_jar.addClass(ee.jakarta.tck.persistence.core.callback.listeneroverride.Product.class);
+    jpa_core_callback_listeneroverride_jar.addAsManifestResource("META-INF/MANIFEST.MF");
+    jpa_core_callback_listeneroverride_jar.addAsManifestResource("META-INF/orm.xml");
+    jpa_core_callback_listeneroverride_jar.addAsManifestResource("META-INF/persistence.xml");
+    jpa_core_callback_listeneroverride_puservlet_vehicle_web_war.addAsLibrary(jpa_core_callback_listeneroverride_jar);
+    jpa_core_callback_listeneroverride_puservlet_vehicle_web_war.addClass(ee.jakarta.tck.persistence.common.PMClientBase.class);
+    jpa_core_callback_listeneroverride_puservlet_vehicle_web_war.addClass(ee.jakarta.tck.persistence.core.callback.listeneroverride.Client.class);
+    jpa_core_callback_listeneroverride_puservlet_vehicle_web_war.addClass(ee.jakarta.tck.persistence.core.callback.common.Constants.class);
+    jpa_core_callback_listeneroverride_puservlet_vehicle_web_war.addClass(ee.jakarta.tck.persistence.core.callback.common.EntityCallbackClientBase.class);
+    ear.addAsModule(jpa_core_callback_listeneroverride_puservlet_vehicle_web_war);
+
+    JavaArchive jpa_core_callback_listeneroverride_stateful3_vehicle_client_jar = ShrinkWrap.create(JavaArchive.class, "jpa_core_callback_listeneroverride_stateful3_vehicle_client_jar");
+    jpa_core_callback_listeneroverride_stateful3_vehicle_client_jar.addClass(ee.jakarta.tck.persistence.common.PMClientBase.class);
+    ear.addAsModule(jpa_core_callback_listeneroverride_stateful3_vehicle_client_jar);
+
+    JavaArchive jpa_core_callback_listeneroverride_stateful3_vehicle_ejb_jar = ShrinkWrap.create(JavaArchive.class, "jpa_core_callback_listeneroverride_stateful3_vehicle_ejb_jar");
+    jpa_core_callback_listeneroverride_stateful3_vehicle_ejb_jar.addClass(ee.jakarta.tck.persistence.common.PMClientBase.class);
+    jpa_core_callback_listeneroverride_stateful3_vehicle_ejb_jar.addClass(ee.jakarta.tck.persistence.core.callback.listeneroverride.Client.class);
+    jpa_core_callback_listeneroverride_stateful3_vehicle_ejb_jar.addClass(ee.jakarta.tck.persistence.core.callback.common.Constants.class);
+    jpa_core_callback_listeneroverride_stateful3_vehicle_ejb_jar.addClass(ee.jakarta.tck.persistence.core.callback.common.EntityCallbackClientBase.class);
+    ear.addAsModule(jpa_core_callback_listeneroverride_stateful3_vehicle_ejb_jar);
+
+    JavaArchive jpa_core_callback_listeneroverride_stateless3_vehicle_client_jar = ShrinkWrap.create(JavaArchive.class, "jpa_core_callback_listeneroverride_stateless3_vehicle_client_jar");
+    jpa_core_callback_listeneroverride_stateless3_vehicle_client_jar.addClass(ee.jakarta.tck.persistence.common.PMClientBase.class);
+    ear.addAsModule(jpa_core_callback_listeneroverride_stateless3_vehicle_client_jar);
+
+    JavaArchive jpa_core_callback_listeneroverride_stateless3_vehicle_ejb_jar = ShrinkWrap.create(JavaArchive.class, "jpa_core_callback_listeneroverride_stateless3_vehicle_ejb_jar");
+    jpa_core_callback_listeneroverride_stateless3_vehicle_ejb_jar.addClass(ee.jakarta.tck.persistence.common.PMClientBase.class);
+    jpa_core_callback_listeneroverride_stateless3_vehicle_ejb_jar.addClass(ee.jakarta.tck.persistence.core.callback.listeneroverride.Client.class);
+    jpa_core_callback_listeneroverride_stateless3_vehicle_ejb_jar.addClass(ee.jakarta.tck.persistence.core.callback.common.Constants.class);
+    jpa_core_callback_listeneroverride_stateless3_vehicle_ejb_jar.addClass(ee.jakarta.tck.persistence.core.callback.common.EntityCallbackClientBase.class);
+    ear.addAsModule(jpa_core_callback_listeneroverride_stateless3_vehicle_ejb_jar);
+    return ear;
+  }
+
 	private static final Logger logger = (Logger) System.getLogger(Client.class.getName());
 
 	private static final long serialVersionUID = 1L;
diff --git a/jpa/spec-tests/src/main/java/ee/jakarta/tck/persistence/core/callback/method/Client.java b/jpa/spec-tests/src/main/java/ee/jakarta/tck/persistence/core/callback/method/Client.java
index ffef61312..ef0029849 100644
--- a/jpa/spec-tests/src/main/java/ee/jakarta/tck/persistence/core/callback/method/Client.java
+++ b/jpa/spec-tests/src/main/java/ee/jakarta/tck/persistence/core/callback/method/Client.java
@@ -23,8 +23,12 @@ package ee.jakarta.tck.persistence.core.callback.method;
 import java.lang.System.Logger;
 import java.util.Arrays;
 import java.util.List;
-
+import org.jboss.arquillian.container.test.api.Deployment;
+import org.jboss.shrinkwrap.api.Archive;
+import org.jboss.shrinkwrap.api.ShrinkWrap;
+import org.jboss.shrinkwrap.api.spec.EnterpriseArchive;
 import org.jboss.shrinkwrap.api.spec.JavaArchive;
+import org.jboss.shrinkwrap.api.spec.WebArchive;
 import org.junit.jupiter.api.AfterEach;
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
@@ -35,6 +39,136 @@ import jakarta.persistence.Query;
 
 public class Client extends EntityCallbackClientBase {
 
+  @Deployment(testable = false)
+  public static Archive<?> deployment() {
+
+    final EnterpriseArchive ear = ShrinkWrap.create(EnterpriseArchive.class, "jpa_core_callback_method_vehicles.ear");
+    // TODO: filter/eliminate the library jar classes that shouldn't be included
+    // Add ear/lib jars
+
+    JavaArchive jpa_core_callback_method_jar = ShrinkWrap.create(JavaArchive.class, "jpa_core_callback_method_jar");
+    jpa_core_callback_method_jar.addClass(ee.jakarta.tck.persistence.core.callback.common.CallbackStatusIF.class);
+    jpa_core_callback_method_jar.addClass(ee.jakarta.tck.persistence.core.callback.common.CallbackStatusImpl.class);
+    jpa_core_callback_method_jar.addClass(ee.jakarta.tck.persistence.core.callback.common.Constants.class);
+    jpa_core_callback_method_jar.addClass(ee.jakarta.tck.persistence.core.callback.common.GenerictListener.class);
+    jpa_core_callback_method_jar.addClass(ee.jakarta.tck.persistence.core.callback.common.GenerictListenerImpl.class);
+    jpa_core_callback_method_jar.addClass(ee.jakarta.tck.persistence.core.callback.common.ListenerA.class);
+    jpa_core_callback_method_jar.addClass(ee.jakarta.tck.persistence.core.callback.common.ListenerAA.class);
+    jpa_core_callback_method_jar.addClass(ee.jakarta.tck.persistence.core.callback.common.ListenerB.class);
+    jpa_core_callback_method_jar.addClass(ee.jakarta.tck.persistence.core.callback.common.ListenerBB.class);
+    jpa_core_callback_method_jar.addClass(ee.jakarta.tck.persistence.core.callback.common.ListenerBase.class);
+    jpa_core_callback_method_jar.addClass(ee.jakarta.tck.persistence.core.callback.common.ListenerC.class);
+    jpa_core_callback_method_jar.addClass(ee.jakarta.tck.persistence.core.callback.common.ListenerCC.class);
+    jpa_core_callback_method_jar.addClass(ee.jakarta.tck.persistence.core.callback.method.LineItem.class);
+    jpa_core_callback_method_jar.addClass(ee.jakarta.tck.persistence.core.callback.method.Order.class);
+    jpa_core_callback_method_jar.addClass(ee.jakarta.tck.persistence.core.callback.method.Product.class);
+    ear.addAsLibrary(jpa_core_callback_method_jar);
+    // Add ear submodules
+
+    JavaArchive jpa_core_callback_method_appmanagedNoTx_vehicle_client_jar = ShrinkWrap.create(JavaArchive.class, "jpa_core_callback_method_appmanagedNoTx_vehicle_client_jar");
+    jpa_core_callback_method_appmanagedNoTx_vehicle_client_jar.addClass(ee.jakarta.tck.persistence.common.PMClientBase.class);
+    ear.addAsModule(jpa_core_callback_method_appmanagedNoTx_vehicle_client_jar);
+
+    JavaArchive jpa_core_callback_method_appmanagedNoTx_vehicle_ejb_jar = ShrinkWrap.create(JavaArchive.class, "jpa_core_callback_method_appmanagedNoTx_vehicle_ejb_jar");
+    jpa_core_callback_method_appmanagedNoTx_vehicle_ejb_jar.addClass(ee.jakarta.tck.persistence.common.PMClientBase.class);
+    jpa_core_callback_method_appmanagedNoTx_vehicle_ejb_jar.addClass(ee.jakarta.tck.persistence.core.callback.method.Client.class);
+    jpa_core_callback_method_appmanagedNoTx_vehicle_ejb_jar.addClass(ee.jakarta.tck.persistence.core.callback.common.Constants.class);
+    jpa_core_callback_method_appmanagedNoTx_vehicle_ejb_jar.addClass(ee.jakarta.tck.persistence.core.callback.common.EntityCallbackClientBase.class);
+    ear.addAsModule(jpa_core_callback_method_appmanagedNoTx_vehicle_ejb_jar);
+
+    JavaArchive jpa_core_callback_method_appmanaged_vehicle_client_jar = ShrinkWrap.create(JavaArchive.class, "jpa_core_callback_method_appmanaged_vehicle_client_jar");
+    jpa_core_callback_method_appmanaged_vehicle_client_jar.addClass(ee.jakarta.tck.persistence.common.PMClientBase.class);
+    ear.addAsModule(jpa_core_callback_method_appmanaged_vehicle_client_jar);
+
+    JavaArchive jpa_core_callback_method_appmanaged_vehicle_ejb_jar = ShrinkWrap.create(JavaArchive.class, "jpa_core_callback_method_appmanaged_vehicle_ejb_jar");
+    jpa_core_callback_method_appmanaged_vehicle_ejb_jar.addClass(ee.jakarta.tck.persistence.common.PMClientBase.class);
+    jpa_core_callback_method_appmanaged_vehicle_ejb_jar.addClass(ee.jakarta.tck.persistence.core.callback.method.Client.class);
+    jpa_core_callback_method_appmanaged_vehicle_ejb_jar.addClass(ee.jakarta.tck.persistence.core.callback.common.Constants.class);
+    jpa_core_callback_method_appmanaged_vehicle_ejb_jar.addClass(ee.jakarta.tck.persistence.core.callback.common.EntityCallbackClientBase.class);
+    ear.addAsModule(jpa_core_callback_method_appmanaged_vehicle_ejb_jar);
+
+    WebArchive jpa_core_callback_method_pmservlet_vehicle_web_war = ShrinkWrap.create(WebArchive.class, "jpa_core_callback_method_pmservlet_vehicle_web_war");
+    jpa_core_callback_method_pmservlet_vehicle_web_war.addAsWebInfResource("web.xml");
+
+    JavaArchive jpa_core_callback_method_jar = ShrinkWrap.create(JavaArchive.class, "jpa_core_callback_method.jar");
+    jpa_core_callback_method_jar.addClass(ee.jakarta.tck.persistence.core.callback.common.CallbackStatusIF.class);
+    jpa_core_callback_method_jar.addClass(ee.jakarta.tck.persistence.core.callback.common.CallbackStatusImpl.class);
+    jpa_core_callback_method_jar.addClass(ee.jakarta.tck.persistence.core.callback.common.Constants.class);
+    jpa_core_callback_method_jar.addClass(ee.jakarta.tck.persistence.core.callback.common.GenerictListener.class);
+    jpa_core_callback_method_jar.addClass(ee.jakarta.tck.persistence.core.callback.common.GenerictListenerImpl.class);
+    jpa_core_callback_method_jar.addClass(ee.jakarta.tck.persistence.core.callback.common.ListenerA.class);
+    jpa_core_callback_method_jar.addClass(ee.jakarta.tck.persistence.core.callback.common.ListenerAA.class);
+    jpa_core_callback_method_jar.addClass(ee.jakarta.tck.persistence.core.callback.common.ListenerB.class);
+    jpa_core_callback_method_jar.addClass(ee.jakarta.tck.persistence.core.callback.common.ListenerBB.class);
+    jpa_core_callback_method_jar.addClass(ee.jakarta.tck.persistence.core.callback.common.ListenerBase.class);
+    jpa_core_callback_method_jar.addClass(ee.jakarta.tck.persistence.core.callback.common.ListenerC.class);
+    jpa_core_callback_method_jar.addClass(ee.jakarta.tck.persistence.core.callback.common.ListenerCC.class);
+    jpa_core_callback_method_jar.addClass(ee.jakarta.tck.persistence.core.callback.method.LineItem.class);
+    jpa_core_callback_method_jar.addClass(ee.jakarta.tck.persistence.core.callback.method.Order.class);
+    jpa_core_callback_method_jar.addClass(ee.jakarta.tck.persistence.core.callback.method.Product.class);
+    jpa_core_callback_method_jar.addAsManifestResource("META-INF/MANIFEST.MF");
+    jpa_core_callback_method_jar.addAsManifestResource("META-INF/orm.xml");
+    jpa_core_callback_method_jar.addAsManifestResource("META-INF/persistence.xml");
+    jpa_core_callback_method_pmservlet_vehicle_web_war.addAsLibrary(jpa_core_callback_method_jar);
+    jpa_core_callback_method_pmservlet_vehicle_web_war.addClass(ee.jakarta.tck.persistence.common.PMClientBase.class);
+    jpa_core_callback_method_pmservlet_vehicle_web_war.addClass(ee.jakarta.tck.persistence.core.callback.method.Client.class);
+    jpa_core_callback_method_pmservlet_vehicle_web_war.addClass(ee.jakarta.tck.persistence.core.callback.common.Constants.class);
+    jpa_core_callback_method_pmservlet_vehicle_web_war.addClass(ee.jakarta.tck.persistence.core.callback.common.EntityCallbackClientBase.class);
+    ear.addAsModule(jpa_core_callback_method_pmservlet_vehicle_web_war);
+
+    WebArchive jpa_core_callback_method_puservlet_vehicle_web_war = ShrinkWrap.create(WebArchive.class, "jpa_core_callback_method_puservlet_vehicle_web_war");
+    jpa_core_callback_method_puservlet_vehicle_web_war.addAsWebInfResource("web.xml");
+
+    JavaArchive jpa_core_callback_method_jar = ShrinkWrap.create(JavaArchive.class, "jpa_core_callback_method.jar");
+    jpa_core_callback_method_jar.addClass(ee.jakarta.tck.persistence.core.callback.common.CallbackStatusIF.class);
+    jpa_core_callback_method_jar.addClass(ee.jakarta.tck.persistence.core.callback.common.CallbackStatusImpl.class);
+    jpa_core_callback_method_jar.addClass(ee.jakarta.tck.persistence.core.callback.common.Constants.class);
+    jpa_core_callback_method_jar.addClass(ee.jakarta.tck.persistence.core.callback.common.GenerictListener.class);
+    jpa_core_callback_method_jar.addClass(ee.jakarta.tck.persistence.core.callback.common.GenerictListenerImpl.class);
+    jpa_core_callback_method_jar.addClass(ee.jakarta.tck.persistence.core.callback.common.ListenerA.class);
+    jpa_core_callback_method_jar.addClass(ee.jakarta.tck.persistence.core.callback.common.ListenerAA.class);
+    jpa_core_callback_method_jar.addClass(ee.jakarta.tck.persistence.core.callback.common.ListenerB.class);
+    jpa_core_callback_method_jar.addClass(ee.jakarta.tck.persistence.core.callback.common.ListenerBB.class);
+    jpa_core_callback_method_jar.addClass(ee.jakarta.tck.persistence.core.callback.common.ListenerBase.class);
+    jpa_core_callback_method_jar.addClass(ee.jakarta.tck.persistence.core.callback.common.ListenerC.class);
+    jpa_core_callback_method_jar.addClass(ee.jakarta.tck.persistence.core.callback.common.ListenerCC.class);
+    jpa_core_callback_method_jar.addClass(ee.jakarta.tck.persistence.core.callback.method.LineItem.class);
+    jpa_core_callback_method_jar.addClass(ee.jakarta.tck.persistence.core.callback.method.Order.class);
+    jpa_core_callback_method_jar.addClass(ee.jakarta.tck.persistence.core.callback.method.Product.class);
+    jpa_core_callback_method_jar.addAsManifestResource("META-INF/MANIFEST.MF");
+    jpa_core_callback_method_jar.addAsManifestResource("META-INF/orm.xml");
+    jpa_core_callback_method_jar.addAsManifestResource("META-INF/persistence.xml");
+    jpa_core_callback_method_puservlet_vehicle_web_war.addAsLibrary(jpa_core_callback_method_jar);
+    jpa_core_callback_method_puservlet_vehicle_web_war.addClass(ee.jakarta.tck.persistence.common.PMClientBase.class);
+    jpa_core_callback_method_puservlet_vehicle_web_war.addClass(ee.jakarta.tck.persistence.core.callback.method.Client.class);
+    jpa_core_callback_method_puservlet_vehicle_web_war.addClass(ee.jakarta.tck.persistence.core.callback.common.Constants.class);
+    jpa_core_callback_method_puservlet_vehicle_web_war.addClass(ee.jakarta.tck.persistence.core.callback.common.EntityCallbackClientBase.class);
+    ear.addAsModule(jpa_core_callback_method_puservlet_vehicle_web_war);
+
+    JavaArchive jpa_core_callback_method_stateful3_vehicle_client_jar = ShrinkWrap.create(JavaArchive.class, "jpa_core_callback_method_stateful3_vehicle_client_jar");
+    jpa_core_callback_method_stateful3_vehicle_client_jar.addClass(ee.jakarta.tck.persistence.common.PMClientBase.class);
+    ear.addAsModule(jpa_core_callback_method_stateful3_vehicle_client_jar);
+
+    JavaArchive jpa_core_callback_method_stateful3_vehicle_ejb_jar = ShrinkWrap.create(JavaArchive.class, "jpa_core_callback_method_stateful3_vehicle_ejb_jar");
+    jpa_core_callback_method_stateful3_vehicle_ejb_jar.addClass(ee.jakarta.tck.persistence.common.PMClientBase.class);
+    jpa_core_callback_method_stateful3_vehicle_ejb_jar.addClass(ee.jakarta.tck.persistence.core.callback.method.Client.class);
+    jpa_core_callback_method_stateful3_vehicle_ejb_jar.addClass(ee.jakarta.tck.persistence.core.callback.common.Constants.class);
+    jpa_core_callback_method_stateful3_vehicle_ejb_jar.addClass(ee.jakarta.tck.persistence.core.callback.common.EntityCallbackClientBase.class);
+    ear.addAsModule(jpa_core_callback_method_stateful3_vehicle_ejb_jar);
+
+    JavaArchive jpa_core_callback_method_stateless3_vehicle_client_jar = ShrinkWrap.create(JavaArchive.class, "jpa_core_callback_method_stateless3_vehicle_client_jar");
+    jpa_core_callback_method_stateless3_vehicle_client_jar.addClass(ee.jakarta.tck.persistence.common.PMClientBase.class);
+    ear.addAsModule(jpa_core_callback_method_stateless3_vehicle_client_jar);
+
+    JavaArchive jpa_core_callback_method_stateless3_vehicle_ejb_jar = ShrinkWrap.create(JavaArchive.class, "jpa_core_callback_method_stateless3_vehicle_ejb_jar");
+    jpa_core_callback_method_stateless3_vehicle_ejb_jar.addClass(ee.jakarta.tck.persistence.common.PMClientBase.class);
+    jpa_core_callback_method_stateless3_vehicle_ejb_jar.addClass(ee.jakarta.tck.persistence.core.callback.method.Client.class);
+    jpa_core_callback_method_stateless3_vehicle_ejb_jar.addClass(ee.jakarta.tck.persistence.core.callback.common.Constants.class);
+    jpa_core_callback_method_stateless3_vehicle_ejb_jar.addClass(ee.jakarta.tck.persistence.core.callback.common.EntityCallbackClientBase.class);
+    ear.addAsModule(jpa_core_callback_method_stateless3_vehicle_ejb_jar);
+    return ear;
+  }
+
 	private static final Logger logger = (Logger) System.getLogger(Client.class.getName());
 
 	private static final long serialVersionUID = 1L;
diff --git a/jpa/spec-tests/src/main/java/ee/jakarta/tck/persistence/core/callback/methodoverride/Client.java b/jpa/spec-tests/src/main/java/ee/jakarta/tck/persistence/core/callback/methodoverride/Client.java
index d3a8636ad..2948a608a 100644
--- a/jpa/spec-tests/src/main/java/ee/jakarta/tck/persistence/core/callback/methodoverride/Client.java
+++ b/jpa/spec-tests/src/main/java/ee/jakarta/tck/persistence/core/callback/methodoverride/Client.java
@@ -23,8 +23,12 @@ package ee.jakarta.tck.persistence.core.callback.methodoverride;
 import java.lang.System.Logger;
 import java.util.Arrays;
 import java.util.List;
-
+import org.jboss.arquillian.container.test.api.Deployment;
+import org.jboss.shrinkwrap.api.Archive;
+import org.jboss.shrinkwrap.api.ShrinkWrap;
+import org.jboss.shrinkwrap.api.spec.EnterpriseArchive;
 import org.jboss.shrinkwrap.api.spec.JavaArchive;
+import org.jboss.shrinkwrap.api.spec.WebArchive;
 import org.junit.jupiter.api.AfterEach;
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
@@ -35,6 +39,136 @@ import jakarta.persistence.Query;
 
 public class Client extends EntityCallbackClientBase {
 
+  @Deployment(testable = false)
+  public static Archive<?> deployment() {
+
+    final EnterpriseArchive ear = ShrinkWrap.create(EnterpriseArchive.class, "jpa_core_callback_methodoverride_vehicles.ear");
+    // TODO: filter/eliminate the library jar classes that shouldn't be included
+    // Add ear/lib jars
+
+    JavaArchive jpa_core_callback_methodoverride_jar = ShrinkWrap.create(JavaArchive.class, "jpa_core_callback_methodoverride_jar");
+    jpa_core_callback_methodoverride_jar.addClass(ee.jakarta.tck.persistence.core.callback.common.CallbackStatusIF.class);
+    jpa_core_callback_methodoverride_jar.addClass(ee.jakarta.tck.persistence.core.callback.common.CallbackStatusImpl.class);
+    jpa_core_callback_methodoverride_jar.addClass(ee.jakarta.tck.persistence.core.callback.common.Constants.class);
+    jpa_core_callback_methodoverride_jar.addClass(ee.jakarta.tck.persistence.core.callback.common.GenerictListener.class);
+    jpa_core_callback_methodoverride_jar.addClass(ee.jakarta.tck.persistence.core.callback.common.GenerictListenerImpl.class);
+    jpa_core_callback_methodoverride_jar.addClass(ee.jakarta.tck.persistence.core.callback.common.ListenerA.class);
+    jpa_core_callback_methodoverride_jar.addClass(ee.jakarta.tck.persistence.core.callback.common.ListenerAA.class);
+    jpa_core_callback_methodoverride_jar.addClass(ee.jakarta.tck.persistence.core.callback.common.ListenerB.class);
+    jpa_core_callback_methodoverride_jar.addClass(ee.jakarta.tck.persistence.core.callback.common.ListenerBB.class);
+    jpa_core_callback_methodoverride_jar.addClass(ee.jakarta.tck.persistence.core.callback.common.ListenerBase.class);
+    jpa_core_callback_methodoverride_jar.addClass(ee.jakarta.tck.persistence.core.callback.common.ListenerC.class);
+    jpa_core_callback_methodoverride_jar.addClass(ee.jakarta.tck.persistence.core.callback.common.ListenerCC.class);
+    jpa_core_callback_methodoverride_jar.addClass(ee.jakarta.tck.persistence.core.callback.methodoverride.LineItem.class);
+    jpa_core_callback_methodoverride_jar.addClass(ee.jakarta.tck.persistence.core.callback.methodoverride.Order.class);
+    jpa_core_callback_methodoverride_jar.addClass(ee.jakarta.tck.persistence.core.callback.methodoverride.Product.class);
+    ear.addAsLibrary(jpa_core_callback_methodoverride_jar);
+    // Add ear submodules
+
+    JavaArchive jpa_core_callback_methodoverride_appmanagedNoTx_vehicle_client_jar = ShrinkWrap.create(JavaArchive.class, "jpa_core_callback_methodoverride_appmanagedNoTx_vehicle_client_jar");
+    jpa_core_callback_methodoverride_appmanagedNoTx_vehicle_client_jar.addClass(ee.jakarta.tck.persistence.common.PMClientBase.class);
+    ear.addAsModule(jpa_core_callback_methodoverride_appmanagedNoTx_vehicle_client_jar);
+
+    JavaArchive jpa_core_callback_methodoverride_appmanagedNoTx_vehicle_ejb_jar = ShrinkWrap.create(JavaArchive.class, "jpa_core_callback_methodoverride_appmanagedNoTx_vehicle_ejb_jar");
+    jpa_core_callback_methodoverride_appmanagedNoTx_vehicle_ejb_jar.addClass(ee.jakarta.tck.persistence.common.PMClientBase.class);
+    jpa_core_callback_methodoverride_appmanagedNoTx_vehicle_ejb_jar.addClass(ee.jakarta.tck.persistence.core.callback.methodoverride.Client.class);
+    jpa_core_callback_methodoverride_appmanagedNoTx_vehicle_ejb_jar.addClass(ee.jakarta.tck.persistence.core.callback.common.Constants.class);
+    jpa_core_callback_methodoverride_appmanagedNoTx_vehicle_ejb_jar.addClass(ee.jakarta.tck.persistence.core.callback.common.EntityCallbackClientBase.class);
+    ear.addAsModule(jpa_core_callback_methodoverride_appmanagedNoTx_vehicle_ejb_jar);
+
+    JavaArchive jpa_core_callback_methodoverride_appmanaged_vehicle_client_jar = ShrinkWrap.create(JavaArchive.class, "jpa_core_callback_methodoverride_appmanaged_vehicle_client_jar");
+    jpa_core_callback_methodoverride_appmanaged_vehicle_client_jar.addClass(ee.jakarta.tck.persistence.common.PMClientBase.class);
+    ear.addAsModule(jpa_core_callback_methodoverride_appmanaged_vehicle_client_jar);
+
+    JavaArchive jpa_core_callback_methodoverride_appmanaged_vehicle_ejb_jar = ShrinkWrap.create(JavaArchive.class, "jpa_core_callback_methodoverride_appmanaged_vehicle_ejb_jar");
+    jpa_core_callback_methodoverride_appmanaged_vehicle_ejb_jar.addClass(ee.jakarta.tck.persistence.common.PMClientBase.class);
+    jpa_core_callback_methodoverride_appmanaged_vehicle_ejb_jar.addClass(ee.jakarta.tck.persistence.core.callback.methodoverride.Client.class);
+    jpa_core_callback_methodoverride_appmanaged_vehicle_ejb_jar.addClass(ee.jakarta.tck.persistence.core.callback.common.Constants.class);
+    jpa_core_callback_methodoverride_appmanaged_vehicle_ejb_jar.addClass(ee.jakarta.tck.persistence.core.callback.common.EntityCallbackClientBase.class);
+    ear.addAsModule(jpa_core_callback_methodoverride_appmanaged_vehicle_ejb_jar);
+
+    WebArchive jpa_core_callback_methodoverride_pmservlet_vehicle_web_war = ShrinkWrap.create(WebArchive.class, "jpa_core_callback_methodoverride_pmservlet_vehicle_web_war");
+    jpa_core_callback_methodoverride_pmservlet_vehicle_web_war.addAsWebInfResource("web.xml");
+
+    JavaArchive jpa_core_callback_methodoverride_jar = ShrinkWrap.create(JavaArchive.class, "jpa_core_callback_methodoverride.jar");
+    jpa_core_callback_methodoverride_jar.addClass(ee.jakarta.tck.persistence.core.callback.common.CallbackStatusIF.class);
+    jpa_core_callback_methodoverride_jar.addClass(ee.jakarta.tck.persistence.core.callback.common.CallbackStatusImpl.class);
+    jpa_core_callback_methodoverride_jar.addClass(ee.jakarta.tck.persistence.core.callback.common.Constants.class);
+    jpa_core_callback_methodoverride_jar.addClass(ee.jakarta.tck.persistence.core.callback.common.GenerictListener.class);
+    jpa_core_callback_methodoverride_jar.addClass(ee.jakarta.tck.persistence.core.callback.common.GenerictListenerImpl.class);
+    jpa_core_callback_methodoverride_jar.addClass(ee.jakarta.tck.persistence.core.callback.common.ListenerA.class);
+    jpa_core_callback_methodoverride_jar.addClass(ee.jakarta.tck.persistence.core.callback.common.ListenerAA.class);
+    jpa_core_callback_methodoverride_jar.addClass(ee.jakarta.tck.persistence.core.callback.common.ListenerB.class);
+    jpa_core_callback_methodoverride_jar.addClass(ee.jakarta.tck.persistence.core.callback.common.ListenerBB.class);
+    jpa_core_callback_methodoverride_jar.addClass(ee.jakarta.tck.persistence.core.callback.common.ListenerBase.class);
+    jpa_core_callback_methodoverride_jar.addClass(ee.jakarta.tck.persistence.core.callback.common.ListenerC.class);
+    jpa_core_callback_methodoverride_jar.addClass(ee.jakarta.tck.persistence.core.callback.common.ListenerCC.class);
+    jpa_core_callback_methodoverride_jar.addClass(ee.jakarta.tck.persistence.core.callback.methodoverride.LineItem.class);
+    jpa_core_callback_methodoverride_jar.addClass(ee.jakarta.tck.persistence.core.callback.methodoverride.Order.class);
+    jpa_core_callback_methodoverride_jar.addClass(ee.jakarta.tck.persistence.core.callback.methodoverride.Product.class);
+    jpa_core_callback_methodoverride_jar.addAsManifestResource("META-INF/MANIFEST.MF");
+    jpa_core_callback_methodoverride_jar.addAsManifestResource("META-INF/orm.xml");
+    jpa_core_callback_methodoverride_jar.addAsManifestResource("META-INF/persistence.xml");
+    jpa_core_callback_methodoverride_pmservlet_vehicle_web_war.addAsLibrary(jpa_core_callback_methodoverride_jar);
+    jpa_core_callback_methodoverride_pmservlet_vehicle_web_war.addClass(ee.jakarta.tck.persistence.common.PMClientBase.class);
+    jpa_core_callback_methodoverride_pmservlet_vehicle_web_war.addClass(ee.jakarta.tck.persistence.core.callback.methodoverride.Client.class);
+    jpa_core_callback_methodoverride_pmservlet_vehicle_web_war.addClass(ee.jakarta.tck.persistence.core.callback.common.Constants.class);
+    jpa_core_callback_methodoverride_pmservlet_vehicle_web_war.addClass(ee.jakarta.tck.persistence.core.callback.common.EntityCallbackClientBase.class);
+    ear.addAsModule(jpa_core_callback_methodoverride_pmservlet_vehicle_web_war);
+
+    WebArchive jpa_core_callback_methodoverride_puservlet_vehicle_web_war = ShrinkWrap.create(WebArchive.class, "jpa_core_callback_methodoverride_puservlet_vehicle_web_war");
+    jpa_core_callback_methodoverride_puservlet_vehicle_web_war.addAsWebInfResource("web.xml");
+
+    JavaArchive jpa_core_callback_methodoverride_jar = ShrinkWrap.create(JavaArchive.class, "jpa_core_callback_methodoverride.jar");
+    jpa_core_callback_methodoverride_jar.addClass(ee.jakarta.tck.persistence.core.callback.common.CallbackStatusIF.class);
+    jpa_core_callback_methodoverride_jar.addClass(ee.jakarta.tck.persistence.core.callback.common.CallbackStatusImpl.class);
+    jpa_core_callback_methodoverride_jar.addClass(ee.jakarta.tck.persistence.core.callback.common.Constants.class);
+    jpa_core_callback_methodoverride_jar.addClass(ee.jakarta.tck.persistence.core.callback.common.GenerictListener.class);
+    jpa_core_callback_methodoverride_jar.addClass(ee.jakarta.tck.persistence.core.callback.common.GenerictListenerImpl.class);
+    jpa_core_callback_methodoverride_jar.addClass(ee.jakarta.tck.persistence.core.callback.common.ListenerA.class);
+    jpa_core_callback_methodoverride_jar.addClass(ee.jakarta.tck.persistence.core.callback.common.ListenerAA.class);
+    jpa_core_callback_methodoverride_jar.addClass(ee.jakarta.tck.persistence.core.callback.common.ListenerB.class);
+    jpa_core_callback_methodoverride_jar.addClass(ee.jakarta.tck.persistence.core.callback.common.ListenerBB.class);
+    jpa_core_callback_methodoverride_jar.addClass(ee.jakarta.tck.persistence.core.callback.common.ListenerBase.class);
+    jpa_core_callback_methodoverride_jar.addClass(ee.jakarta.tck.persistence.core.callback.common.ListenerC.class);
+    jpa_core_callback_methodoverride_jar.addClass(ee.jakarta.tck.persistence.core.callback.common.ListenerCC.class);
+    jpa_core_callback_methodoverride_jar.addClass(ee.jakarta.tck.persistence.core.callback.methodoverride.LineItem.class);
+    jpa_core_callback_methodoverride_jar.addClass(ee.jakarta.tck.persistence.core.callback.methodoverride.Order.class);
+    jpa_core_callback_methodoverride_jar.addClass(ee.jakarta.tck.persistence.core.callback.methodoverride.Product.class);
+    jpa_core_callback_methodoverride_jar.addAsManifestResource("META-INF/MANIFEST.MF");
+    jpa_core_callback_methodoverride_jar.addAsManifestResource("META-INF/orm.xml");
+    jpa_core_callback_methodoverride_jar.addAsManifestResource("META-INF/persistence.xml");
+    jpa_core_callback_methodoverride_puservlet_vehicle_web_war.addAsLibrary(jpa_core_callback_methodoverride_jar);
+    jpa_core_callback_methodoverride_puservlet_vehicle_web_war.addClass(ee.jakarta.tck.persistence.common.PMClientBase.class);
+    jpa_core_callback_methodoverride_puservlet_vehicle_web_war.addClass(ee.jakarta.tck.persistence.core.callback.methodoverride.Client.class);
+    jpa_core_callback_methodoverride_puservlet_vehicle_web_war.addClass(ee.jakarta.tck.persistence.core.callback.common.Constants.class);
+    jpa_core_callback_methodoverride_puservlet_vehicle_web_war.addClass(ee.jakarta.tck.persistence.core.callback.common.EntityCallbackClientBase.class);
+    ear.addAsModule(jpa_core_callback_methodoverride_puservlet_vehicle_web_war);
+
+    JavaArchive jpa_core_callback_methodoverride_stateful3_vehicle_client_jar = ShrinkWrap.create(JavaArchive.class, "jpa_core_callback_methodoverride_stateful3_vehicle_client_jar");
+    jpa_core_callback_methodoverride_stateful3_vehicle_client_jar.addClass(ee.jakarta.tck.persistence.common.PMClientBase.class);
+    ear.addAsModule(jpa_core_callback_methodoverride_stateful3_vehicle_client_jar);
+
+    JavaArchive jpa_core_callback_methodoverride_stateful3_vehicle_ejb_jar = ShrinkWrap.create(JavaArchive.class, "jpa_core_callback_methodoverride_stateful3_vehicle_ejb_jar");
+    jpa_core_callback_methodoverride_stateful3_vehicle_ejb_jar.addClass(ee.jakarta.tck.persistence.common.PMClientBase.class);
+    jpa_core_callback_methodoverride_stateful3_vehicle_ejb_jar.addClass(ee.jakarta.tck.persistence.core.callback.methodoverride.Client.class);
+    jpa_core_callback_methodoverride_stateful3_vehicle_ejb_jar.addClass(ee.jakarta.tck.persistence.core.callback.common.Constants.class);
+    jpa_core_callback_methodoverride_stateful3_vehicle_ejb_jar.addClass(ee.jakarta.tck.persistence.core.callback.common.EntityCallbackClientBase.class);
+    ear.addAsModule(jpa_core_callback_methodoverride_stateful3_vehicle_ejb_jar);
+
+    JavaArchive jpa_core_callback_methodoverride_stateless3_vehicle_client_jar = ShrinkWrap.create(JavaArchive.class, "jpa_core_callback_methodoverride_stateless3_vehicle_client_jar");
+    jpa_core_callback_methodoverride_stateless3_vehicle_client_jar.addClass(ee.jakarta.tck.persistence.common.PMClientBase.class);
+    ear.addAsModule(jpa_core_callback_methodoverride_stateless3_vehicle_client_jar);
+
+    JavaArchive jpa_core_callback_methodoverride_stateless3_vehicle_ejb_jar = ShrinkWrap.create(JavaArchive.class, "jpa_core_callback_methodoverride_stateless3_vehicle_ejb_jar");
+    jpa_core_callback_methodoverride_stateless3_vehicle_ejb_jar.addClass(ee.jakarta.tck.persistence.common.PMClientBase.class);
+    jpa_core_callback_methodoverride_stateless3_vehicle_ejb_jar.addClass(ee.jakarta.tck.persistence.core.callback.methodoverride.Client.class);
+    jpa_core_callback_methodoverride_stateless3_vehicle_ejb_jar.addClass(ee.jakarta.tck.persistence.core.callback.common.Constants.class);
+    jpa_core_callback_methodoverride_stateless3_vehicle_ejb_jar.addClass(ee.jakarta.tck.persistence.core.callback.common.EntityCallbackClientBase.class);
+    ear.addAsModule(jpa_core_callback_methodoverride_stateless3_vehicle_ejb_jar);
+    return ear;
+  }
+
 	private static final Logger logger = (Logger) System.getLogger(Client.class.getName());
 
 	private Product product;
diff --git a/jpa/spec-tests/src/main/java/ee/jakarta/tck/persistence/core/callback/xml/Client.java b/jpa/spec-tests/src/main/java/ee/jakarta/tck/persistence/core/callback/xml/Client.java
index c8248cdcd..b4af6b479 100644
--- a/jpa/spec-tests/src/main/java/ee/jakarta/tck/persistence/core/callback/xml/Client.java
+++ b/jpa/spec-tests/src/main/java/ee/jakarta/tck/persistence/core/callback/xml/Client.java
@@ -24,8 +24,12 @@ import java.lang.System.Logger;
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.List;
-
+import org.jboss.arquillian.container.test.api.Deployment;
+import org.jboss.shrinkwrap.api.Archive;
+import org.jboss.shrinkwrap.api.ShrinkWrap;
+import org.jboss.shrinkwrap.api.spec.EnterpriseArchive;
 import org.jboss.shrinkwrap.api.spec.JavaArchive;
+import org.jboss.shrinkwrap.api.spec.WebArchive;
 import org.junit.jupiter.api.AfterEach;
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
@@ -36,6 +40,142 @@ import jakarta.persistence.Query;
 
 public class Client extends EntityCallbackClientBase {
 
+  @Deployment(testable = false)
+  public static Archive<?> deployment() {
+
+    final EnterpriseArchive ear = ShrinkWrap.create(EnterpriseArchive.class, "jpa_core_callback_xml_vehicles.ear");
+    // TODO: filter/eliminate the library jar classes that shouldn't be included
+    // Add ear/lib jars
+
+    JavaArchive jpa_core_callback_xml_jar = ShrinkWrap.create(JavaArchive.class, "jpa_core_callback_xml_jar");
+    jpa_core_callback_xml_jar.addClass(ee.jakarta.tck.persistence.core.callback.common.CallbackStatusIF.class);
+    jpa_core_callback_xml_jar.addClass(ee.jakarta.tck.persistence.core.callback.common.CallbackStatusImpl.class);
+    jpa_core_callback_xml_jar.addClass(ee.jakarta.tck.persistence.core.callback.common.Constants.class);
+    jpa_core_callback_xml_jar.addClass(ee.jakarta.tck.persistence.core.callback.common.GenerictListener.class);
+    jpa_core_callback_xml_jar.addClass(ee.jakarta.tck.persistence.core.callback.common.GenerictListenerImpl.class);
+    jpa_core_callback_xml_jar.addClass(ee.jakarta.tck.persistence.core.callback.common.ListenerA.class);
+    jpa_core_callback_xml_jar.addClass(ee.jakarta.tck.persistence.core.callback.common.ListenerAA.class);
+    jpa_core_callback_xml_jar.addClass(ee.jakarta.tck.persistence.core.callback.common.ListenerB.class);
+    jpa_core_callback_xml_jar.addClass(ee.jakarta.tck.persistence.core.callback.common.ListenerBB.class);
+    jpa_core_callback_xml_jar.addClass(ee.jakarta.tck.persistence.core.callback.common.ListenerBase.class);
+    jpa_core_callback_xml_jar.addClass(ee.jakarta.tck.persistence.core.callback.common.ListenerC.class);
+    jpa_core_callback_xml_jar.addClass(ee.jakarta.tck.persistence.core.callback.common.ListenerCC.class);
+    jpa_core_callback_xml_jar.addClass(ee.jakarta.tck.persistence.core.callback.xml.Customer.class);
+    jpa_core_callback_xml_jar.addClass(ee.jakarta.tck.persistence.core.callback.xml.LineItem.class);
+    jpa_core_callback_xml_jar.addClass(ee.jakarta.tck.persistence.core.callback.xml.LineItemSuper.class);
+    jpa_core_callback_xml_jar.addClass(ee.jakarta.tck.persistence.core.callback.xml.Order.class);
+    jpa_core_callback_xml_jar.addClass(ee.jakarta.tck.persistence.core.callback.xml.Product.class);
+    ear.addAsLibrary(jpa_core_callback_xml_jar);
+    // Add ear submodules
+
+    JavaArchive jpa_core_callback_xml_appmanagedNoTx_vehicle_client_jar = ShrinkWrap.create(JavaArchive.class, "jpa_core_callback_xml_appmanagedNoTx_vehicle_client_jar");
+    jpa_core_callback_xml_appmanagedNoTx_vehicle_client_jar.addClass(ee.jakarta.tck.persistence.common.PMClientBase.class);
+    ear.addAsModule(jpa_core_callback_xml_appmanagedNoTx_vehicle_client_jar);
+
+    JavaArchive jpa_core_callback_xml_appmanagedNoTx_vehicle_ejb_jar = ShrinkWrap.create(JavaArchive.class, "jpa_core_callback_xml_appmanagedNoTx_vehicle_ejb_jar");
+    jpa_core_callback_xml_appmanagedNoTx_vehicle_ejb_jar.addClass(ee.jakarta.tck.persistence.common.PMClientBase.class);
+    jpa_core_callback_xml_appmanagedNoTx_vehicle_ejb_jar.addClass(ee.jakarta.tck.persistence.core.callback.xml.Client.class);
+    jpa_core_callback_xml_appmanagedNoTx_vehicle_ejb_jar.addClass(ee.jakarta.tck.persistence.core.callback.common.Constants.class);
+    jpa_core_callback_xml_appmanagedNoTx_vehicle_ejb_jar.addClass(ee.jakarta.tck.persistence.core.callback.common.EntityCallbackClientBase.class);
+    ear.addAsModule(jpa_core_callback_xml_appmanagedNoTx_vehicle_ejb_jar);
+
+    JavaArchive jpa_core_callback_xml_appmanaged_vehicle_client_jar = ShrinkWrap.create(JavaArchive.class, "jpa_core_callback_xml_appmanaged_vehicle_client_jar");
+    jpa_core_callback_xml_appmanaged_vehicle_client_jar.addClass(ee.jakarta.tck.persistence.common.PMClientBase.class);
+    ear.addAsModule(jpa_core_callback_xml_appmanaged_vehicle_client_jar);
+
+    JavaArchive jpa_core_callback_xml_appmanaged_vehicle_ejb_jar = ShrinkWrap.create(JavaArchive.class, "jpa_core_callback_xml_appmanaged_vehicle_ejb_jar");
+    jpa_core_callback_xml_appmanaged_vehicle_ejb_jar.addClass(ee.jakarta.tck.persistence.common.PMClientBase.class);
+    jpa_core_callback_xml_appmanaged_vehicle_ejb_jar.addClass(ee.jakarta.tck.persistence.core.callback.xml.Client.class);
+    jpa_core_callback_xml_appmanaged_vehicle_ejb_jar.addClass(ee.jakarta.tck.persistence.core.callback.common.Constants.class);
+    jpa_core_callback_xml_appmanaged_vehicle_ejb_jar.addClass(ee.jakarta.tck.persistence.core.callback.common.EntityCallbackClientBase.class);
+    ear.addAsModule(jpa_core_callback_xml_appmanaged_vehicle_ejb_jar);
+
+    WebArchive jpa_core_callback_xml_pmservlet_vehicle_web_war = ShrinkWrap.create(WebArchive.class, "jpa_core_callback_xml_pmservlet_vehicle_web_war");
+    jpa_core_callback_xml_pmservlet_vehicle_web_war.addAsWebInfResource("web.xml");
+
+    JavaArchive jpa_core_callback_xml_jar = ShrinkWrap.create(JavaArchive.class, "jpa_core_callback_xml.jar");
+    jpa_core_callback_xml_jar.addClass(ee.jakarta.tck.persistence.core.callback.common.CallbackStatusIF.class);
+    jpa_core_callback_xml_jar.addClass(ee.jakarta.tck.persistence.core.callback.common.CallbackStatusImpl.class);
+    jpa_core_callback_xml_jar.addClass(ee.jakarta.tck.persistence.core.callback.common.Constants.class);
+    jpa_core_callback_xml_jar.addClass(ee.jakarta.tck.persistence.core.callback.common.GenerictListener.class);
+    jpa_core_callback_xml_jar.addClass(ee.jakarta.tck.persistence.core.callback.common.GenerictListenerImpl.class);
+    jpa_core_callback_xml_jar.addClass(ee.jakarta.tck.persistence.core.callback.common.ListenerA.class);
+    jpa_core_callback_xml_jar.addClass(ee.jakarta.tck.persistence.core.callback.common.ListenerAA.class);
+    jpa_core_callback_xml_jar.addClass(ee.jakarta.tck.persistence.core.callback.common.ListenerB.class);
+    jpa_core_callback_xml_jar.addClass(ee.jakarta.tck.persistence.core.callback.common.ListenerBB.class);
+    jpa_core_callback_xml_jar.addClass(ee.jakarta.tck.persistence.core.callback.common.ListenerBase.class);
+    jpa_core_callback_xml_jar.addClass(ee.jakarta.tck.persistence.core.callback.common.ListenerC.class);
+    jpa_core_callback_xml_jar.addClass(ee.jakarta.tck.persistence.core.callback.common.ListenerCC.class);
+    jpa_core_callback_xml_jar.addClass(ee.jakarta.tck.persistence.core.callback.xml.Customer.class);
+    jpa_core_callback_xml_jar.addClass(ee.jakarta.tck.persistence.core.callback.xml.LineItem.class);
+    jpa_core_callback_xml_jar.addClass(ee.jakarta.tck.persistence.core.callback.xml.LineItemSuper.class);
+    jpa_core_callback_xml_jar.addClass(ee.jakarta.tck.persistence.core.callback.xml.Order.class);
+    jpa_core_callback_xml_jar.addClass(ee.jakarta.tck.persistence.core.callback.xml.Product.class);
+    jpa_core_callback_xml_jar.addAsManifestResource("META-INF/MANIFEST.MF");
+    jpa_core_callback_xml_jar.addAsManifestResource("META-INF/orm.xml");
+    jpa_core_callback_xml_jar.addAsManifestResource("META-INF/persistence.xml");
+    jpa_core_callback_xml_pmservlet_vehicle_web_war.addAsLibrary(jpa_core_callback_xml_jar);
+    jpa_core_callback_xml_pmservlet_vehicle_web_war.addClass(ee.jakarta.tck.persistence.common.PMClientBase.class);
+    jpa_core_callback_xml_pmservlet_vehicle_web_war.addClass(ee.jakarta.tck.persistence.core.callback.xml.Client.class);
+    jpa_core_callback_xml_pmservlet_vehicle_web_war.addClass(ee.jakarta.tck.persistence.core.callback.common.Constants.class);
+    jpa_core_callback_xml_pmservlet_vehicle_web_war.addClass(ee.jakarta.tck.persistence.core.callback.common.EntityCallbackClientBase.class);
+    ear.addAsModule(jpa_core_callback_xml_pmservlet_vehicle_web_war);
+
+    WebArchive jpa_core_callback_xml_puservlet_vehicle_web_war = ShrinkWrap.create(WebArchive.class, "jpa_core_callback_xml_puservlet_vehicle_web_war");
+    jpa_core_callback_xml_puservlet_vehicle_web_war.addAsWebInfResource("web.xml");
+
+    JavaArchive jpa_core_callback_xml_jar = ShrinkWrap.create(JavaArchive.class, "jpa_core_callback_xml.jar");
+    jpa_core_callback_xml_jar.addClass(ee.jakarta.tck.persistence.core.callback.common.CallbackStatusIF.class);
+    jpa_core_callback_xml_jar.addClass(ee.jakarta.tck.persistence.core.callback.common.CallbackStatusImpl.class);
+    jpa_core_callback_xml_jar.addClass(ee.jakarta.tck.persistence.core.callback.common.Constants.class);
+    jpa_core_callback_xml_jar.addClass(ee.jakarta.tck.persistence.core.callback.common.GenerictListener.class);
+    jpa_core_callback_xml_jar.addClass(ee.jakarta.tck.persistence.core.callback.common.GenerictListenerImpl.class);
+    jpa_core_callback_xml_jar.addClass(ee.jakarta.tck.persistence.core.callback.common.ListenerA.class);
+    jpa_core_callback_xml_jar.addClass(ee.jakarta.tck.persistence.core.callback.common.ListenerAA.class);
+    jpa_core_callback_xml_jar.addClass(ee.jakarta.tck.persistence.core.callback.common.ListenerB.class);
+    jpa_core_callback_xml_jar.addClass(ee.jakarta.tck.persistence.core.callback.common.ListenerBB.class);
+    jpa_core_callback_xml_jar.addClass(ee.jakarta.tck.persistence.core.callback.common.ListenerBase.class);
+    jpa_core_callback_xml_jar.addClass(ee.jakarta.tck.persistence.core.callback.common.ListenerC.class);
+    jpa_core_callback_xml_jar.addClass(ee.jakarta.tck.persistence.core.callback.common.ListenerCC.class);
+    jpa_core_callback_xml_jar.addClass(ee.jakarta.tck.persistence.core.callback.xml.Customer.class);
+    jpa_core_callback_xml_jar.addClass(ee.jakarta.tck.persistence.core.callback.xml.LineItem.class);
+    jpa_core_callback_xml_jar.addClass(ee.jakarta.tck.persistence.core.callback.xml.LineItemSuper.class);
+    jpa_core_callback_xml_jar.addClass(ee.jakarta.tck.persistence.core.callback.xml.Order.class);
+    jpa_core_callback_xml_jar.addClass(ee.jakarta.tck.persistence.core.callback.xml.Product.class);
+    jpa_core_callback_xml_jar.addAsManifestResource("META-INF/MANIFEST.MF");
+    jpa_core_callback_xml_jar.addAsManifestResource("META-INF/orm.xml");
+    jpa_core_callback_xml_jar.addAsManifestResource("META-INF/persistence.xml");
+    jpa_core_callback_xml_puservlet_vehicle_web_war.addAsLibrary(jpa_core_callback_xml_jar);
+    jpa_core_callback_xml_puservlet_vehicle_web_war.addClass(ee.jakarta.tck.persistence.common.PMClientBase.class);
+    jpa_core_callback_xml_puservlet_vehicle_web_war.addClass(ee.jakarta.tck.persistence.core.callback.xml.Client.class);
+    jpa_core_callback_xml_puservlet_vehicle_web_war.addClass(ee.jakarta.tck.persistence.core.callback.common.Constants.class);
+    jpa_core_callback_xml_puservlet_vehicle_web_war.addClass(ee.jakarta.tck.persistence.core.callback.common.EntityCallbackClientBase.class);
+    ear.addAsModule(jpa_core_callback_xml_puservlet_vehicle_web_war);
+
+    JavaArchive jpa_core_callback_xml_stateful3_vehicle_client_jar = ShrinkWrap.create(JavaArchive.class, "jpa_core_callback_xml_stateful3_vehicle_client_jar");
+    jpa_core_callback_xml_stateful3_vehicle_client_jar.addClass(ee.jakarta.tck.persistence.common.PMClientBase.class);
+    ear.addAsModule(jpa_core_callback_xml_stateful3_vehicle_client_jar);
+
+    JavaArchive jpa_core_callback_xml_stateful3_vehicle_ejb_jar = ShrinkWrap.create(JavaArchive.class, "jpa_core_callback_xml_stateful3_vehicle_ejb_jar");
+    jpa_core_callback_xml_stateful3_vehicle_ejb_jar.addClass(ee.jakarta.tck.persistence.common.PMClientBase.class);
+    jpa_core_callback_xml_stateful3_vehicle_ejb_jar.addClass(ee.jakarta.tck.persistence.core.callback.xml.Client.class);
+    jpa_core_callback_xml_stateful3_vehicle_ejb_jar.addClass(ee.jakarta.tck.persistence.core.callback.common.Constants.class);
+    jpa_core_callback_xml_stateful3_vehicle_ejb_jar.addClass(ee.jakarta.tck.persistence.core.callback.common.EntityCallbackClientBase.class);
+    ear.addAsModule(jpa_core_callback_xml_stateful3_vehicle_ejb_jar);
+
+    JavaArchive jpa_core_callback_xml_stateless3_vehicle_client_jar = ShrinkWrap.create(JavaArchive.class, "jpa_core_callback_xml_stateless3_vehicle_client_jar");
+    jpa_core_callback_xml_stateless3_vehicle_client_jar.addClass(ee.jakarta.tck.persistence.common.PMClientBase.class);
+    ear.addAsModule(jpa_core_callback_xml_stateless3_vehicle_client_jar);
+
+    JavaArchive jpa_core_callback_xml_stateless3_vehicle_ejb_jar = ShrinkWrap.create(JavaArchive.class, "jpa_core_callback_xml_stateless3_vehicle_ejb_jar");
+    jpa_core_callback_xml_stateless3_vehicle_ejb_jar.addClass(ee.jakarta.tck.persistence.common.PMClientBase.class);
+    jpa_core_callback_xml_stateless3_vehicle_ejb_jar.addClass(ee.jakarta.tck.persistence.core.callback.xml.Client.class);
+    jpa_core_callback_xml_stateless3_vehicle_ejb_jar.addClass(ee.jakarta.tck.persistence.core.callback.common.Constants.class);
+    jpa_core_callback_xml_stateless3_vehicle_ejb_jar.addClass(ee.jakarta.tck.persistence.core.callback.common.EntityCallbackClientBase.class);
+    ear.addAsModule(jpa_core_callback_xml_stateless3_vehicle_ejb_jar);
+    return ear;
+  }
+
 	private static final Logger logger = (Logger) System.getLogger(Client.class.getName());
 
 	private static final long serialVersionUID = 1L;
diff --git a/jpa/spec-tests/src/main/java/ee/jakarta/tck/persistence/core/criteriaapi/CriteriaBuilder/Client1.java b/jpa/spec-tests/src/main/java/ee/jakarta/tck/persistence/core/criteriaapi/CriteriaBuilder/Client1.java
index e227c78b9..c85e05f3c 100644
--- a/jpa/spec-tests/src/main/java/ee/jakarta/tck/persistence/core/criteriaapi/CriteriaBuilder/Client1.java
+++ b/jpa/spec-tests/src/main/java/ee/jakarta/tck/persistence/core/criteriaapi/CriteriaBuilder/Client1.java
@@ -19,8 +19,12 @@ package ee.jakarta.tck.persistence.core.criteriaapi.CriteriaBuilder;
 import java.lang.System.Logger;
 import java.util.ArrayList;
 import java.util.Collection;
-
+import org.jboss.arquillian.container.test.api.Deployment;
+import org.jboss.shrinkwrap.api.Archive;
+import org.jboss.shrinkwrap.api.ShrinkWrap;
+import org.jboss.shrinkwrap.api.spec.EnterpriseArchive;
 import org.jboss.shrinkwrap.api.spec.JavaArchive;
+import org.jboss.shrinkwrap.api.spec.WebArchive;
 import org.junit.jupiter.api.Test;
 
 import ee.jakarta.tck.persistence.common.schema30.Customer;
@@ -37,6 +41,192 @@ import jakarta.persistence.criteria.Selection;
 
 public class Client1 extends UtilSetup {
 
+  @Deployment(testable = false)
+  public static Archive<?> deployment() {
+
+    final EnterpriseArchive ear = ShrinkWrap.create(EnterpriseArchive.class, "jpa_core_criteriapia_CriteriaBuilder_vehicles.ear");
+    // TODO: filter/eliminate the library jar classes that shouldn't be included
+    // Add ear/lib jars
+
+    JavaArchive jpa_core_criteriapia_CriteriaBuilder_jar = ShrinkWrap.create(JavaArchive.class, "jpa_core_criteriapia_CriteriaBuilder_jar");
+    jpa_core_criteriapia_CriteriaBuilder_jar.addClass(ee.jakarta.tck.persistence.common.schema30.Address.class);
+    jpa_core_criteriapia_CriteriaBuilder_jar.addClass(ee.jakarta.tck.persistence.common.schema30.Address_.class);
+    jpa_core_criteriapia_CriteriaBuilder_jar.addClass(ee.jakarta.tck.persistence.common.schema30.Alias.class);
+    jpa_core_criteriapia_CriteriaBuilder_jar.addClass(ee.jakarta.tck.persistence.common.schema30.Alias_.class);
+    jpa_core_criteriapia_CriteriaBuilder_jar.addClass(ee.jakarta.tck.persistence.common.schema30.Country.class);
+    jpa_core_criteriapia_CriteriaBuilder_jar.addClass(ee.jakarta.tck.persistence.common.schema30.Country_.class);
+    jpa_core_criteriapia_CriteriaBuilder_jar.addClass(ee.jakarta.tck.persistence.common.schema30.CreditCard.class);
+    jpa_core_criteriapia_CriteriaBuilder_jar.addClass(ee.jakarta.tck.persistence.common.schema30.CreditCard_.class);
+    jpa_core_criteriapia_CriteriaBuilder_jar.addClass(ee.jakarta.tck.persistence.common.schema30.Customer.class);
+    jpa_core_criteriapia_CriteriaBuilder_jar.addClass(ee.jakarta.tck.persistence.common.schema30.Customer_.class);
+    jpa_core_criteriapia_CriteriaBuilder_jar.addClass(ee.jakarta.tck.persistence.common.schema30.Department.class);
+    jpa_core_criteriapia_CriteriaBuilder_jar.addClass(ee.jakarta.tck.persistence.common.schema30.Department_.class);
+    jpa_core_criteriapia_CriteriaBuilder_jar.addClass(ee.jakarta.tck.persistence.common.schema30.Employee.class);
+    jpa_core_criteriapia_CriteriaBuilder_jar.addClass(ee.jakarta.tck.persistence.common.schema30.Employee_.class);
+    jpa_core_criteriapia_CriteriaBuilder_jar.addClass(ee.jakarta.tck.persistence.common.schema30.HardwareProduct.class);
+    jpa_core_criteriapia_CriteriaBuilder_jar.addClass(ee.jakarta.tck.persistence.common.schema30.HardwareProduct_.class);
+    jpa_core_criteriapia_CriteriaBuilder_jar.addClass(ee.jakarta.tck.persistence.common.schema30.Info.class);
+    jpa_core_criteriapia_CriteriaBuilder_jar.addClass(ee.jakarta.tck.persistence.common.schema30.Info_.class);
+    jpa_core_criteriapia_CriteriaBuilder_jar.addClass(ee.jakarta.tck.persistence.common.schema30.LineItem.class);
+    jpa_core_criteriapia_CriteriaBuilder_jar.addClass(ee.jakarta.tck.persistence.common.schema30.LineItemException.class);
+    jpa_core_criteriapia_CriteriaBuilder_jar.addClass(ee.jakarta.tck.persistence.common.schema30.LineItem_.class);
+    jpa_core_criteriapia_CriteriaBuilder_jar.addClass(ee.jakarta.tck.persistence.common.schema30.Order.class);
+    jpa_core_criteriapia_CriteriaBuilder_jar.addClass(ee.jakarta.tck.persistence.common.schema30.Order_.class);
+    jpa_core_criteriapia_CriteriaBuilder_jar.addClass(ee.jakarta.tck.persistence.common.schema30.Phone.class);
+    jpa_core_criteriapia_CriteriaBuilder_jar.addClass(ee.jakarta.tck.persistence.common.schema30.Phone_.class);
+    jpa_core_criteriapia_CriteriaBuilder_jar.addClass(ee.jakarta.tck.persistence.common.schema30.Product.class);
+    jpa_core_criteriapia_CriteriaBuilder_jar.addClass(ee.jakarta.tck.persistence.common.schema30.Product_.class);
+    jpa_core_criteriapia_CriteriaBuilder_jar.addClass(ee.jakarta.tck.persistence.common.schema30.ShelfLife.class);
+    jpa_core_criteriapia_CriteriaBuilder_jar.addClass(ee.jakarta.tck.persistence.common.schema30.ShelfLife_.class);
+    jpa_core_criteriapia_CriteriaBuilder_jar.addClass(ee.jakarta.tck.persistence.common.schema30.SoftwareProduct.class);
+    jpa_core_criteriapia_CriteriaBuilder_jar.addClass(ee.jakarta.tck.persistence.common.schema30.SoftwareProduct_.class);
+    jpa_core_criteriapia_CriteriaBuilder_jar.addClass(ee.jakarta.tck.persistence.common.schema30.Spouse.class);
+    jpa_core_criteriapia_CriteriaBuilder_jar.addClass(ee.jakarta.tck.persistence.common.schema30.Spouse_.class);
+    jpa_core_criteriapia_CriteriaBuilder_jar.addClass(ee.jakarta.tck.persistence.common.schema30.Trim.class);
+    jpa_core_criteriapia_CriteriaBuilder_jar.addClass(ee.jakarta.tck.persistence.common.schema30.Trim_.class);
+    ear.addAsLibrary(jpa_core_criteriapia_CriteriaBuilder_jar);
+    // Add ear submodules
+
+    JavaArchive jpa_core_criteriapia_CriteriaBuilder_appmanagedNoTx_vehicle_client_jar = ShrinkWrap.create(JavaArchive.class, "jpa_core_criteriapia_CriteriaBuilder_appmanagedNoTx_vehicle_client_jar");
+    jpa_core_criteriapia_CriteriaBuilder_appmanagedNoTx_vehicle_client_jar.addClass(ee.jakarta.tck.persistence.common.PMClientBase.class);
+    jpa_core_criteriapia_CriteriaBuilder_appmanagedNoTx_vehicle_client_jar.addClass(ee.jakarta.tck.persistence.common.schema30.Util.class);
+    ear.addAsModule(jpa_core_criteriapia_CriteriaBuilder_appmanagedNoTx_vehicle_client_jar);
+
+    JavaArchive jpa_core_criteriapia_CriteriaBuilder_appmanagedNoTx_vehicle_ejb_jar = ShrinkWrap.create(JavaArchive.class, "jpa_core_criteriapia_CriteriaBuilder_appmanagedNoTx_vehicle_ejb_jar");
+    jpa_core_criteriapia_CriteriaBuilder_appmanagedNoTx_vehicle_ejb_jar.addClass(ee.jakarta.tck.persistence.common.PMClientBase.class);
+    jpa_core_criteriapia_CriteriaBuilder_appmanagedNoTx_vehicle_ejb_jar.addClass(ee.jakarta.tck.persistence.core.criteriaapi.CriteriaBuilder.Client.class);
+    jpa_core_criteriapia_CriteriaBuilder_appmanagedNoTx_vehicle_ejb_jar.addClass(ee.jakarta.tck.persistence.common.schema30.Util.class);
+    ear.addAsModule(jpa_core_criteriapia_CriteriaBuilder_appmanagedNoTx_vehicle_ejb_jar);
+
+    JavaArchive jpa_core_criteriapia_CriteriaBuilder_appmanaged_vehicle_client_jar = ShrinkWrap.create(JavaArchive.class, "jpa_core_criteriapia_CriteriaBuilder_appmanaged_vehicle_client_jar");
+    jpa_core_criteriapia_CriteriaBuilder_appmanaged_vehicle_client_jar.addClass(ee.jakarta.tck.persistence.common.PMClientBase.class);
+    jpa_core_criteriapia_CriteriaBuilder_appmanaged_vehicle_client_jar.addClass(ee.jakarta.tck.persistence.common.schema30.Util.class);
+    ear.addAsModule(jpa_core_criteriapia_CriteriaBuilder_appmanaged_vehicle_client_jar);
+
+    JavaArchive jpa_core_criteriapia_CriteriaBuilder_appmanaged_vehicle_ejb_jar = ShrinkWrap.create(JavaArchive.class, "jpa_core_criteriapia_CriteriaBuilder_appmanaged_vehicle_ejb_jar");
+    jpa_core_criteriapia_CriteriaBuilder_appmanaged_vehicle_ejb_jar.addClass(ee.jakarta.tck.persistence.common.PMClientBase.class);
+    jpa_core_criteriapia_CriteriaBuilder_appmanaged_vehicle_ejb_jar.addClass(ee.jakarta.tck.persistence.core.criteriaapi.CriteriaBuilder.Client.class);
+    jpa_core_criteriapia_CriteriaBuilder_appmanaged_vehicle_ejb_jar.addClass(ee.jakarta.tck.persistence.common.schema30.Util.class);
+    ear.addAsModule(jpa_core_criteriapia_CriteriaBuilder_appmanaged_vehicle_ejb_jar);
+
+    WebArchive jpa_core_criteriapia_CriteriaBuilder_pmservlet_vehicle_web_war = ShrinkWrap.create(WebArchive.class, "jpa_core_criteriapia_CriteriaBuilder_pmservlet_vehicle_web_war");
+    jpa_core_criteriapia_CriteriaBuilder_pmservlet_vehicle_web_war.addAsWebInfResource("web.xml");
+
+    JavaArchive jpa_core_criteriapia_CriteriaBuilder_jar = ShrinkWrap.create(JavaArchive.class, "jpa_core_criteriapia_CriteriaBuilder.jar");
+    jpa_core_criteriapia_CriteriaBuilder_jar.addClass(ee.jakarta.tck.persistence.common.schema30.Address.class);
+    jpa_core_criteriapia_CriteriaBuilder_jar.addClass(ee.jakarta.tck.persistence.common.schema30.Address_.class);
+    jpa_core_criteriapia_CriteriaBuilder_jar.addClass(ee.jakarta.tck.persistence.common.schema30.Alias.class);
+    jpa_core_criteriapia_CriteriaBuilder_jar.addClass(ee.jakarta.tck.persistence.common.schema30.Alias_.class);
+    jpa_core_criteriapia_CriteriaBuilder_jar.addClass(ee.jakarta.tck.persistence.common.schema30.Country.class);
+    jpa_core_criteriapia_CriteriaBuilder_jar.addClass(ee.jakarta.tck.persistence.common.schema30.Country_.class);
+    jpa_core_criteriapia_CriteriaBuilder_jar.addClass(ee.jakarta.tck.persistence.common.schema30.CreditCard.class);
+    jpa_core_criteriapia_CriteriaBuilder_jar.addClass(ee.jakarta.tck.persistence.common.schema30.CreditCard_.class);
+    jpa_core_criteriapia_CriteriaBuilder_jar.addClass(ee.jakarta.tck.persistence.common.schema30.Customer.class);
+    jpa_core_criteriapia_CriteriaBuilder_jar.addClass(ee.jakarta.tck.persistence.common.schema30.Customer_.class);
+    jpa_core_criteriapia_CriteriaBuilder_jar.addClass(ee.jakarta.tck.persistence.common.schema30.Department.class);
+    jpa_core_criteriapia_CriteriaBuilder_jar.addClass(ee.jakarta.tck.persistence.common.schema30.Department_.class);
+    jpa_core_criteriapia_CriteriaBuilder_jar.addClass(ee.jakarta.tck.persistence.common.schema30.Employee.class);
+    jpa_core_criteriapia_CriteriaBuilder_jar.addClass(ee.jakarta.tck.persistence.common.schema30.Employee_.class);
+    jpa_core_criteriapia_CriteriaBuilder_jar.addClass(ee.jakarta.tck.persistence.common.schema30.HardwareProduct.class);
+    jpa_core_criteriapia_CriteriaBuilder_jar.addClass(ee.jakarta.tck.persistence.common.schema30.HardwareProduct_.class);
+    jpa_core_criteriapia_CriteriaBuilder_jar.addClass(ee.jakarta.tck.persistence.common.schema30.Info.class);
+    jpa_core_criteriapia_CriteriaBuilder_jar.addClass(ee.jakarta.tck.persistence.common.schema30.Info_.class);
+    jpa_core_criteriapia_CriteriaBuilder_jar.addClass(ee.jakarta.tck.persistence.common.schema30.LineItem.class);
+    jpa_core_criteriapia_CriteriaBuilder_jar.addClass(ee.jakarta.tck.persistence.common.schema30.LineItemException.class);
+    jpa_core_criteriapia_CriteriaBuilder_jar.addClass(ee.jakarta.tck.persistence.common.schema30.LineItem_.class);
+    jpa_core_criteriapia_CriteriaBuilder_jar.addClass(ee.jakarta.tck.persistence.common.schema30.Order.class);
+    jpa_core_criteriapia_CriteriaBuilder_jar.addClass(ee.jakarta.tck.persistence.common.schema30.Order_.class);
+    jpa_core_criteriapia_CriteriaBuilder_jar.addClass(ee.jakarta.tck.persistence.common.schema30.Phone.class);
+    jpa_core_criteriapia_CriteriaBuilder_jar.addClass(ee.jakarta.tck.persistence.common.schema30.Phone_.class);
+    jpa_core_criteriapia_CriteriaBuilder_jar.addClass(ee.jakarta.tck.persistence.common.schema30.Product.class);
+    jpa_core_criteriapia_CriteriaBuilder_jar.addClass(ee.jakarta.tck.persistence.common.schema30.Product_.class);
+    jpa_core_criteriapia_CriteriaBuilder_jar.addClass(ee.jakarta.tck.persistence.common.schema30.ShelfLife.class);
+    jpa_core_criteriapia_CriteriaBuilder_jar.addClass(ee.jakarta.tck.persistence.common.schema30.ShelfLife_.class);
+    jpa_core_criteriapia_CriteriaBuilder_jar.addClass(ee.jakarta.tck.persistence.common.schema30.SoftwareProduct.class);
+    jpa_core_criteriapia_CriteriaBuilder_jar.addClass(ee.jakarta.tck.persistence.common.schema30.SoftwareProduct_.class);
+    jpa_core_criteriapia_CriteriaBuilder_jar.addClass(ee.jakarta.tck.persistence.common.schema30.Spouse.class);
+    jpa_core_criteriapia_CriteriaBuilder_jar.addClass(ee.jakarta.tck.persistence.common.schema30.Spouse_.class);
+    jpa_core_criteriapia_CriteriaBuilder_jar.addClass(ee.jakarta.tck.persistence.common.schema30.Trim.class);
+    jpa_core_criteriapia_CriteriaBuilder_jar.addClass(ee.jakarta.tck.persistence.common.schema30.Trim_.class);
+    jpa_core_criteriapia_CriteriaBuilder_jar.addAsManifestResource("META-INF/MANIFEST.MF");
+    jpa_core_criteriapia_CriteriaBuilder_jar.addAsManifestResource("META-INF/persistence.xml");
+    jpa_core_criteriapia_CriteriaBuilder_pmservlet_vehicle_web_war.addAsLibrary(jpa_core_criteriapia_CriteriaBuilder_jar);
+    jpa_core_criteriapia_CriteriaBuilder_pmservlet_vehicle_web_war.addClass(ee.jakarta.tck.persistence.common.PMClientBase.class);
+    jpa_core_criteriapia_CriteriaBuilder_pmservlet_vehicle_web_war.addClass(ee.jakarta.tck.persistence.core.criteriaapi.CriteriaBuilder.Client.class);
+    jpa_core_criteriapia_CriteriaBuilder_pmservlet_vehicle_web_war.addClass(ee.jakarta.tck.persistence.common.schema30.Util.class);
+    ear.addAsModule(jpa_core_criteriapia_CriteriaBuilder_pmservlet_vehicle_web_war);
+
+    WebArchive jpa_core_criteriapia_CriteriaBuilder_puservlet_vehicle_web_war = ShrinkWrap.create(WebArchive.class, "jpa_core_criteriapia_CriteriaBuilder_puservlet_vehicle_web_war");
+    jpa_core_criteriapia_CriteriaBuilder_puservlet_vehicle_web_war.addAsWebInfResource("web.xml");
+
+    JavaArchive jpa_core_criteriapia_CriteriaBuilder_jar = ShrinkWrap.create(JavaArchive.class, "jpa_core_criteriapia_CriteriaBuilder.jar");
+    jpa_core_criteriapia_CriteriaBuilder_jar.addClass(ee.jakarta.tck.persistence.common.schema30.Address.class);
+    jpa_core_criteriapia_CriteriaBuilder_jar.addClass(ee.jakarta.tck.persistence.common.schema30.Address_.class);
+    jpa_core_criteriapia_CriteriaBuilder_jar.addClass(ee.jakarta.tck.persistence.common.schema30.Alias.class);
+    jpa_core_criteriapia_CriteriaBuilder_jar.addClass(ee.jakarta.tck.persistence.common.schema30.Alias_.class);
+    jpa_core_criteriapia_CriteriaBuilder_jar.addClass(ee.jakarta.tck.persistence.common.schema30.Country.class);
+    jpa_core_criteriapia_CriteriaBuilder_jar.addClass(ee.jakarta.tck.persistence.common.schema30.Country_.class);
+    jpa_core_criteriapia_CriteriaBuilder_jar.addClass(ee.jakarta.tck.persistence.common.schema30.CreditCard.class);
+    jpa_core_criteriapia_CriteriaBuilder_jar.addClass(ee.jakarta.tck.persistence.common.schema30.CreditCard_.class);
+    jpa_core_criteriapia_CriteriaBuilder_jar.addClass(ee.jakarta.tck.persistence.common.schema30.Customer.class);
+    jpa_core_criteriapia_CriteriaBuilder_jar.addClass(ee.jakarta.tck.persistence.common.schema30.Customer_.class);
+    jpa_core_criteriapia_CriteriaBuilder_jar.addClass(ee.jakarta.tck.persistence.common.schema30.Department.class);
+    jpa_core_criteriapia_CriteriaBuilder_jar.addClass(ee.jakarta.tck.persistence.common.schema30.Department_.class);
+    jpa_core_criteriapia_CriteriaBuilder_jar.addClass(ee.jakarta.tck.persistence.common.schema30.Employee.class);
+    jpa_core_criteriapia_CriteriaBuilder_jar.addClass(ee.jakarta.tck.persistence.common.schema30.Employee_.class);
+    jpa_core_criteriapia_CriteriaBuilder_jar.addClass(ee.jakarta.tck.persistence.common.schema30.HardwareProduct.class);
+    jpa_core_criteriapia_CriteriaBuilder_jar.addClass(ee.jakarta.tck.persistence.common.schema30.HardwareProduct_.class);
+    jpa_core_criteriapia_CriteriaBuilder_jar.addClass(ee.jakarta.tck.persistence.common.schema30.Info.class);
+    jpa_core_criteriapia_CriteriaBuilder_jar.addClass(ee.jakarta.tck.persistence.common.schema30.Info_.class);
+    jpa_core_criteriapia_CriteriaBuilder_jar.addClass(ee.jakarta.tck.persistence.common.schema30.LineItem.class);
+    jpa_core_criteriapia_CriteriaBuilder_jar.addClass(ee.jakarta.tck.persistence.common.schema30.LineItemException.class);
+    jpa_core_criteriapia_CriteriaBuilder_jar.addClass(ee.jakarta.tck.persistence.common.schema30.LineItem_.class);
+    jpa_core_criteriapia_CriteriaBuilder_jar.addClass(ee.jakarta.tck.persistence.common.schema30.Order.class);
+    jpa_core_criteriapia_CriteriaBuilder_jar.addClass(ee.jakarta.tck.persistence.common.schema30.Order_.class);
+    jpa_core_criteriapia_CriteriaBuilder_jar.addClass(ee.jakarta.tck.persistence.common.schema30.Phone.class);
+    jpa_core_criteriapia_CriteriaBuilder_jar.addClass(ee.jakarta.tck.persistence.common.schema30.Phone_.class);
+    jpa_core_criteriapia_CriteriaBuilder_jar.addClass(ee.jakarta.tck.persistence.common.schema30.Product.class);
+    jpa_core_criteriapia_CriteriaBuilder_jar.addClass(ee.jakarta.tck.persistence.common.schema30.Product_.class);
+    jpa_core_criteriapia_CriteriaBuilder_jar.addClass(ee.jakarta.tck.persistence.common.schema30.ShelfLife.class);
+    jpa_core_criteriapia_CriteriaBuilder_jar.addClass(ee.jakarta.tck.persistence.common.schema30.ShelfLife_.class);
+    jpa_core_criteriapia_CriteriaBuilder_jar.addClass(ee.jakarta.tck.persistence.common.schema30.SoftwareProduct.class);
+    jpa_core_criteriapia_CriteriaBuilder_jar.addClass(ee.jakarta.tck.persistence.common.schema30.SoftwareProduct_.class);
+    jpa_core_criteriapia_CriteriaBuilder_jar.addClass(ee.jakarta.tck.persistence.common.schema30.Spouse.class);
+    jpa_core_criteriapia_CriteriaBuilder_jar.addClass(ee.jakarta.tck.persistence.common.schema30.Spouse_.class);
+    jpa_core_criteriapia_CriteriaBuilder_jar.addClass(ee.jakarta.tck.persistence.common.schema30.Trim.class);
+    jpa_core_criteriapia_CriteriaBuilder_jar.addClass(ee.jakarta.tck.persistence.common.schema30.Trim_.class);
+    jpa_core_criteriapia_CriteriaBuilder_jar.addAsManifestResource("META-INF/MANIFEST.MF");
+    jpa_core_criteriapia_CriteriaBuilder_jar.addAsManifestResource("META-INF/persistence.xml");
+    jpa_core_criteriapia_CriteriaBuilder_puservlet_vehicle_web_war.addAsLibrary(jpa_core_criteriapia_CriteriaBuilder_jar);
+    jpa_core_criteriapia_CriteriaBuilder_puservlet_vehicle_web_war.addClass(ee.jakarta.tck.persistence.common.PMClientBase.class);
+    jpa_core_criteriapia_CriteriaBuilder_puservlet_vehicle_web_war.addClass(ee.jakarta.tck.persistence.core.criteriaapi.CriteriaBuilder.Client.class);
+    jpa_core_criteriapia_CriteriaBuilder_puservlet_vehicle_web_war.addClass(ee.jakarta.tck.persistence.common.schema30.Util.class);
+    ear.addAsModule(jpa_core_criteriapia_CriteriaBuilder_puservlet_vehicle_web_war);
+
+    JavaArchive jpa_core_criteriapia_CriteriaBuilder_stateful3_vehicle_client_jar = ShrinkWrap.create(JavaArchive.class, "jpa_core_criteriapia_CriteriaBuilder_stateful3_vehicle_client_jar");
+    jpa_core_criteriapia_CriteriaBuilder_stateful3_vehicle_client_jar.addClass(ee.jakarta.tck.persistence.common.PMClientBase.class);
+    jpa_core_criteriapia_CriteriaBuilder_stateful3_vehicle_client_jar.addClass(ee.jakarta.tck.persistence.common.schema30.Util.class);
+    ear.addAsModule(jpa_core_criteriapia_CriteriaBuilder_stateful3_vehicle_client_jar);
+
+    JavaArchive jpa_core_criteriapia_CriteriaBuilder_stateful3_vehicle_ejb_jar = ShrinkWrap.create(JavaArchive.class, "jpa_core_criteriapia_CriteriaBuilder_stateful3_vehicle_ejb_jar");
+    jpa_core_criteriapia_CriteriaBuilder_stateful3_vehicle_ejb_jar.addClass(ee.jakarta.tck.persistence.common.PMClientBase.class);
+    jpa_core_criteriapia_CriteriaBuilder_stateful3_vehicle_ejb_jar.addClass(ee.jakarta.tck.persistence.core.criteriaapi.CriteriaBuilder.Client.class);
+    jpa_core_criteriapia_CriteriaBuilder_stateful3_vehicle_ejb_jar.addClass(ee.jakarta.tck.persistence.common.schema30.Util.class);
+    ear.addAsModule(jpa_core_criteriapia_CriteriaBuilder_stateful3_vehicle_ejb_jar);
+
+    JavaArchive jpa_core_criteriapia_CriteriaBuilder_stateless3_vehicle_client_jar = ShrinkWrap.create(JavaArchive.class, "jpa_core_criteriapia_CriteriaBuilder_stateless3_vehicle_client_jar");
+    jpa_core_criteriapia_CriteriaBuilder_stateless3_vehicle_client_jar.addClass(ee.jakarta.tck.persistence.common.PMClientBase.class);
+    jpa_core_criteriapia_CriteriaBuilder_stateless3_vehicle_client_jar.addClass(ee.jakarta.tck.persistence.common.schema30.Util.class);
+    ear.addAsModule(jpa_core_criteriapia_CriteriaBuilder_stateless3_vehicle_client_jar);
+
+    JavaArchive jpa_core_criteriapia_CriteriaBuilder_stateless3_vehicle_ejb_jar = ShrinkWrap.create(JavaArchive.class, "jpa_core_criteriapia_CriteriaBuilder_stateless3_vehicle_ejb_jar");
+    jpa_core_criteriapia_CriteriaBuilder_stateless3_vehicle_ejb_jar.addClass(ee.jakarta.tck.persistence.common.PMClientBase.class);
+    jpa_core_criteriapia_CriteriaBuilder_stateless3_vehicle_ejb_jar.addClass(ee.jakarta.tck.persistence.core.criteriaapi.CriteriaBuilder.Client.class);
+    jpa_core_criteriapia_CriteriaBuilder_stateless3_vehicle_ejb_jar.addClass(ee.jakarta.tck.persistence.common.schema30.Util.class);
+    ear.addAsModule(jpa_core_criteriapia_CriteriaBuilder_stateless3_vehicle_ejb_jar);
+    return ear;
+  }
+
 	private static final Logger logger = (Logger) System.getLogger(Client1.class.getName());
 
 	public JavaArchive createDeployment() throws Exception {
diff --git a/jpa/spec-tests/src/main/java/ee/jakarta/tck/persistence/core/criteriaapi/CriteriaBuilder/Client2.java b/jpa/spec-tests/src/main/java/ee/jakarta/tck/persistence/core/criteriaapi/CriteriaBuilder/Client2.java
index 919b4c305..b51513e93 100644
--- a/jpa/spec-tests/src/main/java/ee/jakarta/tck/persistence/core/criteriaapi/CriteriaBuilder/Client2.java
+++ b/jpa/spec-tests/src/main/java/ee/jakarta/tck/persistence/core/criteriaapi/CriteriaBuilder/Client2.java
@@ -22,8 +22,12 @@ import java.util.ArrayList;
 import java.util.Collection;
 import java.util.Collections;
 import java.util.List;
-
+import org.jboss.arquillian.container.test.api.Deployment;
+import org.jboss.shrinkwrap.api.Archive;
+import org.jboss.shrinkwrap.api.ShrinkWrap;
+import org.jboss.shrinkwrap.api.spec.EnterpriseArchive;
 import org.jboss.shrinkwrap.api.spec.JavaArchive;
+import org.jboss.shrinkwrap.api.spec.WebArchive;
 import org.junit.jupiter.api.Test;
 
 import com.sun.ts.lib.harness.SetupMethod;
@@ -50,6 +54,192 @@ import jakarta.persistence.metamodel.Metamodel;
 
 public class Client2 extends UtilCustAliasProductData {
 
+  @Deployment(testable = false)
+  public static Archive<?> deployment() {
+
+    final EnterpriseArchive ear = ShrinkWrap.create(EnterpriseArchive.class, "jpa_core_criteriapia_CriteriaBuilder_vehicles.ear");
+    // TODO: filter/eliminate the library jar classes that shouldn't be included
+    // Add ear/lib jars
+
+    JavaArchive jpa_core_criteriapia_CriteriaBuilder_jar = ShrinkWrap.create(JavaArchive.class, "jpa_core_criteriapia_CriteriaBuilder_jar");
+    jpa_core_criteriapia_CriteriaBuilder_jar.addClass(ee.jakarta.tck.persistence.common.schema30.Address.class);
+    jpa_core_criteriapia_CriteriaBuilder_jar.addClass(ee.jakarta.tck.persistence.common.schema30.Address_.class);
+    jpa_core_criteriapia_CriteriaBuilder_jar.addClass(ee.jakarta.tck.persistence.common.schema30.Alias.class);
+    jpa_core_criteriapia_CriteriaBuilder_jar.addClass(ee.jakarta.tck.persistence.common.schema30.Alias_.class);
+    jpa_core_criteriapia_CriteriaBuilder_jar.addClass(ee.jakarta.tck.persistence.common.schema30.Country.class);
+    jpa_core_criteriapia_CriteriaBuilder_jar.addClass(ee.jakarta.tck.persistence.common.schema30.Country_.class);
+    jpa_core_criteriapia_CriteriaBuilder_jar.addClass(ee.jakarta.tck.persistence.common.schema30.CreditCard.class);
+    jpa_core_criteriapia_CriteriaBuilder_jar.addClass(ee.jakarta.tck.persistence.common.schema30.CreditCard_.class);
+    jpa_core_criteriapia_CriteriaBuilder_jar.addClass(ee.jakarta.tck.persistence.common.schema30.Customer.class);
+    jpa_core_criteriapia_CriteriaBuilder_jar.addClass(ee.jakarta.tck.persistence.common.schema30.Customer_.class);
+    jpa_core_criteriapia_CriteriaBuilder_jar.addClass(ee.jakarta.tck.persistence.common.schema30.Department.class);
+    jpa_core_criteriapia_CriteriaBuilder_jar.addClass(ee.jakarta.tck.persistence.common.schema30.Department_.class);
+    jpa_core_criteriapia_CriteriaBuilder_jar.addClass(ee.jakarta.tck.persistence.common.schema30.Employee.class);
+    jpa_core_criteriapia_CriteriaBuilder_jar.addClass(ee.jakarta.tck.persistence.common.schema30.Employee_.class);
+    jpa_core_criteriapia_CriteriaBuilder_jar.addClass(ee.jakarta.tck.persistence.common.schema30.HardwareProduct.class);
+    jpa_core_criteriapia_CriteriaBuilder_jar.addClass(ee.jakarta.tck.persistence.common.schema30.HardwareProduct_.class);
+    jpa_core_criteriapia_CriteriaBuilder_jar.addClass(ee.jakarta.tck.persistence.common.schema30.Info.class);
+    jpa_core_criteriapia_CriteriaBuilder_jar.addClass(ee.jakarta.tck.persistence.common.schema30.Info_.class);
+    jpa_core_criteriapia_CriteriaBuilder_jar.addClass(ee.jakarta.tck.persistence.common.schema30.LineItem.class);
+    jpa_core_criteriapia_CriteriaBuilder_jar.addClass(ee.jakarta.tck.persistence.common.schema30.LineItemException.class);
+    jpa_core_criteriapia_CriteriaBuilder_jar.addClass(ee.jakarta.tck.persistence.common.schema30.LineItem_.class);
+    jpa_core_criteriapia_CriteriaBuilder_jar.addClass(ee.jakarta.tck.persistence.common.schema30.Order.class);
+    jpa_core_criteriapia_CriteriaBuilder_jar.addClass(ee.jakarta.tck.persistence.common.schema30.Order_.class);
+    jpa_core_criteriapia_CriteriaBuilder_jar.addClass(ee.jakarta.tck.persistence.common.schema30.Phone.class);
+    jpa_core_criteriapia_CriteriaBuilder_jar.addClass(ee.jakarta.tck.persistence.common.schema30.Phone_.class);
+    jpa_core_criteriapia_CriteriaBuilder_jar.addClass(ee.jakarta.tck.persistence.common.schema30.Product.class);
+    jpa_core_criteriapia_CriteriaBuilder_jar.addClass(ee.jakarta.tck.persistence.common.schema30.Product_.class);
+    jpa_core_criteriapia_CriteriaBuilder_jar.addClass(ee.jakarta.tck.persistence.common.schema30.ShelfLife.class);
+    jpa_core_criteriapia_CriteriaBuilder_jar.addClass(ee.jakarta.tck.persistence.common.schema30.ShelfLife_.class);
+    jpa_core_criteriapia_CriteriaBuilder_jar.addClass(ee.jakarta.tck.persistence.common.schema30.SoftwareProduct.class);
+    jpa_core_criteriapia_CriteriaBuilder_jar.addClass(ee.jakarta.tck.persistence.common.schema30.SoftwareProduct_.class);
+    jpa_core_criteriapia_CriteriaBuilder_jar.addClass(ee.jakarta.tck.persistence.common.schema30.Spouse.class);
+    jpa_core_criteriapia_CriteriaBuilder_jar.addClass(ee.jakarta.tck.persistence.common.schema30.Spouse_.class);
+    jpa_core_criteriapia_CriteriaBuilder_jar.addClass(ee.jakarta.tck.persistence.common.schema30.Trim.class);
+    jpa_core_criteriapia_CriteriaBuilder_jar.addClass(ee.jakarta.tck.persistence.common.schema30.Trim_.class);
+    ear.addAsLibrary(jpa_core_criteriapia_CriteriaBuilder_jar);
+    // Add ear submodules
+
+    JavaArchive jpa_core_criteriapia_CriteriaBuilder_appmanagedNoTx_vehicle_client_jar = ShrinkWrap.create(JavaArchive.class, "jpa_core_criteriapia_CriteriaBuilder_appmanagedNoTx_vehicle_client_jar");
+    jpa_core_criteriapia_CriteriaBuilder_appmanagedNoTx_vehicle_client_jar.addClass(ee.jakarta.tck.persistence.common.PMClientBase.class);
+    jpa_core_criteriapia_CriteriaBuilder_appmanagedNoTx_vehicle_client_jar.addClass(ee.jakarta.tck.persistence.common.schema30.Util.class);
+    ear.addAsModule(jpa_core_criteriapia_CriteriaBuilder_appmanagedNoTx_vehicle_client_jar);
+
+    JavaArchive jpa_core_criteriapia_CriteriaBuilder_appmanagedNoTx_vehicle_ejb_jar = ShrinkWrap.create(JavaArchive.class, "jpa_core_criteriapia_CriteriaBuilder_appmanagedNoTx_vehicle_ejb_jar");
+    jpa_core_criteriapia_CriteriaBuilder_appmanagedNoTx_vehicle_ejb_jar.addClass(ee.jakarta.tck.persistence.common.PMClientBase.class);
+    jpa_core_criteriapia_CriteriaBuilder_appmanagedNoTx_vehicle_ejb_jar.addClass(ee.jakarta.tck.persistence.core.criteriaapi.CriteriaBuilder.Client.class);
+    jpa_core_criteriapia_CriteriaBuilder_appmanagedNoTx_vehicle_ejb_jar.addClass(ee.jakarta.tck.persistence.common.schema30.Util.class);
+    ear.addAsModule(jpa_core_criteriapia_CriteriaBuilder_appmanagedNoTx_vehicle_ejb_jar);
+
+    JavaArchive jpa_core_criteriapia_CriteriaBuilder_appmanaged_vehicle_client_jar = ShrinkWrap.create(JavaArchive.class, "jpa_core_criteriapia_CriteriaBuilder_appmanaged_vehicle_client_jar");
+    jpa_core_criteriapia_CriteriaBuilder_appmanaged_vehicle_client_jar.addClass(ee.jakarta.tck.persistence.common.PMClientBase.class);
+    jpa_core_criteriapia_CriteriaBuilder_appmanaged_vehicle_client_jar.addClass(ee.jakarta.tck.persistence.common.schema30.Util.class);
+    ear.addAsModule(jpa_core_criteriapia_CriteriaBuilder_appmanaged_vehicle_client_jar);
+
+    JavaArchive jpa_core_criteriapia_CriteriaBuilder_appmanaged_vehicle_ejb_jar = ShrinkWrap.create(JavaArchive.class, "jpa_core_criteriapia_CriteriaBuilder_appmanaged_vehicle_ejb_jar");
+    jpa_core_criteriapia_CriteriaBuilder_appmanaged_vehicle_ejb_jar.addClass(ee.jakarta.tck.persistence.common.PMClientBase.class);
+    jpa_core_criteriapia_CriteriaBuilder_appmanaged_vehicle_ejb_jar.addClass(ee.jakarta.tck.persistence.core.criteriaapi.CriteriaBuilder.Client.class);
+    jpa_core_criteriapia_CriteriaBuilder_appmanaged_vehicle_ejb_jar.addClass(ee.jakarta.tck.persistence.common.schema30.Util.class);
+    ear.addAsModule(jpa_core_criteriapia_CriteriaBuilder_appmanaged_vehicle_ejb_jar);
+
+    WebArchive jpa_core_criteriapia_CriteriaBuilder_pmservlet_vehicle_web_war = ShrinkWrap.create(WebArchive.class, "jpa_core_criteriapia_CriteriaBuilder_pmservlet_vehicle_web_war");
+    jpa_core_criteriapia_CriteriaBuilder_pmservlet_vehicle_web_war.addAsWebInfResource("web.xml");
+
+    JavaArchive jpa_core_criteriapia_CriteriaBuilder_jar = ShrinkWrap.create(JavaArchive.class, "jpa_core_criteriapia_CriteriaBuilder.jar");
+    jpa_core_criteriapia_CriteriaBuilder_jar.addClass(ee.jakarta.tck.persistence.common.schema30.Address.class);
+    jpa_core_criteriapia_CriteriaBuilder_jar.addClass(ee.jakarta.tck.persistence.common.schema30.Address_.class);
+    jpa_core_criteriapia_CriteriaBuilder_jar.addClass(ee.jakarta.tck.persistence.common.schema30.Alias.class);
+    jpa_core_criteriapia_CriteriaBuilder_jar.addClass(ee.jakarta.tck.persistence.common.schema30.Alias_.class);
+    jpa_core_criteriapia_CriteriaBuilder_jar.addClass(ee.jakarta.tck.persistence.common.schema30.Country.class);
+    jpa_core_criteriapia_CriteriaBuilder_jar.addClass(ee.jakarta.tck.persistence.common.schema30.Country_.class);
+    jpa_core_criteriapia_CriteriaBuilder_jar.addClass(ee.jakarta.tck.persistence.common.schema30.CreditCard.class);
+    jpa_core_criteriapia_CriteriaBuilder_jar.addClass(ee.jakarta.tck.persistence.common.schema30.CreditCard_.class);
+    jpa_core_criteriapia_CriteriaBuilder_jar.addClass(ee.jakarta.tck.persistence.common.schema30.Customer.class);
+    jpa_core_criteriapia_CriteriaBuilder_jar.addClass(ee.jakarta.tck.persistence.common.schema30.Customer_.class);
+    jpa_core_criteriapia_CriteriaBuilder_jar.addClass(ee.jakarta.tck.persistence.common.schema30.Department.class);
+    jpa_core_criteriapia_CriteriaBuilder_jar.addClass(ee.jakarta.tck.persistence.common.schema30.Department_.class);
+    jpa_core_criteriapia_CriteriaBuilder_jar.addClass(ee.jakarta.tck.persistence.common.schema30.Employee.class);
+    jpa_core_criteriapia_CriteriaBuilder_jar.addClass(ee.jakarta.tck.persistence.common.schema30.Employee_.class);
+    jpa_core_criteriapia_CriteriaBuilder_jar.addClass(ee.jakarta.tck.persistence.common.schema30.HardwareProduct.class);
+    jpa_core_criteriapia_CriteriaBuilder_jar.addClass(ee.jakarta.tck.persistence.common.schema30.HardwareProduct_.class);
+    jpa_core_criteriapia_CriteriaBuilder_jar.addClass(ee.jakarta.tck.persistence.common.schema30.Info.class);
+    jpa_core_criteriapia_CriteriaBuilder_jar.addClass(ee.jakarta.tck.persistence.common.schema30.Info_.class);
+    jpa_core_criteriapia_CriteriaBuilder_jar.addClass(ee.jakarta.tck.persistence.common.schema30.LineItem.class);
+    jpa_core_criteriapia_CriteriaBuilder_jar.addClass(ee.jakarta.tck.persistence.common.schema30.LineItemException.class);
+    jpa_core_criteriapia_CriteriaBuilder_jar.addClass(ee.jakarta.tck.persistence.common.schema30.LineItem_.class);
+    jpa_core_criteriapia_CriteriaBuilder_jar.addClass(ee.jakarta.tck.persistence.common.schema30.Order.class);
+    jpa_core_criteriapia_CriteriaBuilder_jar.addClass(ee.jakarta.tck.persistence.common.schema30.Order_.class);
+    jpa_core_criteriapia_CriteriaBuilder_jar.addClass(ee.jakarta.tck.persistence.common.schema30.Phone.class);
+    jpa_core_criteriapia_CriteriaBuilder_jar.addClass(ee.jakarta.tck.persistence.common.schema30.Phone_.class);
+    jpa_core_criteriapia_CriteriaBuilder_jar.addClass(ee.jakarta.tck.persistence.common.schema30.Product.class);
+    jpa_core_criteriapia_CriteriaBuilder_jar.addClass(ee.jakarta.tck.persistence.common.schema30.Product_.class);
+    jpa_core_criteriapia_CriteriaBuilder_jar.addClass(ee.jakarta.tck.persistence.common.schema30.ShelfLife.class);
+    jpa_core_criteriapia_CriteriaBuilder_jar.addClass(ee.jakarta.tck.persistence.common.schema30.ShelfLife_.class);
+    jpa_core_criteriapia_CriteriaBuilder_jar.addClass(ee.jakarta.tck.persistence.common.schema30.SoftwareProduct.class);
+    jpa_core_criteriapia_CriteriaBuilder_jar.addClass(ee.jakarta.tck.persistence.common.schema30.SoftwareProduct_.class);
+    jpa_core_criteriapia_CriteriaBuilder_jar.addClass(ee.jakarta.tck.persistence.common.schema30.Spouse.class);
+    jpa_core_criteriapia_CriteriaBuilder_jar.addClass(ee.jakarta.tck.persistence.common.schema30.Spouse_.class);
+    jpa_core_criteriapia_CriteriaBuilder_jar.addClass(ee.jakarta.tck.persistence.common.schema30.Trim.class);
+    jpa_core_criteriapia_CriteriaBuilder_jar.addClass(ee.jakarta.tck.persistence.common.schema30.Trim_.class);
+    jpa_core_criteriapia_CriteriaBuilder_jar.addAsManifestResource("META-INF/MANIFEST.MF");
+    jpa_core_criteriapia_CriteriaBuilder_jar.addAsManifestResource("META-INF/persistence.xml");
+    jpa_core_criteriapia_CriteriaBuilder_pmservlet_vehicle_web_war.addAsLibrary(jpa_core_criteriapia_CriteriaBuilder_jar);
+    jpa_core_criteriapia_CriteriaBuilder_pmservlet_vehicle_web_war.addClass(ee.jakarta.tck.persistence.common.PMClientBase.class);
+    jpa_core_criteriapia_CriteriaBuilder_pmservlet_vehicle_web_war.addClass(ee.jakarta.tck.persistence.core.criteriaapi.CriteriaBuilder.Client.class);
+    jpa_core_criteriapia_CriteriaBuilder_pmservlet_vehicle_web_war.addClass(ee.jakarta.tck.persistence.common.schema30.Util.class);
+    ear.addAsModule(jpa_core_criteriapia_CriteriaBuilder_pmservlet_vehicle_web_war);
+
+    WebArchive jpa_core_criteriapia_CriteriaBuilder_puservlet_vehicle_web_war = ShrinkWrap.create(WebArchive.class, "jpa_core_criteriapia_CriteriaBuilder_puservlet_vehicle_web_war");
+    jpa_core_criteriapia_CriteriaBuilder_puservlet_vehicle_web_war.addAsWebInfResource("web.xml");
+
+    JavaArchive jpa_core_criteriapia_CriteriaBuilder_jar = ShrinkWrap.create(JavaArchive.class, "jpa_core_criteriapia_CriteriaBuilder.jar");
+    jpa_core_criteriapia_CriteriaBuilder_jar.addClass(ee.jakarta.tck.persistence.common.schema30.Address.class);
+    jpa_core_criteriapia_CriteriaBuilder_jar.addClass(ee.jakarta.tck.persistence.common.schema30.Address_.class);
+    jpa_core_criteriapia_CriteriaBuilder_jar.addClass(ee.jakarta.tck.persistence.common.schema30.Alias.class);
+    jpa_core_criteriapia_CriteriaBuilder_jar.addClass(ee.jakarta.tck.persistence.common.schema30.Alias_.class);
+    jpa_core_criteriapia_CriteriaBuilder_jar.addClass(ee.jakarta.tck.persistence.common.schema30.Country.class);
+    jpa_core_criteriapia_CriteriaBuilder_jar.addClass(ee.jakarta.tck.persistence.common.schema30.Country_.class);
+    jpa_core_criteriapia_CriteriaBuilder_jar.addClass(ee.jakarta.tck.persistence.common.schema30.CreditCard.class);
+    jpa_core_criteriapia_CriteriaBuilder_jar.addClass(ee.jakarta.tck.persistence.common.schema30.CreditCard_.class);
+    jpa_core_criteriapia_CriteriaBuilder_jar.addClass(ee.jakarta.tck.persistence.common.schema30.Customer.class);
+    jpa_core_criteriapia_CriteriaBuilder_jar.addClass(ee.jakarta.tck.persistence.common.schema30.Customer_.class);
+    jpa_core_criteriapia_CriteriaBuilder_jar.addClass(ee.jakarta.tck.persistence.common.schema30.Department.class);
+    jpa_core_criteriapia_CriteriaBuilder_jar.addClass(ee.jakarta.tck.persistence.common.schema30.Department_.class);
+    jpa_core_criteriapia_CriteriaBuilder_jar.addClass(ee.jakarta.tck.persistence.common.schema30.Employee.class);
+    jpa_core_criteriapia_CriteriaBuilder_jar.addClass(ee.jakarta.tck.persistence.common.schema30.Employee_.class);
+    jpa_core_criteriapia_CriteriaBuilder_jar.addClass(ee.jakarta.tck.persistence.common.schema30.HardwareProduct.class);
+    jpa_core_criteriapia_CriteriaBuilder_jar.addClass(ee.jakarta.tck.persistence.common.schema30.HardwareProduct_.class);
+    jpa_core_criteriapia_CriteriaBuilder_jar.addClass(ee.jakarta.tck.persistence.common.schema30.Info.class);
+    jpa_core_criteriapia_CriteriaBuilder_jar.addClass(ee.jakarta.tck.persistence.common.schema30.Info_.class);
+    jpa_core_criteriapia_CriteriaBuilder_jar.addClass(ee.jakarta.tck.persistence.common.schema30.LineItem.class);
+    jpa_core_criteriapia_CriteriaBuilder_jar.addClass(ee.jakarta.tck.persistence.common.schema30.LineItemException.class);
+    jpa_core_criteriapia_CriteriaBuilder_jar.addClass(ee.jakarta.tck.persistence.common.schema30.LineItem_.class);
+    jpa_core_criteriapia_CriteriaBuilder_jar.addClass(ee.jakarta.tck.persistence.common.schema30.Order.class);
+    jpa_core_criteriapia_CriteriaBuilder_jar.addClass(ee.jakarta.tck.persistence.common.schema30.Order_.class);
+    jpa_core_criteriapia_CriteriaBuilder_jar.addClass(ee.jakarta.tck.persistence.common.schema30.Phone.class);
+    jpa_core_criteriapia_CriteriaBuilder_jar.addClass(ee.jakarta.tck.persistence.common.schema30.Phone_.class);
+    jpa_core_criteriapia_CriteriaBuilder_jar.addClass(ee.jakarta.tck.persistence.common.schema30.Product.class);
+    jpa_core_criteriapia_CriteriaBuilder_jar.addClass(ee.jakarta.tck.persistence.common.schema30.Product_.class);
+    jpa_core_criteriapia_CriteriaBuilder_jar.addClass(ee.jakarta.tck.persistence.common.schema30.ShelfLife.class);
+    jpa_core_criteriapia_CriteriaBuilder_jar.addClass(ee.jakarta.tck.persistence.common.schema30.ShelfLife_.class);
+    jpa_core_criteriapia_CriteriaBuilder_jar.addClass(ee.jakarta.tck.persistence.common.schema30.SoftwareProduct.class);
+    jpa_core_criteriapia_CriteriaBuilder_jar.addClass(ee.jakarta.tck.persistence.common.schema30.SoftwareProduct_.class);
+    jpa_core_criteriapia_CriteriaBuilder_jar.addClass(ee.jakarta.tck.persistence.common.schema30.Spouse.class);
+    jpa_core_criteriapia_CriteriaBuilder_jar.addClass(ee.jakarta.tck.persistence.common.schema30.Spouse_.class);
+    jpa_core_criteriapia_CriteriaBuilder_jar.addClass(ee.jakarta.tck.persistence.common.schema30.Trim.class);
+    jpa_core_criteriapia_CriteriaBuilder_jar.addClass(ee.jakarta.tck.persistence.common.schema30.Trim_.class);
+    jpa_core_criteriapia_CriteriaBuilder_jar.addAsManifestResource("META-INF/MANIFEST.MF");
+    jpa_core_criteriapia_CriteriaBuilder_jar.addAsManifestResource("META-INF/persistence.xml");
+    jpa_core_criteriapia_CriteriaBuilder_puservlet_vehicle_web_war.addAsLibrary(jpa_core_criteriapia_CriteriaBuilder_jar);
+    jpa_core_criteriapia_CriteriaBuilder_puservlet_vehicle_web_war.addClass(ee.jakarta.tck.persistence.common.PMClientBase.class);
+    jpa_core_criteriapia_CriteriaBuilder_puservlet_vehicle_web_war.addClass(ee.jakarta.tck.persistence.core.criteriaapi.CriteriaBuilder.Client.class);
+    jpa_core_criteriapia_CriteriaBuilder_puservlet_vehicle_web_war.addClass(ee.jakarta.tck.persistence.common.schema30.Util.class);
+    ear.addAsModule(jpa_core_criteriapia_CriteriaBuilder_puservlet_vehicle_web_war);
+
+    JavaArchive jpa_core_criteriapia_CriteriaBuilder_stateful3_vehicle_client_jar = ShrinkWrap.create(JavaArchive.class, "jpa_core_criteriapia_CriteriaBuilder_stateful3_vehicle_client_jar");
+    jpa_core_criteriapia_CriteriaBuilder_stateful3_vehicle_client_jar.addClass(ee.jakarta.tck.persistence.common.PMClientBase.class);
+    jpa_core_criteriapia_CriteriaBuilder_stateful3_vehicle_client_jar.addClass(ee.jakarta.tck.persistence.common.schema30.Util.class);
+    ear.addAsModule(jpa_core_criteriapia_CriteriaBuilder_stateful3_vehicle_client_jar);
+
+    JavaArchive jpa_core_criteriapia_CriteriaBuilder_stateful3_vehicle_ejb_jar = ShrinkWrap.create(JavaArchive.class, "jpa_core_criteriapia_CriteriaBuilder_stateful3_vehicle_ejb_jar");
+    jpa_core_criteriapia_CriteriaBuilder_stateful3_vehicle_ejb_jar.addClass(ee.jakarta.tck.persistence.common.PMClientBase.class);
+    jpa_core_criteriapia_CriteriaBuilder_stateful3_vehicle_ejb_jar.addClass(ee.jakarta.tck.persistence.core.criteriaapi.CriteriaBuilder.Client.class);
+    jpa_core_criteriapia_CriteriaBuilder_stateful3_vehicle_ejb_jar.addClass(ee.jakarta.tck.persistence.common.schema30.Util.class);
+    ear.addAsModule(jpa_core_criteriapia_CriteriaBuilder_stateful3_vehicle_ejb_jar);
+
+    JavaArchive jpa_core_criteriapia_CriteriaBuilder_stateless3_vehicle_client_jar = ShrinkWrap.create(JavaArchive.class, "jpa_core_criteriapia_CriteriaBuilder_stateless3_vehicle_client_jar");
+    jpa_core_criteriapia_CriteriaBuilder_stateless3_vehicle_client_jar.addClass(ee.jakarta.tck.persistence.common.PMClientBase.class);
+    jpa_core_criteriapia_CriteriaBuilder_stateless3_vehicle_client_jar.addClass(ee.jakarta.tck.persistence.common.schema30.Util.class);
+    ear.addAsModule(jpa_core_criteriapia_CriteriaBuilder_stateless3_vehicle_client_jar);
+
+    JavaArchive jpa_core_criteriapia_CriteriaBuilder_stateless3_vehicle_ejb_jar = ShrinkWrap.create(JavaArchive.class, "jpa_core_criteriapia_CriteriaBuilder_stateless3_vehicle_ejb_jar");
+    jpa_core_criteriapia_CriteriaBuilder_stateless3_vehicle_ejb_jar.addClass(ee.jakarta.tck.persistence.common.PMClientBase.class);
+    jpa_core_criteriapia_CriteriaBuilder_stateless3_vehicle_ejb_jar.addClass(ee.jakarta.tck.persistence.core.criteriaapi.CriteriaBuilder.Client.class);
+    jpa_core_criteriapia_CriteriaBuilder_stateless3_vehicle_ejb_jar.addClass(ee.jakarta.tck.persistence.common.schema30.Util.class);
+    ear.addAsModule(jpa_core_criteriapia_CriteriaBuilder_stateless3_vehicle_ejb_jar);
+    return ear;
+  }
+
 	private static final Logger logger = (Logger) System.getLogger(Client2.class.getName());
 
 	public JavaArchive createDeployment() throws Exception {
diff --git a/jpa/spec-tests/src/main/java/ee/jakarta/tck/persistence/core/criteriaapi/CriteriaBuilder/Client3.java b/jpa/spec-tests/src/main/java/ee/jakarta/tck/persistence/core/criteriaapi/CriteriaBuilder/Client3.java
index dfee4ef72..5dc1362fe 100644
--- a/jpa/spec-tests/src/main/java/ee/jakarta/tck/persistence/core/criteriaapi/CriteriaBuilder/Client3.java
+++ b/jpa/spec-tests/src/main/java/ee/jakarta/tck/persistence/core/criteriaapi/CriteriaBuilder/Client3.java
@@ -23,8 +23,12 @@ import java.util.Collection;
 import java.util.Collections;
 import java.util.List;
 import java.util.Set;
-
+import org.jboss.arquillian.container.test.api.Deployment;
+import org.jboss.shrinkwrap.api.Archive;
+import org.jboss.shrinkwrap.api.ShrinkWrap;
+import org.jboss.shrinkwrap.api.spec.EnterpriseArchive;
 import org.jboss.shrinkwrap.api.spec.JavaArchive;
+import org.jboss.shrinkwrap.api.spec.WebArchive;
 import org.junit.jupiter.api.Test;
 
 import com.sun.ts.lib.harness.SetupMethod;
@@ -46,6 +50,192 @@ import jakarta.persistence.metamodel.EntityType;
 
 public class Client3 extends UtilAliasData {
 
+  @Deployment(testable = false)
+  public static Archive<?> deployment() {
+
+    final EnterpriseArchive ear = ShrinkWrap.create(EnterpriseArchive.class, "jpa_core_criteriapia_CriteriaBuilder_vehicles.ear");
+    // TODO: filter/eliminate the library jar classes that shouldn't be included
+    // Add ear/lib jars
+
+    JavaArchive jpa_core_criteriapia_CriteriaBuilder_jar = ShrinkWrap.create(JavaArchive.class, "jpa_core_criteriapia_CriteriaBuilder_jar");
+    jpa_core_criteriapia_CriteriaBuilder_jar.addClass(ee.jakarta.tck.persistence.common.schema30.Address.class);
+    jpa_core_criteriapia_CriteriaBuilder_jar.addClass(ee.jakarta.tck.persistence.common.schema30.Address_.class);
+    jpa_core_criteriapia_CriteriaBuilder_jar.addClass(ee.jakarta.tck.persistence.common.schema30.Alias.class);
+    jpa_core_criteriapia_CriteriaBuilder_jar.addClass(ee.jakarta.tck.persistence.common.schema30.Alias_.class);
+    jpa_core_criteriapia_CriteriaBuilder_jar.addClass(ee.jakarta.tck.persistence.common.schema30.Country.class);
+    jpa_core_criteriapia_CriteriaBuilder_jar.addClass(ee.jakarta.tck.persistence.common.schema30.Country_.class);
+    jpa_core_criteriapia_CriteriaBuilder_jar.addClass(ee.jakarta.tck.persistence.common.schema30.CreditCard.class);
+    jpa_core_criteriapia_CriteriaBuilder_jar.addClass(ee.jakarta.tck.persistence.common.schema30.CreditCard_.class);
+    jpa_core_criteriapia_CriteriaBuilder_jar.addClass(ee.jakarta.tck.persistence.common.schema30.Customer.class);
+    jpa_core_criteriapia_CriteriaBuilder_jar.addClass(ee.jakarta.tck.persistence.common.schema30.Customer_.class);
+    jpa_core_criteriapia_CriteriaBuilder_jar.addClass(ee.jakarta.tck.persistence.common.schema30.Department.class);
+    jpa_core_criteriapia_CriteriaBuilder_jar.addClass(ee.jakarta.tck.persistence.common.schema30.Department_.class);
+    jpa_core_criteriapia_CriteriaBuilder_jar.addClass(ee.jakarta.tck.persistence.common.schema30.Employee.class);
+    jpa_core_criteriapia_CriteriaBuilder_jar.addClass(ee.jakarta.tck.persistence.common.schema30.Employee_.class);
+    jpa_core_criteriapia_CriteriaBuilder_jar.addClass(ee.jakarta.tck.persistence.common.schema30.HardwareProduct.class);
+    jpa_core_criteriapia_CriteriaBuilder_jar.addClass(ee.jakarta.tck.persistence.common.schema30.HardwareProduct_.class);
+    jpa_core_criteriapia_CriteriaBuilder_jar.addClass(ee.jakarta.tck.persistence.common.schema30.Info.class);
+    jpa_core_criteriapia_CriteriaBuilder_jar.addClass(ee.jakarta.tck.persistence.common.schema30.Info_.class);
+    jpa_core_criteriapia_CriteriaBuilder_jar.addClass(ee.jakarta.tck.persistence.common.schema30.LineItem.class);
+    jpa_core_criteriapia_CriteriaBuilder_jar.addClass(ee.jakarta.tck.persistence.common.schema30.LineItemException.class);
+    jpa_core_criteriapia_CriteriaBuilder_jar.addClass(ee.jakarta.tck.persistence.common.schema30.LineItem_.class);
+    jpa_core_criteriapia_CriteriaBuilder_jar.addClass(ee.jakarta.tck.persistence.common.schema30.Order.class);
+    jpa_core_criteriapia_CriteriaBuilder_jar.addClass(ee.jakarta.tck.persistence.common.schema30.Order_.class);
+    jpa_core_criteriapia_CriteriaBuilder_jar.addClass(ee.jakarta.tck.persistence.common.schema30.Phone.class);
+    jpa_core_criteriapia_CriteriaBuilder_jar.addClass(ee.jakarta.tck.persistence.common.schema30.Phone_.class);
+    jpa_core_criteriapia_CriteriaBuilder_jar.addClass(ee.jakarta.tck.persistence.common.schema30.Product.class);
+    jpa_core_criteriapia_CriteriaBuilder_jar.addClass(ee.jakarta.tck.persistence.common.schema30.Product_.class);
+    jpa_core_criteriapia_CriteriaBuilder_jar.addClass(ee.jakarta.tck.persistence.common.schema30.ShelfLife.class);
+    jpa_core_criteriapia_CriteriaBuilder_jar.addClass(ee.jakarta.tck.persistence.common.schema30.ShelfLife_.class);
+    jpa_core_criteriapia_CriteriaBuilder_jar.addClass(ee.jakarta.tck.persistence.common.schema30.SoftwareProduct.class);
+    jpa_core_criteriapia_CriteriaBuilder_jar.addClass(ee.jakarta.tck.persistence.common.schema30.SoftwareProduct_.class);
+    jpa_core_criteriapia_CriteriaBuilder_jar.addClass(ee.jakarta.tck.persistence.common.schema30.Spouse.class);
+    jpa_core_criteriapia_CriteriaBuilder_jar.addClass(ee.jakarta.tck.persistence.common.schema30.Spouse_.class);
+    jpa_core_criteriapia_CriteriaBuilder_jar.addClass(ee.jakarta.tck.persistence.common.schema30.Trim.class);
+    jpa_core_criteriapia_CriteriaBuilder_jar.addClass(ee.jakarta.tck.persistence.common.schema30.Trim_.class);
+    ear.addAsLibrary(jpa_core_criteriapia_CriteriaBuilder_jar);
+    // Add ear submodules
+
+    JavaArchive jpa_core_criteriapia_CriteriaBuilder_appmanagedNoTx_vehicle_client_jar = ShrinkWrap.create(JavaArchive.class, "jpa_core_criteriapia_CriteriaBuilder_appmanagedNoTx_vehicle_client_jar");
+    jpa_core_criteriapia_CriteriaBuilder_appmanagedNoTx_vehicle_client_jar.addClass(ee.jakarta.tck.persistence.common.PMClientBase.class);
+    jpa_core_criteriapia_CriteriaBuilder_appmanagedNoTx_vehicle_client_jar.addClass(ee.jakarta.tck.persistence.common.schema30.Util.class);
+    ear.addAsModule(jpa_core_criteriapia_CriteriaBuilder_appmanagedNoTx_vehicle_client_jar);
+
+    JavaArchive jpa_core_criteriapia_CriteriaBuilder_appmanagedNoTx_vehicle_ejb_jar = ShrinkWrap.create(JavaArchive.class, "jpa_core_criteriapia_CriteriaBuilder_appmanagedNoTx_vehicle_ejb_jar");
+    jpa_core_criteriapia_CriteriaBuilder_appmanagedNoTx_vehicle_ejb_jar.addClass(ee.jakarta.tck.persistence.common.PMClientBase.class);
+    jpa_core_criteriapia_CriteriaBuilder_appmanagedNoTx_vehicle_ejb_jar.addClass(ee.jakarta.tck.persistence.core.criteriaapi.CriteriaBuilder.Client.class);
+    jpa_core_criteriapia_CriteriaBuilder_appmanagedNoTx_vehicle_ejb_jar.addClass(ee.jakarta.tck.persistence.common.schema30.Util.class);
+    ear.addAsModule(jpa_core_criteriapia_CriteriaBuilder_appmanagedNoTx_vehicle_ejb_jar);
+
+    JavaArchive jpa_core_criteriapia_CriteriaBuilder_appmanaged_vehicle_client_jar = ShrinkWrap.create(JavaArchive.class, "jpa_core_criteriapia_CriteriaBuilder_appmanaged_vehicle_client_jar");
+    jpa_core_criteriapia_CriteriaBuilder_appmanaged_vehicle_client_jar.addClass(ee.jakarta.tck.persistence.common.PMClientBase.class);
+    jpa_core_criteriapia_CriteriaBuilder_appmanaged_vehicle_client_jar.addClass(ee.jakarta.tck.persistence.common.schema30.Util.class);
+    ear.addAsModule(jpa_core_criteriapia_CriteriaBuilder_appmanaged_vehicle_client_jar);
+
+    JavaArchive jpa_core_criteriapia_CriteriaBuilder_appmanaged_vehicle_ejb_jar = ShrinkWrap.create(JavaArchive.class, "jpa_core_criteriapia_CriteriaBuilder_appmanaged_vehicle_ejb_jar");
+    jpa_core_criteriapia_CriteriaBuilder_appmanaged_vehicle_ejb_jar.addClass(ee.jakarta.tck.persistence.common.PMClientBase.class);
+    jpa_core_criteriapia_CriteriaBuilder_appmanaged_vehicle_ejb_jar.addClass(ee.jakarta.tck.persistence.core.criteriaapi.CriteriaBuilder.Client.class);
+    jpa_core_criteriapia_CriteriaBuilder_appmanaged_vehicle_ejb_jar.addClass(ee.jakarta.tck.persistence.common.schema30.Util.class);
+    ear.addAsModule(jpa_core_criteriapia_CriteriaBuilder_appmanaged_vehicle_ejb_jar);
+
+    WebArchive jpa_core_criteriapia_CriteriaBuilder_pmservlet_vehicle_web_war = ShrinkWrap.create(WebArchive.class, "jpa_core_criteriapia_CriteriaBuilder_pmservlet_vehicle_web_war");
+    jpa_core_criteriapia_CriteriaBuilder_pmservlet_vehicle_web_war.addAsWebInfResource("web.xml");
+
+    JavaArchive jpa_core_criteriapia_CriteriaBuilder_jar = ShrinkWrap.create(JavaArchive.class, "jpa_core_criteriapia_CriteriaBuilder.jar");
+    jpa_core_criteriapia_CriteriaBuilder_jar.addClass(ee.jakarta.tck.persistence.common.schema30.Address.class);
+    jpa_core_criteriapia_CriteriaBuilder_jar.addClass(ee.jakarta.tck.persistence.common.schema30.Address_.class);
+    jpa_core_criteriapia_CriteriaBuilder_jar.addClass(ee.jakarta.tck.persistence.common.schema30.Alias.class);
+    jpa_core_criteriapia_CriteriaBuilder_jar.addClass(ee.jakarta.tck.persistence.common.schema30.Alias_.class);
+    jpa_core_criteriapia_CriteriaBuilder_jar.addClass(ee.jakarta.tck.persistence.common.schema30.Country.class);
+    jpa_core_criteriapia_CriteriaBuilder_jar.addClass(ee.jakarta.tck.persistence.common.schema30.Country_.class);
+    jpa_core_criteriapia_CriteriaBuilder_jar.addClass(ee.jakarta.tck.persistence.common.schema30.CreditCard.class);
+    jpa_core_criteriapia_CriteriaBuilder_jar.addClass(ee.jakarta.tck.persistence.common.schema30.CreditCard_.class);
+    jpa_core_criteriapia_CriteriaBuilder_jar.addClass(ee.jakarta.tck.persistence.common.schema30.Customer.class);
+    jpa_core_criteriapia_CriteriaBuilder_jar.addClass(ee.jakarta.tck.persistence.common.schema30.Customer_.class);
+    jpa_core_criteriapia_CriteriaBuilder_jar.addClass(ee.jakarta.tck.persistence.common.schema30.Department.class);
+    jpa_core_criteriapia_CriteriaBuilder_jar.addClass(ee.jakarta.tck.persistence.common.schema30.Department_.class);
+    jpa_core_criteriapia_CriteriaBuilder_jar.addClass(ee.jakarta.tck.persistence.common.schema30.Employee.class);
+    jpa_core_criteriapia_CriteriaBuilder_jar.addClass(ee.jakarta.tck.persistence.common.schema30.Employee_.class);
+    jpa_core_criteriapia_CriteriaBuilder_jar.addClass(ee.jakarta.tck.persistence.common.schema30.HardwareProduct.class);
+    jpa_core_criteriapia_CriteriaBuilder_jar.addClass(ee.jakarta.tck.persistence.common.schema30.HardwareProduct_.class);
+    jpa_core_criteriapia_CriteriaBuilder_jar.addClass(ee.jakarta.tck.persistence.common.schema30.Info.class);
+    jpa_core_criteriapia_CriteriaBuilder_jar.addClass(ee.jakarta.tck.persistence.common.schema30.Info_.class);
+    jpa_core_criteriapia_CriteriaBuilder_jar.addClass(ee.jakarta.tck.persistence.common.schema30.LineItem.class);
+    jpa_core_criteriapia_CriteriaBuilder_jar.addClass(ee.jakarta.tck.persistence.common.schema30.LineItemException.class);
+    jpa_core_criteriapia_CriteriaBuilder_jar.addClass(ee.jakarta.tck.persistence.common.schema30.LineItem_.class);
+    jpa_core_criteriapia_CriteriaBuilder_jar.addClass(ee.jakarta.tck.persistence.common.schema30.Order.class);
+    jpa_core_criteriapia_CriteriaBuilder_jar.addClass(ee.jakarta.tck.persistence.common.schema30.Order_.class);
+    jpa_core_criteriapia_CriteriaBuilder_jar.addClass(ee.jakarta.tck.persistence.common.schema30.Phone.class);
+    jpa_core_criteriapia_CriteriaBuilder_jar.addClass(ee.jakarta.tck.persistence.common.schema30.Phone_.class);
+    jpa_core_criteriapia_CriteriaBuilder_jar.addClass(ee.jakarta.tck.persistence.common.schema30.Product.class);
+    jpa_core_criteriapia_CriteriaBuilder_jar.addClass(ee.jakarta.tck.persistence.common.schema30.Product_.class);
+    jpa_core_criteriapia_CriteriaBuilder_jar.addClass(ee.jakarta.tck.persistence.common.schema30.ShelfLife.class);
+    jpa_core_criteriapia_CriteriaBuilder_jar.addClass(ee.jakarta.tck.persistence.common.schema30.ShelfLife_.class);
+    jpa_core_criteriapia_CriteriaBuilder_jar.addClass(ee.jakarta.tck.persistence.common.schema30.SoftwareProduct.class);
+    jpa_core_criteriapia_CriteriaBuilder_jar.addClass(ee.jakarta.tck.persistence.common.schema30.SoftwareProduct_.class);
+    jpa_core_criteriapia_CriteriaBuilder_jar.addClass(ee.jakarta.tck.persistence.common.schema30.Spouse.class);
+    jpa_core_criteriapia_CriteriaBuilder_jar.addClass(ee.jakarta.tck.persistence.common.schema30.Spouse_.class);
+    jpa_core_criteriapia_CriteriaBuilder_jar.addClass(ee.jakarta.tck.persistence.common.schema30.Trim.class);
+    jpa_core_criteriapia_CriteriaBuilder_jar.addClass(ee.jakarta.tck.persistence.common.schema30.Trim_.class);
+    jpa_core_criteriapia_CriteriaBuilder_jar.addAsManifestResource("META-INF/MANIFEST.MF");
+    jpa_core_criteriapia_CriteriaBuilder_jar.addAsManifestResource("META-INF/persistence.xml");
+    jpa_core_criteriapia_CriteriaBuilder_pmservlet_vehicle_web_war.addAsLibrary(jpa_core_criteriapia_CriteriaBuilder_jar);
+    jpa_core_criteriapia_CriteriaBuilder_pmservlet_vehicle_web_war.addClass(ee.jakarta.tck.persistence.common.PMClientBase.class);
+    jpa_core_criteriapia_CriteriaBuilder_pmservlet_vehicle_web_war.addClass(ee.jakarta.tck.persistence.core.criteriaapi.CriteriaBuilder.Client.class);
+    jpa_core_criteriapia_CriteriaBuilder_pmservlet_vehicle_web_war.addClass(ee.jakarta.tck.persistence.common.schema30.Util.class);
+    ear.addAsModule(jpa_core_criteriapia_CriteriaBuilder_pmservlet_vehicle_web_war);
+
+    WebArchive jpa_core_criteriapia_CriteriaBuilder_puservlet_vehicle_web_war = ShrinkWrap.create(WebArchive.class, "jpa_core_criteriapia_CriteriaBuilder_puservlet_vehicle_web_war");
+    jpa_core_criteriapia_CriteriaBuilder_puservlet_vehicle_web_war.addAsWebInfResource("web.xml");
+
+    JavaArchive jpa_core_criteriapia_CriteriaBuilder_jar = ShrinkWrap.create(JavaArchive.class, "jpa_core_criteriapia_CriteriaBuilder.jar");
+    jpa_core_criteriapia_CriteriaBuilder_jar.addClass(ee.jakarta.tck.persistence.common.schema30.Address.class);
+    jpa_core_criteriapia_CriteriaBuilder_jar.addClass(ee.jakarta.tck.persistence.common.schema30.Address_.class);
+    jpa_core_criteriapia_CriteriaBuilder_jar.addClass(ee.jakarta.tck.persistence.common.schema30.Alias.class);
+    jpa_core_criteriapia_CriteriaBuilder_jar.addClass(ee.jakarta.tck.persistence.common.schema30.Alias_.class);
+    jpa_core_criteriapia_CriteriaBuilder_jar.addClass(ee.jakarta.tck.persistence.common.schema30.Country.class);
+    jpa_core_criteriapia_CriteriaBuilder_jar.addClass(ee.jakarta.tck.persistence.common.schema30.Country_.class);
+    jpa_core_criteriapia_CriteriaBuilder_jar.addClass(ee.jakarta.tck.persistence.common.schema30.CreditCard.class);
+    jpa_core_criteriapia_CriteriaBuilder_jar.addClass(ee.jakarta.tck.persistence.common.schema30.CreditCard_.class);
+    jpa_core_criteriapia_CriteriaBuilder_jar.addClass(ee.jakarta.tck.persistence.common.schema30.Customer.class);
+    jpa_core_criteriapia_CriteriaBuilder_jar.addClass(ee.jakarta.tck.persistence.common.schema30.Customer_.class);
+    jpa_core_criteriapia_CriteriaBuilder_jar.addClass(ee.jakarta.tck.persistence.common.schema30.Department.class);
+    jpa_core_criteriapia_CriteriaBuilder_jar.addClass(ee.jakarta.tck.persistence.common.schema30.Department_.class);
+    jpa_core_criteriapia_CriteriaBuilder_jar.addClass(ee.jakarta.tck.persistence.common.schema30.Employee.class);
+    jpa_core_criteriapia_CriteriaBuilder_jar.addClass(ee.jakarta.tck.persistence.common.schema30.Employee_.class);
+    jpa_core_criteriapia_CriteriaBuilder_jar.addClass(ee.jakarta.tck.persistence.common.schema30.HardwareProduct.class);
+    jpa_core_criteriapia_CriteriaBuilder_jar.addClass(ee.jakarta.tck.persistence.common.schema30.HardwareProduct_.class);
+    jpa_core_criteriapia_CriteriaBuilder_jar.addClass(ee.jakarta.tck.persistence.common.schema30.Info.class);
+    jpa_core_criteriapia_CriteriaBuilder_jar.addClass(ee.jakarta.tck.persistence.common.schema30.Info_.class);
+    jpa_core_criteriapia_CriteriaBuilder_jar.addClass(ee.jakarta.tck.persistence.common.schema30.LineItem.class);
+    jpa_core_criteriapia_CriteriaBuilder_jar.addClass(ee.jakarta.tck.persistence.common.schema30.LineItemException.class);
+    jpa_core_criteriapia_CriteriaBuilder_jar.addClass(ee.jakarta.tck.persistence.common.schema30.LineItem_.class);
+    jpa_core_criteriapia_CriteriaBuilder_jar.addClass(ee.jakarta.tck.persistence.common.schema30.Order.class);
+    jpa_core_criteriapia_CriteriaBuilder_jar.addClass(ee.jakarta.tck.persistence.common.schema30.Order_.class);
+    jpa_core_criteriapia_CriteriaBuilder_jar.addClass(ee.jakarta.tck.persistence.common.schema30.Phone.class);
+    jpa_core_criteriapia_CriteriaBuilder_jar.addClass(ee.jakarta.tck.persistence.common.schema30.Phone_.class);
+    jpa_core_criteriapia_CriteriaBuilder_jar.addClass(ee.jakarta.tck.persistence.common.schema30.Product.class);
+    jpa_core_criteriapia_CriteriaBuilder_jar.addClass(ee.jakarta.tck.persistence.common.schema30.Product_.class);
+    jpa_core_criteriapia_CriteriaBuilder_jar.addClass(ee.jakarta.tck.persistence.common.schema30.ShelfLife.class);
+    jpa_core_criteriapia_CriteriaBuilder_jar.addClass(ee.jakarta.tck.persistence.common.schema30.ShelfLife_.class);
+    jpa_core_criteriapia_CriteriaBuilder_jar.addClass(ee.jakarta.tck.persistence.common.schema30.SoftwareProduct.class);
+    jpa_core_criteriapia_CriteriaBuilder_jar.addClass(ee.jakarta.tck.persistence.common.schema30.SoftwareProduct_.class);
+    jpa_core_criteriapia_CriteriaBuilder_jar.addClass(ee.jakarta.tck.persistence.common.schema30.Spouse.class);
+    jpa_core_criteriapia_CriteriaBuilder_jar.addClass(ee.jakarta.tck.persistence.common.schema30.Spouse_.class);
+    jpa_core_criteriapia_CriteriaBuilder_jar.addClass(ee.jakarta.tck.persistence.common.schema30.Trim.class);
+    jpa_core_criteriapia_CriteriaBuilder_jar.addClass(ee.jakarta.tck.persistence.common.schema30.Trim_.class);
+    jpa_core_criteriapia_CriteriaBuilder_jar.addAsManifestResource("META-INF/MANIFEST.MF");
+    jpa_core_criteriapia_CriteriaBuilder_jar.addAsManifestResource("META-INF/persistence.xml");
+    jpa_core_criteriapia_CriteriaBuilder_puservlet_vehicle_web_war.addAsLibrary(jpa_core_criteriapia_CriteriaBuilder_jar);
+    jpa_core_criteriapia_CriteriaBuilder_puservlet_vehicle_web_war.addClass(ee.jakarta.tck.persistence.common.PMClientBase.class);
+    jpa_core_criteriapia_CriteriaBuilder_puservlet_vehicle_web_war.addClass(ee.jakarta.tck.persistence.core.criteriaapi.CriteriaBuilder.Client.class);
+    jpa_core_criteriapia_CriteriaBuilder_puservlet_vehicle_web_war.addClass(ee.jakarta.tck.persistence.common.schema30.Util.class);
+    ear.addAsModule(jpa_core_criteriapia_CriteriaBuilder_puservlet_vehicle_web_war);
+
+    JavaArchive jpa_core_criteriapia_CriteriaBuilder_stateful3_vehicle_client_jar = ShrinkWrap.create(JavaArchive.class, "jpa_core_criteriapia_CriteriaBuilder_stateful3_vehicle_client_jar");
+    jpa_core_criteriapia_CriteriaBuilder_stateful3_vehicle_client_jar.addClass(ee.jakarta.tck.persistence.common.PMClientBase.class);
+    jpa_core_criteriapia_CriteriaBuilder_stateful3_vehicle_client_jar.addClass(ee.jakarta.tck.persistence.common.schema30.Util.class);
+    ear.addAsModule(jpa_core_criteriapia_CriteriaBuilder_stateful3_vehicle_client_jar);
+
+    JavaArchive jpa_core_criteriapia_CriteriaBuilder_stateful3_vehicle_ejb_jar = ShrinkWrap.create(JavaArchive.class, "jpa_core_criteriapia_CriteriaBuilder_stateful3_vehicle_ejb_jar");
+    jpa_core_criteriapia_CriteriaBuilder_stateful3_vehicle_ejb_jar.addClass(ee.jakarta.tck.persistence.common.PMClientBase.class);
+    jpa_core_criteriapia_CriteriaBuilder_stateful3_vehicle_ejb_jar.addClass(ee.jakarta.tck.persistence.core.criteriaapi.CriteriaBuilder.Client.class);
+    jpa_core_criteriapia_CriteriaBuilder_stateful3_vehicle_ejb_jar.addClass(ee.jakarta.tck.persistence.common.schema30.Util.class);
+    ear.addAsModule(jpa_core_criteriapia_CriteriaBuilder_stateful3_vehicle_ejb_jar);
+
+    JavaArchive jpa_core_criteriapia_CriteriaBuilder_stateless3_vehicle_client_jar = ShrinkWrap.create(JavaArchive.class, "jpa_core_criteriapia_CriteriaBuilder_stateless3_vehicle_client_jar");
+    jpa_core_criteriapia_CriteriaBuilder_stateless3_vehicle_client_jar.addClass(ee.jakarta.tck.persistence.common.PMClientBase.class);
+    jpa_core_criteriapia_CriteriaBuilder_stateless3_vehicle_client_jar.addClass(ee.jakarta.tck.persistence.common.schema30.Util.class);
+    ear.addAsModule(jpa_core_criteriapia_CriteriaBuilder_stateless3_vehicle_client_jar);
+
+    JavaArchive jpa_core_criteriapia_CriteriaBuilder_stateless3_vehicle_ejb_jar = ShrinkWrap.create(JavaArchive.class, "jpa_core_criteriapia_CriteriaBuilder_stateless3_vehicle_ejb_jar");
+    jpa_core_criteriapia_CriteriaBuilder_stateless3_vehicle_ejb_jar.addClass(ee.jakarta.tck.persistence.common.PMClientBase.class);
+    jpa_core_criteriapia_CriteriaBuilder_stateless3_vehicle_ejb_jar.addClass(ee.jakarta.tck.persistence.core.criteriaapi.CriteriaBuilder.Client.class);
+    jpa_core_criteriapia_CriteriaBuilder_stateless3_vehicle_ejb_jar.addClass(ee.jakarta.tck.persistence.common.schema30.Util.class);
+    ear.addAsModule(jpa_core_criteriapia_CriteriaBuilder_stateless3_vehicle_ejb_jar);
+    return ear;
+  }
+
 	private static final Logger logger = (Logger) System.getLogger(Client3.class.getName());
 
 	public JavaArchive createDeployment() throws Exception {
diff --git a/jpa/spec-tests/src/main/java/ee/jakarta/tck/persistence/core/criteriaapi/CriteriaBuilder/Client4.java b/jpa/spec-tests/src/main/java/ee/jakarta/tck/persistence/core/criteriaapi/CriteriaBuilder/Client4.java
index 7a6a2833a..f6bca55cb 100644
--- a/jpa/spec-tests/src/main/java/ee/jakarta/tck/persistence/core/criteriaapi/CriteriaBuilder/Client4.java
+++ b/jpa/spec-tests/src/main/java/ee/jakarta/tck/persistence/core/criteriaapi/CriteriaBuilder/Client4.java
@@ -19,8 +19,12 @@ package ee.jakarta.tck.persistence.core.criteriaapi.CriteriaBuilder;
 import java.lang.System.Logger;
 import java.util.ArrayList;
 import java.util.List;
-
+import org.jboss.arquillian.container.test.api.Deployment;
+import org.jboss.shrinkwrap.api.Archive;
+import org.jboss.shrinkwrap.api.ShrinkWrap;
+import org.jboss.shrinkwrap.api.spec.EnterpriseArchive;
 import org.jboss.shrinkwrap.api.spec.JavaArchive;
+import org.jboss.shrinkwrap.api.spec.WebArchive;
 import org.junit.jupiter.api.Test;
 
 import com.sun.ts.lib.harness.SetupMethod;
@@ -36,6 +40,192 @@ import jakarta.persistence.metamodel.EntityType;
 
 public class Client4 extends UtilAliasOnlyData {
 
+  @Deployment(testable = false)
+  public static Archive<?> deployment() {
+
+    final EnterpriseArchive ear = ShrinkWrap.create(EnterpriseArchive.class, "jpa_core_criteriapia_CriteriaBuilder_vehicles.ear");
+    // TODO: filter/eliminate the library jar classes that shouldn't be included
+    // Add ear/lib jars
+
+    JavaArchive jpa_core_criteriapia_CriteriaBuilder_jar = ShrinkWrap.create(JavaArchive.class, "jpa_core_criteriapia_CriteriaBuilder_jar");
+    jpa_core_criteriapia_CriteriaBuilder_jar.addClass(ee.jakarta.tck.persistence.common.schema30.Address.class);
+    jpa_core_criteriapia_CriteriaBuilder_jar.addClass(ee.jakarta.tck.persistence.common.schema30.Address_.class);
+    jpa_core_criteriapia_CriteriaBuilder_jar.addClass(ee.jakarta.tck.persistence.common.schema30.Alias.class);
+    jpa_core_criteriapia_CriteriaBuilder_jar.addClass(ee.jakarta.tck.persistence.common.schema30.Alias_.class);
+    jpa_core_criteriapia_CriteriaBuilder_jar.addClass(ee.jakarta.tck.persistence.common.schema30.Country.class);
+    jpa_core_criteriapia_CriteriaBuilder_jar.addClass(ee.jakarta.tck.persistence.common.schema30.Country_.class);
+    jpa_core_criteriapia_CriteriaBuilder_jar.addClass(ee.jakarta.tck.persistence.common.schema30.CreditCard.class);
+    jpa_core_criteriapia_CriteriaBuilder_jar.addClass(ee.jakarta.tck.persistence.common.schema30.CreditCard_.class);
+    jpa_core_criteriapia_CriteriaBuilder_jar.addClass(ee.jakarta.tck.persistence.common.schema30.Customer.class);
+    jpa_core_criteriapia_CriteriaBuilder_jar.addClass(ee.jakarta.tck.persistence.common.schema30.Customer_.class);
+    jpa_core_criteriapia_CriteriaBuilder_jar.addClass(ee.jakarta.tck.persistence.common.schema30.Department.class);
+    jpa_core_criteriapia_CriteriaBuilder_jar.addClass(ee.jakarta.tck.persistence.common.schema30.Department_.class);
+    jpa_core_criteriapia_CriteriaBuilder_jar.addClass(ee.jakarta.tck.persistence.common.schema30.Employee.class);
+    jpa_core_criteriapia_CriteriaBuilder_jar.addClass(ee.jakarta.tck.persistence.common.schema30.Employee_.class);
+    jpa_core_criteriapia_CriteriaBuilder_jar.addClass(ee.jakarta.tck.persistence.common.schema30.HardwareProduct.class);
+    jpa_core_criteriapia_CriteriaBuilder_jar.addClass(ee.jakarta.tck.persistence.common.schema30.HardwareProduct_.class);
+    jpa_core_criteriapia_CriteriaBuilder_jar.addClass(ee.jakarta.tck.persistence.common.schema30.Info.class);
+    jpa_core_criteriapia_CriteriaBuilder_jar.addClass(ee.jakarta.tck.persistence.common.schema30.Info_.class);
+    jpa_core_criteriapia_CriteriaBuilder_jar.addClass(ee.jakarta.tck.persistence.common.schema30.LineItem.class);
+    jpa_core_criteriapia_CriteriaBuilder_jar.addClass(ee.jakarta.tck.persistence.common.schema30.LineItemException.class);
+    jpa_core_criteriapia_CriteriaBuilder_jar.addClass(ee.jakarta.tck.persistence.common.schema30.LineItem_.class);
+    jpa_core_criteriapia_CriteriaBuilder_jar.addClass(ee.jakarta.tck.persistence.common.schema30.Order.class);
+    jpa_core_criteriapia_CriteriaBuilder_jar.addClass(ee.jakarta.tck.persistence.common.schema30.Order_.class);
+    jpa_core_criteriapia_CriteriaBuilder_jar.addClass(ee.jakarta.tck.persistence.common.schema30.Phone.class);
+    jpa_core_criteriapia_CriteriaBuilder_jar.addClass(ee.jakarta.tck.persistence.common.schema30.Phone_.class);
+    jpa_core_criteriapia_CriteriaBuilder_jar.addClass(ee.jakarta.tck.persistence.common.schema30.Product.class);
+    jpa_core_criteriapia_CriteriaBuilder_jar.addClass(ee.jakarta.tck.persistence.common.schema30.Product_.class);
+    jpa_core_criteriapia_CriteriaBuilder_jar.addClass(ee.jakarta.tck.persistence.common.schema30.ShelfLife.class);
+    jpa_core_criteriapia_CriteriaBuilder_jar.addClass(ee.jakarta.tck.persistence.common.schema30.ShelfLife_.class);
+    jpa_core_criteriapia_CriteriaBuilder_jar.addClass(ee.jakarta.tck.persistence.common.schema30.SoftwareProduct.class);
+    jpa_core_criteriapia_CriteriaBuilder_jar.addClass(ee.jakarta.tck.persistence.common.schema30.SoftwareProduct_.class);
+    jpa_core_criteriapia_CriteriaBuilder_jar.addClass(ee.jakarta.tck.persistence.common.schema30.Spouse.class);
+    jpa_core_criteriapia_CriteriaBuilder_jar.addClass(ee.jakarta.tck.persistence.common.schema30.Spouse_.class);
+    jpa_core_criteriapia_CriteriaBuilder_jar.addClass(ee.jakarta.tck.persistence.common.schema30.Trim.class);
+    jpa_core_criteriapia_CriteriaBuilder_jar.addClass(ee.jakarta.tck.persistence.common.schema30.Trim_.class);
+    ear.addAsLibrary(jpa_core_criteriapia_CriteriaBuilder_jar);
+    // Add ear submodules
+
+    JavaArchive jpa_core_criteriapia_CriteriaBuilder_appmanagedNoTx_vehicle_client_jar = ShrinkWrap.create(JavaArchive.class, "jpa_core_criteriapia_CriteriaBuilder_appmanagedNoTx_vehicle_client_jar");
+    jpa_core_criteriapia_CriteriaBuilder_appmanagedNoTx_vehicle_client_jar.addClass(ee.jakarta.tck.persistence.common.PMClientBase.class);
+    jpa_core_criteriapia_CriteriaBuilder_appmanagedNoTx_vehicle_client_jar.addClass(ee.jakarta.tck.persistence.common.schema30.Util.class);
+    ear.addAsModule(jpa_core_criteriapia_CriteriaBuilder_appmanagedNoTx_vehicle_client_jar);
+
+    JavaArchive jpa_core_criteriapia_CriteriaBuilder_appmanagedNoTx_vehicle_ejb_jar = ShrinkWrap.create(JavaArchive.class, "jpa_core_criteriapia_CriteriaBuilder_appmanagedNoTx_vehicle_ejb_jar");
+    jpa_core_criteriapia_CriteriaBuilder_appmanagedNoTx_vehicle_ejb_jar.addClass(ee.jakarta.tck.persistence.common.PMClientBase.class);
+    jpa_core_criteriapia_CriteriaBuilder_appmanagedNoTx_vehicle_ejb_jar.addClass(ee.jakarta.tck.persistence.core.criteriaapi.CriteriaBuilder.Client.class);
+    jpa_core_criteriapia_CriteriaBuilder_appmanagedNoTx_vehicle_ejb_jar.addClass(ee.jakarta.tck.persistence.common.schema30.Util.class);
+    ear.addAsModule(jpa_core_criteriapia_CriteriaBuilder_appmanagedNoTx_vehicle_ejb_jar);
+
+    JavaArchive jpa_core_criteriapia_CriteriaBuilder_appmanaged_vehicle_client_jar = ShrinkWrap.create(JavaArchive.class, "jpa_core_criteriapia_CriteriaBuilder_appmanaged_vehicle_client_jar");
+    jpa_core_criteriapia_CriteriaBuilder_appmanaged_vehicle_client_jar.addClass(ee.jakarta.tck.persistence.common.PMClientBase.class);
+    jpa_core_criteriapia_CriteriaBuilder_appmanaged_vehicle_client_jar.addClass(ee.jakarta.tck.persistence.common.schema30.Util.class);
+    ear.addAsModule(jpa_core_criteriapia_CriteriaBuilder_appmanaged_vehicle_client_jar);
+
+    JavaArchive jpa_core_criteriapia_CriteriaBuilder_appmanaged_vehicle_ejb_jar = ShrinkWrap.create(JavaArchive.class, "jpa_core_criteriapia_CriteriaBuilder_appmanaged_vehicle_ejb_jar");
+    jpa_core_criteriapia_CriteriaBuilder_appmanaged_vehicle_ejb_jar.addClass(ee.jakarta.tck.persistence.common.PMClientBase.class);
+    jpa_core_criteriapia_CriteriaBuilder_appmanaged_vehicle_ejb_jar.addClass(ee.jakarta.tck.persistence.core.criteriaapi.CriteriaBuilder.Client.class);
+    jpa_core_criteriapia_CriteriaBuilder_appmanaged_vehicle_ejb_jar.addClass(ee.jakarta.tck.persistence.common.schema30.Util.class);
+    ear.addAsModule(jpa_core_criteriapia_CriteriaBuilder_appmanaged_vehicle_ejb_jar);
+
+    WebArchive jpa_core_criteriapia_CriteriaBuilder_pmservlet_vehicle_web_war = ShrinkWrap.create(WebArchive.class, "jpa_core_criteriapia_CriteriaBuilder_pmservlet_vehicle_web_war");
+    jpa_core_criteriapia_CriteriaBuilder_pmservlet_vehicle_web_war.addAsWebInfResource("web.xml");
+
+    JavaArchive jpa_core_criteriapia_CriteriaBuilder_jar = ShrinkWrap.create(JavaArchive.class, "jpa_core_criteriapia_CriteriaBuilder.jar");
+    jpa_core_criteriapia_CriteriaBuilder_jar.addClass(ee.jakarta.tck.persistence.common.schema30.Address.class);
+    jpa_core_criteriapia_CriteriaBuilder_jar.addClass(ee.jakarta.tck.persistence.common.schema30.Address_.class);
+    jpa_core_criteriapia_CriteriaBuilder_jar.addClass(ee.jakarta.tck.persistence.common.schema30.Alias.class);
+    jpa_core_criteriapia_CriteriaBuilder_jar.addClass(ee.jakarta.tck.persistence.common.schema30.Alias_.class);
+    jpa_core_criteriapia_CriteriaBuilder_jar.addClass(ee.jakarta.tck.persistence.common.schema30.Country.class);
+    jpa_core_criteriapia_CriteriaBuilder_jar.addClass(ee.jakarta.tck.persistence.common.schema30.Country_.class);
+    jpa_core_criteriapia_CriteriaBuilder_jar.addClass(ee.jakarta.tck.persistence.common.schema30.CreditCard.class);
+    jpa_core_criteriapia_CriteriaBuilder_jar.addClass(ee.jakarta.tck.persistence.common.schema30.CreditCard_.class);
+    jpa_core_criteriapia_CriteriaBuilder_jar.addClass(ee.jakarta.tck.persistence.common.schema30.Customer.class);
+    jpa_core_criteriapia_CriteriaBuilder_jar.addClass(ee.jakarta.tck.persistence.common.schema30.Customer_.class);
+    jpa_core_criteriapia_CriteriaBuilder_jar.addClass(ee.jakarta.tck.persistence.common.schema30.Department.class);
+    jpa_core_criteriapia_CriteriaBuilder_jar.addClass(ee.jakarta.tck.persistence.common.schema30.Department_.class);
+    jpa_core_criteriapia_CriteriaBuilder_jar.addClass(ee.jakarta.tck.persistence.common.schema30.Employee.class);
+    jpa_core_criteriapia_CriteriaBuilder_jar.addClass(ee.jakarta.tck.persistence.common.schema30.Employee_.class);
+    jpa_core_criteriapia_CriteriaBuilder_jar.addClass(ee.jakarta.tck.persistence.common.schema30.HardwareProduct.class);
+    jpa_core_criteriapia_CriteriaBuilder_jar.addClass(ee.jakarta.tck.persistence.common.schema30.HardwareProduct_.class);
+    jpa_core_criteriapia_CriteriaBuilder_jar.addClass(ee.jakarta.tck.persistence.common.schema30.Info.class);
+    jpa_core_criteriapia_CriteriaBuilder_jar.addClass(ee.jakarta.tck.persistence.common.schema30.Info_.class);
+    jpa_core_criteriapia_CriteriaBuilder_jar.addClass(ee.jakarta.tck.persistence.common.schema30.LineItem.class);
+    jpa_core_criteriapia_CriteriaBuilder_jar.addClass(ee.jakarta.tck.persistence.common.schema30.LineItemException.class);
+    jpa_core_criteriapia_CriteriaBuilder_jar.addClass(ee.jakarta.tck.persistence.common.schema30.LineItem_.class);
+    jpa_core_criteriapia_CriteriaBuilder_jar.addClass(ee.jakarta.tck.persistence.common.schema30.Order.class);
+    jpa_core_criteriapia_CriteriaBuilder_jar.addClass(ee.jakarta.tck.persistence.common.schema30.Order_.class);
+    jpa_core_criteriapia_CriteriaBuilder_jar.addClass(ee.jakarta.tck.persistence.common.schema30.Phone.class);
+    jpa_core_criteriapia_CriteriaBuilder_jar.addClass(ee.jakarta.tck.persistence.common.schema30.Phone_.class);
+    jpa_core_criteriapia_CriteriaBuilder_jar.addClass(ee.jakarta.tck.persistence.common.schema30.Product.class);
+    jpa_core_criteriapia_CriteriaBuilder_jar.addClass(ee.jakarta.tck.persistence.common.schema30.Product_.class);
+    jpa_core_criteriapia_CriteriaBuilder_jar.addClass(ee.jakarta.tck.persistence.common.schema30.ShelfLife.class);
+    jpa_core_criteriapia_CriteriaBuilder_jar.addClass(ee.jakarta.tck.persistence.common.schema30.ShelfLife_.class);
+    jpa_core_criteriapia_CriteriaBuilder_jar.addClass(ee.jakarta.tck.persistence.common.schema30.SoftwareProduct.class);
+    jpa_core_criteriapia_CriteriaBuilder_jar.addClass(ee.jakarta.tck.persistence.common.schema30.SoftwareProduct_.class);
+    jpa_core_criteriapia_CriteriaBuilder_jar.addClass(ee.jakarta.tck.persistence.common.schema30.Spouse.class);
+    jpa_core_criteriapia_CriteriaBuilder_jar.addClass(ee.jakarta.tck.persistence.common.schema30.Spouse_.class);
+    jpa_core_criteriapia_CriteriaBuilder_jar.addClass(ee.jakarta.tck.persistence.common.schema30.Trim.class);
+    jpa_core_criteriapia_CriteriaBuilder_jar.addClass(ee.jakarta.tck.persistence.common.schema30.Trim_.class);
+    jpa_core_criteriapia_CriteriaBuilder_jar.addAsManifestResource("META-INF/MANIFEST.MF");
+    jpa_core_criteriapia_CriteriaBuilder_jar.addAsManifestResource("META-INF/persistence.xml");
+    jpa_core_criteriapia_CriteriaBuilder_pmservlet_vehicle_web_war.addAsLibrary(jpa_core_criteriapia_CriteriaBuilder_jar);
+    jpa_core_criteriapia_CriteriaBuilder_pmservlet_vehicle_web_war.addClass(ee.jakarta.tck.persistence.common.PMClientBase.class);
+    jpa_core_criteriapia_CriteriaBuilder_pmservlet_vehicle_web_war.addClass(ee.jakarta.tck.persistence.core.criteriaapi.CriteriaBuilder.Client.class);
+    jpa_core_criteriapia_CriteriaBuilder_pmservlet_vehicle_web_war.addClass(ee.jakarta.tck.persistence.common.schema30.Util.class);
+    ear.addAsModule(jpa_core_criteriapia_CriteriaBuilder_pmservlet_vehicle_web_war);
+
+    WebArchive jpa_core_criteriapia_CriteriaBuilder_puservlet_vehicle_web_war = ShrinkWrap.create(WebArchive.class, "jpa_core_criteriapia_CriteriaBuilder_puservlet_vehicle_web_war");
+    jpa_core_criteriapia_CriteriaBuilder_puservlet_vehicle_web_war.addAsWebInfResource("web.xml");
+
+    JavaArchive jpa_core_criteriapia_CriteriaBuilder_jar = ShrinkWrap.create(JavaArchive.class, "jpa_core_criteriapia_CriteriaBuilder.jar");
+    jpa_core_criteriapia_CriteriaBuilder_jar.addClass(ee.jakarta.tck.persistence.common.schema30.Address.class);
+    jpa_core_criteriapia_CriteriaBuilder_jar.addClass(ee.jakarta.tck.persistence.common.schema30.Address_.class);
+    jpa_core_criteriapia_CriteriaBuilder_jar.addClass(ee.jakarta.tck.persistence.common.schema30.Alias.class);
+    jpa_core_criteriapia_CriteriaBuilder_jar.addClass(ee.jakarta.tck.persistence.common.schema30.Alias_.class);
+    jpa_core_criteriapia_CriteriaBuilder_jar.addClass(ee.jakarta.tck.persistence.common.schema30.Country.class);
+    jpa_core_criteriapia_CriteriaBuilder_jar.addClass(ee.jakarta.tck.persistence.common.schema30.Country_.class);
+    jpa_core_criteriapia_CriteriaBuilder_jar.addClass(ee.jakarta.tck.persistence.common.schema30.CreditCard.class);
+    jpa_core_criteriapia_CriteriaBuilder_jar.addClass(ee.jakarta.tck.persistence.common.schema30.CreditCard_.class);
+    jpa_core_criteriapia_CriteriaBuilder_jar.addClass(ee.jakarta.tck.persistence.common.schema30.Customer.class);
+    jpa_core_criteriapia_CriteriaBuilder_jar.addClass(ee.jakarta.tck.persistence.common.schema30.Customer_.class);
+    jpa_core_criteriapia_CriteriaBuilder_jar.addClass(ee.jakarta.tck.persistence.common.schema30.Department.class);
+    jpa_core_criteriapia_CriteriaBuilder_jar.addClass(ee.jakarta.tck.persistence.common.schema30.Department_.class);
+    jpa_core_criteriapia_CriteriaBuilder_jar.addClass(ee.jakarta.tck.persistence.common.schema30.Employee.class);
+    jpa_core_criteriapia_CriteriaBuilder_jar.addClass(ee.jakarta.tck.persistence.common.schema30.Employee_.class);
+    jpa_core_criteriapia_CriteriaBuilder_jar.addClass(ee.jakarta.tck.persistence.common.schema30.HardwareProduct.class);
+    jpa_core_criteriapia_CriteriaBuilder_jar.addClass(ee.jakarta.tck.persistence.common.schema30.HardwareProduct_.class);
+    jpa_core_criteriapia_CriteriaBuilder_jar.addClass(ee.jakarta.tck.persistence.common.schema30.Info.class);
+    jpa_core_criteriapia_CriteriaBuilder_jar.addClass(ee.jakarta.tck.persistence.common.schema30.Info_.class);
+    jpa_core_criteriapia_CriteriaBuilder_jar.addClass(ee.jakarta.tck.persistence.common.schema30.LineItem.class);
+    jpa_core_criteriapia_CriteriaBuilder_jar.addClass(ee.jakarta.tck.persistence.common.schema30.LineItemException.class);
+    jpa_core_criteriapia_CriteriaBuilder_jar.addClass(ee.jakarta.tck.persistence.common.schema30.LineItem_.class);
+    jpa_core_criteriapia_CriteriaBuilder_jar.addClass(ee.jakarta.tck.persistence.common.schema30.Order.class);
+    jpa_core_criteriapia_CriteriaBuilder_jar.addClass(ee.jakarta.tck.persistence.common.schema30.Order_.class);
+    jpa_core_criteriapia_CriteriaBuilder_jar.addClass(ee.jakarta.tck.persistence.common.schema30.Phone.class);
+    jpa_core_criteriapia_CriteriaBuilder_jar.addClass(ee.jakarta.tck.persistence.common.schema30.Phone_.class);
+    jpa_core_criteriapia_CriteriaBuilder_jar.addClass(ee.jakarta.tck.persistence.common.schema30.Product.class);
+    jpa_core_criteriapia_CriteriaBuilder_jar.addClass(ee.jakarta.tck.persistence.common.schema30.Product_.class);
+    jpa_core_criteriapia_CriteriaBuilder_jar.addClass(ee.jakarta.tck.persistence.common.schema30.ShelfLife.class);
+    jpa_core_criteriapia_CriteriaBuilder_jar.addClass(ee.jakarta.tck.persistence.common.schema30.ShelfLife_.class);
+    jpa_core_criteriapia_CriteriaBuilder_jar.addClass(ee.jakarta.tck.persistence.common.schema30.SoftwareProduct.class);
+    jpa_core_criteriapia_CriteriaBuilder_jar.addClass(ee.jakarta.tck.persistence.common.schema30.SoftwareProduct_.class);
+    jpa_core_criteriapia_CriteriaBuilder_jar.addClass(ee.jakarta.tck.persistence.common.schema30.Spouse.class);
+    jpa_core_criteriapia_CriteriaBuilder_jar.addClass(ee.jakarta.tck.persistence.common.schema30.Spouse_.class);
+    jpa_core_criteriapia_CriteriaBuilder_jar.addClass(ee.jakarta.tck.persistence.common.schema30.Trim.class);
+    jpa_core_criteriapia_CriteriaBuilder_jar.addClass(ee.jakarta.tck.persistence.common.schema30.Trim_.class);
+    jpa_core_criteriapia_CriteriaBuilder_jar.addAsManifestResource("META-INF/MANIFEST.MF");
+    jpa_core_criteriapia_CriteriaBuilder_jar.addAsManifestResource("META-INF/persistence.xml");
+    jpa_core_criteriapia_CriteriaBuilder_puservlet_vehicle_web_war.addAsLibrary(jpa_core_criteriapia_CriteriaBuilder_jar);
+    jpa_core_criteriapia_CriteriaBuilder_puservlet_vehicle_web_war.addClass(ee.jakarta.tck.persistence.common.PMClientBase.class);
+    jpa_core_criteriapia_CriteriaBuilder_puservlet_vehicle_web_war.addClass(ee.jakarta.tck.persistence.core.criteriaapi.CriteriaBuilder.Client.class);
+    jpa_core_criteriapia_CriteriaBuilder_puservlet_vehicle_web_war.addClass(ee.jakarta.tck.persistence.common.schema30.Util.class);
+    ear.addAsModule(jpa_core_criteriapia_CriteriaBuilder_puservlet_vehicle_web_war);
+
+    JavaArchive jpa_core_criteriapia_CriteriaBuilder_stateful3_vehicle_client_jar = ShrinkWrap.create(JavaArchive.class, "jpa_core_criteriapia_CriteriaBuilder_stateful3_vehicle_client_jar");
+    jpa_core_criteriapia_CriteriaBuilder_stateful3_vehicle_client_jar.addClass(ee.jakarta.tck.persistence.common.PMClientBase.class);
+    jpa_core_criteriapia_CriteriaBuilder_stateful3_vehicle_client_jar.addClass(ee.jakarta.tck.persistence.common.schema30.Util.class);
+    ear.addAsModule(jpa_core_criteriapia_CriteriaBuilder_stateful3_vehicle_client_jar);
+
+    JavaArchive jpa_core_criteriapia_CriteriaBuilder_stateful3_vehicle_ejb_jar = ShrinkWrap.create(JavaArchive.class, "jpa_core_criteriapia_CriteriaBuilder_stateful3_vehicle_ejb_jar");
+    jpa_core_criteriapia_CriteriaBuilder_stateful3_vehicle_ejb_jar.addClass(ee.jakarta.tck.persistence.common.PMClientBase.class);
+    jpa_core_criteriapia_CriteriaBuilder_stateful3_vehicle_ejb_jar.addClass(ee.jakarta.tck.persistence.core.criteriaapi.CriteriaBuilder.Client.class);
+    jpa_core_criteriapia_CriteriaBuilder_stateful3_vehicle_ejb_jar.addClass(ee.jakarta.tck.persistence.common.schema30.Util.class);
+    ear.addAsModule(jpa_core_criteriapia_CriteriaBuilder_stateful3_vehicle_ejb_jar);
+
+    JavaArchive jpa_core_criteriapia_CriteriaBuilder_stateless3_vehicle_client_jar = ShrinkWrap.create(JavaArchive.class, "jpa_core_criteriapia_CriteriaBuilder_stateless3_vehicle_client_jar");
+    jpa_core_criteriapia_CriteriaBuilder_stateless3_vehicle_client_jar.addClass(ee.jakarta.tck.persistence.common.PMClientBase.class);
+    jpa_core_criteriapia_CriteriaBuilder_stateless3_vehicle_client_jar.addClass(ee.jakarta.tck.persistence.common.schema30.Util.class);
+    ear.addAsModule(jpa_core_criteriapia_CriteriaBuilder_stateless3_vehicle_client_jar);
+
+    JavaArchive jpa_core_criteriapia_CriteriaBuilder_stateless3_vehicle_ejb_jar = ShrinkWrap.create(JavaArchive.class, "jpa_core_criteriapia_CriteriaBuilder_stateless3_vehicle_ejb_jar");
+    jpa_core_criteriapia_CriteriaBuilder_stateless3_vehicle_ejb_jar.addClass(ee.jakarta.tck.persistence.common.PMClientBase.class);
+    jpa_core_criteriapia_CriteriaBuilder_stateless3_vehicle_ejb_jar.addClass(ee.jakarta.tck.persistence.core.criteriaapi.CriteriaBuilder.Client.class);
+    jpa_core_criteriapia_CriteriaBuilder_stateless3_vehicle_ejb_jar.addClass(ee.jakarta.tck.persistence.common.schema30.Util.class);
+    ear.addAsModule(jpa_core_criteriapia_CriteriaBuilder_stateless3_vehicle_ejb_jar);
+    return ear;
+  }
+
 	private static final Logger logger = (Logger) System.getLogger(Client4.class.getName());
 
 	public JavaArchive createDeployment() throws Exception {
diff --git a/jpa/spec-tests/src/main/java/ee/jakarta/tck/persistence/core/criteriaapi/CriteriaBuilder/Client5.java b/jpa/spec-tests/src/main/java/ee/jakarta/tck/persistence/core/criteriaapi/CriteriaBuilder/Client5.java
index b70dd7738..c48557ee4 100644
--- a/jpa/spec-tests/src/main/java/ee/jakarta/tck/persistence/core/criteriaapi/CriteriaBuilder/Client5.java
+++ b/jpa/spec-tests/src/main/java/ee/jakarta/tck/persistence/core/criteriaapi/CriteriaBuilder/Client5.java
@@ -25,8 +25,12 @@ import java.sql.Timestamp;
 import java.util.ArrayList;
 import java.util.Collections;
 import java.util.List;
-
+import org.jboss.arquillian.container.test.api.Deployment;
+import org.jboss.shrinkwrap.api.Archive;
+import org.jboss.shrinkwrap.api.ShrinkWrap;
+import org.jboss.shrinkwrap.api.spec.EnterpriseArchive;
 import org.jboss.shrinkwrap.api.spec.JavaArchive;
+import org.jboss.shrinkwrap.api.spec.WebArchive;
 import org.junit.jupiter.api.Test;
 
 import com.sun.ts.lib.harness.SetupMethod;
@@ -49,6 +53,192 @@ import jakarta.persistence.metamodel.Metamodel;
 
 public class Client5 extends UtilProductData {
 
+  @Deployment(testable = false)
+  public static Archive<?> deployment() {
+
+    final EnterpriseArchive ear = ShrinkWrap.create(EnterpriseArchive.class, "jpa_core_criteriapia_CriteriaBuilder_vehicles.ear");
+    // TODO: filter/eliminate the library jar classes that shouldn't be included
+    // Add ear/lib jars
+
+    JavaArchive jpa_core_criteriapia_CriteriaBuilder_jar = ShrinkWrap.create(JavaArchive.class, "jpa_core_criteriapia_CriteriaBuilder_jar");
+    jpa_core_criteriapia_CriteriaBuilder_jar.addClass(ee.jakarta.tck.persistence.common.schema30.Address.class);
+    jpa_core_criteriapia_CriteriaBuilder_jar.addClass(ee.jakarta.tck.persistence.common.schema30.Address_.class);
+    jpa_core_criteriapia_CriteriaBuilder_jar.addClass(ee.jakarta.tck.persistence.common.schema30.Alias.class);
+    jpa_core_criteriapia_CriteriaBuilder_jar.addClass(ee.jakarta.tck.persistence.common.schema30.Alias_.class);
+    jpa_core_criteriapia_CriteriaBuilder_jar.addClass(ee.jakarta.tck.persistence.common.schema30.Country.class);
+    jpa_core_criteriapia_CriteriaBuilder_jar.addClass(ee.jakarta.tck.persistence.common.schema30.Country_.class);
+    jpa_core_criteriapia_CriteriaBuilder_jar.addClass(ee.jakarta.tck.persistence.common.schema30.CreditCard.class);
+    jpa_core_criteriapia_CriteriaBuilder_jar.addClass(ee.jakarta.tck.persistence.common.schema30.CreditCard_.class);
+    jpa_core_criteriapia_CriteriaBuilder_jar.addClass(ee.jakarta.tck.persistence.common.schema30.Customer.class);
+    jpa_core_criteriapia_CriteriaBuilder_jar.addClass(ee.jakarta.tck.persistence.common.schema30.Customer_.class);
+    jpa_core_criteriapia_CriteriaBuilder_jar.addClass(ee.jakarta.tck.persistence.common.schema30.Department.class);
+    jpa_core_criteriapia_CriteriaBuilder_jar.addClass(ee.jakarta.tck.persistence.common.schema30.Department_.class);
+    jpa_core_criteriapia_CriteriaBuilder_jar.addClass(ee.jakarta.tck.persistence.common.schema30.Employee.class);
+    jpa_core_criteriapia_CriteriaBuilder_jar.addClass(ee.jakarta.tck.persistence.common.schema30.Employee_.class);
+    jpa_core_criteriapia_CriteriaBuilder_jar.addClass(ee.jakarta.tck.persistence.common.schema30.HardwareProduct.class);
+    jpa_core_criteriapia_CriteriaBuilder_jar.addClass(ee.jakarta.tck.persistence.common.schema30.HardwareProduct_.class);
+    jpa_core_criteriapia_CriteriaBuilder_jar.addClass(ee.jakarta.tck.persistence.common.schema30.Info.class);
+    jpa_core_criteriapia_CriteriaBuilder_jar.addClass(ee.jakarta.tck.persistence.common.schema30.Info_.class);
+    jpa_core_criteriapia_CriteriaBuilder_jar.addClass(ee.jakarta.tck.persistence.common.schema30.LineItem.class);
+    jpa_core_criteriapia_CriteriaBuilder_jar.addClass(ee.jakarta.tck.persistence.common.schema30.LineItemException.class);
+    jpa_core_criteriapia_CriteriaBuilder_jar.addClass(ee.jakarta.tck.persistence.common.schema30.LineItem_.class);
+    jpa_core_criteriapia_CriteriaBuilder_jar.addClass(ee.jakarta.tck.persistence.common.schema30.Order.class);
+    jpa_core_criteriapia_CriteriaBuilder_jar.addClass(ee.jakarta.tck.persistence.common.schema30.Order_.class);
+    jpa_core_criteriapia_CriteriaBuilder_jar.addClass(ee.jakarta.tck.persistence.common.schema30.Phone.class);
+    jpa_core_criteriapia_CriteriaBuilder_jar.addClass(ee.jakarta.tck.persistence.common.schema30.Phone_.class);
+    jpa_core_criteriapia_CriteriaBuilder_jar.addClass(ee.jakarta.tck.persistence.common.schema30.Product.class);
+    jpa_core_criteriapia_CriteriaBuilder_jar.addClass(ee.jakarta.tck.persistence.common.schema30.Product_.class);
+    jpa_core_criteriapia_CriteriaBuilder_jar.addClass(ee.jakarta.tck.persistence.common.schema30.ShelfLife.class);
+    jpa_core_criteriapia_CriteriaBuilder_jar.addClass(ee.jakarta.tck.persistence.common.schema30.ShelfLife_.class);
+    jpa_core_criteriapia_CriteriaBuilder_jar.addClass(ee.jakarta.tck.persistence.common.schema30.SoftwareProduct.class);
+    jpa_core_criteriapia_CriteriaBuilder_jar.addClass(ee.jakarta.tck.persistence.common.schema30.SoftwareProduct_.class);
+    jpa_core_criteriapia_CriteriaBuilder_jar.addClass(ee.jakarta.tck.persistence.common.schema30.Spouse.class);
+    jpa_core_criteriapia_CriteriaBuilder_jar.addClass(ee.jakarta.tck.persistence.common.schema30.Spouse_.class);
+    jpa_core_criteriapia_CriteriaBuilder_jar.addClass(ee.jakarta.tck.persistence.common.schema30.Trim.class);
+    jpa_core_criteriapia_CriteriaBuilder_jar.addClass(ee.jakarta.tck.persistence.common.schema30.Trim_.class);
+    ear.addAsLibrary(jpa_core_criteriapia_CriteriaBuilder_jar);
+    // Add ear submodules
+
+    JavaArchive jpa_core_criteriapia_CriteriaBuilder_appmanagedNoTx_vehicle_client_jar = ShrinkWrap.create(JavaArchive.class, "jpa_core_criteriapia_CriteriaBuilder_appmanagedNoTx_vehicle_client_jar");
+    jpa_core_criteriapia_CriteriaBuilder_appmanagedNoTx_vehicle_client_jar.addClass(ee.jakarta.tck.persistence.common.PMClientBase.class);
+    jpa_core_criteriapia_CriteriaBuilder_appmanagedNoTx_vehicle_client_jar.addClass(ee.jakarta.tck.persistence.common.schema30.Util.class);
+    ear.addAsModule(jpa_core_criteriapia_CriteriaBuilder_appmanagedNoTx_vehicle_client_jar);
+
+    JavaArchive jpa_core_criteriapia_CriteriaBuilder_appmanagedNoTx_vehicle_ejb_jar = ShrinkWrap.create(JavaArchive.class, "jpa_core_criteriapia_CriteriaBuilder_appmanagedNoTx_vehicle_ejb_jar");
+    jpa_core_criteriapia_CriteriaBuilder_appmanagedNoTx_vehicle_ejb_jar.addClass(ee.jakarta.tck.persistence.common.PMClientBase.class);
+    jpa_core_criteriapia_CriteriaBuilder_appmanagedNoTx_vehicle_ejb_jar.addClass(ee.jakarta.tck.persistence.core.criteriaapi.CriteriaBuilder.Client.class);
+    jpa_core_criteriapia_CriteriaBuilder_appmanagedNoTx_vehicle_ejb_jar.addClass(ee.jakarta.tck.persistence.common.schema30.Util.class);
+    ear.addAsModule(jpa_core_criteriapia_CriteriaBuilder_appmanagedNoTx_vehicle_ejb_jar);
+
+    JavaArchive jpa_core_criteriapia_CriteriaBuilder_appmanaged_vehicle_client_jar = ShrinkWrap.create(JavaArchive.class, "jpa_core_criteriapia_CriteriaBuilder_appmanaged_vehicle_client_jar");
+    jpa_core_criteriapia_CriteriaBuilder_appmanaged_vehicle_client_jar.addClass(ee.jakarta.tck.persistence.common.PMClientBase.class);
+    jpa_core_criteriapia_CriteriaBuilder_appmanaged_vehicle_client_jar.addClass(ee.jakarta.tck.persistence.common.schema30.Util.class);
+    ear.addAsModule(jpa_core_criteriapia_CriteriaBuilder_appmanaged_vehicle_client_jar);
+
+    JavaArchive jpa_core_criteriapia_CriteriaBuilder_appmanaged_vehicle_ejb_jar = ShrinkWrap.create(JavaArchive.class, "jpa_core_criteriapia_CriteriaBuilder_appmanaged_vehicle_ejb_jar");
+    jpa_core_criteriapia_CriteriaBuilder_appmanaged_vehicle_ejb_jar.addClass(ee.jakarta.tck.persistence.common.PMClientBase.class);
+    jpa_core_criteriapia_CriteriaBuilder_appmanaged_vehicle_ejb_jar.addClass(ee.jakarta.tck.persistence.core.criteriaapi.CriteriaBuilder.Client.class);
+    jpa_core_criteriapia_CriteriaBuilder_appmanaged_vehicle_ejb_jar.addClass(ee.jakarta.tck.persistence.common.schema30.Util.class);
+    ear.addAsModule(jpa_core_criteriapia_CriteriaBuilder_appmanaged_vehicle_ejb_jar);
+
+    WebArchive jpa_core_criteriapia_CriteriaBuilder_pmservlet_vehicle_web_war = ShrinkWrap.create(WebArchive.class, "jpa_core_criteriapia_CriteriaBuilder_pmservlet_vehicle_web_war");
+    jpa_core_criteriapia_CriteriaBuilder_pmservlet_vehicle_web_war.addAsWebInfResource("web.xml");
+
+    JavaArchive jpa_core_criteriapia_CriteriaBuilder_jar = ShrinkWrap.create(JavaArchive.class, "jpa_core_criteriapia_CriteriaBuilder.jar");
+    jpa_core_criteriapia_CriteriaBuilder_jar.addClass(ee.jakarta.tck.persistence.common.schema30.Address.class);
+    jpa_core_criteriapia_CriteriaBuilder_jar.addClass(ee.jakarta.tck.persistence.common.schema30.Address_.class);
+    jpa_core_criteriapia_CriteriaBuilder_jar.addClass(ee.jakarta.tck.persistence.common.schema30.Alias.class);
+    jpa_core_criteriapia_CriteriaBuilder_jar.addClass(ee.jakarta.tck.persistence.common.schema30.Alias_.class);
+    jpa_core_criteriapia_CriteriaBuilder_jar.addClass(ee.jakarta.tck.persistence.common.schema30.Country.class);
+    jpa_core_criteriapia_CriteriaBuilder_jar.addClass(ee.jakarta.tck.persistence.common.schema30.Country_.class);
+    jpa_core_criteriapia_CriteriaBuilder_jar.addClass(ee.jakarta.tck.persistence.common.schema30.CreditCard.class);
+    jpa_core_criteriapia_CriteriaBuilder_jar.addClass(ee.jakarta.tck.persistence.common.schema30.CreditCard_.class);
+    jpa_core_criteriapia_CriteriaBuilder_jar.addClass(ee.jakarta.tck.persistence.common.schema30.Customer.class);
+    jpa_core_criteriapia_CriteriaBuilder_jar.addClass(ee.jakarta.tck.persistence.common.schema30.Customer_.class);
+    jpa_core_criteriapia_CriteriaBuilder_jar.addClass(ee.jakarta.tck.persistence.common.schema30.Department.class);
+    jpa_core_criteriapia_CriteriaBuilder_jar.addClass(ee.jakarta.tck.persistence.common.schema30.Department_.class);
+    jpa_core_criteriapia_CriteriaBuilder_jar.addClass(ee.jakarta.tck.persistence.common.schema30.Employee.class);
+    jpa_core_criteriapia_CriteriaBuilder_jar.addClass(ee.jakarta.tck.persistence.common.schema30.Employee_.class);
+    jpa_core_criteriapia_CriteriaBuilder_jar.addClass(ee.jakarta.tck.persistence.common.schema30.HardwareProduct.class);
+    jpa_core_criteriapia_CriteriaBuilder_jar.addClass(ee.jakarta.tck.persistence.common.schema30.HardwareProduct_.class);
+    jpa_core_criteriapia_CriteriaBuilder_jar.addClass(ee.jakarta.tck.persistence.common.schema30.Info.class);
+    jpa_core_criteriapia_CriteriaBuilder_jar.addClass(ee.jakarta.tck.persistence.common.schema30.Info_.class);
+    jpa_core_criteriapia_CriteriaBuilder_jar.addClass(ee.jakarta.tck.persistence.common.schema30.LineItem.class);
+    jpa_core_criteriapia_CriteriaBuilder_jar.addClass(ee.jakarta.tck.persistence.common.schema30.LineItemException.class);
+    jpa_core_criteriapia_CriteriaBuilder_jar.addClass(ee.jakarta.tck.persistence.common.schema30.LineItem_.class);
+    jpa_core_criteriapia_CriteriaBuilder_jar.addClass(ee.jakarta.tck.persistence.common.schema30.Order.class);
+    jpa_core_criteriapia_CriteriaBuilder_jar.addClass(ee.jakarta.tck.persistence.common.schema30.Order_.class);
+    jpa_core_criteriapia_CriteriaBuilder_jar.addClass(ee.jakarta.tck.persistence.common.schema30.Phone.class);
+    jpa_core_criteriapia_CriteriaBuilder_jar.addClass(ee.jakarta.tck.persistence.common.schema30.Phone_.class);
+    jpa_core_criteriapia_CriteriaBuilder_jar.addClass(ee.jakarta.tck.persistence.common.schema30.Product.class);
+    jpa_core_criteriapia_CriteriaBuilder_jar.addClass(ee.jakarta.tck.persistence.common.schema30.Product_.class);
+    jpa_core_criteriapia_CriteriaBuilder_jar.addClass(ee.jakarta.tck.persistence.common.schema30.ShelfLife.class);
+    jpa_core_criteriapia_CriteriaBuilder_jar.addClass(ee.jakarta.tck.persistence.common.schema30.ShelfLife_.class);
+    jpa_core_criteriapia_CriteriaBuilder_jar.addClass(ee.jakarta.tck.persistence.common.schema30.SoftwareProduct.class);
+    jpa_core_criteriapia_CriteriaBuilder_jar.addClass(ee.jakarta.tck.persistence.common.schema30.SoftwareProduct_.class);
+    jpa_core_criteriapia_CriteriaBuilder_jar.addClass(ee.jakarta.tck.persistence.common.schema30.Spouse.class);
+    jpa_core_criteriapia_CriteriaBuilder_jar.addClass(ee.jakarta.tck.persistence.common.schema30.Spouse_.class);
+    jpa_core_criteriapia_CriteriaBuilder_jar.addClass(ee.jakarta.tck.persistence.common.schema30.Trim.class);
+    jpa_core_criteriapia_CriteriaBuilder_jar.addClass(ee.jakarta.tck.persistence.common.schema30.Trim_.class);
+    jpa_core_criteriapia_CriteriaBuilder_jar.addAsManifestResource("META-INF/MANIFEST.MF");
+    jpa_core_criteriapia_CriteriaBuilder_jar.addAsManifestResource("META-INF/persistence.xml");
+    jpa_core_criteriapia_CriteriaBuilder_pmservlet_vehicle_web_war.addAsLibrary(jpa_core_criteriapia_CriteriaBuilder_jar);
+    jpa_core_criteriapia_CriteriaBuilder_pmservlet_vehicle_web_war.addClass(ee.jakarta.tck.persistence.common.PMClientBase.class);
+    jpa_core_criteriapia_CriteriaBuilder_pmservlet_vehicle_web_war.addClass(ee.jakarta.tck.persistence.core.criteriaapi.CriteriaBuilder.Client.class);
+    jpa_core_criteriapia_CriteriaBuilder_pmservlet_vehicle_web_war.addClass(ee.jakarta.tck.persistence.common.schema30.Util.class);
+    ear.addAsModule(jpa_core_criteriapia_CriteriaBuilder_pmservlet_vehicle_web_war);
+
+    WebArchive jpa_core_criteriapia_CriteriaBuilder_puservlet_vehicle_web_war = ShrinkWrap.create(WebArchive.class, "jpa_core_criteriapia_CriteriaBuilder_puservlet_vehicle_web_war");
+    jpa_core_criteriapia_CriteriaBuilder_puservlet_vehicle_web_war.addAsWebInfResource("web.xml");
+
+    JavaArchive jpa_core_criteriapia_CriteriaBuilder_jar = ShrinkWrap.create(JavaArchive.class, "jpa_core_criteriapia_CriteriaBuilder.jar");
+    jpa_core_criteriapia_CriteriaBuilder_jar.addClass(ee.jakarta.tck.persistence.common.schema30.Address.class);
+    jpa_core_criteriapia_CriteriaBuilder_jar.addClass(ee.jakarta.tck.persistence.common.schema30.Address_.class);
+    jpa_core_criteriapia_CriteriaBuilder_jar.addClass(ee.jakarta.tck.persistence.common.schema30.Alias.class);
+    jpa_core_criteriapia_CriteriaBuilder_jar.addClass(ee.jakarta.tck.persistence.common.schema30.Alias_.class);
+    jpa_core_criteriapia_CriteriaBuilder_jar.addClass(ee.jakarta.tck.persistence.common.schema30.Country.class);
+    jpa_core_criteriapia_CriteriaBuilder_jar.addClass(ee.jakarta.tck.persistence.common.schema30.Country_.class);
+    jpa_core_criteriapia_CriteriaBuilder_jar.addClass(ee.jakarta.tck.persistence.common.schema30.CreditCard.class);
+    jpa_core_criteriapia_CriteriaBuilder_jar.addClass(ee.jakarta.tck.persistence.common.schema30.CreditCard_.class);
+    jpa_core_criteriapia_CriteriaBuilder_jar.addClass(ee.jakarta.tck.persistence.common.schema30.Customer.class);
+    jpa_core_criteriapia_CriteriaBuilder_jar.addClass(ee.jakarta.tck.persistence.common.schema30.Customer_.class);
+    jpa_core_criteriapia_CriteriaBuilder_jar.addClass(ee.jakarta.tck.persistence.common.schema30.Department.class);
+    jpa_core_criteriapia_CriteriaBuilder_jar.addClass(ee.jakarta.tck.persistence.common.schema30.Department_.class);
+    jpa_core_criteriapia_CriteriaBuilder_jar.addClass(ee.jakarta.tck.persistence.common.schema30.Employee.class);
+    jpa_core_criteriapia_CriteriaBuilder_jar.addClass(ee.jakarta.tck.persistence.common.schema30.Employee_.class);
+    jpa_core_criteriapia_CriteriaBuilder_jar.addClass(ee.jakarta.tck.persistence.common.schema30.HardwareProduct.class);
+    jpa_core_criteriapia_CriteriaBuilder_jar.addClass(ee.jakarta.tck.persistence.common.schema30.HardwareProduct_.class);
+    jpa_core_criteriapia_CriteriaBuilder_jar.addClass(ee.jakarta.tck.persistence.common.schema30.Info.class);
+    jpa_core_criteriapia_CriteriaBuilder_jar.addClass(ee.jakarta.tck.persistence.common.schema30.Info_.class);
+    jpa_core_criteriapia_CriteriaBuilder_jar.addClass(ee.jakarta.tck.persistence.common.schema30.LineItem.class);
+    jpa_core_criteriapia_CriteriaBuilder_jar.addClass(ee.jakarta.tck.persistence.common.schema30.LineItemException.class);
+    jpa_core_criteriapia_CriteriaBuilder_jar.addClass(ee.jakarta.tck.persistence.common.schema30.LineItem_.class);
+    jpa_core_criteriapia_CriteriaBuilder_jar.addClass(ee.jakarta.tck.persistence.common.schema30.Order.class);
+    jpa_core_criteriapia_CriteriaBuilder_jar.addClass(ee.jakarta.tck.persistence.common.schema30.Order_.class);
+    jpa_core_criteriapia_CriteriaBuilder_jar.addClass(ee.jakarta.tck.persistence.common.schema30.Phone.class);
+    jpa_core_criteriapia_CriteriaBuilder_jar.addClass(ee.jakarta.tck.persistence.common.schema30.Phone_.class);
+    jpa_core_criteriapia_CriteriaBuilder_jar.addClass(ee.jakarta.tck.persistence.common.schema30.Product.class);
+    jpa_core_criteriapia_CriteriaBuilder_jar.addClass(ee.jakarta.tck.persistence.common.schema30.Product_.class);
+    jpa_core_criteriapia_CriteriaBuilder_jar.addClass(ee.jakarta.tck.persistence.common.schema30.ShelfLife.class);
+    jpa_core_criteriapia_CriteriaBuilder_jar.addClass(ee.jakarta.tck.persistence.common.schema30.ShelfLife_.class);
+    jpa_core_criteriapia_CriteriaBuilder_jar.addClass(ee.jakarta.tck.persistence.common.schema30.SoftwareProduct.class);
+    jpa_core_criteriapia_CriteriaBuilder_jar.addClass(ee.jakarta.tck.persistence.common.schema30.SoftwareProduct_.class);
+    jpa_core_criteriapia_CriteriaBuilder_jar.addClass(ee.jakarta.tck.persistence.common.schema30.Spouse.class);
+    jpa_core_criteriapia_CriteriaBuilder_jar.addClass(ee.jakarta.tck.persistence.common.schema30.Spouse_.class);
+    jpa_core_criteriapia_CriteriaBuilder_jar.addClass(ee.jakarta.tck.persistence.common.schema30.Trim.class);
+    jpa_core_criteriapia_CriteriaBuilder_jar.addClass(ee.jakarta.tck.persistence.common.schema30.Trim_.class);
+    jpa_core_criteriapia_CriteriaBuilder_jar.addAsManifestResource("META-INF/MANIFEST.MF");
+    jpa_core_criteriapia_CriteriaBuilder_jar.addAsManifestResource("META-INF/persistence.xml");
+    jpa_core_criteriapia_CriteriaBuilder_puservlet_vehicle_web_war.addAsLibrary(jpa_core_criteriapia_CriteriaBuilder_jar);
+    jpa_core_criteriapia_CriteriaBuilder_puservlet_vehicle_web_war.addClass(ee.jakarta.tck.persistence.common.PMClientBase.class);
+    jpa_core_criteriapia_CriteriaBuilder_puservlet_vehicle_web_war.addClass(ee.jakarta.tck.persistence.core.criteriaapi.CriteriaBuilder.Client.class);
+    jpa_core_criteriapia_CriteriaBuilder_puservlet_vehicle_web_war.addClass(ee.jakarta.tck.persistence.common.schema30.Util.class);
+    ear.addAsModule(jpa_core_criteriapia_CriteriaBuilder_puservlet_vehicle_web_war);
+
+    JavaArchive jpa_core_criteriapia_CriteriaBuilder_stateful3_vehicle_client_jar = ShrinkWrap.create(JavaArchive.class, "jpa_core_criteriapia_CriteriaBuilder_stateful3_vehicle_client_jar");
+    jpa_core_criteriapia_CriteriaBuilder_stateful3_vehicle_client_jar.addClass(ee.jakarta.tck.persistence.common.PMClientBase.class);
+    jpa_core_criteriapia_CriteriaBuilder_stateful3_vehicle_client_jar.addClass(ee.jakarta.tck.persistence.common.schema30.Util.class);
+    ear.addAsModule(jpa_core_criteriapia_CriteriaBuilder_stateful3_vehicle_client_jar);
+
+    JavaArchive jpa_core_criteriapia_CriteriaBuilder_stateful3_vehicle_ejb_jar = ShrinkWrap.create(JavaArchive.class, "jpa_core_criteriapia_CriteriaBuilder_stateful3_vehicle_ejb_jar");
+    jpa_core_criteriapia_CriteriaBuilder_stateful3_vehicle_ejb_jar.addClass(ee.jakarta.tck.persistence.common.PMClientBase.class);
+    jpa_core_criteriapia_CriteriaBuilder_stateful3_vehicle_ejb_jar.addClass(ee.jakarta.tck.persistence.core.criteriaapi.CriteriaBuilder.Client.class);
+    jpa_core_criteriapia_CriteriaBuilder_stateful3_vehicle_ejb_jar.addClass(ee.jakarta.tck.persistence.common.schema30.Util.class);
+    ear.addAsModule(jpa_core_criteriapia_CriteriaBuilder_stateful3_vehicle_ejb_jar);
+
+    JavaArchive jpa_core_criteriapia_CriteriaBuilder_stateless3_vehicle_client_jar = ShrinkWrap.create(JavaArchive.class, "jpa_core_criteriapia_CriteriaBuilder_stateless3_vehicle_client_jar");
+    jpa_core_criteriapia_CriteriaBuilder_stateless3_vehicle_client_jar.addClass(ee.jakarta.tck.persistence.common.PMClientBase.class);
+    jpa_core_criteriapia_CriteriaBuilder_stateless3_vehicle_client_jar.addClass(ee.jakarta.tck.persistence.common.schema30.Util.class);
+    ear.addAsModule(jpa_core_criteriapia_CriteriaBuilder_stateless3_vehicle_client_jar);
+
+    JavaArchive jpa_core_criteriapia_CriteriaBuilder_stateless3_vehicle_ejb_jar = ShrinkWrap.create(JavaArchive.class, "jpa_core_criteriapia_CriteriaBuilder_stateless3_vehicle_ejb_jar");
+    jpa_core_criteriapia_CriteriaBuilder_stateless3_vehicle_ejb_jar.addClass(ee.jakarta.tck.persistence.common.PMClientBase.class);
+    jpa_core_criteriapia_CriteriaBuilder_stateless3_vehicle_ejb_jar.addClass(ee.jakarta.tck.persistence.core.criteriaapi.CriteriaBuilder.Client.class);
+    jpa_core_criteriapia_CriteriaBuilder_stateless3_vehicle_ejb_jar.addClass(ee.jakarta.tck.persistence.common.schema30.Util.class);
+    ear.addAsModule(jpa_core_criteriapia_CriteriaBuilder_stateless3_vehicle_ejb_jar);
+    return ear;
+  }
+
 	private static final Logger logger = (Logger) System.getLogger(Client5.class.getName());
 
 	public JavaArchive createDeployment() throws Exception {
diff --git a/jpa/spec-tests/src/main/java/ee/jakarta/tck/persistence/core/criteriaapi/CriteriaBuilder/Client6.java b/jpa/spec-tests/src/main/java/ee/jakarta/tck/persistence/core/criteriaapi/CriteriaBuilder/Client6.java
index 2707d413d..190574f18 100644
--- a/jpa/spec-tests/src/main/java/ee/jakarta/tck/persistence/core/criteriaapi/CriteriaBuilder/Client6.java
+++ b/jpa/spec-tests/src/main/java/ee/jakarta/tck/persistence/core/criteriaapi/CriteriaBuilder/Client6.java
@@ -19,8 +19,12 @@ package ee.jakarta.tck.persistence.core.criteriaapi.CriteriaBuilder;
 import java.lang.System.Logger;
 import java.util.ArrayList;
 import java.util.List;
-
+import org.jboss.arquillian.container.test.api.Deployment;
+import org.jboss.shrinkwrap.api.Archive;
+import org.jboss.shrinkwrap.api.ShrinkWrap;
+import org.jboss.shrinkwrap.api.spec.EnterpriseArchive;
 import org.jboss.shrinkwrap.api.spec.JavaArchive;
+import org.jboss.shrinkwrap.api.spec.WebArchive;
 import org.junit.jupiter.api.Test;
 
 import com.sun.ts.lib.harness.SetupMethod;
@@ -46,6 +50,192 @@ import jakarta.persistence.metamodel.Metamodel;
 
 public class Client6 extends UtilOrderData {
 
+  @Deployment(testable = false)
+  public static Archive<?> deployment() {
+
+    final EnterpriseArchive ear = ShrinkWrap.create(EnterpriseArchive.class, "jpa_core_criteriapia_CriteriaBuilder_vehicles.ear");
+    // TODO: filter/eliminate the library jar classes that shouldn't be included
+    // Add ear/lib jars
+
+    JavaArchive jpa_core_criteriapia_CriteriaBuilder_jar = ShrinkWrap.create(JavaArchive.class, "jpa_core_criteriapia_CriteriaBuilder_jar");
+    jpa_core_criteriapia_CriteriaBuilder_jar.addClass(ee.jakarta.tck.persistence.common.schema30.Address.class);
+    jpa_core_criteriapia_CriteriaBuilder_jar.addClass(ee.jakarta.tck.persistence.common.schema30.Address_.class);
+    jpa_core_criteriapia_CriteriaBuilder_jar.addClass(ee.jakarta.tck.persistence.common.schema30.Alias.class);
+    jpa_core_criteriapia_CriteriaBuilder_jar.addClass(ee.jakarta.tck.persistence.common.schema30.Alias_.class);
+    jpa_core_criteriapia_CriteriaBuilder_jar.addClass(ee.jakarta.tck.persistence.common.schema30.Country.class);
+    jpa_core_criteriapia_CriteriaBuilder_jar.addClass(ee.jakarta.tck.persistence.common.schema30.Country_.class);
+    jpa_core_criteriapia_CriteriaBuilder_jar.addClass(ee.jakarta.tck.persistence.common.schema30.CreditCard.class);
+    jpa_core_criteriapia_CriteriaBuilder_jar.addClass(ee.jakarta.tck.persistence.common.schema30.CreditCard_.class);
+    jpa_core_criteriapia_CriteriaBuilder_jar.addClass(ee.jakarta.tck.persistence.common.schema30.Customer.class);
+    jpa_core_criteriapia_CriteriaBuilder_jar.addClass(ee.jakarta.tck.persistence.common.schema30.Customer_.class);
+    jpa_core_criteriapia_CriteriaBuilder_jar.addClass(ee.jakarta.tck.persistence.common.schema30.Department.class);
+    jpa_core_criteriapia_CriteriaBuilder_jar.addClass(ee.jakarta.tck.persistence.common.schema30.Department_.class);
+    jpa_core_criteriapia_CriteriaBuilder_jar.addClass(ee.jakarta.tck.persistence.common.schema30.Employee.class);
+    jpa_core_criteriapia_CriteriaBuilder_jar.addClass(ee.jakarta.tck.persistence.common.schema30.Employee_.class);
+    jpa_core_criteriapia_CriteriaBuilder_jar.addClass(ee.jakarta.tck.persistence.common.schema30.HardwareProduct.class);
+    jpa_core_criteriapia_CriteriaBuilder_jar.addClass(ee.jakarta.tck.persistence.common.schema30.HardwareProduct_.class);
+    jpa_core_criteriapia_CriteriaBuilder_jar.addClass(ee.jakarta.tck.persistence.common.schema30.Info.class);
+    jpa_core_criteriapia_CriteriaBuilder_jar.addClass(ee.jakarta.tck.persistence.common.schema30.Info_.class);
+    jpa_core_criteriapia_CriteriaBuilder_jar.addClass(ee.jakarta.tck.persistence.common.schema30.LineItem.class);
+    jpa_core_criteriapia_CriteriaBuilder_jar.addClass(ee.jakarta.tck.persistence.common.schema30.LineItemException.class);
+    jpa_core_criteriapia_CriteriaBuilder_jar.addClass(ee.jakarta.tck.persistence.common.schema30.LineItem_.class);
+    jpa_core_criteriapia_CriteriaBuilder_jar.addClass(ee.jakarta.tck.persistence.common.schema30.Order.class);
+    jpa_core_criteriapia_CriteriaBuilder_jar.addClass(ee.jakarta.tck.persistence.common.schema30.Order_.class);
+    jpa_core_criteriapia_CriteriaBuilder_jar.addClass(ee.jakarta.tck.persistence.common.schema30.Phone.class);
+    jpa_core_criteriapia_CriteriaBuilder_jar.addClass(ee.jakarta.tck.persistence.common.schema30.Phone_.class);
+    jpa_core_criteriapia_CriteriaBuilder_jar.addClass(ee.jakarta.tck.persistence.common.schema30.Product.class);
+    jpa_core_criteriapia_CriteriaBuilder_jar.addClass(ee.jakarta.tck.persistence.common.schema30.Product_.class);
+    jpa_core_criteriapia_CriteriaBuilder_jar.addClass(ee.jakarta.tck.persistence.common.schema30.ShelfLife.class);
+    jpa_core_criteriapia_CriteriaBuilder_jar.addClass(ee.jakarta.tck.persistence.common.schema30.ShelfLife_.class);
+    jpa_core_criteriapia_CriteriaBuilder_jar.addClass(ee.jakarta.tck.persistence.common.schema30.SoftwareProduct.class);
+    jpa_core_criteriapia_CriteriaBuilder_jar.addClass(ee.jakarta.tck.persistence.common.schema30.SoftwareProduct_.class);
+    jpa_core_criteriapia_CriteriaBuilder_jar.addClass(ee.jakarta.tck.persistence.common.schema30.Spouse.class);
+    jpa_core_criteriapia_CriteriaBuilder_jar.addClass(ee.jakarta.tck.persistence.common.schema30.Spouse_.class);
+    jpa_core_criteriapia_CriteriaBuilder_jar.addClass(ee.jakarta.tck.persistence.common.schema30.Trim.class);
+    jpa_core_criteriapia_CriteriaBuilder_jar.addClass(ee.jakarta.tck.persistence.common.schema30.Trim_.class);
+    ear.addAsLibrary(jpa_core_criteriapia_CriteriaBuilder_jar);
+    // Add ear submodules
+
+    JavaArchive jpa_core_criteriapia_CriteriaBuilder_appmanagedNoTx_vehicle_client_jar = ShrinkWrap.create(JavaArchive.class, "jpa_core_criteriapia_CriteriaBuilder_appmanagedNoTx_vehicle_client_jar");
+    jpa_core_criteriapia_CriteriaBuilder_appmanagedNoTx_vehicle_client_jar.addClass(ee.jakarta.tck.persistence.common.PMClientBase.class);
+    jpa_core_criteriapia_CriteriaBuilder_appmanagedNoTx_vehicle_client_jar.addClass(ee.jakarta.tck.persistence.common.schema30.Util.class);
+    ear.addAsModule(jpa_core_criteriapia_CriteriaBuilder_appmanagedNoTx_vehicle_client_jar);
+
+    JavaArchive jpa_core_criteriapia_CriteriaBuilder_appmanagedNoTx_vehicle_ejb_jar = ShrinkWrap.create(JavaArchive.class, "jpa_core_criteriapia_CriteriaBuilder_appmanagedNoTx_vehicle_ejb_jar");
+    jpa_core_criteriapia_CriteriaBuilder_appmanagedNoTx_vehicle_ejb_jar.addClass(ee.jakarta.tck.persistence.common.PMClientBase.class);
+    jpa_core_criteriapia_CriteriaBuilder_appmanagedNoTx_vehicle_ejb_jar.addClass(ee.jakarta.tck.persistence.core.criteriaapi.CriteriaBuilder.Client.class);
+    jpa_core_criteriapia_CriteriaBuilder_appmanagedNoTx_vehicle_ejb_jar.addClass(ee.jakarta.tck.persistence.common.schema30.Util.class);
+    ear.addAsModule(jpa_core_criteriapia_CriteriaBuilder_appmanagedNoTx_vehicle_ejb_jar);
+
+    JavaArchive jpa_core_criteriapia_CriteriaBuilder_appmanaged_vehicle_client_jar = ShrinkWrap.create(JavaArchive.class, "jpa_core_criteriapia_CriteriaBuilder_appmanaged_vehicle_client_jar");
+    jpa_core_criteriapia_CriteriaBuilder_appmanaged_vehicle_client_jar.addClass(ee.jakarta.tck.persistence.common.PMClientBase.class);
+    jpa_core_criteriapia_CriteriaBuilder_appmanaged_vehicle_client_jar.addClass(ee.jakarta.tck.persistence.common.schema30.Util.class);
+    ear.addAsModule(jpa_core_criteriapia_CriteriaBuilder_appmanaged_vehicle_client_jar);
+
+    JavaArchive jpa_core_criteriapia_CriteriaBuilder_appmanaged_vehicle_ejb_jar = ShrinkWrap.create(JavaArchive.class, "jpa_core_criteriapia_CriteriaBuilder_appmanaged_vehicle_ejb_jar");
+    jpa_core_criteriapia_CriteriaBuilder_appmanaged_vehicle_ejb_jar.addClass(ee.jakarta.tck.persistence.common.PMClientBase.class);
+    jpa_core_criteriapia_CriteriaBuilder_appmanaged_vehicle_ejb_jar.addClass(ee.jakarta.tck.persistence.core.criteriaapi.CriteriaBuilder.Client.class);
+    jpa_core_criteriapia_CriteriaBuilder_appmanaged_vehicle_ejb_jar.addClass(ee.jakarta.tck.persistence.common.schema30.Util.class);
+    ear.addAsModule(jpa_core_criteriapia_CriteriaBuilder_appmanaged_vehicle_ejb_jar);
+
+    WebArchive jpa_core_criteriapia_CriteriaBuilder_pmservlet_vehicle_web_war = ShrinkWrap.create(WebArchive.class, "jpa_core_criteriapia_CriteriaBuilder_pmservlet_vehicle_web_war");
+    jpa_core_criteriapia_CriteriaBuilder_pmservlet_vehicle_web_war.addAsWebInfResource("web.xml");
+
+    JavaArchive jpa_core_criteriapia_CriteriaBuilder_jar = ShrinkWrap.create(JavaArchive.class, "jpa_core_criteriapia_CriteriaBuilder.jar");
+    jpa_core_criteriapia_CriteriaBuilder_jar.addClass(ee.jakarta.tck.persistence.common.schema30.Address.class);
+    jpa_core_criteriapia_CriteriaBuilder_jar.addClass(ee.jakarta.tck.persistence.common.schema30.Address_.class);
+    jpa_core_criteriapia_CriteriaBuilder_jar.addClass(ee.jakarta.tck.persistence.common.schema30.Alias.class);
+    jpa_core_criteriapia_CriteriaBuilder_jar.addClass(ee.jakarta.tck.persistence.common.schema30.Alias_.class);
+    jpa_core_criteriapia_CriteriaBuilder_jar.addClass(ee.jakarta.tck.persistence.common.schema30.Country.class);
+    jpa_core_criteriapia_CriteriaBuilder_jar.addClass(ee.jakarta.tck.persistence.common.schema30.Country_.class);
+    jpa_core_criteriapia_CriteriaBuilder_jar.addClass(ee.jakarta.tck.persistence.common.schema30.CreditCard.class);
+    jpa_core_criteriapia_CriteriaBuilder_jar.addClass(ee.jakarta.tck.persistence.common.schema30.CreditCard_.class);
+    jpa_core_criteriapia_CriteriaBuilder_jar.addClass(ee.jakarta.tck.persistence.common.schema30.Customer.class);
+    jpa_core_criteriapia_CriteriaBuilder_jar.addClass(ee.jakarta.tck.persistence.common.schema30.Customer_.class);
+    jpa_core_criteriapia_CriteriaBuilder_jar.addClass(ee.jakarta.tck.persistence.common.schema30.Department.class);
+    jpa_core_criteriapia_CriteriaBuilder_jar.addClass(ee.jakarta.tck.persistence.common.schema30.Department_.class);
+    jpa_core_criteriapia_CriteriaBuilder_jar.addClass(ee.jakarta.tck.persistence.common.schema30.Employee.class);
+    jpa_core_criteriapia_CriteriaBuilder_jar.addClass(ee.jakarta.tck.persistence.common.schema30.Employee_.class);
+    jpa_core_criteriapia_CriteriaBuilder_jar.addClass(ee.jakarta.tck.persistence.common.schema30.HardwareProduct.class);
+    jpa_core_criteriapia_CriteriaBuilder_jar.addClass(ee.jakarta.tck.persistence.common.schema30.HardwareProduct_.class);
+    jpa_core_criteriapia_CriteriaBuilder_jar.addClass(ee.jakarta.tck.persistence.common.schema30.Info.class);
+    jpa_core_criteriapia_CriteriaBuilder_jar.addClass(ee.jakarta.tck.persistence.common.schema30.Info_.class);
+    jpa_core_criteriapia_CriteriaBuilder_jar.addClass(ee.jakarta.tck.persistence.common.schema30.LineItem.class);
+    jpa_core_criteriapia_CriteriaBuilder_jar.addClass(ee.jakarta.tck.persistence.common.schema30.LineItemException.class);
+    jpa_core_criteriapia_CriteriaBuilder_jar.addClass(ee.jakarta.tck.persistence.common.schema30.LineItem_.class);
+    jpa_core_criteriapia_CriteriaBuilder_jar.addClass(ee.jakarta.tck.persistence.common.schema30.Order.class);
+    jpa_core_criteriapia_CriteriaBuilder_jar.addClass(ee.jakarta.tck.persistence.common.schema30.Order_.class);
+    jpa_core_criteriapia_CriteriaBuilder_jar.addClass(ee.jakarta.tck.persistence.common.schema30.Phone.class);
+    jpa_core_criteriapia_CriteriaBuilder_jar.addClass(ee.jakarta.tck.persistence.common.schema30.Phone_.class);
+    jpa_core_criteriapia_CriteriaBuilder_jar.addClass(ee.jakarta.tck.persistence.common.schema30.Product.class);
+    jpa_core_criteriapia_CriteriaBuilder_jar.addClass(ee.jakarta.tck.persistence.common.schema30.Product_.class);
+    jpa_core_criteriapia_CriteriaBuilder_jar.addClass(ee.jakarta.tck.persistence.common.schema30.ShelfLife.class);
+    jpa_core_criteriapia_CriteriaBuilder_jar.addClass(ee.jakarta.tck.persistence.common.schema30.ShelfLife_.class);
+    jpa_core_criteriapia_CriteriaBuilder_jar.addClass(ee.jakarta.tck.persistence.common.schema30.SoftwareProduct.class);
+    jpa_core_criteriapia_CriteriaBuilder_jar.addClass(ee.jakarta.tck.persistence.common.schema30.SoftwareProduct_.class);
+    jpa_core_criteriapia_CriteriaBuilder_jar.addClass(ee.jakarta.tck.persistence.common.schema30.Spouse.class);
+    jpa_core_criteriapia_CriteriaBuilder_jar.addClass(ee.jakarta.tck.persistence.common.schema30.Spouse_.class);
+    jpa_core_criteriapia_CriteriaBuilder_jar.addClass(ee.jakarta.tck.persistence.common.schema30.Trim.class);
+    jpa_core_criteriapia_CriteriaBuilder_jar.addClass(ee.jakarta.tck.persistence.common.schema30.Trim_.class);
+    jpa_core_criteriapia_CriteriaBuilder_jar.addAsManifestResource("META-INF/MANIFEST.MF");
+    jpa_core_criteriapia_CriteriaBuilder_jar.addAsManifestResource("META-INF/persistence.xml");
+    jpa_core_criteriapia_CriteriaBuilder_pmservlet_vehicle_web_war.addAsLibrary(jpa_core_criteriapia_CriteriaBuilder_jar);
+    jpa_core_criteriapia_CriteriaBuilder_pmservlet_vehicle_web_war.addClass(ee.jakarta.tck.persistence.common.PMClientBase.class);
+    jpa_core_criteriapia_CriteriaBuilder_pmservlet_vehicle_web_war.addClass(ee.jakarta.tck.persistence.core.criteriaapi.CriteriaBuilder.Client.class);
+    jpa_core_criteriapia_CriteriaBuilder_pmservlet_vehicle_web_war.addClass(ee.jakarta.tck.persistence.common.schema30.Util.class);
+    ear.addAsModule(jpa_core_criteriapia_CriteriaBuilder_pmservlet_vehicle_web_war);
+
+    WebArchive jpa_core_criteriapia_CriteriaBuilder_puservlet_vehicle_web_war = ShrinkWrap.create(WebArchive.class, "jpa_core_criteriapia_CriteriaBuilder_puservlet_vehicle_web_war");
+    jpa_core_criteriapia_CriteriaBuilder_puservlet_vehicle_web_war.addAsWebInfResource("web.xml");
+
+    JavaArchive jpa_core_criteriapia_CriteriaBuilder_jar = ShrinkWrap.create(JavaArchive.class, "jpa_core_criteriapia_CriteriaBuilder.jar");
+    jpa_core_criteriapia_CriteriaBuilder_jar.addClass(ee.jakarta.tck.persistence.common.schema30.Address.class);
+    jpa_core_criteriapia_CriteriaBuilder_jar.addClass(ee.jakarta.tck.persistence.common.schema30.Address_.class);
+    jpa_core_criteriapia_CriteriaBuilder_jar.addClass(ee.jakarta.tck.persistence.common.schema30.Alias.class);
+    jpa_core_criteriapia_CriteriaBuilder_jar.addClass(ee.jakarta.tck.persistence.common.schema30.Alias_.class);
+    jpa_core_criteriapia_CriteriaBuilder_jar.addClass(ee.jakarta.tck.persistence.common.schema30.Country.class);
+    jpa_core_criteriapia_CriteriaBuilder_jar.addClass(ee.jakarta.tck.persistence.common.schema30.Country_.class);
+    jpa_core_criteriapia_CriteriaBuilder_jar.addClass(ee.jakarta.tck.persistence.common.schema30.CreditCard.class);
+    jpa_core_criteriapia_CriteriaBuilder_jar.addClass(ee.jakarta.tck.persistence.common.schema30.CreditCard_.class);
+    jpa_core_criteriapia_CriteriaBuilder_jar.addClass(ee.jakarta.tck.persistence.common.schema30.Customer.class);
+    jpa_core_criteriapia_CriteriaBuilder_jar.addClass(ee.jakarta.tck.persistence.common.schema30.Customer_.class);
+    jpa_core_criteriapia_CriteriaBuilder_jar.addClass(ee.jakarta.tck.persistence.common.schema30.Department.class);
+    jpa_core_criteriapia_CriteriaBuilder_jar.addClass(ee.jakarta.tck.persistence.common.schema30.Department_.class);
+    jpa_core_criteriapia_CriteriaBuilder_jar.addClass(ee.jakarta.tck.persistence.common.schema30.Employee.class);
+    jpa_core_criteriapia_CriteriaBuilder_jar.addClass(ee.jakarta.tck.persistence.common.schema30.Employee_.class);
+    jpa_core_criteriapia_CriteriaBuilder_jar.addClass(ee.jakarta.tck.persistence.common.schema30.HardwareProduct.class);
+    jpa_core_criteriapia_CriteriaBuilder_jar.addClass(ee.jakarta.tck.persistence.common.schema30.HardwareProduct_.class);
+    jpa_core_criteriapia_CriteriaBuilder_jar.addClass(ee.jakarta.tck.persistence.common.schema30.Info.class);
+    jpa_core_criteriapia_CriteriaBuilder_jar.addClass(ee.jakarta.tck.persistence.common.schema30.Info_.class);
+    jpa_core_criteriapia_CriteriaBuilder_jar.addClass(ee.jakarta.tck.persistence.common.schema30.LineItem.class);
+    jpa_core_criteriapia_CriteriaBuilder_jar.addClass(ee.jakarta.tck.persistence.common.schema30.LineItemException.class);
+    jpa_core_criteriapia_CriteriaBuilder_jar.addClass(ee.jakarta.tck.persistence.common.schema30.LineItem_.class);
+    jpa_core_criteriapia_CriteriaBuilder_jar.addClass(ee.jakarta.tck.persistence.common.schema30.Order.class);
+    jpa_core_criteriapia_CriteriaBuilder_jar.addClass(ee.jakarta.tck.persistence.common.schema30.Order_.class);
+    jpa_core_criteriapia_CriteriaBuilder_jar.addClass(ee.jakarta.tck.persistence.common.schema30.Phone.class);
+    jpa_core_criteriapia_CriteriaBuilder_jar.addClass(ee.jakarta.tck.persistence.common.schema30.Phone_.class);
+    jpa_core_criteriapia_CriteriaBuilder_jar.addClass(ee.jakarta.tck.persistence.common.schema30.Product.class);
+    jpa_core_criteriapia_CriteriaBuilder_jar.addClass(ee.jakarta.tck.persistence.common.schema30.Product_.class);
+    jpa_core_criteriapia_CriteriaBuilder_jar.addClass(ee.jakarta.tck.persistence.common.schema30.ShelfLife.class);
+    jpa_core_criteriapia_CriteriaBuilder_jar.addClass(ee.jakarta.tck.persistence.common.schema30.ShelfLife_.class);
+    jpa_core_criteriapia_CriteriaBuilder_jar.addClass(ee.jakarta.tck.persistence.common.schema30.SoftwareProduct.class);
+    jpa_core_criteriapia_CriteriaBuilder_jar.addClass(ee.jakarta.tck.persistence.common.schema30.SoftwareProduct_.class);
+    jpa_core_criteriapia_CriteriaBuilder_jar.addClass(ee.jakarta.tck.persistence.common.schema30.Spouse.class);
+    jpa_core_criteriapia_CriteriaBuilder_jar.addClass(ee.jakarta.tck.persistence.common.schema30.Spouse_.class);
+    jpa_core_criteriapia_CriteriaBuilder_jar.addClass(ee.jakarta.tck.persistence.common.schema30.Trim.class);
+    jpa_core_criteriapia_CriteriaBuilder_jar.addClass(ee.jakarta.tck.persistence.common.schema30.Trim_.class);
+    jpa_core_criteriapia_CriteriaBuilder_jar.addAsManifestResource("META-INF/MANIFEST.MF");
+    jpa_core_criteriapia_CriteriaBuilder_jar.addAsManifestResource("META-INF/persistence.xml");
+    jpa_core_criteriapia_CriteriaBuilder_puservlet_vehicle_web_war.addAsLibrary(jpa_core_criteriapia_CriteriaBuilder_jar);
+    jpa_core_criteriapia_CriteriaBuilder_puservlet_vehicle_web_war.addClass(ee.jakarta.tck.persistence.common.PMClientBase.class);
+    jpa_core_criteriapia_CriteriaBuilder_puservlet_vehicle_web_war.addClass(ee.jakarta.tck.persistence.core.criteriaapi.CriteriaBuilder.Client.class);
+    jpa_core_criteriapia_CriteriaBuilder_puservlet_vehicle_web_war.addClass(ee.jakarta.tck.persistence.common.schema30.Util.class);
+    ear.addAsModule(jpa_core_criteriapia_CriteriaBuilder_puservlet_vehicle_web_war);
+
+    JavaArchive jpa_core_criteriapia_CriteriaBuilder_stateful3_vehicle_client_jar = ShrinkWrap.create(JavaArchive.class, "jpa_core_criteriapia_CriteriaBuilder_stateful3_vehicle_client_jar");
+    jpa_core_criteriapia_CriteriaBuilder_stateful3_vehicle_client_jar.addClass(ee.jakarta.tck.persistence.common.PMClientBase.class);
+    jpa_core_criteriapia_CriteriaBuilder_stateful3_vehicle_client_jar.addClass(ee.jakarta.tck.persistence.common.schema30.Util.class);
+    ear.addAsModule(jpa_core_criteriapia_CriteriaBuilder_stateful3_vehicle_client_jar);
+
+    JavaArchive jpa_core_criteriapia_CriteriaBuilder_stateful3_vehicle_ejb_jar = ShrinkWrap.create(JavaArchive.class, "jpa_core_criteriapia_CriteriaBuilder_stateful3_vehicle_ejb_jar");
+    jpa_core_criteriapia_CriteriaBuilder_stateful3_vehicle_ejb_jar.addClass(ee.jakarta.tck.persistence.common.PMClientBase.class);
+    jpa_core_criteriapia_CriteriaBuilder_stateful3_vehicle_ejb_jar.addClass(ee.jakarta.tck.persistence.core.criteriaapi.CriteriaBuilder.Client.class);
+    jpa_core_criteriapia_CriteriaBuilder_stateful3_vehicle_ejb_jar.addClass(ee.jakarta.tck.persistence.common.schema30.Util.class);
+    ear.addAsModule(jpa_core_criteriapia_CriteriaBuilder_stateful3_vehicle_ejb_jar);
+
+    JavaArchive jpa_core_criteriapia_CriteriaBuilder_stateless3_vehicle_client_jar = ShrinkWrap.create(JavaArchive.class, "jpa_core_criteriapia_CriteriaBuilder_stateless3_vehicle_client_jar");
+    jpa_core_criteriapia_CriteriaBuilder_stateless3_vehicle_client_jar.addClass(ee.jakarta.tck.persistence.common.PMClientBase.class);
+    jpa_core_criteriapia_CriteriaBuilder_stateless3_vehicle_client_jar.addClass(ee.jakarta.tck.persistence.common.schema30.Util.class);
+    ear.addAsModule(jpa_core_criteriapia_CriteriaBuilder_stateless3_vehicle_client_jar);
+
+    JavaArchive jpa_core_criteriapia_CriteriaBuilder_stateless3_vehicle_ejb_jar = ShrinkWrap.create(JavaArchive.class, "jpa_core_criteriapia_CriteriaBuilder_stateless3_vehicle_ejb_jar");
+    jpa_core_criteriapia_CriteriaBuilder_stateless3_vehicle_ejb_jar.addClass(ee.jakarta.tck.persistence.common.PMClientBase.class);
+    jpa_core_criteriapia_CriteriaBuilder_stateless3_vehicle_ejb_jar.addClass(ee.jakarta.tck.persistence.core.criteriaapi.CriteriaBuilder.Client.class);
+    jpa_core_criteriapia_CriteriaBuilder_stateless3_vehicle_ejb_jar.addClass(ee.jakarta.tck.persistence.common.schema30.Util.class);
+    ear.addAsModule(jpa_core_criteriapia_CriteriaBuilder_stateless3_vehicle_ejb_jar);
+    return ear;
+  }
+
 	private static final Logger logger = (Logger) System.getLogger(Client6.class.getName());
 
 	public JavaArchive createDeployment() throws Exception {
diff --git a/jpa/spec-tests/src/main/java/ee/jakarta/tck/persistence/core/criteriaapi/CriteriaBuilder/Client7.java b/jpa/spec-tests/src/main/java/ee/jakarta/tck/persistence/core/criteriaapi/CriteriaBuilder/Client7.java
index 250693466..f59630468 100644
--- a/jpa/spec-tests/src/main/java/ee/jakarta/tck/persistence/core/criteriaapi/CriteriaBuilder/Client7.java
+++ b/jpa/spec-tests/src/main/java/ee/jakarta/tck/persistence/core/criteriaapi/CriteriaBuilder/Client7.java
@@ -18,8 +18,12 @@ package ee.jakarta.tck.persistence.core.criteriaapi.CriteriaBuilder;
 
 import java.lang.System.Logger;
 import java.util.List;
-
+import org.jboss.arquillian.container.test.api.Deployment;
+import org.jboss.shrinkwrap.api.Archive;
+import org.jboss.shrinkwrap.api.ShrinkWrap;
+import org.jboss.shrinkwrap.api.spec.EnterpriseArchive;
 import org.jboss.shrinkwrap.api.spec.JavaArchive;
+import org.jboss.shrinkwrap.api.spec.WebArchive;
 import org.junit.jupiter.api.Test;
 
 import com.sun.ts.lib.harness.SetupMethod;
@@ -36,6 +40,192 @@ import jakarta.persistence.criteria.Root;
 
 public class Client7 extends UtilCustAliasProductData {
 
+  @Deployment(testable = false)
+  public static Archive<?> deployment() {
+
+    final EnterpriseArchive ear = ShrinkWrap.create(EnterpriseArchive.class, "jpa_core_criteriapia_CriteriaBuilder_vehicles.ear");
+    // TODO: filter/eliminate the library jar classes that shouldn't be included
+    // Add ear/lib jars
+
+    JavaArchive jpa_core_criteriapia_CriteriaBuilder_jar = ShrinkWrap.create(JavaArchive.class, "jpa_core_criteriapia_CriteriaBuilder_jar");
+    jpa_core_criteriapia_CriteriaBuilder_jar.addClass(ee.jakarta.tck.persistence.common.schema30.Address.class);
+    jpa_core_criteriapia_CriteriaBuilder_jar.addClass(ee.jakarta.tck.persistence.common.schema30.Address_.class);
+    jpa_core_criteriapia_CriteriaBuilder_jar.addClass(ee.jakarta.tck.persistence.common.schema30.Alias.class);
+    jpa_core_criteriapia_CriteriaBuilder_jar.addClass(ee.jakarta.tck.persistence.common.schema30.Alias_.class);
+    jpa_core_criteriapia_CriteriaBuilder_jar.addClass(ee.jakarta.tck.persistence.common.schema30.Country.class);
+    jpa_core_criteriapia_CriteriaBuilder_jar.addClass(ee.jakarta.tck.persistence.common.schema30.Country_.class);
+    jpa_core_criteriapia_CriteriaBuilder_jar.addClass(ee.jakarta.tck.persistence.common.schema30.CreditCard.class);
+    jpa_core_criteriapia_CriteriaBuilder_jar.addClass(ee.jakarta.tck.persistence.common.schema30.CreditCard_.class);
+    jpa_core_criteriapia_CriteriaBuilder_jar.addClass(ee.jakarta.tck.persistence.common.schema30.Customer.class);
+    jpa_core_criteriapia_CriteriaBuilder_jar.addClass(ee.jakarta.tck.persistence.common.schema30.Customer_.class);
+    jpa_core_criteriapia_CriteriaBuilder_jar.addClass(ee.jakarta.tck.persistence.common.schema30.Department.class);
+    jpa_core_criteriapia_CriteriaBuilder_jar.addClass(ee.jakarta.tck.persistence.common.schema30.Department_.class);
+    jpa_core_criteriapia_CriteriaBuilder_jar.addClass(ee.jakarta.tck.persistence.common.schema30.Employee.class);
+    jpa_core_criteriapia_CriteriaBuilder_jar.addClass(ee.jakarta.tck.persistence.common.schema30.Employee_.class);
+    jpa_core_criteriapia_CriteriaBuilder_jar.addClass(ee.jakarta.tck.persistence.common.schema30.HardwareProduct.class);
+    jpa_core_criteriapia_CriteriaBuilder_jar.addClass(ee.jakarta.tck.persistence.common.schema30.HardwareProduct_.class);
+    jpa_core_criteriapia_CriteriaBuilder_jar.addClass(ee.jakarta.tck.persistence.common.schema30.Info.class);
+    jpa_core_criteriapia_CriteriaBuilder_jar.addClass(ee.jakarta.tck.persistence.common.schema30.Info_.class);
+    jpa_core_criteriapia_CriteriaBuilder_jar.addClass(ee.jakarta.tck.persistence.common.schema30.LineItem.class);
+    jpa_core_criteriapia_CriteriaBuilder_jar.addClass(ee.jakarta.tck.persistence.common.schema30.LineItemException.class);
+    jpa_core_criteriapia_CriteriaBuilder_jar.addClass(ee.jakarta.tck.persistence.common.schema30.LineItem_.class);
+    jpa_core_criteriapia_CriteriaBuilder_jar.addClass(ee.jakarta.tck.persistence.common.schema30.Order.class);
+    jpa_core_criteriapia_CriteriaBuilder_jar.addClass(ee.jakarta.tck.persistence.common.schema30.Order_.class);
+    jpa_core_criteriapia_CriteriaBuilder_jar.addClass(ee.jakarta.tck.persistence.common.schema30.Phone.class);
+    jpa_core_criteriapia_CriteriaBuilder_jar.addClass(ee.jakarta.tck.persistence.common.schema30.Phone_.class);
+    jpa_core_criteriapia_CriteriaBuilder_jar.addClass(ee.jakarta.tck.persistence.common.schema30.Product.class);
+    jpa_core_criteriapia_CriteriaBuilder_jar.addClass(ee.jakarta.tck.persistence.common.schema30.Product_.class);
+    jpa_core_criteriapia_CriteriaBuilder_jar.addClass(ee.jakarta.tck.persistence.common.schema30.ShelfLife.class);
+    jpa_core_criteriapia_CriteriaBuilder_jar.addClass(ee.jakarta.tck.persistence.common.schema30.ShelfLife_.class);
+    jpa_core_criteriapia_CriteriaBuilder_jar.addClass(ee.jakarta.tck.persistence.common.schema30.SoftwareProduct.class);
+    jpa_core_criteriapia_CriteriaBuilder_jar.addClass(ee.jakarta.tck.persistence.common.schema30.SoftwareProduct_.class);
+    jpa_core_criteriapia_CriteriaBuilder_jar.addClass(ee.jakarta.tck.persistence.common.schema30.Spouse.class);
+    jpa_core_criteriapia_CriteriaBuilder_jar.addClass(ee.jakarta.tck.persistence.common.schema30.Spouse_.class);
+    jpa_core_criteriapia_CriteriaBuilder_jar.addClass(ee.jakarta.tck.persistence.common.schema30.Trim.class);
+    jpa_core_criteriapia_CriteriaBuilder_jar.addClass(ee.jakarta.tck.persistence.common.schema30.Trim_.class);
+    ear.addAsLibrary(jpa_core_criteriapia_CriteriaBuilder_jar);
+    // Add ear submodules
+
+    JavaArchive jpa_core_criteriapia_CriteriaBuilder_appmanagedNoTx_vehicle_client_jar = ShrinkWrap.create(JavaArchive.class, "jpa_core_criteriapia_CriteriaBuilder_appmanagedNoTx_vehicle_client_jar");
+    jpa_core_criteriapia_CriteriaBuilder_appmanagedNoTx_vehicle_client_jar.addClass(ee.jakarta.tck.persistence.common.PMClientBase.class);
+    jpa_core_criteriapia_CriteriaBuilder_appmanagedNoTx_vehicle_client_jar.addClass(ee.jakarta.tck.persistence.common.schema30.Util.class);
+    ear.addAsModule(jpa_core_criteriapia_CriteriaBuilder_appmanagedNoTx_vehicle_client_jar);
+
+    JavaArchive jpa_core_criteriapia_CriteriaBuilder_appmanagedNoTx_vehicle_ejb_jar = ShrinkWrap.create(JavaArchive.class, "jpa_core_criteriapia_CriteriaBuilder_appmanagedNoTx_vehicle_ejb_jar");
+    jpa_core_criteriapia_CriteriaBuilder_appmanagedNoTx_vehicle_ejb_jar.addClass(ee.jakarta.tck.persistence.common.PMClientBase.class);
+    jpa_core_criteriapia_CriteriaBuilder_appmanagedNoTx_vehicle_ejb_jar.addClass(ee.jakarta.tck.persistence.core.criteriaapi.CriteriaBuilder.Client.class);
+    jpa_core_criteriapia_CriteriaBuilder_appmanagedNoTx_vehicle_ejb_jar.addClass(ee.jakarta.tck.persistence.common.schema30.Util.class);
+    ear.addAsModule(jpa_core_criteriapia_CriteriaBuilder_appmanagedNoTx_vehicle_ejb_jar);
+
+    JavaArchive jpa_core_criteriapia_CriteriaBuilder_appmanaged_vehicle_client_jar = ShrinkWrap.create(JavaArchive.class, "jpa_core_criteriapia_CriteriaBuilder_appmanaged_vehicle_client_jar");
+    jpa_core_criteriapia_CriteriaBuilder_appmanaged_vehicle_client_jar.addClass(ee.jakarta.tck.persistence.common.PMClientBase.class);
+    jpa_core_criteriapia_CriteriaBuilder_appmanaged_vehicle_client_jar.addClass(ee.jakarta.tck.persistence.common.schema30.Util.class);
+    ear.addAsModule(jpa_core_criteriapia_CriteriaBuilder_appmanaged_vehicle_client_jar);
+
+    JavaArchive jpa_core_criteriapia_CriteriaBuilder_appmanaged_vehicle_ejb_jar = ShrinkWrap.create(JavaArchive.class, "jpa_core_criteriapia_CriteriaBuilder_appmanaged_vehicle_ejb_jar");
+    jpa_core_criteriapia_CriteriaBuilder_appmanaged_vehicle_ejb_jar.addClass(ee.jakarta.tck.persistence.common.PMClientBase.class);
+    jpa_core_criteriapia_CriteriaBuilder_appmanaged_vehicle_ejb_jar.addClass(ee.jakarta.tck.persistence.core.criteriaapi.CriteriaBuilder.Client.class);
+    jpa_core_criteriapia_CriteriaBuilder_appmanaged_vehicle_ejb_jar.addClass(ee.jakarta.tck.persistence.common.schema30.Util.class);
+    ear.addAsModule(jpa_core_criteriapia_CriteriaBuilder_appmanaged_vehicle_ejb_jar);
+
+    WebArchive jpa_core_criteriapia_CriteriaBuilder_pmservlet_vehicle_web_war = ShrinkWrap.create(WebArchive.class, "jpa_core_criteriapia_CriteriaBuilder_pmservlet_vehicle_web_war");
+    jpa_core_criteriapia_CriteriaBuilder_pmservlet_vehicle_web_war.addAsWebInfResource("web.xml");
+
+    JavaArchive jpa_core_criteriapia_CriteriaBuilder_jar = ShrinkWrap.create(JavaArchive.class, "jpa_core_criteriapia_CriteriaBuilder.jar");
+    jpa_core_criteriapia_CriteriaBuilder_jar.addClass(ee.jakarta.tck.persistence.common.schema30.Address.class);
+    jpa_core_criteriapia_CriteriaBuilder_jar.addClass(ee.jakarta.tck.persistence.common.schema30.Address_.class);
+    jpa_core_criteriapia_CriteriaBuilder_jar.addClass(ee.jakarta.tck.persistence.common.schema30.Alias.class);
+    jpa_core_criteriapia_CriteriaBuilder_jar.addClass(ee.jakarta.tck.persistence.common.schema30.Alias_.class);
+    jpa_core_criteriapia_CriteriaBuilder_jar.addClass(ee.jakarta.tck.persistence.common.schema30.Country.class);
+    jpa_core_criteriapia_CriteriaBuilder_jar.addClass(ee.jakarta.tck.persistence.common.schema30.Country_.class);
+    jpa_core_criteriapia_CriteriaBuilder_jar.addClass(ee.jakarta.tck.persistence.common.schema30.CreditCard.class);
+    jpa_core_criteriapia_CriteriaBuilder_jar.addClass(ee.jakarta.tck.persistence.common.schema30.CreditCard_.class);
+    jpa_core_criteriapia_CriteriaBuilder_jar.addClass(ee.jakarta.tck.persistence.common.schema30.Customer.class);
+    jpa_core_criteriapia_CriteriaBuilder_jar.addClass(ee.jakarta.tck.persistence.common.schema30.Customer_.class);
+    jpa_core_criteriapia_CriteriaBuilder_jar.addClass(ee.jakarta.tck.persistence.common.schema30.Department.class);
+    jpa_core_criteriapia_CriteriaBuilder_jar.addClass(ee.jakarta.tck.persistence.common.schema30.Department_.class);
+    jpa_core_criteriapia_CriteriaBuilder_jar.addClass(ee.jakarta.tck.persistence.common.schema30.Employee.class);
+    jpa_core_criteriapia_CriteriaBuilder_jar.addClass(ee.jakarta.tck.persistence.common.schema30.Employee_.class);
+    jpa_core_criteriapia_CriteriaBuilder_jar.addClass(ee.jakarta.tck.persistence.common.schema30.HardwareProduct.class);
+    jpa_core_criteriapia_CriteriaBuilder_jar.addClass(ee.jakarta.tck.persistence.common.schema30.HardwareProduct_.class);
+    jpa_core_criteriapia_CriteriaBuilder_jar.addClass(ee.jakarta.tck.persistence.common.schema30.Info.class);
+    jpa_core_criteriapia_CriteriaBuilder_jar.addClass(ee.jakarta.tck.persistence.common.schema30.Info_.class);
+    jpa_core_criteriapia_CriteriaBuilder_jar.addClass(ee.jakarta.tck.persistence.common.schema30.LineItem.class);
+    jpa_core_criteriapia_CriteriaBuilder_jar.addClass(ee.jakarta.tck.persistence.common.schema30.LineItemException.class);
+    jpa_core_criteriapia_CriteriaBuilder_jar.addClass(ee.jakarta.tck.persistence.common.schema30.LineItem_.class);
+    jpa_core_criteriapia_CriteriaBuilder_jar.addClass(ee.jakarta.tck.persistence.common.schema30.Order.class);
+    jpa_core_criteriapia_CriteriaBuilder_jar.addClass(ee.jakarta.tck.persistence.common.schema30.Order_.class);
+    jpa_core_criteriapia_CriteriaBuilder_jar.addClass(ee.jakarta.tck.persistence.common.schema30.Phone.class);
+    jpa_core_criteriapia_CriteriaBuilder_jar.addClass(ee.jakarta.tck.persistence.common.schema30.Phone_.class);
+    jpa_core_criteriapia_CriteriaBuilder_jar.addClass(ee.jakarta.tck.persistence.common.schema30.Product.class);
+    jpa_core_criteriapia_CriteriaBuilder_jar.addClass(ee.jakarta.tck.persistence.common.schema30.Product_.class);
+    jpa_core_criteriapia_CriteriaBuilder_jar.addClass(ee.jakarta.tck.persistence.common.schema30.ShelfLife.class);
+    jpa_core_criteriapia_CriteriaBuilder_jar.addClass(ee.jakarta.tck.persistence.common.schema30.ShelfLife_.class);
+    jpa_core_criteriapia_CriteriaBuilder_jar.addClass(ee.jakarta.tck.persistence.common.schema30.SoftwareProduct.class);
+    jpa_core_criteriapia_CriteriaBuilder_jar.addClass(ee.jakarta.tck.persistence.common.schema30.SoftwareProduct_.class);
+    jpa_core_criteriapia_CriteriaBuilder_jar.addClass(ee.jakarta.tck.persistence.common.schema30.Spouse.class);
+    jpa_core_criteriapia_CriteriaBuilder_jar.addClass(ee.jakarta.tck.persistence.common.schema30.Spouse_.class);
+    jpa_core_criteriapia_CriteriaBuilder_jar.addClass(ee.jakarta.tck.persistence.common.schema30.Trim.class);
+    jpa_core_criteriapia_CriteriaBuilder_jar.addClass(ee.jakarta.tck.persistence.common.schema30.Trim_.class);
+    jpa_core_criteriapia_CriteriaBuilder_jar.addAsManifestResource("META-INF/MANIFEST.MF");
+    jpa_core_criteriapia_CriteriaBuilder_jar.addAsManifestResource("META-INF/persistence.xml");
+    jpa_core_criteriapia_CriteriaBuilder_pmservlet_vehicle_web_war.addAsLibrary(jpa_core_criteriapia_CriteriaBuilder_jar);
+    jpa_core_criteriapia_CriteriaBuilder_pmservlet_vehicle_web_war.addClass(ee.jakarta.tck.persistence.common.PMClientBase.class);
+    jpa_core_criteriapia_CriteriaBuilder_pmservlet_vehicle_web_war.addClass(ee.jakarta.tck.persistence.core.criteriaapi.CriteriaBuilder.Client.class);
+    jpa_core_criteriapia_CriteriaBuilder_pmservlet_vehicle_web_war.addClass(ee.jakarta.tck.persistence.common.schema30.Util.class);
+    ear.addAsModule(jpa_core_criteriapia_CriteriaBuilder_pmservlet_vehicle_web_war);
+
+    WebArchive jpa_core_criteriapia_CriteriaBuilder_puservlet_vehicle_web_war = ShrinkWrap.create(WebArchive.class, "jpa_core_criteriapia_CriteriaBuilder_puservlet_vehicle_web_war");
+    jpa_core_criteriapia_CriteriaBuilder_puservlet_vehicle_web_war.addAsWebInfResource("web.xml");
+
+    JavaArchive jpa_core_criteriapia_CriteriaBuilder_jar = ShrinkWrap.create(JavaArchive.class, "jpa_core_criteriapia_CriteriaBuilder.jar");
+    jpa_core_criteriapia_CriteriaBuilder_jar.addClass(ee.jakarta.tck.persistence.common.schema30.Address.class);
+    jpa_core_criteriapia_CriteriaBuilder_jar.addClass(ee.jakarta.tck.persistence.common.schema30.Address_.class);
+    jpa_core_criteriapia_CriteriaBuilder_jar.addClass(ee.jakarta.tck.persistence.common.schema30.Alias.class);
+    jpa_core_criteriapia_CriteriaBuilder_jar.addClass(ee.jakarta.tck.persistence.common.schema30.Alias_.class);
+    jpa_core_criteriapia_CriteriaBuilder_jar.addClass(ee.jakarta.tck.persistence.common.schema30.Country.class);
+    jpa_core_criteriapia_CriteriaBuilder_jar.addClass(ee.jakarta.tck.persistence.common.schema30.Country_.class);
+    jpa_core_criteriapia_CriteriaBuilder_jar.addClass(ee.jakarta.tck.persistence.common.schema30.CreditCard.class);
+    jpa_core_criteriapia_CriteriaBuilder_jar.addClass(ee.jakarta.tck.persistence.common.schema30.CreditCard_.class);
+    jpa_core_criteriapia_CriteriaBuilder_jar.addClass(ee.jakarta.tck.persistence.common.schema30.Customer.class);
+    jpa_core_criteriapia_CriteriaBuilder_jar.addClass(ee.jakarta.tck.persistence.common.schema30.Customer_.class);
+    jpa_core_criteriapia_CriteriaBuilder_jar.addClass(ee.jakarta.tck.persistence.common.schema30.Department.class);
+    jpa_core_criteriapia_CriteriaBuilder_jar.addClass(ee.jakarta.tck.persistence.common.schema30.Department_.class);
+    jpa_core_criteriapia_CriteriaBuilder_jar.addClass(ee.jakarta.tck.persistence.common.schema30.Employee.class);
+    jpa_core_criteriapia_CriteriaBuilder_jar.addClass(ee.jakarta.tck.persistence.common.schema30.Employee_.class);
+    jpa_core_criteriapia_CriteriaBuilder_jar.addClass(ee.jakarta.tck.persistence.common.schema30.HardwareProduct.class);
+    jpa_core_criteriapia_CriteriaBuilder_jar.addClass(ee.jakarta.tck.persistence.common.schema30.HardwareProduct_.class);
+    jpa_core_criteriapia_CriteriaBuilder_jar.addClass(ee.jakarta.tck.persistence.common.schema30.Info.class);
+    jpa_core_criteriapia_CriteriaBuilder_jar.addClass(ee.jakarta.tck.persistence.common.schema30.Info_.class);
+    jpa_core_criteriapia_CriteriaBuilder_jar.addClass(ee.jakarta.tck.persistence.common.schema30.LineItem.class);
+    jpa_core_criteriapia_CriteriaBuilder_jar.addClass(ee.jakarta.tck.persistence.common.schema30.LineItemException.class);
+    jpa_core_criteriapia_CriteriaBuilder_jar.addClass(ee.jakarta.tck.persistence.common.schema30.LineItem_.class);
+    jpa_core_criteriapia_CriteriaBuilder_jar.addClass(ee.jakarta.tck.persistence.common.schema30.Order.class);
+    jpa_core_criteriapia_CriteriaBuilder_jar.addClass(ee.jakarta.tck.persistence.common.schema30.Order_.class);
+    jpa_core_criteriapia_CriteriaBuilder_jar.addClass(ee.jakarta.tck.persistence.common.schema30.Phone.class);
+    jpa_core_criteriapia_CriteriaBuilder_jar.addClass(ee.jakarta.tck.persistence.common.schema30.Phone_.class);
+    jpa_core_criteriapia_CriteriaBuilder_jar.addClass(ee.jakarta.tck.persistence.common.schema30.Product.class);
+    jpa_core_criteriapia_CriteriaBuilder_jar.addClass(ee.jakarta.tck.persistence.common.schema30.Product_.class);
+    jpa_core_criteriapia_CriteriaBuilder_jar.addClass(ee.jakarta.tck.persistence.common.schema30.ShelfLife.class);
+    jpa_core_criteriapia_CriteriaBuilder_jar.addClass(ee.jakarta.tck.persistence.common.schema30.ShelfLife_.class);
+    jpa_core_criteriapia_CriteriaBuilder_jar.addClass(ee.jakarta.tck.persistence.common.schema30.SoftwareProduct.class);
+    jpa_core_criteriapia_CriteriaBuilder_jar.addClass(ee.jakarta.tck.persistence.common.schema30.SoftwareProduct_.class);
+    jpa_core_criteriapia_CriteriaBuilder_jar.addClass(ee.jakarta.tck.persistence.common.schema30.Spouse.class);
+    jpa_core_criteriapia_CriteriaBuilder_jar.addClass(ee.jakarta.tck.persistence.common.schema30.Spouse_.class);
+    jpa_core_criteriapia_CriteriaBuilder_jar.addClass(ee.jakarta.tck.persistence.common.schema30.Trim.class);
+    jpa_core_criteriapia_CriteriaBuilder_jar.addClass(ee.jakarta.tck.persistence.common.schema30.Trim_.class);
+    jpa_core_criteriapia_CriteriaBuilder_jar.addAsManifestResource("META-INF/MANIFEST.MF");
+    jpa_core_criteriapia_CriteriaBuilder_jar.addAsManifestResource("META-INF/persistence.xml");
+    jpa_core_criteriapia_CriteriaBuilder_puservlet_vehicle_web_war.addAsLibrary(jpa_core_criteriapia_CriteriaBuilder_jar);
+    jpa_core_criteriapia_CriteriaBuilder_puservlet_vehicle_web_war.addClass(ee.jakarta.tck.persistence.common.PMClientBase.class);
+    jpa_core_criteriapia_CriteriaBuilder_puservlet_vehicle_web_war.addClass(ee.jakarta.tck.persistence.core.criteriaapi.CriteriaBuilder.Client.class);
+    jpa_core_criteriapia_CriteriaBuilder_puservlet_vehicle_web_war.addClass(ee.jakarta.tck.persistence.common.schema30.Util.class);
+    ear.addAsModule(jpa_core_criteriapia_CriteriaBuilder_puservlet_vehicle_web_war);
+
+    JavaArchive jpa_core_criteriapia_CriteriaBuilder_stateful3_vehicle_client_jar = ShrinkWrap.create(JavaArchive.class, "jpa_core_criteriapia_CriteriaBuilder_stateful3_vehicle_client_jar");
+    jpa_core_criteriapia_CriteriaBuilder_stateful3_vehicle_client_jar.addClass(ee.jakarta.tck.persistence.common.PMClientBase.class);
+    jpa_core_criteriapia_CriteriaBuilder_stateful3_vehicle_client_jar.addClass(ee.jakarta.tck.persistence.common.schema30.Util.class);
+    ear.addAsModule(jpa_core_criteriapia_CriteriaBuilder_stateful3_vehicle_client_jar);
+
+    JavaArchive jpa_core_criteriapia_CriteriaBuilder_stateful3_vehicle_ejb_jar = ShrinkWrap.create(JavaArchive.class, "jpa_core_criteriapia_CriteriaBuilder_stateful3_vehicle_ejb_jar");
+    jpa_core_criteriapia_CriteriaBuilder_stateful3_vehicle_ejb_jar.addClass(ee.jakarta.tck.persistence.common.PMClientBase.class);
+    jpa_core_criteriapia_CriteriaBuilder_stateful3_vehicle_ejb_jar.addClass(ee.jakarta.tck.persistence.core.criteriaapi.CriteriaBuilder.Client.class);
+    jpa_core_criteriapia_CriteriaBuilder_stateful3_vehicle_ejb_jar.addClass(ee.jakarta.tck.persistence.common.schema30.Util.class);
+    ear.addAsModule(jpa_core_criteriapia_CriteriaBuilder_stateful3_vehicle_ejb_jar);
+
+    JavaArchive jpa_core_criteriapia_CriteriaBuilder_stateless3_vehicle_client_jar = ShrinkWrap.create(JavaArchive.class, "jpa_core_criteriapia_CriteriaBuilder_stateless3_vehicle_client_jar");
+    jpa_core_criteriapia_CriteriaBuilder_stateless3_vehicle_client_jar.addClass(ee.jakarta.tck.persistence.common.PMClientBase.class);
+    jpa_core_criteriapia_CriteriaBuilder_stateless3_vehicle_client_jar.addClass(ee.jakarta.tck.persistence.common.schema30.Util.class);
+    ear.addAsModule(jpa_core_criteriapia_CriteriaBuilder_stateless3_vehicle_client_jar);
+
+    JavaArchive jpa_core_criteriapia_CriteriaBuilder_stateless3_vehicle_ejb_jar = ShrinkWrap.create(JavaArchive.class, "jpa_core_criteriapia_CriteriaBuilder_stateless3_vehicle_ejb_jar");
+    jpa_core_criteriapia_CriteriaBuilder_stateless3_vehicle_ejb_jar.addClass(ee.jakarta.tck.persistence.common.PMClientBase.class);
+    jpa_core_criteriapia_CriteriaBuilder_stateless3_vehicle_ejb_jar.addClass(ee.jakarta.tck.persistence.core.criteriaapi.CriteriaBuilder.Client.class);
+    jpa_core_criteriapia_CriteriaBuilder_stateless3_vehicle_ejb_jar.addClass(ee.jakarta.tck.persistence.common.schema30.Util.class);
+    ear.addAsModule(jpa_core_criteriapia_CriteriaBuilder_stateless3_vehicle_ejb_jar);
+    return ear;
+  }
+
 	private static final Logger logger = (Logger) System.getLogger(Client7.class.getName());
 
 	public JavaArchive createDeployment() throws Exception {
diff --git a/jpa/spec-tests/src/main/java/ee/jakarta/tck/persistence/core/criteriaapi/CriteriaBuilder/Client8.java b/jpa/spec-tests/src/main/java/ee/jakarta/tck/persistence/core/criteriaapi/CriteriaBuilder/Client8.java
index 9cdb950a4..09e98efa2 100644
--- a/jpa/spec-tests/src/main/java/ee/jakarta/tck/persistence/core/criteriaapi/CriteriaBuilder/Client8.java
+++ b/jpa/spec-tests/src/main/java/ee/jakarta/tck/persistence/core/criteriaapi/CriteriaBuilder/Client8.java
@@ -17,8 +17,12 @@
 package ee.jakarta.tck.persistence.core.criteriaapi.CriteriaBuilder;
 
 import java.lang.System.Logger;
-
+import org.jboss.arquillian.container.test.api.Deployment;
+import org.jboss.shrinkwrap.api.Archive;
+import org.jboss.shrinkwrap.api.ShrinkWrap;
+import org.jboss.shrinkwrap.api.spec.EnterpriseArchive;
 import org.jboss.shrinkwrap.api.spec.JavaArchive;
+import org.jboss.shrinkwrap.api.spec.WebArchive;
 import org.junit.jupiter.api.Test;
 
 import com.sun.ts.lib.harness.SetupMethod;
@@ -34,6 +38,192 @@ import jakarta.persistence.metamodel.EntityType;
 
 public class Client8 extends UtilTrimData {
 
+  @Deployment(testable = false)
+  public static Archive<?> deployment() {
+
+    final EnterpriseArchive ear = ShrinkWrap.create(EnterpriseArchive.class, "jpa_core_criteriapia_CriteriaBuilder_vehicles.ear");
+    // TODO: filter/eliminate the library jar classes that shouldn't be included
+    // Add ear/lib jars
+
+    JavaArchive jpa_core_criteriapia_CriteriaBuilder_jar = ShrinkWrap.create(JavaArchive.class, "jpa_core_criteriapia_CriteriaBuilder_jar");
+    jpa_core_criteriapia_CriteriaBuilder_jar.addClass(ee.jakarta.tck.persistence.common.schema30.Address.class);
+    jpa_core_criteriapia_CriteriaBuilder_jar.addClass(ee.jakarta.tck.persistence.common.schema30.Address_.class);
+    jpa_core_criteriapia_CriteriaBuilder_jar.addClass(ee.jakarta.tck.persistence.common.schema30.Alias.class);
+    jpa_core_criteriapia_CriteriaBuilder_jar.addClass(ee.jakarta.tck.persistence.common.schema30.Alias_.class);
+    jpa_core_criteriapia_CriteriaBuilder_jar.addClass(ee.jakarta.tck.persistence.common.schema30.Country.class);
+    jpa_core_criteriapia_CriteriaBuilder_jar.addClass(ee.jakarta.tck.persistence.common.schema30.Country_.class);
+    jpa_core_criteriapia_CriteriaBuilder_jar.addClass(ee.jakarta.tck.persistence.common.schema30.CreditCard.class);
+    jpa_core_criteriapia_CriteriaBuilder_jar.addClass(ee.jakarta.tck.persistence.common.schema30.CreditCard_.class);
+    jpa_core_criteriapia_CriteriaBuilder_jar.addClass(ee.jakarta.tck.persistence.common.schema30.Customer.class);
+    jpa_core_criteriapia_CriteriaBuilder_jar.addClass(ee.jakarta.tck.persistence.common.schema30.Customer_.class);
+    jpa_core_criteriapia_CriteriaBuilder_jar.addClass(ee.jakarta.tck.persistence.common.schema30.Department.class);
+    jpa_core_criteriapia_CriteriaBuilder_jar.addClass(ee.jakarta.tck.persistence.common.schema30.Department_.class);
+    jpa_core_criteriapia_CriteriaBuilder_jar.addClass(ee.jakarta.tck.persistence.common.schema30.Employee.class);
+    jpa_core_criteriapia_CriteriaBuilder_jar.addClass(ee.jakarta.tck.persistence.common.schema30.Employee_.class);
+    jpa_core_criteriapia_CriteriaBuilder_jar.addClass(ee.jakarta.tck.persistence.common.schema30.HardwareProduct.class);
+    jpa_core_criteriapia_CriteriaBuilder_jar.addClass(ee.jakarta.tck.persistence.common.schema30.HardwareProduct_.class);
+    jpa_core_criteriapia_CriteriaBuilder_jar.addClass(ee.jakarta.tck.persistence.common.schema30.Info.class);
+    jpa_core_criteriapia_CriteriaBuilder_jar.addClass(ee.jakarta.tck.persistence.common.schema30.Info_.class);
+    jpa_core_criteriapia_CriteriaBuilder_jar.addClass(ee.jakarta.tck.persistence.common.schema30.LineItem.class);
+    jpa_core_criteriapia_CriteriaBuilder_jar.addClass(ee.jakarta.tck.persistence.common.schema30.LineItemException.class);
+    jpa_core_criteriapia_CriteriaBuilder_jar.addClass(ee.jakarta.tck.persistence.common.schema30.LineItem_.class);
+    jpa_core_criteriapia_CriteriaBuilder_jar.addClass(ee.jakarta.tck.persistence.common.schema30.Order.class);
+    jpa_core_criteriapia_CriteriaBuilder_jar.addClass(ee.jakarta.tck.persistence.common.schema30.Order_.class);
+    jpa_core_criteriapia_CriteriaBuilder_jar.addClass(ee.jakarta.tck.persistence.common.schema30.Phone.class);
+    jpa_core_criteriapia_CriteriaBuilder_jar.addClass(ee.jakarta.tck.persistence.common.schema30.Phone_.class);
+    jpa_core_criteriapia_CriteriaBuilder_jar.addClass(ee.jakarta.tck.persistence.common.schema30.Product.class);
+    jpa_core_criteriapia_CriteriaBuilder_jar.addClass(ee.jakarta.tck.persistence.common.schema30.Product_.class);
+    jpa_core_criteriapia_CriteriaBuilder_jar.addClass(ee.jakarta.tck.persistence.common.schema30.ShelfLife.class);
+    jpa_core_criteriapia_CriteriaBuilder_jar.addClass(ee.jakarta.tck.persistence.common.schema30.ShelfLife_.class);
+    jpa_core_criteriapia_CriteriaBuilder_jar.addClass(ee.jakarta.tck.persistence.common.schema30.SoftwareProduct.class);
+    jpa_core_criteriapia_CriteriaBuilder_jar.addClass(ee.jakarta.tck.persistence.common.schema30.SoftwareProduct_.class);
+    jpa_core_criteriapia_CriteriaBuilder_jar.addClass(ee.jakarta.tck.persistence.common.schema30.Spouse.class);
+    jpa_core_criteriapia_CriteriaBuilder_jar.addClass(ee.jakarta.tck.persistence.common.schema30.Spouse_.class);
+    jpa_core_criteriapia_CriteriaBuilder_jar.addClass(ee.jakarta.tck.persistence.common.schema30.Trim.class);
+    jpa_core_criteriapia_CriteriaBuilder_jar.addClass(ee.jakarta.tck.persistence.common.schema30.Trim_.class);
+    ear.addAsLibrary(jpa_core_criteriapia_CriteriaBuilder_jar);
+    // Add ear submodules
+
+    JavaArchive jpa_core_criteriapia_CriteriaBuilder_appmanagedNoTx_vehicle_client_jar = ShrinkWrap.create(JavaArchive.class, "jpa_core_criteriapia_CriteriaBuilder_appmanagedNoTx_vehicle_client_jar");
+    jpa_core_criteriapia_CriteriaBuilder_appmanagedNoTx_vehicle_client_jar.addClass(ee.jakarta.tck.persistence.common.PMClientBase.class);
+    jpa_core_criteriapia_CriteriaBuilder_appmanagedNoTx_vehicle_client_jar.addClass(ee.jakarta.tck.persistence.common.schema30.Util.class);
+    ear.addAsModule(jpa_core_criteriapia_CriteriaBuilder_appmanagedNoTx_vehicle_client_jar);
+
+    JavaArchive jpa_core_criteriapia_CriteriaBuilder_appmanagedNoTx_vehicle_ejb_jar = ShrinkWrap.create(JavaArchive.class, "jpa_core_criteriapia_CriteriaBuilder_appmanagedNoTx_vehicle_ejb_jar");
+    jpa_core_criteriapia_CriteriaBuilder_appmanagedNoTx_vehicle_ejb_jar.addClass(ee.jakarta.tck.persistence.common.PMClientBase.class);
+    jpa_core_criteriapia_CriteriaBuilder_appmanagedNoTx_vehicle_ejb_jar.addClass(ee.jakarta.tck.persistence.core.criteriaapi.CriteriaBuilder.Client.class);
+    jpa_core_criteriapia_CriteriaBuilder_appmanagedNoTx_vehicle_ejb_jar.addClass(ee.jakarta.tck.persistence.common.schema30.Util.class);
+    ear.addAsModule(jpa_core_criteriapia_CriteriaBuilder_appmanagedNoTx_vehicle_ejb_jar);
+
+    JavaArchive jpa_core_criteriapia_CriteriaBuilder_appmanaged_vehicle_client_jar = ShrinkWrap.create(JavaArchive.class, "jpa_core_criteriapia_CriteriaBuilder_appmanaged_vehicle_client_jar");
+    jpa_core_criteriapia_CriteriaBuilder_appmanaged_vehicle_client_jar.addClass(ee.jakarta.tck.persistence.common.PMClientBase.class);
+    jpa_core_criteriapia_CriteriaBuilder_appmanaged_vehicle_client_jar.addClass(ee.jakarta.tck.persistence.common.schema30.Util.class);
+    ear.addAsModule(jpa_core_criteriapia_CriteriaBuilder_appmanaged_vehicle_client_jar);
+
+    JavaArchive jpa_core_criteriapia_CriteriaBuilder_appmanaged_vehicle_ejb_jar = ShrinkWrap.create(JavaArchive.class, "jpa_core_criteriapia_CriteriaBuilder_appmanaged_vehicle_ejb_jar");
+    jpa_core_criteriapia_CriteriaBuilder_appmanaged_vehicle_ejb_jar.addClass(ee.jakarta.tck.persistence.common.PMClientBase.class);
+    jpa_core_criteriapia_CriteriaBuilder_appmanaged_vehicle_ejb_jar.addClass(ee.jakarta.tck.persistence.core.criteriaapi.CriteriaBuilder.Client.class);
+    jpa_core_criteriapia_CriteriaBuilder_appmanaged_vehicle_ejb_jar.addClass(ee.jakarta.tck.persistence.common.schema30.Util.class);
+    ear.addAsModule(jpa_core_criteriapia_CriteriaBuilder_appmanaged_vehicle_ejb_jar);
+
+    WebArchive jpa_core_criteriapia_CriteriaBuilder_pmservlet_vehicle_web_war = ShrinkWrap.create(WebArchive.class, "jpa_core_criteriapia_CriteriaBuilder_pmservlet_vehicle_web_war");
+    jpa_core_criteriapia_CriteriaBuilder_pmservlet_vehicle_web_war.addAsWebInfResource("web.xml");
+
+    JavaArchive jpa_core_criteriapia_CriteriaBuilder_jar = ShrinkWrap.create(JavaArchive.class, "jpa_core_criteriapia_CriteriaBuilder.jar");
+    jpa_core_criteriapia_CriteriaBuilder_jar.addClass(ee.jakarta.tck.persistence.common.schema30.Address.class);
+    jpa_core_criteriapia_CriteriaBuilder_jar.addClass(ee.jakarta.tck.persistence.common.schema30.Address_.class);
+    jpa_core_criteriapia_CriteriaBuilder_jar.addClass(ee.jakarta.tck.persistence.common.schema30.Alias.class);
+    jpa_core_criteriapia_CriteriaBuilder_jar.addClass(ee.jakarta.tck.persistence.common.schema30.Alias_.class);
+    jpa_core_criteriapia_CriteriaBuilder_jar.addClass(ee.jakarta.tck.persistence.common.schema30.Country.class);
+    jpa_core_criteriapia_CriteriaBuilder_jar.addClass(ee.jakarta.tck.persistence.common.schema30.Country_.class);
+    jpa_core_criteriapia_CriteriaBuilder_jar.addClass(ee.jakarta.tck.persistence.common.schema30.CreditCard.class);
+    jpa_core_criteriapia_CriteriaBuilder_jar.addClass(ee.jakarta.tck.persistence.common.schema30.CreditCard_.class);
+    jpa_core_criteriapia_CriteriaBuilder_jar.addClass(ee.jakarta.tck.persistence.common.schema30.Customer.class);
+    jpa_core_criteriapia_CriteriaBuilder_jar.addClass(ee.jakarta.tck.persistence.common.schema30.Customer_.class);
+    jpa_core_criteriapia_CriteriaBuilder_jar.addClass(ee.jakarta.tck.persistence.common.schema30.Department.class);
+    jpa_core_criteriapia_CriteriaBuilder_jar.addClass(ee.jakarta.tck.persistence.common.schema30.Department_.class);
+    jpa_core_criteriapia_CriteriaBuilder_jar.addClass(ee.jakarta.tck.persistence.common.schema30.Employee.class);
+    jpa_core_criteriapia_CriteriaBuilder_jar.addClass(ee.jakarta.tck.persistence.common.schema30.Employee_.class);
+    jpa_core_criteriapia_CriteriaBuilder_jar.addClass(ee.jakarta.tck.persistence.common.schema30.HardwareProduct.class);
+    jpa_core_criteriapia_CriteriaBuilder_jar.addClass(ee.jakarta.tck.persistence.common.schema30.HardwareProduct_.class);
+    jpa_core_criteriapia_CriteriaBuilder_jar.addClass(ee.jakarta.tck.persistence.common.schema30.Info.class);
+    jpa_core_criteriapia_CriteriaBuilder_jar.addClass(ee.jakarta.tck.persistence.common.schema30.Info_.class);
+    jpa_core_criteriapia_CriteriaBuilder_jar.addClass(ee.jakarta.tck.persistence.common.schema30.LineItem.class);
+    jpa_core_criteriapia_CriteriaBuilder_jar.addClass(ee.jakarta.tck.persistence.common.schema30.LineItemException.class);
+    jpa_core_criteriapia_CriteriaBuilder_jar.addClass(ee.jakarta.tck.persistence.common.schema30.LineItem_.class);
+    jpa_core_criteriapia_CriteriaBuilder_jar.addClass(ee.jakarta.tck.persistence.common.schema30.Order.class);
+    jpa_core_criteriapia_CriteriaBuilder_jar.addClass(ee.jakarta.tck.persistence.common.schema30.Order_.class);
+    jpa_core_criteriapia_CriteriaBuilder_jar.addClass(ee.jakarta.tck.persistence.common.schema30.Phone.class);
+    jpa_core_criteriapia_CriteriaBuilder_jar.addClass(ee.jakarta.tck.persistence.common.schema30.Phone_.class);
+    jpa_core_criteriapia_CriteriaBuilder_jar.addClass(ee.jakarta.tck.persistence.common.schema30.Product.class);
+    jpa_core_criteriapia_CriteriaBuilder_jar.addClass(ee.jakarta.tck.persistence.common.schema30.Product_.class);
+    jpa_core_criteriapia_CriteriaBuilder_jar.addClass(ee.jakarta.tck.persistence.common.schema30.ShelfLife.class);
+    jpa_core_criteriapia_CriteriaBuilder_jar.addClass(ee.jakarta.tck.persistence.common.schema30.ShelfLife_.class);
+    jpa_core_criteriapia_CriteriaBuilder_jar.addClass(ee.jakarta.tck.persistence.common.schema30.SoftwareProduct.class);
+    jpa_core_criteriapia_CriteriaBuilder_jar.addClass(ee.jakarta.tck.persistence.common.schema30.SoftwareProduct_.class);
+    jpa_core_criteriapia_CriteriaBuilder_jar.addClass(ee.jakarta.tck.persistence.common.schema30.Spouse.class);
+    jpa_core_criteriapia_CriteriaBuilder_jar.addClass(ee.jakarta.tck.persistence.common.schema30.Spouse_.class);
+    jpa_core_criteriapia_CriteriaBuilder_jar.addClass(ee.jakarta.tck.persistence.common.schema30.Trim.class);
+    jpa_core_criteriapia_CriteriaBuilder_jar.addClass(ee.jakarta.tck.persistence.common.schema30.Trim_.class);
+    jpa_core_criteriapia_CriteriaBuilder_jar.addAsManifestResource("META-INF/MANIFEST.MF");
+    jpa_core_criteriapia_CriteriaBuilder_jar.addAsManifestResource("META-INF/persistence.xml");
+    jpa_core_criteriapia_CriteriaBuilder_pmservlet_vehicle_web_war.addAsLibrary(jpa_core_criteriapia_CriteriaBuilder_jar);
+    jpa_core_criteriapia_CriteriaBuilder_pmservlet_vehicle_web_war.addClass(ee.jakarta.tck.persistence.common.PMClientBase.class);
+    jpa_core_criteriapia_CriteriaBuilder_pmservlet_vehicle_web_war.addClass(ee.jakarta.tck.persistence.core.criteriaapi.CriteriaBuilder.Client.class);
+    jpa_core_criteriapia_CriteriaBuilder_pmservlet_vehicle_web_war.addClass(ee.jakarta.tck.persistence.common.schema30.Util.class);
+    ear.addAsModule(jpa_core_criteriapia_CriteriaBuilder_pmservlet_vehicle_web_war);
+
+    WebArchive jpa_core_criteriapia_CriteriaBuilder_puservlet_vehicle_web_war = ShrinkWrap.create(WebArchive.class, "jpa_core_criteriapia_CriteriaBuilder_puservlet_vehicle_web_war");
+    jpa_core_criteriapia_CriteriaBuilder_puservlet_vehicle_web_war.addAsWebInfResource("web.xml");
+
+    JavaArchive jpa_core_criteriapia_CriteriaBuilder_jar = ShrinkWrap.create(JavaArchive.class, "jpa_core_criteriapia_CriteriaBuilder.jar");
+    jpa_core_criteriapia_CriteriaBuilder_jar.addClass(ee.jakarta.tck.persistence.common.schema30.Address.class);
+    jpa_core_criteriapia_CriteriaBuilder_jar.addClass(ee.jakarta.tck.persistence.common.schema30.Address_.class);
+    jpa_core_criteriapia_CriteriaBuilder_jar.addClass(ee.jakarta.tck.persistence.common.schema30.Alias.class);
+    jpa_core_criteriapia_CriteriaBuilder_jar.addClass(ee.jakarta.tck.persistence.common.schema30.Alias_.class);
+    jpa_core_criteriapia_CriteriaBuilder_jar.addClass(ee.jakarta.tck.persistence.common.schema30.Country.class);
+    jpa_core_criteriapia_CriteriaBuilder_jar.addClass(ee.jakarta.tck.persistence.common.schema30.Country_.class);
+    jpa_core_criteriapia_CriteriaBuilder_jar.addClass(ee.jakarta.tck.persistence.common.schema30.CreditCard.class);
+    jpa_core_criteriapia_CriteriaBuilder_jar.addClass(ee.jakarta.tck.persistence.common.schema30.CreditCard_.class);
+    jpa_core_criteriapia_CriteriaBuilder_jar.addClass(ee.jakarta.tck.persistence.common.schema30.Customer.class);
+    jpa_core_criteriapia_CriteriaBuilder_jar.addClass(ee.jakarta.tck.persistence.common.schema30.Customer_.class);
+    jpa_core_criteriapia_CriteriaBuilder_jar.addClass(ee.jakarta.tck.persistence.common.schema30.Department.class);
+    jpa_core_criteriapia_CriteriaBuilder_jar.addClass(ee.jakarta.tck.persistence.common.schema30.Department_.class);
+    jpa_core_criteriapia_CriteriaBuilder_jar.addClass(ee.jakarta.tck.persistence.common.schema30.Employee.class);
+    jpa_core_criteriapia_CriteriaBuilder_jar.addClass(ee.jakarta.tck.persistence.common.schema30.Employee_.class);
+    jpa_core_criteriapia_CriteriaBuilder_jar.addClass(ee.jakarta.tck.persistence.common.schema30.HardwareProduct.class);
+    jpa_core_criteriapia_CriteriaBuilder_jar.addClass(ee.jakarta.tck.persistence.common.schema30.HardwareProduct_.class);
+    jpa_core_criteriapia_CriteriaBuilder_jar.addClass(ee.jakarta.tck.persistence.common.schema30.Info.class);
+    jpa_core_criteriapia_CriteriaBuilder_jar.addClass(ee.jakarta.tck.persistence.common.schema30.Info_.class);
+    jpa_core_criteriapia_CriteriaBuilder_jar.addClass(ee.jakarta.tck.persistence.common.schema30.LineItem.class);
+    jpa_core_criteriapia_CriteriaBuilder_jar.addClass(ee.jakarta.tck.persistence.common.schema30.LineItemException.class);
+    jpa_core_criteriapia_CriteriaBuilder_jar.addClass(ee.jakarta.tck.persistence.common.schema30.LineItem_.class);
+    jpa_core_criteriapia_CriteriaBuilder_jar.addClass(ee.jakarta.tck.persistence.common.schema30.Order.class);
+    jpa_core_criteriapia_CriteriaBuilder_jar.addClass(ee.jakarta.tck.persistence.common.schema30.Order_.class);
+    jpa_core_criteriapia_CriteriaBuilder_jar.addClass(ee.jakarta.tck.persistence.common.schema30.Phone.class);
+    jpa_core_criteriapia_CriteriaBuilder_jar.addClass(ee.jakarta.tck.persistence.common.schema30.Phone_.class);
+    jpa_core_criteriapia_CriteriaBuilder_jar.addClass(ee.jakarta.tck.persistence.common.schema30.Product.class);
+    jpa_core_criteriapia_CriteriaBuilder_jar.addClass(ee.jakarta.tck.persistence.common.schema30.Product_.class);
+    jpa_core_criteriapia_CriteriaBuilder_jar.addClass(ee.jakarta.tck.persistence.common.schema30.ShelfLife.class);
+    jpa_core_criteriapia_CriteriaBuilder_jar.addClass(ee.jakarta.tck.persistence.common.schema30.ShelfLife_.class);
+    jpa_core_criteriapia_CriteriaBuilder_jar.addClass(ee.jakarta.tck.persistence.common.schema30.SoftwareProduct.class);
+    jpa_core_criteriapia_CriteriaBuilder_jar.addClass(ee.jakarta.tck.persistence.common.schema30.SoftwareProduct_.class);
+    jpa_core_criteriapia_CriteriaBuilder_jar.addClass(ee.jakarta.tck.persistence.common.schema30.Spouse.class);
+    jpa_core_criteriapia_CriteriaBuilder_jar.addClass(ee.jakarta.tck.persistence.common.schema30.Spouse_.class);
+    jpa_core_criteriapia_CriteriaBuilder_jar.addClass(ee.jakarta.tck.persistence.common.schema30.Trim.class);
+    jpa_core_criteriapia_CriteriaBuilder_jar.addClass(ee.jakarta.tck.persistence.common.schema30.Trim_.class);
+    jpa_core_criteriapia_CriteriaBuilder_jar.addAsManifestResource("META-INF/MANIFEST.MF");
+    jpa_core_criteriapia_CriteriaBuilder_jar.addAsManifestResource("META-INF/persistence.xml");
+    jpa_core_criteriapia_CriteriaBuilder_puservlet_vehicle_web_war.addAsLibrary(jpa_core_criteriapia_CriteriaBuilder_jar);
+    jpa_core_criteriapia_CriteriaBuilder_puservlet_vehicle_web_war.addClass(ee.jakarta.tck.persistence.common.PMClientBase.class);
+    jpa_core_criteriapia_CriteriaBuilder_puservlet_vehicle_web_war.addClass(ee.jakarta.tck.persistence.core.criteriaapi.CriteriaBuilder.Client.class);
+    jpa_core_criteriapia_CriteriaBuilder_puservlet_vehicle_web_war.addClass(ee.jakarta.tck.persistence.common.schema30.Util.class);
+    ear.addAsModule(jpa_core_criteriapia_CriteriaBuilder_puservlet_vehicle_web_war);
+
+    JavaArchive jpa_core_criteriapia_CriteriaBuilder_stateful3_vehicle_client_jar = ShrinkWrap.create(JavaArchive.class, "jpa_core_criteriapia_CriteriaBuilder_stateful3_vehicle_client_jar");
+    jpa_core_criteriapia_CriteriaBuilder_stateful3_vehicle_client_jar.addClass(ee.jakarta.tck.persistence.common.PMClientBase.class);
+    jpa_core_criteriapia_CriteriaBuilder_stateful3_vehicle_client_jar.addClass(ee.jakarta.tck.persistence.common.schema30.Util.class);
+    ear.addAsModule(jpa_core_criteriapia_CriteriaBuilder_stateful3_vehicle_client_jar);
+
+    JavaArchive jpa_core_criteriapia_CriteriaBuilder_stateful3_vehicle_ejb_jar = ShrinkWrap.create(JavaArchive.class, "jpa_core_criteriapia_CriteriaBuilder_stateful3_vehicle_ejb_jar");
+    jpa_core_criteriapia_CriteriaBuilder_stateful3_vehicle_ejb_jar.addClass(ee.jakarta.tck.persistence.common.PMClientBase.class);
+    jpa_core_criteriapia_CriteriaBuilder_stateful3_vehicle_ejb_jar.addClass(ee.jakarta.tck.persistence.core.criteriaapi.CriteriaBuilder.Client.class);
+    jpa_core_criteriapia_CriteriaBuilder_stateful3_vehicle_ejb_jar.addClass(ee.jakarta.tck.persistence.common.schema30.Util.class);
+    ear.addAsModule(jpa_core_criteriapia_CriteriaBuilder_stateful3_vehicle_ejb_jar);
+
+    JavaArchive jpa_core_criteriapia_CriteriaBuilder_stateless3_vehicle_client_jar = ShrinkWrap.create(JavaArchive.class, "jpa_core_criteriapia_CriteriaBuilder_stateless3_vehicle_client_jar");
+    jpa_core_criteriapia_CriteriaBuilder_stateless3_vehicle_client_jar.addClass(ee.jakarta.tck.persistence.common.PMClientBase.class);
+    jpa_core_criteriapia_CriteriaBuilder_stateless3_vehicle_client_jar.addClass(ee.jakarta.tck.persistence.common.schema30.Util.class);
+    ear.addAsModule(jpa_core_criteriapia_CriteriaBuilder_stateless3_vehicle_client_jar);
+
+    JavaArchive jpa_core_criteriapia_CriteriaBuilder_stateless3_vehicle_ejb_jar = ShrinkWrap.create(JavaArchive.class, "jpa_core_criteriapia_CriteriaBuilder_stateless3_vehicle_ejb_jar");
+    jpa_core_criteriapia_CriteriaBuilder_stateless3_vehicle_ejb_jar.addClass(ee.jakarta.tck.persistence.common.PMClientBase.class);
+    jpa_core_criteriapia_CriteriaBuilder_stateless3_vehicle_ejb_jar.addClass(ee.jakarta.tck.persistence.core.criteriaapi.CriteriaBuilder.Client.class);
+    jpa_core_criteriapia_CriteriaBuilder_stateless3_vehicle_ejb_jar.addClass(ee.jakarta.tck.persistence.common.schema30.Util.class);
+    ear.addAsModule(jpa_core_criteriapia_CriteriaBuilder_stateless3_vehicle_ejb_jar);
+    return ear;
+  }
+
 	private static final Logger logger = (Logger) System.getLogger(Client8.class.getName());
 
 	public JavaArchive createDeployment() throws Exception {
diff --git a/jpa/spec-tests/src/main/java/ee/jakarta/tck/persistence/core/criteriaapi/CriteriaBuilder/Client9.java b/jpa/spec-tests/src/main/java/ee/jakarta/tck/persistence/core/criteriaapi/CriteriaBuilder/Client9.java
index 72b9ad76e..5206facfa 100644
--- a/jpa/spec-tests/src/main/java/ee/jakarta/tck/persistence/core/criteriaapi/CriteriaBuilder/Client9.java
+++ b/jpa/spec-tests/src/main/java/ee/jakarta/tck/persistence/core/criteriaapi/CriteriaBuilder/Client9.java
@@ -33,7 +33,12 @@ import jakarta.persistence.criteria.LocalDateField;
 import jakarta.persistence.criteria.LocalTimeField;
 import jakarta.persistence.criteria.ParameterExpression;
 import jakarta.persistence.criteria.Root;
+import org.jboss.arquillian.container.test.api.Deployment;
+import org.jboss.shrinkwrap.api.Archive;
+import org.jboss.shrinkwrap.api.ShrinkWrap;
+import org.jboss.shrinkwrap.api.spec.EnterpriseArchive;
 import org.jboss.shrinkwrap.api.spec.JavaArchive;
+import org.jboss.shrinkwrap.api.spec.WebArchive;
 import org.junit.jupiter.api.Test;
 
 import com.sun.ts.lib.harness.SetupMethod;
@@ -44,6 +49,192 @@ import jakarta.persistence.criteria.CriteriaQuery;
 
 public class Client9 extends UtilCriteriaEntityData {
 
+  @Deployment(testable = false)
+  public static Archive<?> deployment() {
+
+    final EnterpriseArchive ear = ShrinkWrap.create(EnterpriseArchive.class, "jpa_core_criteriapia_CriteriaBuilder_vehicles.ear");
+    // TODO: filter/eliminate the library jar classes that shouldn't be included
+    // Add ear/lib jars
+
+    JavaArchive jpa_core_criteriapia_CriteriaBuilder_jar = ShrinkWrap.create(JavaArchive.class, "jpa_core_criteriapia_CriteriaBuilder_jar");
+    jpa_core_criteriapia_CriteriaBuilder_jar.addClass(ee.jakarta.tck.persistence.common.schema30.Address.class);
+    jpa_core_criteriapia_CriteriaBuilder_jar.addClass(ee.jakarta.tck.persistence.common.schema30.Address_.class);
+    jpa_core_criteriapia_CriteriaBuilder_jar.addClass(ee.jakarta.tck.persistence.common.schema30.Alias.class);
+    jpa_core_criteriapia_CriteriaBuilder_jar.addClass(ee.jakarta.tck.persistence.common.schema30.Alias_.class);
+    jpa_core_criteriapia_CriteriaBuilder_jar.addClass(ee.jakarta.tck.persistence.common.schema30.Country.class);
+    jpa_core_criteriapia_CriteriaBuilder_jar.addClass(ee.jakarta.tck.persistence.common.schema30.Country_.class);
+    jpa_core_criteriapia_CriteriaBuilder_jar.addClass(ee.jakarta.tck.persistence.common.schema30.CreditCard.class);
+    jpa_core_criteriapia_CriteriaBuilder_jar.addClass(ee.jakarta.tck.persistence.common.schema30.CreditCard_.class);
+    jpa_core_criteriapia_CriteriaBuilder_jar.addClass(ee.jakarta.tck.persistence.common.schema30.Customer.class);
+    jpa_core_criteriapia_CriteriaBuilder_jar.addClass(ee.jakarta.tck.persistence.common.schema30.Customer_.class);
+    jpa_core_criteriapia_CriteriaBuilder_jar.addClass(ee.jakarta.tck.persistence.common.schema30.Department.class);
+    jpa_core_criteriapia_CriteriaBuilder_jar.addClass(ee.jakarta.tck.persistence.common.schema30.Department_.class);
+    jpa_core_criteriapia_CriteriaBuilder_jar.addClass(ee.jakarta.tck.persistence.common.schema30.Employee.class);
+    jpa_core_criteriapia_CriteriaBuilder_jar.addClass(ee.jakarta.tck.persistence.common.schema30.Employee_.class);
+    jpa_core_criteriapia_CriteriaBuilder_jar.addClass(ee.jakarta.tck.persistence.common.schema30.HardwareProduct.class);
+    jpa_core_criteriapia_CriteriaBuilder_jar.addClass(ee.jakarta.tck.persistence.common.schema30.HardwareProduct_.class);
+    jpa_core_criteriapia_CriteriaBuilder_jar.addClass(ee.jakarta.tck.persistence.common.schema30.Info.class);
+    jpa_core_criteriapia_CriteriaBuilder_jar.addClass(ee.jakarta.tck.persistence.common.schema30.Info_.class);
+    jpa_core_criteriapia_CriteriaBuilder_jar.addClass(ee.jakarta.tck.persistence.common.schema30.LineItem.class);
+    jpa_core_criteriapia_CriteriaBuilder_jar.addClass(ee.jakarta.tck.persistence.common.schema30.LineItemException.class);
+    jpa_core_criteriapia_CriteriaBuilder_jar.addClass(ee.jakarta.tck.persistence.common.schema30.LineItem_.class);
+    jpa_core_criteriapia_CriteriaBuilder_jar.addClass(ee.jakarta.tck.persistence.common.schema30.Order.class);
+    jpa_core_criteriapia_CriteriaBuilder_jar.addClass(ee.jakarta.tck.persistence.common.schema30.Order_.class);
+    jpa_core_criteriapia_CriteriaBuilder_jar.addClass(ee.jakarta.tck.persistence.common.schema30.Phone.class);
+    jpa_core_criteriapia_CriteriaBuilder_jar.addClass(ee.jakarta.tck.persistence.common.schema30.Phone_.class);
+    jpa_core_criteriapia_CriteriaBuilder_jar.addClass(ee.jakarta.tck.persistence.common.schema30.Product.class);
+    jpa_core_criteriapia_CriteriaBuilder_jar.addClass(ee.jakarta.tck.persistence.common.schema30.Product_.class);
+    jpa_core_criteriapia_CriteriaBuilder_jar.addClass(ee.jakarta.tck.persistence.common.schema30.ShelfLife.class);
+    jpa_core_criteriapia_CriteriaBuilder_jar.addClass(ee.jakarta.tck.persistence.common.schema30.ShelfLife_.class);
+    jpa_core_criteriapia_CriteriaBuilder_jar.addClass(ee.jakarta.tck.persistence.common.schema30.SoftwareProduct.class);
+    jpa_core_criteriapia_CriteriaBuilder_jar.addClass(ee.jakarta.tck.persistence.common.schema30.SoftwareProduct_.class);
+    jpa_core_criteriapia_CriteriaBuilder_jar.addClass(ee.jakarta.tck.persistence.common.schema30.Spouse.class);
+    jpa_core_criteriapia_CriteriaBuilder_jar.addClass(ee.jakarta.tck.persistence.common.schema30.Spouse_.class);
+    jpa_core_criteriapia_CriteriaBuilder_jar.addClass(ee.jakarta.tck.persistence.common.schema30.Trim.class);
+    jpa_core_criteriapia_CriteriaBuilder_jar.addClass(ee.jakarta.tck.persistence.common.schema30.Trim_.class);
+    ear.addAsLibrary(jpa_core_criteriapia_CriteriaBuilder_jar);
+    // Add ear submodules
+
+    JavaArchive jpa_core_criteriapia_CriteriaBuilder_appmanagedNoTx_vehicle_client_jar = ShrinkWrap.create(JavaArchive.class, "jpa_core_criteriapia_CriteriaBuilder_appmanagedNoTx_vehicle_client_jar");
+    jpa_core_criteriapia_CriteriaBuilder_appmanagedNoTx_vehicle_client_jar.addClass(ee.jakarta.tck.persistence.common.PMClientBase.class);
+    jpa_core_criteriapia_CriteriaBuilder_appmanagedNoTx_vehicle_client_jar.addClass(ee.jakarta.tck.persistence.common.schema30.Util.class);
+    ear.addAsModule(jpa_core_criteriapia_CriteriaBuilder_appmanagedNoTx_vehicle_client_jar);
+
+    JavaArchive jpa_core_criteriapia_CriteriaBuilder_appmanagedNoTx_vehicle_ejb_jar = ShrinkWrap.create(JavaArchive.class, "jpa_core_criteriapia_CriteriaBuilder_appmanagedNoTx_vehicle_ejb_jar");
+    jpa_core_criteriapia_CriteriaBuilder_appmanagedNoTx_vehicle_ejb_jar.addClass(ee.jakarta.tck.persistence.common.PMClientBase.class);
+    jpa_core_criteriapia_CriteriaBuilder_appmanagedNoTx_vehicle_ejb_jar.addClass(ee.jakarta.tck.persistence.core.criteriaapi.CriteriaBuilder.Client.class);
+    jpa_core_criteriapia_CriteriaBuilder_appmanagedNoTx_vehicle_ejb_jar.addClass(ee.jakarta.tck.persistence.common.schema30.Util.class);
+    ear.addAsModule(jpa_core_criteriapia_CriteriaBuilder_appmanagedNoTx_vehicle_ejb_jar);
+
+    JavaArchive jpa_core_criteriapia_CriteriaBuilder_appmanaged_vehicle_client_jar = ShrinkWrap.create(JavaArchive.class, "jpa_core_criteriapia_CriteriaBuilder_appmanaged_vehicle_client_jar");
+    jpa_core_criteriapia_CriteriaBuilder_appmanaged_vehicle_client_jar.addClass(ee.jakarta.tck.persistence.common.PMClientBase.class);
+    jpa_core_criteriapia_CriteriaBuilder_appmanaged_vehicle_client_jar.addClass(ee.jakarta.tck.persistence.common.schema30.Util.class);
+    ear.addAsModule(jpa_core_criteriapia_CriteriaBuilder_appmanaged_vehicle_client_jar);
+
+    JavaArchive jpa_core_criteriapia_CriteriaBuilder_appmanaged_vehicle_ejb_jar = ShrinkWrap.create(JavaArchive.class, "jpa_core_criteriapia_CriteriaBuilder_appmanaged_vehicle_ejb_jar");
+    jpa_core_criteriapia_CriteriaBuilder_appmanaged_vehicle_ejb_jar.addClass(ee.jakarta.tck.persistence.common.PMClientBase.class);
+    jpa_core_criteriapia_CriteriaBuilder_appmanaged_vehicle_ejb_jar.addClass(ee.jakarta.tck.persistence.core.criteriaapi.CriteriaBuilder.Client.class);
+    jpa_core_criteriapia_CriteriaBuilder_appmanaged_vehicle_ejb_jar.addClass(ee.jakarta.tck.persistence.common.schema30.Util.class);
+    ear.addAsModule(jpa_core_criteriapia_CriteriaBuilder_appmanaged_vehicle_ejb_jar);
+
+    WebArchive jpa_core_criteriapia_CriteriaBuilder_pmservlet_vehicle_web_war = ShrinkWrap.create(WebArchive.class, "jpa_core_criteriapia_CriteriaBuilder_pmservlet_vehicle_web_war");
+    jpa_core_criteriapia_CriteriaBuilder_pmservlet_vehicle_web_war.addAsWebInfResource("web.xml");
+
+    JavaArchive jpa_core_criteriapia_CriteriaBuilder_jar = ShrinkWrap.create(JavaArchive.class, "jpa_core_criteriapia_CriteriaBuilder.jar");
+    jpa_core_criteriapia_CriteriaBuilder_jar.addClass(ee.jakarta.tck.persistence.common.schema30.Address.class);
+    jpa_core_criteriapia_CriteriaBuilder_jar.addClass(ee.jakarta.tck.persistence.common.schema30.Address_.class);
+    jpa_core_criteriapia_CriteriaBuilder_jar.addClass(ee.jakarta.tck.persistence.common.schema30.Alias.class);
+    jpa_core_criteriapia_CriteriaBuilder_jar.addClass(ee.jakarta.tck.persistence.common.schema30.Alias_.class);
+    jpa_core_criteriapia_CriteriaBuilder_jar.addClass(ee.jakarta.tck.persistence.common.schema30.Country.class);
+    jpa_core_criteriapia_CriteriaBuilder_jar.addClass(ee.jakarta.tck.persistence.common.schema30.Country_.class);
+    jpa_core_criteriapia_CriteriaBuilder_jar.addClass(ee.jakarta.tck.persistence.common.schema30.CreditCard.class);
+    jpa_core_criteriapia_CriteriaBuilder_jar.addClass(ee.jakarta.tck.persistence.common.schema30.CreditCard_.class);
+    jpa_core_criteriapia_CriteriaBuilder_jar.addClass(ee.jakarta.tck.persistence.common.schema30.Customer.class);
+    jpa_core_criteriapia_CriteriaBuilder_jar.addClass(ee.jakarta.tck.persistence.common.schema30.Customer_.class);
+    jpa_core_criteriapia_CriteriaBuilder_jar.addClass(ee.jakarta.tck.persistence.common.schema30.Department.class);
+    jpa_core_criteriapia_CriteriaBuilder_jar.addClass(ee.jakarta.tck.persistence.common.schema30.Department_.class);
+    jpa_core_criteriapia_CriteriaBuilder_jar.addClass(ee.jakarta.tck.persistence.common.schema30.Employee.class);
+    jpa_core_criteriapia_CriteriaBuilder_jar.addClass(ee.jakarta.tck.persistence.common.schema30.Employee_.class);
+    jpa_core_criteriapia_CriteriaBuilder_jar.addClass(ee.jakarta.tck.persistence.common.schema30.HardwareProduct.class);
+    jpa_core_criteriapia_CriteriaBuilder_jar.addClass(ee.jakarta.tck.persistence.common.schema30.HardwareProduct_.class);
+    jpa_core_criteriapia_CriteriaBuilder_jar.addClass(ee.jakarta.tck.persistence.common.schema30.Info.class);
+    jpa_core_criteriapia_CriteriaBuilder_jar.addClass(ee.jakarta.tck.persistence.common.schema30.Info_.class);
+    jpa_core_criteriapia_CriteriaBuilder_jar.addClass(ee.jakarta.tck.persistence.common.schema30.LineItem.class);
+    jpa_core_criteriapia_CriteriaBuilder_jar.addClass(ee.jakarta.tck.persistence.common.schema30.LineItemException.class);
+    jpa_core_criteriapia_CriteriaBuilder_jar.addClass(ee.jakarta.tck.persistence.common.schema30.LineItem_.class);
+    jpa_core_criteriapia_CriteriaBuilder_jar.addClass(ee.jakarta.tck.persistence.common.schema30.Order.class);
+    jpa_core_criteriapia_CriteriaBuilder_jar.addClass(ee.jakarta.tck.persistence.common.schema30.Order_.class);
+    jpa_core_criteriapia_CriteriaBuilder_jar.addClass(ee.jakarta.tck.persistence.common.schema30.Phone.class);
+    jpa_core_criteriapia_CriteriaBuilder_jar.addClass(ee.jakarta.tck.persistence.common.schema30.Phone_.class);
+    jpa_core_criteriapia_CriteriaBuilder_jar.addClass(ee.jakarta.tck.persistence.common.schema30.Product.class);
+    jpa_core_criteriapia_CriteriaBuilder_jar.addClass(ee.jakarta.tck.persistence.common.schema30.Product_.class);
+    jpa_core_criteriapia_CriteriaBuilder_jar.addClass(ee.jakarta.tck.persistence.common.schema30.ShelfLife.class);
+    jpa_core_criteriapia_CriteriaBuilder_jar.addClass(ee.jakarta.tck.persistence.common.schema30.ShelfLife_.class);
+    jpa_core_criteriapia_CriteriaBuilder_jar.addClass(ee.jakarta.tck.persistence.common.schema30.SoftwareProduct.class);
+    jpa_core_criteriapia_CriteriaBuilder_jar.addClass(ee.jakarta.tck.persistence.common.schema30.SoftwareProduct_.class);
+    jpa_core_criteriapia_CriteriaBuilder_jar.addClass(ee.jakarta.tck.persistence.common.schema30.Spouse.class);
+    jpa_core_criteriapia_CriteriaBuilder_jar.addClass(ee.jakarta.tck.persistence.common.schema30.Spouse_.class);
+    jpa_core_criteriapia_CriteriaBuilder_jar.addClass(ee.jakarta.tck.persistence.common.schema30.Trim.class);
+    jpa_core_criteriapia_CriteriaBuilder_jar.addClass(ee.jakarta.tck.persistence.common.schema30.Trim_.class);
+    jpa_core_criteriapia_CriteriaBuilder_jar.addAsManifestResource("META-INF/MANIFEST.MF");
+    jpa_core_criteriapia_CriteriaBuilder_jar.addAsManifestResource("META-INF/persistence.xml");
+    jpa_core_criteriapia_CriteriaBuilder_pmservlet_vehicle_web_war.addAsLibrary(jpa_core_criteriapia_CriteriaBuilder_jar);
+    jpa_core_criteriapia_CriteriaBuilder_pmservlet_vehicle_web_war.addClass(ee.jakarta.tck.persistence.common.PMClientBase.class);
+    jpa_core_criteriapia_CriteriaBuilder_pmservlet_vehicle_web_war.addClass(ee.jakarta.tck.persistence.core.criteriaapi.CriteriaBuilder.Client.class);
+    jpa_core_criteriapia_CriteriaBuilder_pmservlet_vehicle_web_war.addClass(ee.jakarta.tck.persistence.common.schema30.Util.class);
+    ear.addAsModule(jpa_core_criteriapia_CriteriaBuilder_pmservlet_vehicle_web_war);
+
+    WebArchive jpa_core_criteriapia_CriteriaBuilder_puservlet_vehicle_web_war = ShrinkWrap.create(WebArchive.class, "jpa_core_criteriapia_CriteriaBuilder_puservlet_vehicle_web_war");
+    jpa_core_criteriapia_CriteriaBuilder_puservlet_vehicle_web_war.addAsWebInfResource("web.xml");
+
+    JavaArchive jpa_core_criteriapia_CriteriaBuilder_jar = ShrinkWrap.create(JavaArchive.class, "jpa_core_criteriapia_CriteriaBuilder.jar");
+    jpa_core_criteriapia_CriteriaBuilder_jar.addClass(ee.jakarta.tck.persistence.common.schema30.Address.class);
+    jpa_core_criteriapia_CriteriaBuilder_jar.addClass(ee.jakarta.tck.persistence.common.schema30.Address_.class);
+    jpa_core_criteriapia_CriteriaBuilder_jar.addClass(ee.jakarta.tck.persistence.common.schema30.Alias.class);
+    jpa_core_criteriapia_CriteriaBuilder_jar.addClass(ee.jakarta.tck.persistence.common.schema30.Alias_.class);
+    jpa_core_criteriapia_CriteriaBuilder_jar.addClass(ee.jakarta.tck.persistence.common.schema30.Country.class);
+    jpa_core_criteriapia_CriteriaBuilder_jar.addClass(ee.jakarta.tck.persistence.common.schema30.Country_.class);
+    jpa_core_criteriapia_CriteriaBuilder_jar.addClass(ee.jakarta.tck.persistence.common.schema30.CreditCard.class);
+    jpa_core_criteriapia_CriteriaBuilder_jar.addClass(ee.jakarta.tck.persistence.common.schema30.CreditCard_.class);
+    jpa_core_criteriapia_CriteriaBuilder_jar.addClass(ee.jakarta.tck.persistence.common.schema30.Customer.class);
+    jpa_core_criteriapia_CriteriaBuilder_jar.addClass(ee.jakarta.tck.persistence.common.schema30.Customer_.class);
+    jpa_core_criteriapia_CriteriaBuilder_jar.addClass(ee.jakarta.tck.persistence.common.schema30.Department.class);
+    jpa_core_criteriapia_CriteriaBuilder_jar.addClass(ee.jakarta.tck.persistence.common.schema30.Department_.class);
+    jpa_core_criteriapia_CriteriaBuilder_jar.addClass(ee.jakarta.tck.persistence.common.schema30.Employee.class);
+    jpa_core_criteriapia_CriteriaBuilder_jar.addClass(ee.jakarta.tck.persistence.common.schema30.Employee_.class);
+    jpa_core_criteriapia_CriteriaBuilder_jar.addClass(ee.jakarta.tck.persistence.common.schema30.HardwareProduct.class);
+    jpa_core_criteriapia_CriteriaBuilder_jar.addClass(ee.jakarta.tck.persistence.common.schema30.HardwareProduct_.class);
+    jpa_core_criteriapia_CriteriaBuilder_jar.addClass(ee.jakarta.tck.persistence.common.schema30.Info.class);
+    jpa_core_criteriapia_CriteriaBuilder_jar.addClass(ee.jakarta.tck.persistence.common.schema30.Info_.class);
+    jpa_core_criteriapia_CriteriaBuilder_jar.addClass(ee.jakarta.tck.persistence.common.schema30.LineItem.class);
+    jpa_core_criteriapia_CriteriaBuilder_jar.addClass(ee.jakarta.tck.persistence.common.schema30.LineItemException.class);
+    jpa_core_criteriapia_CriteriaBuilder_jar.addClass(ee.jakarta.tck.persistence.common.schema30.LineItem_.class);
+    jpa_core_criteriapia_CriteriaBuilder_jar.addClass(ee.jakarta.tck.persistence.common.schema30.Order.class);
+    jpa_core_criteriapia_CriteriaBuilder_jar.addClass(ee.jakarta.tck.persistence.common.schema30.Order_.class);
+    jpa_core_criteriapia_CriteriaBuilder_jar.addClass(ee.jakarta.tck.persistence.common.schema30.Phone.class);
+    jpa_core_criteriapia_CriteriaBuilder_jar.addClass(ee.jakarta.tck.persistence.common.schema30.Phone_.class);
+    jpa_core_criteriapia_CriteriaBuilder_jar.addClass(ee.jakarta.tck.persistence.common.schema30.Product.class);
+    jpa_core_criteriapia_CriteriaBuilder_jar.addClass(ee.jakarta.tck.persistence.common.schema30.Product_.class);
+    jpa_core_criteriapia_CriteriaBuilder_jar.addClass(ee.jakarta.tck.persistence.common.schema30.ShelfLife.class);
+    jpa_core_criteriapia_CriteriaBuilder_jar.addClass(ee.jakarta.tck.persistence.common.schema30.ShelfLife_.class);
+    jpa_core_criteriapia_CriteriaBuilder_jar.addClass(ee.jakarta.tck.persistence.common.schema30.SoftwareProduct.class);
+    jpa_core_criteriapia_CriteriaBuilder_jar.addClass(ee.jakarta.tck.persistence.common.schema30.SoftwareProduct_.class);
+    jpa_core_criteriapia_CriteriaBuilder_jar.addClass(ee.jakarta.tck.persistence.common.schema30.Spouse.class);
+    jpa_core_criteriapia_CriteriaBuilder_jar.addClass(ee.jakarta.tck.persistence.common.schema30.Spouse_.class);
+    jpa_core_criteriapia_CriteriaBuilder_jar.addClass(ee.jakarta.tck.persistence.common.schema30.Trim.class);
+    jpa_core_criteriapia_CriteriaBuilder_jar.addClass(ee.jakarta.tck.persistence.common.schema30.Trim_.class);
+    jpa_core_criteriapia_CriteriaBuilder_jar.addAsManifestResource("META-INF/MANIFEST.MF");
+    jpa_core_criteriapia_CriteriaBuilder_jar.addAsManifestResource("META-INF/persistence.xml");
+    jpa_core_criteriapia_CriteriaBuilder_puservlet_vehicle_web_war.addAsLibrary(jpa_core_criteriapia_CriteriaBuilder_jar);
+    jpa_core_criteriapia_CriteriaBuilder_puservlet_vehicle_web_war.addClass(ee.jakarta.tck.persistence.common.PMClientBase.class);
+    jpa_core_criteriapia_CriteriaBuilder_puservlet_vehicle_web_war.addClass(ee.jakarta.tck.persistence.core.criteriaapi.CriteriaBuilder.Client.class);
+    jpa_core_criteriapia_CriteriaBuilder_puservlet_vehicle_web_war.addClass(ee.jakarta.tck.persistence.common.schema30.Util.class);
+    ear.addAsModule(jpa_core_criteriapia_CriteriaBuilder_puservlet_vehicle_web_war);
+
+    JavaArchive jpa_core_criteriapia_CriteriaBuilder_stateful3_vehicle_client_jar = ShrinkWrap.create(JavaArchive.class, "jpa_core_criteriapia_CriteriaBuilder_stateful3_vehicle_client_jar");
+    jpa_core_criteriapia_CriteriaBuilder_stateful3_vehicle_client_jar.addClass(ee.jakarta.tck.persistence.common.PMClientBase.class);
+    jpa_core_criteriapia_CriteriaBuilder_stateful3_vehicle_client_jar.addClass(ee.jakarta.tck.persistence.common.schema30.Util.class);
+    ear.addAsModule(jpa_core_criteriapia_CriteriaBuilder_stateful3_vehicle_client_jar);
+
+    JavaArchive jpa_core_criteriapia_CriteriaBuilder_stateful3_vehicle_ejb_jar = ShrinkWrap.create(JavaArchive.class, "jpa_core_criteriapia_CriteriaBuilder_stateful3_vehicle_ejb_jar");
+    jpa_core_criteriapia_CriteriaBuilder_stateful3_vehicle_ejb_jar.addClass(ee.jakarta.tck.persistence.common.PMClientBase.class);
+    jpa_core_criteriapia_CriteriaBuilder_stateful3_vehicle_ejb_jar.addClass(ee.jakarta.tck.persistence.core.criteriaapi.CriteriaBuilder.Client.class);
+    jpa_core_criteriapia_CriteriaBuilder_stateful3_vehicle_ejb_jar.addClass(ee.jakarta.tck.persistence.common.schema30.Util.class);
+    ear.addAsModule(jpa_core_criteriapia_CriteriaBuilder_stateful3_vehicle_ejb_jar);
+
+    JavaArchive jpa_core_criteriapia_CriteriaBuilder_stateless3_vehicle_client_jar = ShrinkWrap.create(JavaArchive.class, "jpa_core_criteriapia_CriteriaBuilder_stateless3_vehicle_client_jar");
+    jpa_core_criteriapia_CriteriaBuilder_stateless3_vehicle_client_jar.addClass(ee.jakarta.tck.persistence.common.PMClientBase.class);
+    jpa_core_criteriapia_CriteriaBuilder_stateless3_vehicle_client_jar.addClass(ee.jakarta.tck.persistence.common.schema30.Util.class);
+    ear.addAsModule(jpa_core_criteriapia_CriteriaBuilder_stateless3_vehicle_client_jar);
+
+    JavaArchive jpa_core_criteriapia_CriteriaBuilder_stateless3_vehicle_ejb_jar = ShrinkWrap.create(JavaArchive.class, "jpa_core_criteriapia_CriteriaBuilder_stateless3_vehicle_ejb_jar");
+    jpa_core_criteriapia_CriteriaBuilder_stateless3_vehicle_ejb_jar.addClass(ee.jakarta.tck.persistence.common.PMClientBase.class);
+    jpa_core_criteriapia_CriteriaBuilder_stateless3_vehicle_ejb_jar.addClass(ee.jakarta.tck.persistence.core.criteriaapi.CriteriaBuilder.Client.class);
+    jpa_core_criteriapia_CriteriaBuilder_stateless3_vehicle_ejb_jar.addClass(ee.jakarta.tck.persistence.common.schema30.Util.class);
+    ear.addAsModule(jpa_core_criteriapia_CriteriaBuilder_stateless3_vehicle_ejb_jar);
+    return ear;
+  }
+
     private static final System.Logger logger = System.getLogger(Client9.class.getName());
 
     public JavaArchive createDeployment() throws Exception {
diff --git a/jpa/spec-tests/src/main/java/ee/jakarta/tck/persistence/core/criteriaapi/CriteriaDelete/Client.java b/jpa/spec-tests/src/main/java/ee/jakarta/tck/persistence/core/criteriaapi/CriteriaDelete/Client.java
index 62ddd5b04..cbb585496 100644
--- a/jpa/spec-tests/src/main/java/ee/jakarta/tck/persistence/core/criteriaapi/CriteriaDelete/Client.java
+++ b/jpa/spec-tests/src/main/java/ee/jakarta/tck/persistence/core/criteriaapi/CriteriaDelete/Client.java
@@ -20,8 +20,12 @@ import java.lang.System.Logger;
 import java.util.ArrayList;
 import java.util.Collection;
 import java.util.List;
-
+import org.jboss.arquillian.container.test.api.Deployment;
+import org.jboss.shrinkwrap.api.Archive;
+import org.jboss.shrinkwrap.api.ShrinkWrap;
+import org.jboss.shrinkwrap.api.spec.EnterpriseArchive;
 import org.jboss.shrinkwrap.api.spec.JavaArchive;
+import org.jboss.shrinkwrap.api.spec.WebArchive;
 import org.junit.jupiter.api.Test;
 
 import ee.jakarta.tck.persistence.common.schema30.Product;
@@ -39,6 +43,192 @@ import jakarta.persistence.metamodel.Metamodel;
 
 public class Client extends UtilProductData {
 
+  @Deployment(testable = false)
+  public static Archive<?> deployment() {
+
+    final EnterpriseArchive ear = ShrinkWrap.create(EnterpriseArchive.class, "jpa_core_criteriapia_CriteriaDelete_vehicles.ear");
+    // TODO: filter/eliminate the library jar classes that shouldn't be included
+    // Add ear/lib jars
+
+    JavaArchive jpa_core_criteriapia_CriteriaDelete_jar = ShrinkWrap.create(JavaArchive.class, "jpa_core_criteriapia_CriteriaDelete_jar");
+    jpa_core_criteriapia_CriteriaDelete_jar.addClass(ee.jakarta.tck.persistence.common.schema30.Address.class);
+    jpa_core_criteriapia_CriteriaDelete_jar.addClass(ee.jakarta.tck.persistence.common.schema30.Address_.class);
+    jpa_core_criteriapia_CriteriaDelete_jar.addClass(ee.jakarta.tck.persistence.common.schema30.Alias.class);
+    jpa_core_criteriapia_CriteriaDelete_jar.addClass(ee.jakarta.tck.persistence.common.schema30.Alias_.class);
+    jpa_core_criteriapia_CriteriaDelete_jar.addClass(ee.jakarta.tck.persistence.common.schema30.Country.class);
+    jpa_core_criteriapia_CriteriaDelete_jar.addClass(ee.jakarta.tck.persistence.common.schema30.Country_.class);
+    jpa_core_criteriapia_CriteriaDelete_jar.addClass(ee.jakarta.tck.persistence.common.schema30.CreditCard.class);
+    jpa_core_criteriapia_CriteriaDelete_jar.addClass(ee.jakarta.tck.persistence.common.schema30.CreditCard_.class);
+    jpa_core_criteriapia_CriteriaDelete_jar.addClass(ee.jakarta.tck.persistence.common.schema30.Customer.class);
+    jpa_core_criteriapia_CriteriaDelete_jar.addClass(ee.jakarta.tck.persistence.common.schema30.Customer_.class);
+    jpa_core_criteriapia_CriteriaDelete_jar.addClass(ee.jakarta.tck.persistence.common.schema30.Department.class);
+    jpa_core_criteriapia_CriteriaDelete_jar.addClass(ee.jakarta.tck.persistence.common.schema30.Department_.class);
+    jpa_core_criteriapia_CriteriaDelete_jar.addClass(ee.jakarta.tck.persistence.common.schema30.Employee.class);
+    jpa_core_criteriapia_CriteriaDelete_jar.addClass(ee.jakarta.tck.persistence.common.schema30.Employee_.class);
+    jpa_core_criteriapia_CriteriaDelete_jar.addClass(ee.jakarta.tck.persistence.common.schema30.HardwareProduct.class);
+    jpa_core_criteriapia_CriteriaDelete_jar.addClass(ee.jakarta.tck.persistence.common.schema30.HardwareProduct_.class);
+    jpa_core_criteriapia_CriteriaDelete_jar.addClass(ee.jakarta.tck.persistence.common.schema30.Info.class);
+    jpa_core_criteriapia_CriteriaDelete_jar.addClass(ee.jakarta.tck.persistence.common.schema30.Info_.class);
+    jpa_core_criteriapia_CriteriaDelete_jar.addClass(ee.jakarta.tck.persistence.common.schema30.LineItem.class);
+    jpa_core_criteriapia_CriteriaDelete_jar.addClass(ee.jakarta.tck.persistence.common.schema30.LineItemException.class);
+    jpa_core_criteriapia_CriteriaDelete_jar.addClass(ee.jakarta.tck.persistence.common.schema30.LineItem_.class);
+    jpa_core_criteriapia_CriteriaDelete_jar.addClass(ee.jakarta.tck.persistence.common.schema30.Order.class);
+    jpa_core_criteriapia_CriteriaDelete_jar.addClass(ee.jakarta.tck.persistence.common.schema30.Order_.class);
+    jpa_core_criteriapia_CriteriaDelete_jar.addClass(ee.jakarta.tck.persistence.common.schema30.Phone.class);
+    jpa_core_criteriapia_CriteriaDelete_jar.addClass(ee.jakarta.tck.persistence.common.schema30.Phone_.class);
+    jpa_core_criteriapia_CriteriaDelete_jar.addClass(ee.jakarta.tck.persistence.common.schema30.Product.class);
+    jpa_core_criteriapia_CriteriaDelete_jar.addClass(ee.jakarta.tck.persistence.common.schema30.Product_.class);
+    jpa_core_criteriapia_CriteriaDelete_jar.addClass(ee.jakarta.tck.persistence.common.schema30.ShelfLife.class);
+    jpa_core_criteriapia_CriteriaDelete_jar.addClass(ee.jakarta.tck.persistence.common.schema30.ShelfLife_.class);
+    jpa_core_criteriapia_CriteriaDelete_jar.addClass(ee.jakarta.tck.persistence.common.schema30.SoftwareProduct.class);
+    jpa_core_criteriapia_CriteriaDelete_jar.addClass(ee.jakarta.tck.persistence.common.schema30.SoftwareProduct_.class);
+    jpa_core_criteriapia_CriteriaDelete_jar.addClass(ee.jakarta.tck.persistence.common.schema30.Spouse.class);
+    jpa_core_criteriapia_CriteriaDelete_jar.addClass(ee.jakarta.tck.persistence.common.schema30.Spouse_.class);
+    jpa_core_criteriapia_CriteriaDelete_jar.addClass(ee.jakarta.tck.persistence.common.schema30.Trim.class);
+    jpa_core_criteriapia_CriteriaDelete_jar.addClass(ee.jakarta.tck.persistence.common.schema30.Trim_.class);
+    ear.addAsLibrary(jpa_core_criteriapia_CriteriaDelete_jar);
+    // Add ear submodules
+
+    JavaArchive jpa_core_criteriapia_CriteriaDelete_appmanagedNoTx_vehicle_client_jar = ShrinkWrap.create(JavaArchive.class, "jpa_core_criteriapia_CriteriaDelete_appmanagedNoTx_vehicle_client_jar");
+    jpa_core_criteriapia_CriteriaDelete_appmanagedNoTx_vehicle_client_jar.addClass(ee.jakarta.tck.persistence.common.PMClientBase.class);
+    jpa_core_criteriapia_CriteriaDelete_appmanagedNoTx_vehicle_client_jar.addClass(ee.jakarta.tck.persistence.common.schema30.Util.class);
+    ear.addAsModule(jpa_core_criteriapia_CriteriaDelete_appmanagedNoTx_vehicle_client_jar);
+
+    JavaArchive jpa_core_criteriapia_CriteriaDelete_appmanagedNoTx_vehicle_ejb_jar = ShrinkWrap.create(JavaArchive.class, "jpa_core_criteriapia_CriteriaDelete_appmanagedNoTx_vehicle_ejb_jar");
+    jpa_core_criteriapia_CriteriaDelete_appmanagedNoTx_vehicle_ejb_jar.addClass(ee.jakarta.tck.persistence.common.PMClientBase.class);
+    jpa_core_criteriapia_CriteriaDelete_appmanagedNoTx_vehicle_ejb_jar.addClass(ee.jakarta.tck.persistence.core.criteriaapi.CriteriaDelete.Client.class);
+    jpa_core_criteriapia_CriteriaDelete_appmanagedNoTx_vehicle_ejb_jar.addClass(ee.jakarta.tck.persistence.common.schema30.Util.class);
+    ear.addAsModule(jpa_core_criteriapia_CriteriaDelete_appmanagedNoTx_vehicle_ejb_jar);
+
+    JavaArchive jpa_core_criteriapia_CriteriaDelete_appmanaged_vehicle_client_jar = ShrinkWrap.create(JavaArchive.class, "jpa_core_criteriapia_CriteriaDelete_appmanaged_vehicle_client_jar");
+    jpa_core_criteriapia_CriteriaDelete_appmanaged_vehicle_client_jar.addClass(ee.jakarta.tck.persistence.common.PMClientBase.class);
+    jpa_core_criteriapia_CriteriaDelete_appmanaged_vehicle_client_jar.addClass(ee.jakarta.tck.persistence.common.schema30.Util.class);
+    ear.addAsModule(jpa_core_criteriapia_CriteriaDelete_appmanaged_vehicle_client_jar);
+
+    JavaArchive jpa_core_criteriapia_CriteriaDelete_appmanaged_vehicle_ejb_jar = ShrinkWrap.create(JavaArchive.class, "jpa_core_criteriapia_CriteriaDelete_appmanaged_vehicle_ejb_jar");
+    jpa_core_criteriapia_CriteriaDelete_appmanaged_vehicle_ejb_jar.addClass(ee.jakarta.tck.persistence.common.PMClientBase.class);
+    jpa_core_criteriapia_CriteriaDelete_appmanaged_vehicle_ejb_jar.addClass(ee.jakarta.tck.persistence.core.criteriaapi.CriteriaDelete.Client.class);
+    jpa_core_criteriapia_CriteriaDelete_appmanaged_vehicle_ejb_jar.addClass(ee.jakarta.tck.persistence.common.schema30.Util.class);
+    ear.addAsModule(jpa_core_criteriapia_CriteriaDelete_appmanaged_vehicle_ejb_jar);
+
+    WebArchive jpa_core_criteriapia_CriteriaDelete_pmservlet_vehicle_web_war = ShrinkWrap.create(WebArchive.class, "jpa_core_criteriapia_CriteriaDelete_pmservlet_vehicle_web_war");
+    jpa_core_criteriapia_CriteriaDelete_pmservlet_vehicle_web_war.addAsWebInfResource("web.xml");
+
+    JavaArchive jpa_core_criteriapia_CriteriaDelete_jar = ShrinkWrap.create(JavaArchive.class, "jpa_core_criteriapia_CriteriaDelete.jar");
+    jpa_core_criteriapia_CriteriaDelete_jar.addClass(ee.jakarta.tck.persistence.common.schema30.Address.class);
+    jpa_core_criteriapia_CriteriaDelete_jar.addClass(ee.jakarta.tck.persistence.common.schema30.Address_.class);
+    jpa_core_criteriapia_CriteriaDelete_jar.addClass(ee.jakarta.tck.persistence.common.schema30.Alias.class);
+    jpa_core_criteriapia_CriteriaDelete_jar.addClass(ee.jakarta.tck.persistence.common.schema30.Alias_.class);
+    jpa_core_criteriapia_CriteriaDelete_jar.addClass(ee.jakarta.tck.persistence.common.schema30.Country.class);
+    jpa_core_criteriapia_CriteriaDelete_jar.addClass(ee.jakarta.tck.persistence.common.schema30.Country_.class);
+    jpa_core_criteriapia_CriteriaDelete_jar.addClass(ee.jakarta.tck.persistence.common.schema30.CreditCard.class);
+    jpa_core_criteriapia_CriteriaDelete_jar.addClass(ee.jakarta.tck.persistence.common.schema30.CreditCard_.class);
+    jpa_core_criteriapia_CriteriaDelete_jar.addClass(ee.jakarta.tck.persistence.common.schema30.Customer.class);
+    jpa_core_criteriapia_CriteriaDelete_jar.addClass(ee.jakarta.tck.persistence.common.schema30.Customer_.class);
+    jpa_core_criteriapia_CriteriaDelete_jar.addClass(ee.jakarta.tck.persistence.common.schema30.Department.class);
+    jpa_core_criteriapia_CriteriaDelete_jar.addClass(ee.jakarta.tck.persistence.common.schema30.Department_.class);
+    jpa_core_criteriapia_CriteriaDelete_jar.addClass(ee.jakarta.tck.persistence.common.schema30.Employee.class);
+    jpa_core_criteriapia_CriteriaDelete_jar.addClass(ee.jakarta.tck.persistence.common.schema30.Employee_.class);
+    jpa_core_criteriapia_CriteriaDelete_jar.addClass(ee.jakarta.tck.persistence.common.schema30.HardwareProduct.class);
+    jpa_core_criteriapia_CriteriaDelete_jar.addClass(ee.jakarta.tck.persistence.common.schema30.HardwareProduct_.class);
+    jpa_core_criteriapia_CriteriaDelete_jar.addClass(ee.jakarta.tck.persistence.common.schema30.Info.class);
+    jpa_core_criteriapia_CriteriaDelete_jar.addClass(ee.jakarta.tck.persistence.common.schema30.Info_.class);
+    jpa_core_criteriapia_CriteriaDelete_jar.addClass(ee.jakarta.tck.persistence.common.schema30.LineItem.class);
+    jpa_core_criteriapia_CriteriaDelete_jar.addClass(ee.jakarta.tck.persistence.common.schema30.LineItemException.class);
+    jpa_core_criteriapia_CriteriaDelete_jar.addClass(ee.jakarta.tck.persistence.common.schema30.LineItem_.class);
+    jpa_core_criteriapia_CriteriaDelete_jar.addClass(ee.jakarta.tck.persistence.common.schema30.Order.class);
+    jpa_core_criteriapia_CriteriaDelete_jar.addClass(ee.jakarta.tck.persistence.common.schema30.Order_.class);
+    jpa_core_criteriapia_CriteriaDelete_jar.addClass(ee.jakarta.tck.persistence.common.schema30.Phone.class);
+    jpa_core_criteriapia_CriteriaDelete_jar.addClass(ee.jakarta.tck.persistence.common.schema30.Phone_.class);
+    jpa_core_criteriapia_CriteriaDelete_jar.addClass(ee.jakarta.tck.persistence.common.schema30.Product.class);
+    jpa_core_criteriapia_CriteriaDelete_jar.addClass(ee.jakarta.tck.persistence.common.schema30.Product_.class);
+    jpa_core_criteriapia_CriteriaDelete_jar.addClass(ee.jakarta.tck.persistence.common.schema30.ShelfLife.class);
+    jpa_core_criteriapia_CriteriaDelete_jar.addClass(ee.jakarta.tck.persistence.common.schema30.ShelfLife_.class);
+    jpa_core_criteriapia_CriteriaDelete_jar.addClass(ee.jakarta.tck.persistence.common.schema30.SoftwareProduct.class);
+    jpa_core_criteriapia_CriteriaDelete_jar.addClass(ee.jakarta.tck.persistence.common.schema30.SoftwareProduct_.class);
+    jpa_core_criteriapia_CriteriaDelete_jar.addClass(ee.jakarta.tck.persistence.common.schema30.Spouse.class);
+    jpa_core_criteriapia_CriteriaDelete_jar.addClass(ee.jakarta.tck.persistence.common.schema30.Spouse_.class);
+    jpa_core_criteriapia_CriteriaDelete_jar.addClass(ee.jakarta.tck.persistence.common.schema30.Trim.class);
+    jpa_core_criteriapia_CriteriaDelete_jar.addClass(ee.jakarta.tck.persistence.common.schema30.Trim_.class);
+    jpa_core_criteriapia_CriteriaDelete_jar.addAsManifestResource("META-INF/MANIFEST.MF");
+    jpa_core_criteriapia_CriteriaDelete_jar.addAsManifestResource("META-INF/persistence.xml");
+    jpa_core_criteriapia_CriteriaDelete_pmservlet_vehicle_web_war.addAsLibrary(jpa_core_criteriapia_CriteriaDelete_jar);
+    jpa_core_criteriapia_CriteriaDelete_pmservlet_vehicle_web_war.addClass(ee.jakarta.tck.persistence.common.PMClientBase.class);
+    jpa_core_criteriapia_CriteriaDelete_pmservlet_vehicle_web_war.addClass(ee.jakarta.tck.persistence.core.criteriaapi.CriteriaDelete.Client.class);
+    jpa_core_criteriapia_CriteriaDelete_pmservlet_vehicle_web_war.addClass(ee.jakarta.tck.persistence.common.schema30.Util.class);
+    ear.addAsModule(jpa_core_criteriapia_CriteriaDelete_pmservlet_vehicle_web_war);
+
+    WebArchive jpa_core_criteriapia_CriteriaDelete_puservlet_vehicle_web_war = ShrinkWrap.create(WebArchive.class, "jpa_core_criteriapia_CriteriaDelete_puservlet_vehicle_web_war");
+    jpa_core_criteriapia_CriteriaDelete_puservlet_vehicle_web_war.addAsWebInfResource("web.xml");
+
+    JavaArchive jpa_core_criteriapia_CriteriaDelete_jar = ShrinkWrap.create(JavaArchive.class, "jpa_core_criteriapia_CriteriaDelete.jar");
+    jpa_core_criteriapia_CriteriaDelete_jar.addClass(ee.jakarta.tck.persistence.common.schema30.Address.class);
+    jpa_core_criteriapia_CriteriaDelete_jar.addClass(ee.jakarta.tck.persistence.common.schema30.Address_.class);
+    jpa_core_criteriapia_CriteriaDelete_jar.addClass(ee.jakarta.tck.persistence.common.schema30.Alias.class);
+    jpa_core_criteriapia_CriteriaDelete_jar.addClass(ee.jakarta.tck.persistence.common.schema30.Alias_.class);
+    jpa_core_criteriapia_CriteriaDelete_jar.addClass(ee.jakarta.tck.persistence.common.schema30.Country.class);
+    jpa_core_criteriapia_CriteriaDelete_jar.addClass(ee.jakarta.tck.persistence.common.schema30.Country_.class);
+    jpa_core_criteriapia_CriteriaDelete_jar.addClass(ee.jakarta.tck.persistence.common.schema30.CreditCard.class);
+    jpa_core_criteriapia_CriteriaDelete_jar.addClass(ee.jakarta.tck.persistence.common.schema30.CreditCard_.class);
+    jpa_core_criteriapia_CriteriaDelete_jar.addClass(ee.jakarta.tck.persistence.common.schema30.Customer.class);
+    jpa_core_criteriapia_CriteriaDelete_jar.addClass(ee.jakarta.tck.persistence.common.schema30.Customer_.class);
+    jpa_core_criteriapia_CriteriaDelete_jar.addClass(ee.jakarta.tck.persistence.common.schema30.Department.class);
+    jpa_core_criteriapia_CriteriaDelete_jar.addClass(ee.jakarta.tck.persistence.common.schema30.Department_.class);
+    jpa_core_criteriapia_CriteriaDelete_jar.addClass(ee.jakarta.tck.persistence.common.schema30.Employee.class);
+    jpa_core_criteriapia_CriteriaDelete_jar.addClass(ee.jakarta.tck.persistence.common.schema30.Employee_.class);
+    jpa_core_criteriapia_CriteriaDelete_jar.addClass(ee.jakarta.tck.persistence.common.schema30.HardwareProduct.class);
+    jpa_core_criteriapia_CriteriaDelete_jar.addClass(ee.jakarta.tck.persistence.common.schema30.HardwareProduct_.class);
+    jpa_core_criteriapia_CriteriaDelete_jar.addClass(ee.jakarta.tck.persistence.common.schema30.Info.class);
+    jpa_core_criteriapia_CriteriaDelete_jar.addClass(ee.jakarta.tck.persistence.common.schema30.Info_.class);
+    jpa_core_criteriapia_CriteriaDelete_jar.addClass(ee.jakarta.tck.persistence.common.schema30.LineItem.class);
+    jpa_core_criteriapia_CriteriaDelete_jar.addClass(ee.jakarta.tck.persistence.common.schema30.LineItemException.class);
+    jpa_core_criteriapia_CriteriaDelete_jar.addClass(ee.jakarta.tck.persistence.common.schema30.LineItem_.class);
+    jpa_core_criteriapia_CriteriaDelete_jar.addClass(ee.jakarta.tck.persistence.common.schema30.Order.class);
+    jpa_core_criteriapia_CriteriaDelete_jar.addClass(ee.jakarta.tck.persistence.common.schema30.Order_.class);
+    jpa_core_criteriapia_CriteriaDelete_jar.addClass(ee.jakarta.tck.persistence.common.schema30.Phone.class);
+    jpa_core_criteriapia_CriteriaDelete_jar.addClass(ee.jakarta.tck.persistence.common.schema30.Phone_.class);
+    jpa_core_criteriapia_CriteriaDelete_jar.addClass(ee.jakarta.tck.persistence.common.schema30.Product.class);
+    jpa_core_criteriapia_CriteriaDelete_jar.addClass(ee.jakarta.tck.persistence.common.schema30.Product_.class);
+    jpa_core_criteriapia_CriteriaDelete_jar.addClass(ee.jakarta.tck.persistence.common.schema30.ShelfLife.class);
+    jpa_core_criteriapia_CriteriaDelete_jar.addClass(ee.jakarta.tck.persistence.common.schema30.ShelfLife_.class);
+    jpa_core_criteriapia_CriteriaDelete_jar.addClass(ee.jakarta.tck.persistence.common.schema30.SoftwareProduct.class);
+    jpa_core_criteriapia_CriteriaDelete_jar.addClass(ee.jakarta.tck.persistence.common.schema30.SoftwareProduct_.class);
+    jpa_core_criteriapia_CriteriaDelete_jar.addClass(ee.jakarta.tck.persistence.common.schema30.Spouse.class);
+    jpa_core_criteriapia_CriteriaDelete_jar.addClass(ee.jakarta.tck.persistence.common.schema30.Spouse_.class);
+    jpa_core_criteriapia_CriteriaDelete_jar.addClass(ee.jakarta.tck.persistence.common.schema30.Trim.class);
+    jpa_core_criteriapia_CriteriaDelete_jar.addClass(ee.jakarta.tck.persistence.common.schema30.Trim_.class);
+    jpa_core_criteriapia_CriteriaDelete_jar.addAsManifestResource("META-INF/MANIFEST.MF");
+    jpa_core_criteriapia_CriteriaDelete_jar.addAsManifestResource("META-INF/persistence.xml");
+    jpa_core_criteriapia_CriteriaDelete_puservlet_vehicle_web_war.addAsLibrary(jpa_core_criteriapia_CriteriaDelete_jar);
+    jpa_core_criteriapia_CriteriaDelete_puservlet_vehicle_web_war.addClass(ee.jakarta.tck.persistence.common.PMClientBase.class);
+    jpa_core_criteriapia_CriteriaDelete_puservlet_vehicle_web_war.addClass(ee.jakarta.tck.persistence.core.criteriaapi.CriteriaDelete.Client.class);
+    jpa_core_criteriapia_CriteriaDelete_puservlet_vehicle_web_war.addClass(ee.jakarta.tck.persistence.common.schema30.Util.class);
+    ear.addAsModule(jpa_core_criteriapia_CriteriaDelete_puservlet_vehicle_web_war);
+
+    JavaArchive jpa_core_criteriapia_CriteriaDelete_stateful3_vehicle_client_jar = ShrinkWrap.create(JavaArchive.class, "jpa_core_criteriapia_CriteriaDelete_stateful3_vehicle_client_jar");
+    jpa_core_criteriapia_CriteriaDelete_stateful3_vehicle_client_jar.addClass(ee.jakarta.tck.persistence.common.PMClientBase.class);
+    jpa_core_criteriapia_CriteriaDelete_stateful3_vehicle_client_jar.addClass(ee.jakarta.tck.persistence.common.schema30.Util.class);
+    ear.addAsModule(jpa_core_criteriapia_CriteriaDelete_stateful3_vehicle_client_jar);
+
+    JavaArchive jpa_core_criteriapia_CriteriaDelete_stateful3_vehicle_ejb_jar = ShrinkWrap.create(JavaArchive.class, "jpa_core_criteriapia_CriteriaDelete_stateful3_vehicle_ejb_jar");
+    jpa_core_criteriapia_CriteriaDelete_stateful3_vehicle_ejb_jar.addClass(ee.jakarta.tck.persistence.common.PMClientBase.class);
+    jpa_core_criteriapia_CriteriaDelete_stateful3_vehicle_ejb_jar.addClass(ee.jakarta.tck.persistence.core.criteriaapi.CriteriaDelete.Client.class);
+    jpa_core_criteriapia_CriteriaDelete_stateful3_vehicle_ejb_jar.addClass(ee.jakarta.tck.persistence.common.schema30.Util.class);
+    ear.addAsModule(jpa_core_criteriapia_CriteriaDelete_stateful3_vehicle_ejb_jar);
+
+    JavaArchive jpa_core_criteriapia_CriteriaDelete_stateless3_vehicle_client_jar = ShrinkWrap.create(JavaArchive.class, "jpa_core_criteriapia_CriteriaDelete_stateless3_vehicle_client_jar");
+    jpa_core_criteriapia_CriteriaDelete_stateless3_vehicle_client_jar.addClass(ee.jakarta.tck.persistence.common.PMClientBase.class);
+    jpa_core_criteriapia_CriteriaDelete_stateless3_vehicle_client_jar.addClass(ee.jakarta.tck.persistence.common.schema30.Util.class);
+    ear.addAsModule(jpa_core_criteriapia_CriteriaDelete_stateless3_vehicle_client_jar);
+
+    JavaArchive jpa_core_criteriapia_CriteriaDelete_stateless3_vehicle_ejb_jar = ShrinkWrap.create(JavaArchive.class, "jpa_core_criteriapia_CriteriaDelete_stateless3_vehicle_ejb_jar");
+    jpa_core_criteriapia_CriteriaDelete_stateless3_vehicle_ejb_jar.addClass(ee.jakarta.tck.persistence.common.PMClientBase.class);
+    jpa_core_criteriapia_CriteriaDelete_stateless3_vehicle_ejb_jar.addClass(ee.jakarta.tck.persistence.core.criteriaapi.CriteriaDelete.Client.class);
+    jpa_core_criteriapia_CriteriaDelete_stateless3_vehicle_ejb_jar.addClass(ee.jakarta.tck.persistence.common.schema30.Util.class);
+    ear.addAsModule(jpa_core_criteriapia_CriteriaDelete_stateless3_vehicle_ejb_jar);
+    return ear;
+  }
+
 	private static final Logger logger = (Logger) System.getLogger(Client.class.getName());
 
 	public JavaArchive createDeployment() throws Exception {
diff --git a/jpa/spec-tests/src/main/java/ee/jakarta/tck/persistence/core/criteriaapi/CriteriaQuery/Client1.java b/jpa/spec-tests/src/main/java/ee/jakarta/tck/persistence/core/criteriaapi/CriteriaQuery/Client1.java
index ebf321cec..22637b4ea 100644
--- a/jpa/spec-tests/src/main/java/ee/jakarta/tck/persistence/core/criteriaapi/CriteriaQuery/Client1.java
+++ b/jpa/spec-tests/src/main/java/ee/jakarta/tck/persistence/core/criteriaapi/CriteriaQuery/Client1.java
@@ -21,8 +21,12 @@ import java.util.ArrayList;
 import java.util.Collections;
 import java.util.List;
 import java.util.Set;
-
+import org.jboss.arquillian.container.test.api.Deployment;
+import org.jboss.shrinkwrap.api.Archive;
+import org.jboss.shrinkwrap.api.ShrinkWrap;
+import org.jboss.shrinkwrap.api.spec.EnterpriseArchive;
 import org.jboss.shrinkwrap.api.spec.JavaArchive;
+import org.jboss.shrinkwrap.api.spec.WebArchive;
 import org.junit.jupiter.api.Test;
 
 import com.sun.ts.lib.harness.SetupMethod;
@@ -48,6 +52,201 @@ import jakarta.persistence.metamodel.Metamodel;
 
 public class Client1 extends UtilOrderData {
 
+  @Deployment(testable = false)
+  public static Archive<?> deployment() {
+
+    final EnterpriseArchive ear = ShrinkWrap.create(EnterpriseArchive.class, "jpa_core_criteriaapi_CriteriaQuery_vehicles.ear");
+    // TODO: filter/eliminate the library jar classes that shouldn't be included
+    // Add ear/lib jars
+
+    JavaArchive jpa_core_criteriaapi_CriteriaQuery_jar = ShrinkWrap.create(JavaArchive.class, "jpa_core_criteriaapi_CriteriaQuery_jar");
+    jpa_core_criteriaapi_CriteriaQuery_jar.addClass(ee.jakarta.tck.persistence.common.schema30.Address.class);
+    jpa_core_criteriaapi_CriteriaQuery_jar.addClass(ee.jakarta.tck.persistence.common.schema30.Address_.class);
+    jpa_core_criteriaapi_CriteriaQuery_jar.addClass(ee.jakarta.tck.persistence.common.schema30.Alias.class);
+    jpa_core_criteriaapi_CriteriaQuery_jar.addClass(ee.jakarta.tck.persistence.common.schema30.Alias_.class);
+    jpa_core_criteriaapi_CriteriaQuery_jar.addClass(ee.jakarta.tck.persistence.common.schema30.Country.class);
+    jpa_core_criteriaapi_CriteriaQuery_jar.addClass(ee.jakarta.tck.persistence.common.schema30.Country_.class);
+    jpa_core_criteriaapi_CriteriaQuery_jar.addClass(ee.jakarta.tck.persistence.common.schema30.CreditCard.class);
+    jpa_core_criteriaapi_CriteriaQuery_jar.addClass(ee.jakarta.tck.persistence.common.schema30.CreditCard_.class);
+    jpa_core_criteriaapi_CriteriaQuery_jar.addClass(ee.jakarta.tck.persistence.common.schema30.Customer.class);
+    jpa_core_criteriaapi_CriteriaQuery_jar.addClass(ee.jakarta.tck.persistence.common.schema30.Customer_.class);
+    jpa_core_criteriaapi_CriteriaQuery_jar.addClass(ee.jakarta.tck.persistence.common.schema30.Department.class);
+    jpa_core_criteriaapi_CriteriaQuery_jar.addClass(ee.jakarta.tck.persistence.common.schema30.Department_.class);
+    jpa_core_criteriaapi_CriteriaQuery_jar.addClass(ee.jakarta.tck.persistence.common.schema30.Employee.class);
+    jpa_core_criteriaapi_CriteriaQuery_jar.addClass(ee.jakarta.tck.persistence.common.schema30.Employee_.class);
+    jpa_core_criteriaapi_CriteriaQuery_jar.addClass(ee.jakarta.tck.persistence.common.schema30.HardwareProduct.class);
+    jpa_core_criteriaapi_CriteriaQuery_jar.addClass(ee.jakarta.tck.persistence.common.schema30.HardwareProduct_.class);
+    jpa_core_criteriaapi_CriteriaQuery_jar.addClass(ee.jakarta.tck.persistence.common.schema30.Info.class);
+    jpa_core_criteriaapi_CriteriaQuery_jar.addClass(ee.jakarta.tck.persistence.common.schema30.Info_.class);
+    jpa_core_criteriaapi_CriteriaQuery_jar.addClass(ee.jakarta.tck.persistence.common.schema30.LineItem.class);
+    jpa_core_criteriaapi_CriteriaQuery_jar.addClass(ee.jakarta.tck.persistence.common.schema30.LineItemException.class);
+    jpa_core_criteriaapi_CriteriaQuery_jar.addClass(ee.jakarta.tck.persistence.common.schema30.LineItem_.class);
+    jpa_core_criteriaapi_CriteriaQuery_jar.addClass(ee.jakarta.tck.persistence.common.schema30.Order.class);
+    jpa_core_criteriaapi_CriteriaQuery_jar.addClass(ee.jakarta.tck.persistence.common.schema30.Order_.class);
+    jpa_core_criteriaapi_CriteriaQuery_jar.addClass(ee.jakarta.tck.persistence.common.schema30.Phone.class);
+    jpa_core_criteriaapi_CriteriaQuery_jar.addClass(ee.jakarta.tck.persistence.common.schema30.Phone_.class);
+    jpa_core_criteriaapi_CriteriaQuery_jar.addClass(ee.jakarta.tck.persistence.common.schema30.Product.class);
+    jpa_core_criteriaapi_CriteriaQuery_jar.addClass(ee.jakarta.tck.persistence.common.schema30.Product_.class);
+    jpa_core_criteriaapi_CriteriaQuery_jar.addClass(ee.jakarta.tck.persistence.common.schema30.ShelfLife.class);
+    jpa_core_criteriaapi_CriteriaQuery_jar.addClass(ee.jakarta.tck.persistence.common.schema30.ShelfLife_.class);
+    jpa_core_criteriaapi_CriteriaQuery_jar.addClass(ee.jakarta.tck.persistence.common.schema30.SoftwareProduct.class);
+    jpa_core_criteriaapi_CriteriaQuery_jar.addClass(ee.jakarta.tck.persistence.common.schema30.SoftwareProduct_.class);
+    jpa_core_criteriaapi_CriteriaQuery_jar.addClass(ee.jakarta.tck.persistence.common.schema30.Spouse.class);
+    jpa_core_criteriaapi_CriteriaQuery_jar.addClass(ee.jakarta.tck.persistence.common.schema30.Spouse_.class);
+    jpa_core_criteriaapi_CriteriaQuery_jar.addClass(ee.jakarta.tck.persistence.common.schema30.Trim.class);
+    jpa_core_criteriaapi_CriteriaQuery_jar.addClass(ee.jakarta.tck.persistence.common.schema30.Trim_.class);
+    jpa_core_criteriaapi_CriteriaQuery_jar.addClass(ee.jakarta.tck.persistence.core.criteriaapi.CriteriaQuery.A.class);
+    ear.addAsLibrary(jpa_core_criteriaapi_CriteriaQuery_jar);
+    // Add ear submodules
+
+    JavaArchive jpa_core_criteriaapi_CriteriaQuery_appmanagedNoTx_vehicle_client_jar = ShrinkWrap.create(JavaArchive.class, "jpa_core_criteriaapi_CriteriaQuery_appmanagedNoTx_vehicle_client_jar");
+    jpa_core_criteriaapi_CriteriaQuery_appmanagedNoTx_vehicle_client_jar.addClass(ee.jakarta.tck.persistence.common.PMClientBase.class);
+    jpa_core_criteriaapi_CriteriaQuery_appmanagedNoTx_vehicle_client_jar.addClass(ee.jakarta.tck.persistence.common.schema30.Util.class);
+    ear.addAsModule(jpa_core_criteriaapi_CriteriaQuery_appmanagedNoTx_vehicle_client_jar);
+
+    JavaArchive jpa_core_criteriaapi_CriteriaQuery_appmanagedNoTx_vehicle_ejb_jar = ShrinkWrap.create(JavaArchive.class, "jpa_core_criteriaapi_CriteriaQuery_appmanagedNoTx_vehicle_ejb_jar");
+    jpa_core_criteriaapi_CriteriaQuery_appmanagedNoTx_vehicle_ejb_jar.addClass(ee.jakarta.tck.persistence.common.PMClientBase.class);
+    jpa_core_criteriaapi_CriteriaQuery_appmanagedNoTx_vehicle_ejb_jar.addClass(ee.jakarta.tck.persistence.core.criteriaapi.CriteriaQuery.Client$ExpectedResult.class);
+    jpa_core_criteriaapi_CriteriaQuery_appmanagedNoTx_vehicle_ejb_jar.addClass(ee.jakarta.tck.persistence.core.criteriaapi.CriteriaQuery.Client.class);
+    jpa_core_criteriaapi_CriteriaQuery_appmanagedNoTx_vehicle_ejb_jar.addClass(ee.jakarta.tck.persistence.common.schema30.Util.class);
+    ear.addAsModule(jpa_core_criteriaapi_CriteriaQuery_appmanagedNoTx_vehicle_ejb_jar);
+
+    JavaArchive jpa_core_criteriaapi_CriteriaQuery_appmanaged_vehicle_client_jar = ShrinkWrap.create(JavaArchive.class, "jpa_core_criteriaapi_CriteriaQuery_appmanaged_vehicle_client_jar");
+    jpa_core_criteriaapi_CriteriaQuery_appmanaged_vehicle_client_jar.addClass(ee.jakarta.tck.persistence.common.PMClientBase.class);
+    jpa_core_criteriaapi_CriteriaQuery_appmanaged_vehicle_client_jar.addClass(ee.jakarta.tck.persistence.common.schema30.Util.class);
+    ear.addAsModule(jpa_core_criteriaapi_CriteriaQuery_appmanaged_vehicle_client_jar);
+
+    JavaArchive jpa_core_criteriaapi_CriteriaQuery_appmanaged_vehicle_ejb_jar = ShrinkWrap.create(JavaArchive.class, "jpa_core_criteriaapi_CriteriaQuery_appmanaged_vehicle_ejb_jar");
+    jpa_core_criteriaapi_CriteriaQuery_appmanaged_vehicle_ejb_jar.addClass(ee.jakarta.tck.persistence.common.PMClientBase.class);
+    jpa_core_criteriaapi_CriteriaQuery_appmanaged_vehicle_ejb_jar.addClass(ee.jakarta.tck.persistence.core.criteriaapi.CriteriaQuery.Client$ExpectedResult.class);
+    jpa_core_criteriaapi_CriteriaQuery_appmanaged_vehicle_ejb_jar.addClass(ee.jakarta.tck.persistence.core.criteriaapi.CriteriaQuery.Client.class);
+    jpa_core_criteriaapi_CriteriaQuery_appmanaged_vehicle_ejb_jar.addClass(ee.jakarta.tck.persistence.common.schema30.Util.class);
+    ear.addAsModule(jpa_core_criteriaapi_CriteriaQuery_appmanaged_vehicle_ejb_jar);
+
+    WebArchive jpa_core_criteriaapi_CriteriaQuery_pmservlet_vehicle_web_war = ShrinkWrap.create(WebArchive.class, "jpa_core_criteriaapi_CriteriaQuery_pmservlet_vehicle_web_war");
+    jpa_core_criteriaapi_CriteriaQuery_pmservlet_vehicle_web_war.addAsWebInfResource("web.xml");
+
+    JavaArchive jpa_core_criteriaapi_CriteriaQuery_jar = ShrinkWrap.create(JavaArchive.class, "jpa_core_criteriaapi_CriteriaQuery.jar");
+    jpa_core_criteriaapi_CriteriaQuery_jar.addClass(ee.jakarta.tck.persistence.common.schema30.Address.class);
+    jpa_core_criteriaapi_CriteriaQuery_jar.addClass(ee.jakarta.tck.persistence.common.schema30.Address_.class);
+    jpa_core_criteriaapi_CriteriaQuery_jar.addClass(ee.jakarta.tck.persistence.common.schema30.Alias.class);
+    jpa_core_criteriaapi_CriteriaQuery_jar.addClass(ee.jakarta.tck.persistence.common.schema30.Alias_.class);
+    jpa_core_criteriaapi_CriteriaQuery_jar.addClass(ee.jakarta.tck.persistence.common.schema30.Country.class);
+    jpa_core_criteriaapi_CriteriaQuery_jar.addClass(ee.jakarta.tck.persistence.common.schema30.Country_.class);
+    jpa_core_criteriaapi_CriteriaQuery_jar.addClass(ee.jakarta.tck.persistence.common.schema30.CreditCard.class);
+    jpa_core_criteriaapi_CriteriaQuery_jar.addClass(ee.jakarta.tck.persistence.common.schema30.CreditCard_.class);
+    jpa_core_criteriaapi_CriteriaQuery_jar.addClass(ee.jakarta.tck.persistence.common.schema30.Customer.class);
+    jpa_core_criteriaapi_CriteriaQuery_jar.addClass(ee.jakarta.tck.persistence.common.schema30.Customer_.class);
+    jpa_core_criteriaapi_CriteriaQuery_jar.addClass(ee.jakarta.tck.persistence.common.schema30.Department.class);
+    jpa_core_criteriaapi_CriteriaQuery_jar.addClass(ee.jakarta.tck.persistence.common.schema30.Department_.class);
+    jpa_core_criteriaapi_CriteriaQuery_jar.addClass(ee.jakarta.tck.persistence.common.schema30.Employee.class);
+    jpa_core_criteriaapi_CriteriaQuery_jar.addClass(ee.jakarta.tck.persistence.common.schema30.Employee_.class);
+    jpa_core_criteriaapi_CriteriaQuery_jar.addClass(ee.jakarta.tck.persistence.common.schema30.HardwareProduct.class);
+    jpa_core_criteriaapi_CriteriaQuery_jar.addClass(ee.jakarta.tck.persistence.common.schema30.HardwareProduct_.class);
+    jpa_core_criteriaapi_CriteriaQuery_jar.addClass(ee.jakarta.tck.persistence.common.schema30.Info.class);
+    jpa_core_criteriaapi_CriteriaQuery_jar.addClass(ee.jakarta.tck.persistence.common.schema30.Info_.class);
+    jpa_core_criteriaapi_CriteriaQuery_jar.addClass(ee.jakarta.tck.persistence.common.schema30.LineItem.class);
+    jpa_core_criteriaapi_CriteriaQuery_jar.addClass(ee.jakarta.tck.persistence.common.schema30.LineItemException.class);
+    jpa_core_criteriaapi_CriteriaQuery_jar.addClass(ee.jakarta.tck.persistence.common.schema30.LineItem_.class);
+    jpa_core_criteriaapi_CriteriaQuery_jar.addClass(ee.jakarta.tck.persistence.common.schema30.Order.class);
+    jpa_core_criteriaapi_CriteriaQuery_jar.addClass(ee.jakarta.tck.persistence.common.schema30.Order_.class);
+    jpa_core_criteriaapi_CriteriaQuery_jar.addClass(ee.jakarta.tck.persistence.common.schema30.Phone.class);
+    jpa_core_criteriaapi_CriteriaQuery_jar.addClass(ee.jakarta.tck.persistence.common.schema30.Phone_.class);
+    jpa_core_criteriaapi_CriteriaQuery_jar.addClass(ee.jakarta.tck.persistence.common.schema30.Product.class);
+    jpa_core_criteriaapi_CriteriaQuery_jar.addClass(ee.jakarta.tck.persistence.common.schema30.Product_.class);
+    jpa_core_criteriaapi_CriteriaQuery_jar.addClass(ee.jakarta.tck.persistence.common.schema30.ShelfLife.class);
+    jpa_core_criteriaapi_CriteriaQuery_jar.addClass(ee.jakarta.tck.persistence.common.schema30.ShelfLife_.class);
+    jpa_core_criteriaapi_CriteriaQuery_jar.addClass(ee.jakarta.tck.persistence.common.schema30.SoftwareProduct.class);
+    jpa_core_criteriaapi_CriteriaQuery_jar.addClass(ee.jakarta.tck.persistence.common.schema30.SoftwareProduct_.class);
+    jpa_core_criteriaapi_CriteriaQuery_jar.addClass(ee.jakarta.tck.persistence.common.schema30.Spouse.class);
+    jpa_core_criteriaapi_CriteriaQuery_jar.addClass(ee.jakarta.tck.persistence.common.schema30.Spouse_.class);
+    jpa_core_criteriaapi_CriteriaQuery_jar.addClass(ee.jakarta.tck.persistence.common.schema30.Trim.class);
+    jpa_core_criteriaapi_CriteriaQuery_jar.addClass(ee.jakarta.tck.persistence.common.schema30.Trim_.class);
+    jpa_core_criteriaapi_CriteriaQuery_jar.addClass(ee.jakarta.tck.persistence.core.criteriaapi.CriteriaQuery.A.class);
+    jpa_core_criteriaapi_CriteriaQuery_jar.addAsManifestResource("META-INF/MANIFEST.MF");
+    jpa_core_criteriaapi_CriteriaQuery_jar.addAsManifestResource("META-INF/persistence.xml");
+    jpa_core_criteriaapi_CriteriaQuery_pmservlet_vehicle_web_war.addAsLibrary(jpa_core_criteriaapi_CriteriaQuery_jar);
+    jpa_core_criteriaapi_CriteriaQuery_pmservlet_vehicle_web_war.addClass(ee.jakarta.tck.persistence.common.PMClientBase.class);
+    jpa_core_criteriaapi_CriteriaQuery_pmservlet_vehicle_web_war.addClass(ee.jakarta.tck.persistence.core.criteriaapi.CriteriaQuery.Client$ExpectedResult.class);
+    jpa_core_criteriaapi_CriteriaQuery_pmservlet_vehicle_web_war.addClass(ee.jakarta.tck.persistence.core.criteriaapi.CriteriaQuery.Client.class);
+    jpa_core_criteriaapi_CriteriaQuery_pmservlet_vehicle_web_war.addClass(ee.jakarta.tck.persistence.common.schema30.Util.class);
+    ear.addAsModule(jpa_core_criteriaapi_CriteriaQuery_pmservlet_vehicle_web_war);
+
+    WebArchive jpa_core_criteriaapi_CriteriaQuery_puservlet_vehicle_web_war = ShrinkWrap.create(WebArchive.class, "jpa_core_criteriaapi_CriteriaQuery_puservlet_vehicle_web_war");
+    jpa_core_criteriaapi_CriteriaQuery_puservlet_vehicle_web_war.addAsWebInfResource("web.xml");
+
+    JavaArchive jpa_core_criteriaapi_CriteriaQuery_jar = ShrinkWrap.create(JavaArchive.class, "jpa_core_criteriaapi_CriteriaQuery.jar");
+    jpa_core_criteriaapi_CriteriaQuery_jar.addClass(ee.jakarta.tck.persistence.common.schema30.Address.class);
+    jpa_core_criteriaapi_CriteriaQuery_jar.addClass(ee.jakarta.tck.persistence.common.schema30.Address_.class);
+    jpa_core_criteriaapi_CriteriaQuery_jar.addClass(ee.jakarta.tck.persistence.common.schema30.Alias.class);
+    jpa_core_criteriaapi_CriteriaQuery_jar.addClass(ee.jakarta.tck.persistence.common.schema30.Alias_.class);
+    jpa_core_criteriaapi_CriteriaQuery_jar.addClass(ee.jakarta.tck.persistence.common.schema30.Country.class);
+    jpa_core_criteriaapi_CriteriaQuery_jar.addClass(ee.jakarta.tck.persistence.common.schema30.Country_.class);
+    jpa_core_criteriaapi_CriteriaQuery_jar.addClass(ee.jakarta.tck.persistence.common.schema30.CreditCard.class);
+    jpa_core_criteriaapi_CriteriaQuery_jar.addClass(ee.jakarta.tck.persistence.common.schema30.CreditCard_.class);
+    jpa_core_criteriaapi_CriteriaQuery_jar.addClass(ee.jakarta.tck.persistence.common.schema30.Customer.class);
+    jpa_core_criteriaapi_CriteriaQuery_jar.addClass(ee.jakarta.tck.persistence.common.schema30.Customer_.class);
+    jpa_core_criteriaapi_CriteriaQuery_jar.addClass(ee.jakarta.tck.persistence.common.schema30.Department.class);
+    jpa_core_criteriaapi_CriteriaQuery_jar.addClass(ee.jakarta.tck.persistence.common.schema30.Department_.class);
+    jpa_core_criteriaapi_CriteriaQuery_jar.addClass(ee.jakarta.tck.persistence.common.schema30.Employee.class);
+    jpa_core_criteriaapi_CriteriaQuery_jar.addClass(ee.jakarta.tck.persistence.common.schema30.Employee_.class);
+    jpa_core_criteriaapi_CriteriaQuery_jar.addClass(ee.jakarta.tck.persistence.common.schema30.HardwareProduct.class);
+    jpa_core_criteriaapi_CriteriaQuery_jar.addClass(ee.jakarta.tck.persistence.common.schema30.HardwareProduct_.class);
+    jpa_core_criteriaapi_CriteriaQuery_jar.addClass(ee.jakarta.tck.persistence.common.schema30.Info.class);
+    jpa_core_criteriaapi_CriteriaQuery_jar.addClass(ee.jakarta.tck.persistence.common.schema30.Info_.class);
+    jpa_core_criteriaapi_CriteriaQuery_jar.addClass(ee.jakarta.tck.persistence.common.schema30.LineItem.class);
+    jpa_core_criteriaapi_CriteriaQuery_jar.addClass(ee.jakarta.tck.persistence.common.schema30.LineItemException.class);
+    jpa_core_criteriaapi_CriteriaQuery_jar.addClass(ee.jakarta.tck.persistence.common.schema30.LineItem_.class);
+    jpa_core_criteriaapi_CriteriaQuery_jar.addClass(ee.jakarta.tck.persistence.common.schema30.Order.class);
+    jpa_core_criteriaapi_CriteriaQuery_jar.addClass(ee.jakarta.tck.persistence.common.schema30.Order_.class);
+    jpa_core_criteriaapi_CriteriaQuery_jar.addClass(ee.jakarta.tck.persistence.common.schema30.Phone.class);
+    jpa_core_criteriaapi_CriteriaQuery_jar.addClass(ee.jakarta.tck.persistence.common.schema30.Phone_.class);
+    jpa_core_criteriaapi_CriteriaQuery_jar.addClass(ee.jakarta.tck.persistence.common.schema30.Product.class);
+    jpa_core_criteriaapi_CriteriaQuery_jar.addClass(ee.jakarta.tck.persistence.common.schema30.Product_.class);
+    jpa_core_criteriaapi_CriteriaQuery_jar.addClass(ee.jakarta.tck.persistence.common.schema30.ShelfLife.class);
+    jpa_core_criteriaapi_CriteriaQuery_jar.addClass(ee.jakarta.tck.persistence.common.schema30.ShelfLife_.class);
+    jpa_core_criteriaapi_CriteriaQuery_jar.addClass(ee.jakarta.tck.persistence.common.schema30.SoftwareProduct.class);
+    jpa_core_criteriaapi_CriteriaQuery_jar.addClass(ee.jakarta.tck.persistence.common.schema30.SoftwareProduct_.class);
+    jpa_core_criteriaapi_CriteriaQuery_jar.addClass(ee.jakarta.tck.persistence.common.schema30.Spouse.class);
+    jpa_core_criteriaapi_CriteriaQuery_jar.addClass(ee.jakarta.tck.persistence.common.schema30.Spouse_.class);
+    jpa_core_criteriaapi_CriteriaQuery_jar.addClass(ee.jakarta.tck.persistence.common.schema30.Trim.class);
+    jpa_core_criteriaapi_CriteriaQuery_jar.addClass(ee.jakarta.tck.persistence.common.schema30.Trim_.class);
+    jpa_core_criteriaapi_CriteriaQuery_jar.addClass(ee.jakarta.tck.persiste