diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/ee/entityManager/persistence.xml b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/ee/entityManager/persistence.xml
new file mode 100644
index 0000000000..94e5ce5b84
--- /dev/null
+++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/ee/entityManager/persistence.xml
@@ -0,0 +1,38 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+
+    Copyright (c) 2018 Oracle and/or its affiliates. All rights reserved.
+
+    This program and the accompanying materials are made available under the
+    terms of the Eclipse Public License v. 2.0, which is available at
+    http://www.eclipse.org/legal/epl-2.0.
+
+    This Source Code may also be made available under the following Secondary
+    Licenses when the conditions for such availability set forth in the
+    Eclipse Public License v. 2.0 are satisfied: GNU General Public License,
+    version 2 with the GNU Classpath Exception, which is available at
+    https://www.gnu.org/software/classpath/license.html.
+
+    SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
+
+-->
+<persistence xmlns="https://jakarta.ee/xml/ns/persistence" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="https://jakarta.ee/xml/ns/persistence     https://jakarta.ee/xml/ns/persistence/persistence_3_0.xsd" version="3.0">
+  <persistence-unit name="CTS-EM" transaction-type="JTA">
+    <description>Persistence Unit for CTS Vehicle Tests</description>
+    <jta-data-source>jdbc/DB1</jta-data-source>
+    <class>ee.jakarta.tck.persistence.ee.entityManager.Order</class>
+  </persistence-unit>
+  <persistence-unit name="CTS-EM2" transaction-type="JTA">
+    <description>Persistence Unit for CTS Vehicle Tests</description>
+    <jta-data-source>jdbc/DB1</jta-data-source>
+    <class>ee.jakarta.tck.persistence.ee.entityManager.Order</class>
+  </persistence-unit>
+  <persistence-unit name="CTS-EM-NOTX" transaction-type="RESOURCE_LOCAL">
+    <description>The persistence.xml file may be used to designate
+                  more than one persistence unit within the same scope.
+                  Persistence Unit for Application Managed Resource Local</description>
+    <non-jta-data-source>jdbc/DB_no_tx</non-jta-data-source>
+    <class>ee.jakarta.tck.persistence.ee.entityManager.Order</class>
+  </persistence-unit>
+</persistence>
+
diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/ee/entityManagerFactory/persistence.xml b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/ee/entityManagerFactory/persistence.xml
new file mode 100644
index 0000000000..c4c34c1953
--- /dev/null
+++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/ee/entityManagerFactory/persistence.xml
@@ -0,0 +1,38 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+
+    Copyright (c) 2018 Oracle and/or its affiliates. All rights reserved.
+
+    This program and the accompanying materials are made available under the
+    terms of the Eclipse Public License v. 2.0, which is available at
+    http://www.eclipse.org/legal/epl-2.0.
+
+    This Source Code may also be made available under the following Secondary
+    Licenses when the conditions for such availability set forth in the
+    Eclipse Public License v. 2.0 are satisfied: GNU General Public License,
+    version 2 with the GNU Classpath Exception, which is available at
+    https://www.gnu.org/software/classpath/license.html.
+
+    SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
+
+-->
+<persistence xmlns="https://jakarta.ee/xml/ns/persistence" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="https://jakarta.ee/xml/ns/persistence     https://jakarta.ee/xml/ns/persistence/persistence_3_0.xsd" version="3.0">
+  <persistence-unit name="CTS-EM" transaction-type="JTA">
+    <description>Persistence Unit for CTS Vehicle Tests</description>
+    <jta-data-source>jdbc/DB1</jta-data-source>
+    <class>ee.jakarta.tck.persistence.ee.entityManagerFactory.Order</class>
+  </persistence-unit>
+  <persistence-unit name="CTS-EM2" transaction-type="JTA">
+    <description>Persistence Unit for CTS Vehicle Tests</description>
+    <jta-data-source>jdbc/DB1</jta-data-source>
+    <class>ee.jakarta.tck.persistence.ee.entityManagerFactory.Order</class>
+  </persistence-unit>
+  <persistence-unit name="CTS-EM-NOTX" transaction-type="RESOURCE_LOCAL">
+    <description>The persistence.xml file may be used to designate
+                  more than one persistence unit within the same scope.
+                  Persistence Unit for Application Managed Resource Local</description>
+    <non-jta-data-source>jdbc/DB_no_tx</non-jta-data-source>
+    <class>ee.jakarta.tck.persistence.ee.entityManagerFactory.Order</class>
+  </persistence-unit>
+</persistence>
+
diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/ee/packaging/web/standalone/persistence.new.xml b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/ee/packaging/web/standalone/persistence.new.xml
new file mode 100644
index 0000000000..a2340558dd
--- /dev/null
+++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/ee/packaging/web/standalone/persistence.new.xml
@@ -0,0 +1,26 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+
+    Copyright (c) 2018 Oracle and/or its affiliates. All rights reserved.
+
+    This program and the accompanying materials are made available under the
+    terms of the Eclipse Public License v. 2.0, which is available at
+    http://www.eclipse.org/legal/epl-2.0.
+
+    This Source Code may also be made available under the following Secondary
+    Licenses when the conditions for such availability set forth in the
+    Eclipse Public License v. 2.0 are satisfied: GNU General Public License,
+    version 2 with the GNU Classpath Exception, which is available at
+    https://www.gnu.org/software/classpath/license.html.
+
+    SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
+
+-->
+<persistence xmlns="https://jakarta.ee/xml/ns/persistence" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="https://jakarta.ee/xml/ns/persistence     https://jakarta.ee/xml/ns/persistence/persistence_3_0.xsd" version="3.0">
+  <persistence-unit name="StandaloneAccountManager" transaction-type="JTA">
+    <description>Persistence Unit for CTS EE Package Tests</description>
+    <jta-data-source>jdbc/DB1</jta-data-source>
+    <class>ee.jakarta.tck.persistence.ee.common.Account</class>
+  </persistence-unit>
+</persistence>
+
diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/ee/propagation/cm/extended/persistence.new.xml b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/ee/propagation/cm/extended/persistence.new.xml
new file mode 100644
index 0000000000..6b31e77a55
--- /dev/null
+++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/ee/propagation/cm/extended/persistence.new.xml
@@ -0,0 +1,30 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+
+    Copyright (c) 2018 Oracle and/or its affiliates. All rights reserved.
+
+    This program and the accompanying materials are made available under the
+    terms of the Eclipse Public License v. 2.0, which is available at
+    http://www.eclipse.org/legal/epl-2.0.
+
+    This Source Code may also be made available under the following Secondary
+    Licenses when the conditions for such availability set forth in the
+    Eclipse Public License v. 2.0 are satisfied: GNU General Public License,
+    version 2 with the GNU Classpath Exception, which is available at
+    https://www.gnu.org/software/classpath/license.html.
+
+    SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
+
+-->
+<persistence xmlns="https://jakarta.ee/xml/ns/persistence" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="https://jakarta.ee/xml/ns/persistence     https://jakarta.ee/xml/ns/persistence/persistence_3_0.xsd" version="3.0">
+  <persistence-unit name="CTS-EXT-UNIT">
+    <description>Persistence Unit for CTS EE Propagation Tests.
+            If the transaction-type is not specified,
+            the default is JTA.</description>
+    <jta-data-source>jdbc/DB1</jta-data-source>
+    <class>ee.jakarta.tck.persistence.ee.common.A</class>
+    <class>ee.jakarta.tck.persistence.ee.common.Account</class>
+    <class>ee.jakarta.tck.persistence.ee.common.B</class>
+  </persistence-unit>
+</persistence>
+
diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/ee/propagation/cm/jta/persistence.new.xml b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/ee/propagation/cm/jta/persistence.new.xml
new file mode 100644
index 0000000000..5262efdfc2
--- /dev/null
+++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/ee/propagation/cm/jta/persistence.new.xml
@@ -0,0 +1,35 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+
+    Copyright (c) 2018 Oracle and/or its affiliates. All rights reserved.
+
+    This program and the accompanying materials are made available under the
+    terms of the Eclipse Public License v. 2.0, which is available at
+    http://www.eclipse.org/legal/epl-2.0.
+
+    This Source Code may also be made available under the following Secondary
+    Licenses when the conditions for such availability set forth in the
+    Eclipse Public License v. 2.0 are satisfied: GNU General Public License,
+    version 2 with the GNU Classpath Exception, which is available at
+    https://www.gnu.org/software/classpath/license.html.
+
+    SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
+
+-->
+<persistence xmlns="https://jakarta.ee/xml/ns/persistence" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="https://jakarta.ee/xml/ns/persistence     https://jakarta.ee/xml/ns/persistence/persistence_3_0.xsd" version="3.0">
+  <persistence-unit name="CTS-JTA-UNIT" transaction-type="JTA">
+    <description>Persistence Unit for CTS EE Package Tests</description>
+    <jta-data-source>jdbc/DB1</jta-data-source>
+    <class>ee.jakarta.tck.persistence.ee.common.A</class>
+    <class>ee.jakarta.tck.persistence.ee.common.Account</class>
+    <class>ee.jakarta.tck.persistence.ee.common.B</class>
+  </persistence-unit>
+  <persistence-unit name="CTS-JTA-UNIT2" transaction-type="JTA">
+    <description>Persistence Unit for CTS EE Package Tests</description>
+    <jta-data-source>jdbc/DB1</jta-data-source>
+    <class>ee.jakarta.tck.persistence.ee.common.A</class>
+    <class>ee.jakarta.tck.persistence.ee.common.Account</class>
+    <class>ee.jakarta.tck.persistence.ee.common.B</class>
+  </persistence-unit>
+</persistence>
+
diff --git a/jpa/spec-tests/src/main/java/ee/jakarta/tck/persistence/core/EntityGraph/persistence.xml b/jpa/spec-tests/src/main/java/ee/jakarta/tck/persistence/core/EntityGraph/persistence.xml
new file mode 100644
index 0000000000..de8af6ac40
--- /dev/null
+++ b/jpa/spec-tests/src/main/java/ee/jakarta/tck/persistence/core/EntityGraph/persistence.xml
@@ -0,0 +1,47 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+
+    Copyright (c) 2018 Oracle and/or its affiliates. All rights reserved.
+
+    This program and the accompanying materials are made available under the
+    terms of the Eclipse Public License v. 2.0, which is available at
+    http://www.eclipse.org/legal/epl-2.0.
+
+    This Source Code may also be made available under the following Secondary
+    Licenses when the conditions for such availability set forth in the
+    Eclipse Public License v. 2.0 are satisfied: GNU General Public License,
+    version 2 with the GNU Classpath Exception, which is available at
+    https://www.gnu.org/software/classpath/license.html.
+
+    SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
+
+-->
+<persistence xmlns="https://jakarta.ee/xml/ns/persistence" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="https://jakarta.ee/xml/ns/persistence     https://jakarta.ee/xml/ns/persistence/persistence_3_0.xsd" version="3.0">
+  <persistence-unit name="CTS-EM" transaction-type="JTA">
+    <description>Persistence Unit for CTS Vehicle Tests</description>
+    <jta-data-source>jdbc/DB1</jta-data-source>
+    <class>ee.jakarta.tck.persistence.core.EntityGraph.Department</class>
+    <class>ee.jakarta.tck.persistence.core.EntityGraph.Employee</class>
+    <class>ee.jakarta.tck.persistence.core.EntityGraph.Employee2</class>
+    <class>ee.jakarta.tck.persistence.core.EntityGraph.Employee3</class>
+  </persistence-unit>
+  <persistence-unit name="CTS-EM2" transaction-type="JTA">
+    <description>Persistence Unit for CTS Vehicle Tests</description>
+    <jta-data-source>jdbc/DB1</jta-data-source>
+    <class>ee.jakarta.tck.persistence.core.EntityGraph.Department</class>
+    <class>ee.jakarta.tck.persistence.core.EntityGraph.Employee</class>
+    <class>ee.jakarta.tck.persistence.core.EntityGraph.Employee2</class>
+    <class>ee.jakarta.tck.persistence.core.EntityGraph.Employee3</class>
+  </persistence-unit>
+  <persistence-unit name="CTS-EM-NOTX" transaction-type="RESOURCE_LOCAL">
+    <description>The persistence.xml file may be used to designate
+                  more than one persistence unit within the same scope.
+                  Persistence Unit for Application Managed Resource Local</description>
+    <non-jta-data-source>jdbc/DB_no_tx</non-jta-data-source>
+    <class>ee.jakarta.tck.persistence.core.EntityGraph.Department</class>
+    <class>ee.jakarta.tck.persistence.core.EntityGraph.Employee</class>
+    <class>ee.jakarta.tck.persistence.core.EntityGraph.Employee2</class>
+    <class>ee.jakarta.tck.persistence.core.EntityGraph.Employee3</class>
+  </persistence-unit>
+</persistence>
+
diff --git a/jpa/spec-tests/src/main/java/ee/jakarta/tck/persistence/core/StoredProcedureQuery/persistence.xml b/jpa/spec-tests/src/main/java/ee/jakarta/tck/persistence/core/StoredProcedureQuery/persistence.xml
new file mode 100644
index 0000000000..20190d9744
--- /dev/null
+++ b/jpa/spec-tests/src/main/java/ee/jakarta/tck/persistence/core/StoredProcedureQuery/persistence.xml
@@ -0,0 +1,47 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+
+    Copyright (c) 2018 Oracle and/or its affiliates. All rights reserved.
+
+    This program and the accompanying materials are made available under the
+    terms of the Eclipse Public License v. 2.0, which is available at
+    http://www.eclipse.org/legal/epl-2.0.
+
+    This Source Code may also be made available under the following Secondary
+    Licenses when the conditions for such availability set forth in the
+    Eclipse Public License v. 2.0 are satisfied: GNU General Public License,
+    version 2 with the GNU Classpath Exception, which is available at
+    https://www.gnu.org/software/classpath/license.html.
+
+    SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
+
+-->
+<persistence xmlns="https://jakarta.ee/xml/ns/persistence" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="https://jakarta.ee/xml/ns/persistence     https://jakarta.ee/xml/ns/persistence/persistence_3_0.xsd" version="3.0">
+  <persistence-unit name="CTS-EM" transaction-type="JTA">
+    <description>Persistence Unit for CTS Vehicle Tests</description>
+    <jta-data-source>jdbc/DB1</jta-data-source>
+    <mapping-file>myMappingFile.xml</mapping-file>
+    <class>ee.jakarta.tck.persistence.core.StoredProcedureQuery.Employee</class>
+    <class>ee.jakarta.tck.persistence.core.StoredProcedureQuery.Employee2</class>
+    <class>ee.jakarta.tck.persistence.core.StoredProcedureQuery.EmployeeMappedSC</class>
+  </persistence-unit>
+  <persistence-unit name="CTS-EM2" transaction-type="JTA">
+    <description>Persistence Unit for CTS Vehicle Tests</description>
+    <jta-data-source>jdbc/DB1</jta-data-source>
+    <mapping-file>myMappingFile.xml</mapping-file>
+    <class>ee.jakarta.tck.persistence.core.StoredProcedureQuery.Employee</class>
+    <class>ee.jakarta.tck.persistence.core.StoredProcedureQuery.Employee2</class>
+    <class>ee.jakarta.tck.persistence.core.StoredProcedureQuery.EmployeeMappedSC</class>
+  </persistence-unit>
+  <persistence-unit name="CTS-EM-NOTX" transaction-type="RESOURCE_LOCAL">
+    <description>The persistence.xml file may be used to designate
+                  more than one persistence unit within the same scope.
+                  Persistence Unit for Application Managed Resource Local</description>
+    <non-jta-data-source>jdbc/DB_no_tx</non-jta-data-source>
+    <mapping-file>myMappingFile.xml</mapping-file>
+    <class>ee.jakarta.tck.persistence.core.StoredProcedureQuery.Employee</class>
+    <class>ee.jakarta.tck.persistence.core.StoredProcedureQuery.Employee2</class>
+    <class>ee.jakarta.tck.persistence.core.StoredProcedureQuery.EmployeeMappedSC</class>
+  </persistence-unit>
+</persistence>
+
diff --git a/jpa/spec-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/access/field/persistence.xml b/jpa/spec-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/access/field/persistence.xml
new file mode 100644
index 0000000000..5c3e025e0f
--- /dev/null
+++ b/jpa/spec-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/access/field/persistence.xml
@@ -0,0 +1,44 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+
+    Copyright (c) 2018 Oracle and/or its affiliates. All rights reserved.
+
+    This program and the accompanying materials are made available under the
+    terms of the Eclipse Public License v. 2.0, which is available at
+    http://www.eclipse.org/legal/epl-2.0.
+
+    This Source Code may also be made available under the following Secondary
+    Licenses when the conditions for such availability set forth in the
+    Eclipse Public License v. 2.0 are satisfied: GNU General Public License,
+    version 2 with the GNU Classpath Exception, which is available at
+    https://www.gnu.org/software/classpath/license.html.
+
+    SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
+
+-->
+<persistence xmlns="https://jakarta.ee/xml/ns/persistence" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="https://jakarta.ee/xml/ns/persistence     https://jakarta.ee/xml/ns/persistence/persistence_3_0.xsd" version="3.0">
+  <persistence-unit name="CTS-EM" transaction-type="JTA">
+    <description>Persistence Unit for CTS Vehicle Tests</description>
+    <jta-data-source>jdbc/DB1</jta-data-source>
+    <class>ee.jakarta.tck.persistence.core.annotations.access.field.DataTypes</class>
+    <class>ee.jakarta.tck.persistence.core.annotations.access.field.DataTypes2</class>
+    <class>ee.jakarta.tck.persistence.core.types.common.Grade</class>
+  </persistence-unit>
+  <persistence-unit name="CTS-EM2" transaction-type="JTA">
+    <description>Persistence Unit for CTS Vehicle Tests</description>
+    <jta-data-source>jdbc/DB1</jta-data-source>
+    <class>ee.jakarta.tck.persistence.core.annotations.access.field.DataTypes</class>
+    <class>ee.jakarta.tck.persistence.core.annotations.access.field.DataTypes2</class>
+    <class>ee.jakarta.tck.persistence.core.types.common.Grade</class>
+  </persistence-unit>
+  <persistence-unit name="CTS-EM-NOTX" transaction-type="RESOURCE_LOCAL">
+    <description>The persistence.xml file may be used to designate
+                  more than one persistence unit within the same scope.
+                  Persistence Unit for Application Managed Resource Local</description>
+    <non-jta-data-source>jdbc/DB_no_tx</non-jta-data-source>
+    <class>ee.jakarta.tck.persistence.core.annotations.access.field.DataTypes</class>
+    <class>ee.jakarta.tck.persistence.core.annotations.access.field.DataTypes2</class>
+    <class>ee.jakarta.tck.persistence.core.types.common.Grade</class>
+  </persistence-unit>
+</persistence>
+
diff --git a/jpa/spec-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/access/mappedsc/persistence.xml b/jpa/spec-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/access/mappedsc/persistence.xml
new file mode 100644
index 0000000000..c348ce33df
--- /dev/null
+++ b/jpa/spec-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/access/mappedsc/persistence.xml
@@ -0,0 +1,53 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+
+    Copyright (c) 2018 Oracle and/or its affiliates. All rights reserved.
+
+    This program and the accompanying materials are made available under the
+    terms of the Eclipse Public License v. 2.0, which is available at
+    http://www.eclipse.org/legal/epl-2.0.
+
+    This Source Code may also be made available under the following Secondary
+    Licenses when the conditions for such availability set forth in the
+    Eclipse Public License v. 2.0 are satisfied: GNU General Public License,
+    version 2 with the GNU Classpath Exception, which is available at
+    https://www.gnu.org/software/classpath/license.html.
+
+    SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
+
+-->
+<persistence xmlns="https://jakarta.ee/xml/ns/persistence" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="https://jakarta.ee/xml/ns/persistence     https://jakarta.ee/xml/ns/persistence/persistence_3_0.xsd" version="3.0">
+  <persistence-unit name="CTS-EM" transaction-type="JTA">
+    <description>Persistence Unit for CTS Vehicle Tests</description>
+    <jta-data-source>jdbc/DB1</jta-data-source>
+    <class>ee.jakarta.tck.persistence.core.annotations.access.mappedsc.AbstractPersonnel</class>
+    <class>ee.jakarta.tck.persistence.core.annotations.access.mappedsc.Department</class>
+    <class>ee.jakarta.tck.persistence.core.annotations.access.mappedsc.Employee</class>
+    <class>ee.jakarta.tck.persistence.core.annotations.access.mappedsc.FullTimeEmployee</class>
+    <class>ee.jakarta.tck.persistence.core.annotations.access.mappedsc.PartTimeEmployee</class>
+    <class>ee.jakarta.tck.persistence.core.annotations.access.mappedsc.Project</class>
+  </persistence-unit>
+  <persistence-unit name="CTS-EM2" transaction-type="JTA">
+    <description>Persistence Unit for CTS Vehicle Tests</description>
+    <jta-data-source>jdbc/DB1</jta-data-source>
+    <class>ee.jakarta.tck.persistence.core.annotations.access.mappedsc.AbstractPersonnel</class>
+    <class>ee.jakarta.tck.persistence.core.annotations.access.mappedsc.Department</class>
+    <class>ee.jakarta.tck.persistence.core.annotations.access.mappedsc.Employee</class>
+    <class>ee.jakarta.tck.persistence.core.annotations.access.mappedsc.FullTimeEmployee</class>
+    <class>ee.jakarta.tck.persistence.core.annotations.access.mappedsc.PartTimeEmployee</class>
+    <class>ee.jakarta.tck.persistence.core.annotations.access.mappedsc.Project</class>
+  </persistence-unit>
+  <persistence-unit name="CTS-EM-NOTX" transaction-type="RESOURCE_LOCAL">
+    <description>The persistence.xml file may be used to designate
+                  more than one persistence unit within the same scope.
+                  Persistence Unit for Application Managed Resource Local</description>
+    <non-jta-data-source>jdbc/DB_no_tx</non-jta-data-source>
+    <class>ee.jakarta.tck.persistence.core.annotations.access.mappedsc.AbstractPersonnel</class>
+    <class>ee.jakarta.tck.persistence.core.annotations.access.mappedsc.Department</class>
+    <class>ee.jakarta.tck.persistence.core.annotations.access.mappedsc.Employee</class>
+    <class>ee.jakarta.tck.persistence.core.annotations.access.mappedsc.FullTimeEmployee</class>
+    <class>ee.jakarta.tck.persistence.core.annotations.access.mappedsc.PartTimeEmployee</class>
+    <class>ee.jakarta.tck.persistence.core.annotations.access.mappedsc.Project</class>
+  </persistence-unit>
+</persistence>
+
diff --git a/jpa/spec-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/access/property/persistence.xml b/jpa/spec-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/access/property/persistence.xml
new file mode 100644
index 0000000000..7c6610625e
--- /dev/null
+++ b/jpa/spec-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/access/property/persistence.xml
@@ -0,0 +1,44 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+
+    Copyright (c) 2018 Oracle and/or its affiliates. All rights reserved.
+
+    This program and the accompanying materials are made available under the
+    terms of the Eclipse Public License v. 2.0, which is available at
+    http://www.eclipse.org/legal/epl-2.0.
+
+    This Source Code may also be made available under the following Secondary
+    Licenses when the conditions for such availability set forth in the
+    Eclipse Public License v. 2.0 are satisfied: GNU General Public License,
+    version 2 with the GNU Classpath Exception, which is available at
+    https://www.gnu.org/software/classpath/license.html.
+
+    SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
+
+-->
+<persistence xmlns="https://jakarta.ee/xml/ns/persistence" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="https://jakarta.ee/xml/ns/persistence     https://jakarta.ee/xml/ns/persistence/persistence_3_0.xsd" version="3.0">
+  <persistence-unit name="CTS-EM" transaction-type="JTA">
+    <description>Persistence Unit for CTS Vehicle Tests</description>
+    <jta-data-source>jdbc/DB1</jta-data-source>
+    <class>ee.jakarta.tck.persistence.core.annotations.access.property.DataTypes</class>
+    <class>ee.jakarta.tck.persistence.core.annotations.access.property.DataTypes2</class>
+    <class>ee.jakarta.tck.persistence.core.types.common.Grade</class>
+  </persistence-unit>
+  <persistence-unit name="CTS-EM2" transaction-type="JTA">
+    <description>Persistence Unit for CTS Vehicle Tests</description>
+    <jta-data-source>jdbc/DB1</jta-data-source>
+    <class>ee.jakarta.tck.persistence.core.annotations.access.property.DataTypes</class>
+    <class>ee.jakarta.tck.persistence.core.annotations.access.property.DataTypes2</class>
+    <class>ee.jakarta.tck.persistence.core.types.common.Grade</class>
+  </persistence-unit>
+  <persistence-unit name="CTS-EM-NOTX" transaction-type="RESOURCE_LOCAL">
+    <description>The persistence.xml file may be used to designate
+                  more than one persistence unit within the same scope.
+                  Persistence Unit for Application Managed Resource Local</description>
+    <non-jta-data-source>jdbc/DB_no_tx</non-jta-data-source>
+    <class>ee.jakarta.tck.persistence.core.annotations.access.property.DataTypes</class>
+    <class>ee.jakarta.tck.persistence.core.annotations.access.property.DataTypes2</class>
+    <class>ee.jakarta.tck.persistence.core.types.common.Grade</class>
+  </persistence-unit>
+</persistence>
+
diff --git a/jpa/spec-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/assocoverride/persistence.xml b/jpa/spec-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/assocoverride/persistence.xml
new file mode 100644
index 0000000000..564f2c4727
--- /dev/null
+++ b/jpa/spec-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/assocoverride/persistence.xml
@@ -0,0 +1,44 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+
+    Copyright (c) 2018 Oracle and/or its affiliates. All rights reserved.
+
+    This program and the accompanying materials are made available under the
+    terms of the Eclipse Public License v. 2.0, which is available at
+    http://www.eclipse.org/legal/epl-2.0.
+
+    This Source Code may also be made available under the following Secondary
+    Licenses when the conditions for such availability set forth in the
+    Eclipse Public License v. 2.0 are satisfied: GNU General Public License,
+    version 2 with the GNU Classpath Exception, which is available at
+    https://www.gnu.org/software/classpath/license.html.
+
+    SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
+
+-->
+<persistence xmlns="https://jakarta.ee/xml/ns/persistence" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="https://jakarta.ee/xml/ns/persistence     https://jakarta.ee/xml/ns/persistence/persistence_3_0.xsd" version="3.0">
+  <persistence-unit name="CTS-EM" transaction-type="JTA">
+    <description>Persistence Unit for CTS Vehicle Tests</description>
+    <jta-data-source>jdbc/DB1</jta-data-source>
+    <class>ee.jakarta.tck.persistence.core.annotations.assocoverride.Address</class>
+    <class>ee.jakarta.tck.persistence.core.annotations.assocoverride.Employee</class>
+    <class>ee.jakarta.tck.persistence.core.annotations.assocoverride.PartTimeEmployee</class>
+  </persistence-unit>
+  <persistence-unit name="CTS-EM2" transaction-type="JTA">
+    <description>Persistence Unit for CTS Vehicle Tests</description>
+    <jta-data-source>jdbc/DB1</jta-data-source>
+    <class>ee.jakarta.tck.persistence.core.annotations.assocoverride.Address</class>
+    <class>ee.jakarta.tck.persistence.core.annotations.assocoverride.Employee</class>
+    <class>ee.jakarta.tck.persistence.core.annotations.assocoverride.PartTimeEmployee</class>
+  </persistence-unit>
+  <persistence-unit name="CTS-EM-NOTX" transaction-type="RESOURCE_LOCAL">
+    <description>The persistence.xml file may be used to designate
+                  more than one persistence unit within the same scope.
+                  Persistence Unit for Application Managed Resource Local</description>
+    <non-jta-data-source>jdbc/DB_no_tx</non-jta-data-source>
+    <class>ee.jakarta.tck.persistence.core.annotations.assocoverride.Address</class>
+    <class>ee.jakarta.tck.persistence.core.annotations.assocoverride.Employee</class>
+    <class>ee.jakarta.tck.persistence.core.annotations.assocoverride.PartTimeEmployee</class>
+  </persistence-unit>
+</persistence>
+
diff --git a/jpa/spec-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/basic/persistence.xml b/jpa/spec-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/basic/persistence.xml
new file mode 100644
index 0000000000..fe0f180734
--- /dev/null
+++ b/jpa/spec-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/basic/persistence.xml
@@ -0,0 +1,38 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+
+    Copyright (c) 2018 Oracle and/or its affiliates. All rights reserved.
+
+    This program and the accompanying materials are made available under the
+    terms of the Eclipse Public License v. 2.0, which is available at
+    http://www.eclipse.org/legal/epl-2.0.
+
+    This Source Code may also be made available under the following Secondary
+    Licenses when the conditions for such availability set forth in the
+    Eclipse Public License v. 2.0 are satisfied: GNU General Public License,
+    version 2 with the GNU Classpath Exception, which is available at
+    https://www.gnu.org/software/classpath/license.html.
+
+    SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
+
+-->
+<persistence xmlns="https://jakarta.ee/xml/ns/persistence" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="https://jakarta.ee/xml/ns/persistence     https://jakarta.ee/xml/ns/persistence/persistence_3_0.xsd" version="3.0">
+  <persistence-unit name="CTS-EM" transaction-type="JTA">
+    <description>Persistence Unit for CTS Vehicle Tests</description>
+    <jta-data-source>jdbc/DB1</jta-data-source>
+    <class>ee.jakarta.tck.persistence.core.annotations.basic.A</class>
+  </persistence-unit>
+  <persistence-unit name="CTS-EM2" transaction-type="JTA">
+    <description>Persistence Unit for CTS Vehicle Tests</description>
+    <jta-data-source>jdbc/DB1</jta-data-source>
+    <class>ee.jakarta.tck.persistence.core.annotations.basic.A</class>
+  </persistence-unit>
+  <persistence-unit name="CTS-EM-NOTX" transaction-type="RESOURCE_LOCAL">
+    <description>The persistence.xml file may be used to designate
+                  more than one persistence unit within the same scope.
+                  Persistence Unit for Application Managed Resource Local</description>
+    <non-jta-data-source>jdbc/DB_no_tx</non-jta-data-source>
+    <class>ee.jakarta.tck.persistence.core.annotations.basic.A</class>
+  </persistence-unit>
+</persistence>
+
diff --git a/jpa/spec-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/collectiontable/persistence.xml b/jpa/spec-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/collectiontable/persistence.xml
new file mode 100644
index 0000000000..fda7b59a98
--- /dev/null
+++ b/jpa/spec-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/collectiontable/persistence.xml
@@ -0,0 +1,41 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+
+    Copyright (c) 2018 Oracle and/or its affiliates. All rights reserved.
+
+    This program and the accompanying materials are made available under the
+    terms of the Eclipse Public License v. 2.0, which is available at
+    http://www.eclipse.org/legal/epl-2.0.
+
+    This Source Code may also be made available under the following Secondary
+    Licenses when the conditions for such availability set forth in the
+    Eclipse Public License v. 2.0 are satisfied: GNU General Public License,
+    version 2 with the GNU Classpath Exception, which is available at
+    https://www.gnu.org/software/classpath/license.html.
+
+    SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
+
+-->
+<persistence xmlns="https://jakarta.ee/xml/ns/persistence" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="https://jakarta.ee/xml/ns/persistence     https://jakarta.ee/xml/ns/persistence/persistence_3_0.xsd" version="3.0">
+  <persistence-unit name="CTS-EM" transaction-type="JTA">
+    <description>Persistence Unit for CTS Vehicle Tests</description>
+    <jta-data-source>jdbc/DB1</jta-data-source>
+    <class>ee.jakarta.tck.persistence.core.annotations.collectiontable.A</class>
+    <class>ee.jakarta.tck.persistence.core.annotations.collectiontable.Address</class>
+  </persistence-unit>
+  <persistence-unit name="CTS-EM2" transaction-type="JTA">
+    <description>Persistence Unit for CTS Vehicle Tests</description>
+    <jta-data-source>jdbc/DB1</jta-data-source>
+    <class>ee.jakarta.tck.persistence.core.annotations.collectiontable.A</class>
+    <class>ee.jakarta.tck.persistence.core.annotations.collectiontable.Address</class>
+  </persistence-unit>
+  <persistence-unit name="CTS-EM-NOTX" transaction-type="RESOURCE_LOCAL">
+    <description>The persistence.xml file may be used to designate
+                  more than one persistence unit within the same scope.
+                  Persistence Unit for Application Managed Resource Local</description>
+    <non-jta-data-source>jdbc/DB_no_tx</non-jta-data-source>
+    <class>ee.jakarta.tck.persistence.core.annotations.collectiontable.A</class>
+    <class>ee.jakarta.tck.persistence.core.annotations.collectiontable.Address</class>
+  </persistence-unit>
+</persistence>
+
diff --git a/jpa/spec-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/convert/persistence.xml b/jpa/spec-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/convert/persistence.xml
new file mode 100644
index 0000000000..a84b302aa2
--- /dev/null
+++ b/jpa/spec-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/convert/persistence.xml
@@ -0,0 +1,92 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+
+    Copyright (c) 2018 Oracle and/or its affiliates. All rights reserved.
+
+    This program and the accompanying materials are made available under the
+    terms of the Eclipse Public License v. 2.0, which is available at
+    http://www.eclipse.org/legal/epl-2.0.
+
+    This Source Code may also be made available under the following Secondary
+    Licenses when the conditions for such availability set forth in the
+    Eclipse Public License v. 2.0 are satisfied: GNU General Public License,
+    version 2 with the GNU Classpath Exception, which is available at
+    https://www.gnu.org/software/classpath/license.html.
+
+    SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
+
+-->
+<persistence xmlns="https://jakarta.ee/xml/ns/persistence" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="https://jakarta.ee/xml/ns/persistence     https://jakarta.ee/xml/ns/persistence/persistence_3_0.xsd" version="3.0">
+  <persistence-unit name="CTS-EM" transaction-type="JTA">
+    <description>Persistence Unit for CTS Vehicle Tests</description>
+    <jta-data-source>jdbc/DB1</jta-data-source>
+    <class>ee.jakarta.tck.persistence.core.annotations.convert.Address</class>
+    <class>ee.jakarta.tck.persistence.core.annotations.convert.B</class>
+    <class>ee.jakarta.tck.persistence.core.annotations.convert.CharConverter</class>
+    <class>ee.jakarta.tck.persistence.core.annotations.convert.CommaConverter</class>
+    <class>ee.jakarta.tck.persistence.core.annotations.convert.Country</class>
+    <class>ee.jakarta.tck.persistence.core.annotations.convert.Customer</class>
+    <class>ee.jakarta.tck.persistence.core.annotations.convert.Department</class>
+    <class>ee.jakarta.tck.persistence.core.annotations.convert.DisableAutoApplyConverter</class>
+    <class>ee.jakarta.tck.persistence.core.annotations.convert.DotConverter</class>
+    <class>ee.jakarta.tck.persistence.core.annotations.convert.DotConverter2</class>
+    <class>ee.jakarta.tck.persistence.core.annotations.convert.Employee</class>
+    <class>ee.jakarta.tck.persistence.core.annotations.convert.Employee2</class>
+    <class>ee.jakarta.tck.persistence.core.annotations.convert.Employee3</class>
+    <class>ee.jakarta.tck.persistence.core.annotations.convert.FullTimeEmployee</class>
+    <class>ee.jakarta.tck.persistence.core.annotations.convert.FullTimeEmployee2</class>
+    <class>ee.jakarta.tck.persistence.core.annotations.convert.IntegerConverter</class>
+    <class>ee.jakarta.tck.persistence.core.annotations.convert.NumberToStateConverter</class>
+    <class>ee.jakarta.tck.persistence.core.annotations.convert.SalaryConverter</class>
+    <class>ee.jakarta.tck.persistence.core.annotations.convert.SpaceConverter</class>
+  </persistence-unit>
+  <persistence-unit name="CTS-EM2" transaction-type="JTA">
+    <description>Persistence Unit for CTS Vehicle Tests</description>
+    <jta-data-source>jdbc/DB1</jta-data-source>
+    <class>ee.jakarta.tck.persistence.core.annotations.convert.Address</class>
+    <class>ee.jakarta.tck.persistence.core.annotations.convert.B</class>
+    <class>ee.jakarta.tck.persistence.core.annotations.convert.CharConverter</class>
+    <class>ee.jakarta.tck.persistence.core.annotations.convert.CommaConverter</class>
+    <class>ee.jakarta.tck.persistence.core.annotations.convert.Country</class>
+    <class>ee.jakarta.tck.persistence.core.annotations.convert.Customer</class>
+    <class>ee.jakarta.tck.persistence.core.annotations.convert.Department</class>
+    <class>ee.jakarta.tck.persistence.core.annotations.convert.DisableAutoApplyConverter</class>
+    <class>ee.jakarta.tck.persistence.core.annotations.convert.DotConverter</class>
+    <class>ee.jakarta.tck.persistence.core.annotations.convert.DotConverter2</class>
+    <class>ee.jakarta.tck.persistence.core.annotations.convert.Employee</class>
+    <class>ee.jakarta.tck.persistence.core.annotations.convert.Employee2</class>
+    <class>ee.jakarta.tck.persistence.core.annotations.convert.Employee3</class>
+    <class>ee.jakarta.tck.persistence.core.annotations.convert.FullTimeEmployee</class>
+    <class>ee.jakarta.tck.persistence.core.annotations.convert.FullTimeEmployee2</class>
+    <class>ee.jakarta.tck.persistence.core.annotations.convert.IntegerConverter</class>
+    <class>ee.jakarta.tck.persistence.core.annotations.convert.NumberToStateConverter</class>
+    <class>ee.jakarta.tck.persistence.core.annotations.convert.SalaryConverter</class>
+    <class>ee.jakarta.tck.persistence.core.annotations.convert.SpaceConverter</class>
+  </persistence-unit>
+  <persistence-unit name="CTS-EM-NOTX" transaction-type="RESOURCE_LOCAL">
+    <description>The persistence.xml file may be used to designate
+                  more than one persistence unit within the same scope.
+                  Persistence Unit for Application Managed Resource Local</description>
+    <non-jta-data-source>jdbc/DB_no_tx</non-jta-data-source>
+    <class>ee.jakarta.tck.persistence.core.annotations.convert.Address</class>
+    <class>ee.jakarta.tck.persistence.core.annotations.convert.B</class>
+    <class>ee.jakarta.tck.persistence.core.annotations.convert.CharConverter</class>
+    <class>ee.jakarta.tck.persistence.core.annotations.convert.CommaConverter</class>
+    <class>ee.jakarta.tck.persistence.core.annotations.convert.Country</class>
+    <class>ee.jakarta.tck.persistence.core.annotations.convert.Customer</class>
+    <class>ee.jakarta.tck.persistence.core.annotations.convert.Department</class>
+    <class>ee.jakarta.tck.persistence.core.annotations.convert.DisableAutoApplyConverter</class>
+    <class>ee.jakarta.tck.persistence.core.annotations.convert.DotConverter</class>
+    <class>ee.jakarta.tck.persistence.core.annotations.convert.DotConverter2</class>
+    <class>ee.jakarta.tck.persistence.core.annotations.convert.Employee</class>
+    <class>ee.jakarta.tck.persistence.core.annotations.convert.Employee2</class>
+    <class>ee.jakarta.tck.persistence.core.annotations.convert.Employee3</class>
+    <class>ee.jakarta.tck.persistence.core.annotations.convert.FullTimeEmployee</class>
+    <class>ee.jakarta.tck.persistence.core.annotations.convert.FullTimeEmployee2</class>
+    <class>ee.jakarta.tck.persistence.core.annotations.convert.IntegerConverter</class>
+    <class>ee.jakarta.tck.persistence.core.annotations.convert.NumberToStateConverter</class>
+    <class>ee.jakarta.tck.persistence.core.annotations.convert.SalaryConverter</class>
+    <class>ee.jakarta.tck.persistence.core.annotations.convert.SpaceConverter</class>
+  </persistence-unit>
+</persistence>
+
diff --git a/jpa/spec-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/discriminatorValue/persistence.xml b/jpa/spec-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/discriminatorValue/persistence.xml
new file mode 100644
index 0000000000..73118afb71
--- /dev/null
+++ b/jpa/spec-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/discriminatorValue/persistence.xml
@@ -0,0 +1,50 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+
+    Copyright (c) 2018 Oracle and/or its affiliates. All rights reserved.
+
+    This program and the accompanying materials are made available under the
+    terms of the Eclipse Public License v. 2.0, which is available at
+    http://www.eclipse.org/legal/epl-2.0.
+
+    This Source Code may also be made available under the following Secondary
+    Licenses when the conditions for such availability set forth in the
+    Eclipse Public License v. 2.0 are satisfied: GNU General Public License,
+    version 2 with the GNU Classpath Exception, which is available at
+    https://www.gnu.org/software/classpath/license.html.
+
+    SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
+
+-->
+<persistence xmlns="https://jakarta.ee/xml/ns/persistence" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="https://jakarta.ee/xml/ns/persistence     https://jakarta.ee/xml/ns/persistence/persistence_3_0.xsd" version="3.0">
+  <persistence-unit name="CTS-EM" transaction-type="JTA">
+    <description>Persistence Unit for CTS Vehicle Tests</description>
+    <jta-data-source>jdbc/DB1</jta-data-source>
+    <class>ee.jakarta.tck.persistence.core.annotations.discriminatorValue.PartProduct</class>
+    <class>ee.jakarta.tck.persistence.core.annotations.discriminatorValue.PartProduct2</class>
+    <class>ee.jakarta.tck.persistence.core.annotations.discriminatorValue.PricedPartProduct2</class>
+    <class>ee.jakarta.tck.persistence.core.annotations.discriminatorValue.Product</class>
+    <class>ee.jakarta.tck.persistence.core.annotations.discriminatorValue.Product2</class>
+  </persistence-unit>
+  <persistence-unit name="CTS-EM2" transaction-type="JTA">
+    <description>Persistence Unit for CTS Vehicle Tests</description>
+    <jta-data-source>jdbc/DB1</jta-data-source>
+    <class>ee.jakarta.tck.persistence.core.annotations.discriminatorValue.PartProduct</class>
+    <class>ee.jakarta.tck.persistence.core.annotations.discriminatorValue.PartProduct2</class>
+    <class>ee.jakarta.tck.persistence.core.annotations.discriminatorValue.PricedPartProduct2</class>
+    <class>ee.jakarta.tck.persistence.core.annotations.discriminatorValue.Product</class>
+    <class>ee.jakarta.tck.persistence.core.annotations.discriminatorValue.Product2</class>
+  </persistence-unit>
+  <persistence-unit name="CTS-EM-NOTX" transaction-type="RESOURCE_LOCAL">
+    <description>The persistence.xml file may be used to designate
+                  more than one persistence unit within the same scope.
+                  Persistence Unit for Application Managed Resource Local</description>
+    <non-jta-data-source>jdbc/DB_no_tx</non-jta-data-source>
+    <class>ee.jakarta.tck.persistence.core.annotations.discriminatorValue.PartProduct</class>
+    <class>ee.jakarta.tck.persistence.core.annotations.discriminatorValue.PartProduct2</class>
+    <class>ee.jakarta.tck.persistence.core.annotations.discriminatorValue.PricedPartProduct2</class>
+    <class>ee.jakarta.tck.persistence.core.annotations.discriminatorValue.Product</class>
+    <class>ee.jakarta.tck.persistence.core.annotations.discriminatorValue.Product2</class>
+  </persistence-unit>
+</persistence>
+
diff --git a/jpa/spec-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/elementcollection/persistence.xml b/jpa/spec-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/elementcollection/persistence.xml
new file mode 100644
index 0000000000..ebde5f849c
--- /dev/null
+++ b/jpa/spec-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/elementcollection/persistence.xml
@@ -0,0 +1,50 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+
+    Copyright (c) 2018 Oracle and/or its affiliates. All rights reserved.
+
+    This program and the accompanying materials are made available under the
+    terms of the Eclipse Public License v. 2.0, which is available at
+    http://www.eclipse.org/legal/epl-2.0.
+
+    This Source Code may also be made available under the following Secondary
+    Licenses when the conditions for such availability set forth in the
+    Eclipse Public License v. 2.0 are satisfied: GNU General Public License,
+    version 2 with the GNU Classpath Exception, which is available at
+    https://www.gnu.org/software/classpath/license.html.
+
+    SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
+
+-->
+<persistence xmlns="https://jakarta.ee/xml/ns/persistence" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="https://jakarta.ee/xml/ns/persistence     https://jakarta.ee/xml/ns/persistence/persistence_3_0.xsd" version="3.0">
+  <persistence-unit name="CTS-EM" transaction-type="JTA">
+    <description>Persistence Unit for CTS Vehicle Tests</description>
+    <jta-data-source>jdbc/DB1</jta-data-source>
+    <mapping-file>myMappingFile.xml</mapping-file>
+    <class>ee.jakarta.tck.persistence.core.annotations.elementcollection.A</class>
+    <class>ee.jakarta.tck.persistence.core.annotations.elementcollection.Address</class>
+    <class>ee.jakarta.tck.persistence.core.annotations.elementcollection.Customer</class>
+    <class>ee.jakarta.tck.persistence.core.annotations.elementcollection.CustomerXML</class>
+  </persistence-unit>
+  <persistence-unit name="CTS-EM2" transaction-type="JTA">
+    <description>Persistence Unit for CTS Vehicle Tests</description>
+    <jta-data-source>jdbc/DB1</jta-data-source>
+    <mapping-file>myMappingFile.xml</mapping-file>
+    <class>ee.jakarta.tck.persistence.core.annotations.elementcollection.A</class>
+    <class>ee.jakarta.tck.persistence.core.annotations.elementcollection.Address</class>
+    <class>ee.jakarta.tck.persistence.core.annotations.elementcollection.Customer</class>
+    <class>ee.jakarta.tck.persistence.core.annotations.elementcollection.CustomerXML</class>
+  </persistence-unit>
+  <persistence-unit name="CTS-EM-NOTX" transaction-type="RESOURCE_LOCAL">
+    <description>The persistence.xml file may be used to designate
+                  more than one persistence unit within the same scope.
+                  Persistence Unit for Application Managed Resource Local</description>
+    <non-jta-data-source>jdbc/DB_no_tx</non-jta-data-source>
+    <mapping-file>myMappingFile.xml</mapping-file>
+    <class>ee.jakarta.tck.persistence.core.annotations.elementcollection.A</class>
+    <class>ee.jakarta.tck.persistence.core.annotations.elementcollection.Address</class>
+    <class>ee.jakarta.tck.persistence.core.annotations.elementcollection.Customer</class>
+    <class>ee.jakarta.tck.persistence.core.annotations.elementcollection.CustomerXML</class>
+  </persistence-unit>
+</persistence>
+
diff --git a/jpa/spec-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/embeddable/persistence.xml b/jpa/spec-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/embeddable/persistence.xml
new file mode 100644
index 0000000000..6e3b7e5bd2
--- /dev/null
+++ b/jpa/spec-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/embeddable/persistence.xml
@@ -0,0 +1,44 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+
+    Copyright (c) 2018 Oracle and/or its affiliates. All rights reserved.
+
+    This program and the accompanying materials are made available under the
+    terms of the Eclipse Public License v. 2.0, which is available at
+    http://www.eclipse.org/legal/epl-2.0.
+
+    This Source Code may also be made available under the following Secondary
+    Licenses when the conditions for such availability set forth in the
+    Eclipse Public License v. 2.0 are satisfied: GNU General Public License,
+    version 2 with the GNU Classpath Exception, which is available at
+    https://www.gnu.org/software/classpath/license.html.
+
+    SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
+
+-->
+<persistence xmlns="https://jakarta.ee/xml/ns/persistence" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="https://jakarta.ee/xml/ns/persistence     https://jakarta.ee/xml/ns/persistence/persistence_3_0.xsd" version="3.0">
+  <persistence-unit name="CTS-EM" transaction-type="JTA">
+    <description>Persistence Unit for CTS Vehicle Tests</description>
+    <jta-data-source>jdbc/DB1</jta-data-source>
+    <class>ee.jakarta.tck.persistence.core.annotations.embeddable.Address</class>
+    <class>ee.jakarta.tck.persistence.core.annotations.embeddable.B</class>
+    <class>ee.jakarta.tck.persistence.core.annotations.embeddable.ZipCode</class>
+  </persistence-unit>
+  <persistence-unit name="CTS-EM2" transaction-type="JTA">
+    <description>Persistence Unit for CTS Vehicle Tests</description>
+    <jta-data-source>jdbc/DB1</jta-data-source>
+    <class>ee.jakarta.tck.persistence.core.annotations.embeddable.Address</class>
+    <class>ee.jakarta.tck.persistence.core.annotations.embeddable.B</class>
+    <class>ee.jakarta.tck.persistence.core.annotations.embeddable.ZipCode</class>
+  </persistence-unit>
+  <persistence-unit name="CTS-EM-NOTX" transaction-type="RESOURCE_LOCAL">
+    <description>The persistence.xml file may be used to designate
+                  more than one persistence unit within the same scope.
+                  Persistence Unit for Application Managed Resource Local</description>
+    <non-jta-data-source>jdbc/DB_no_tx</non-jta-data-source>
+    <class>ee.jakarta.tck.persistence.core.annotations.embeddable.Address</class>
+    <class>ee.jakarta.tck.persistence.core.annotations.embeddable.B</class>
+    <class>ee.jakarta.tck.persistence.core.annotations.embeddable.ZipCode</class>
+  </persistence-unit>
+</persistence>
+
diff --git a/jpa/spec-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/embeddableMapValue/persistence.xml b/jpa/spec-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/embeddableMapValue/persistence.xml
new file mode 100644
index 0000000000..6490ec1329
--- /dev/null
+++ b/jpa/spec-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/embeddableMapValue/persistence.xml
@@ -0,0 +1,41 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+
+    Copyright (c) 2018 Oracle and/or its affiliates. All rights reserved.
+
+    This program and the accompanying materials are made available under the
+    terms of the Eclipse Public License v. 2.0, which is available at
+    http://www.eclipse.org/legal/epl-2.0.
+
+    This Source Code may also be made available under the following Secondary
+    Licenses when the conditions for such availability set forth in the
+    Eclipse Public License v. 2.0 are satisfied: GNU General Public License,
+    version 2 with the GNU Classpath Exception, which is available at
+    https://www.gnu.org/software/classpath/license.html.
+
+    SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
+
+-->
+<persistence xmlns="https://jakarta.ee/xml/ns/persistence" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="https://jakarta.ee/xml/ns/persistence     https://jakarta.ee/xml/ns/persistence/persistence_3_0.xsd" version="3.0">
+  <persistence-unit name="CTS-EM" transaction-type="JTA">
+    <description>Persistence Unit for CTS Vehicle Tests</description>
+    <jta-data-source>jdbc/DB1</jta-data-source>
+    <class>ee.jakarta.tck.persistence.core.annotations.embeddableMapValue.Address</class>
+    <class>ee.jakarta.tck.persistence.core.annotations.embeddableMapValue.Employee</class>
+  </persistence-unit>
+  <persistence-unit name="CTS-EM2" transaction-type="JTA">
+    <description>Persistence Unit for CTS Vehicle Tests</description>
+    <jta-data-source>jdbc/DB1</jta-data-source>
+    <class>ee.jakarta.tck.persistence.core.annotations.embeddableMapValue.Address</class>
+    <class>ee.jakarta.tck.persistence.core.annotations.embeddableMapValue.Employee</class>
+  </persistence-unit>
+  <persistence-unit name="CTS-EM-NOTX" transaction-type="RESOURCE_LOCAL">
+    <description>The persistence.xml file may be used to designate
+                  more than one persistence unit within the same scope.
+                  Persistence Unit for Application Managed Resource Local</description>
+    <non-jta-data-source>jdbc/DB_no_tx</non-jta-data-source>
+    <class>ee.jakarta.tck.persistence.core.annotations.embeddableMapValue.Address</class>
+    <class>ee.jakarta.tck.persistence.core.annotations.embeddableMapValue.Employee</class>
+  </persistence-unit>
+</persistence>
+
diff --git a/jpa/spec-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/entity/persistence.xml b/jpa/spec-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/entity/persistence.xml
new file mode 100644
index 0000000000..36f73c9df1
--- /dev/null
+++ b/jpa/spec-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/entity/persistence.xml
@@ -0,0 +1,38 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+
+    Copyright (c) 2018 Oracle and/or its affiliates. All rights reserved.
+
+    This program and the accompanying materials are made available under the
+    terms of the Eclipse Public License v. 2.0, which is available at
+    http://www.eclipse.org/legal/epl-2.0.
+
+    This Source Code may also be made available under the following Secondary
+    Licenses when the conditions for such availability set forth in the
+    Eclipse Public License v. 2.0 are satisfied: GNU General Public License,
+    version 2 with the GNU Classpath Exception, which is available at
+    https://www.gnu.org/software/classpath/license.html.
+
+    SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
+
+-->
+<persistence xmlns="https://jakarta.ee/xml/ns/persistence" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="https://jakarta.ee/xml/ns/persistence     https://jakarta.ee/xml/ns/persistence/persistence_3_0.xsd" version="3.0">
+  <persistence-unit name="CTS-EM" transaction-type="JTA">
+    <description>Persistence Unit for CTS Vehicle Tests</description>
+    <jta-data-source>jdbc/DB1</jta-data-source>
+    <class>ee.jakarta.tck.persistence.core.annotations.entity.Coffee</class>
+  </persistence-unit>
+  <persistence-unit name="CTS-EM2" transaction-type="JTA">
+    <description>Persistence Unit for CTS Vehicle Tests</description>
+    <jta-data-source>jdbc/DB1</jta-data-source>
+    <class>ee.jakarta.tck.persistence.core.annotations.entity.Coffee</class>
+  </persistence-unit>
+  <persistence-unit name="CTS-EM-NOTX" transaction-type="RESOURCE_LOCAL">
+    <description>The persistence.xml file may be used to designate
+                  more than one persistence unit within the same scope.
+                  Persistence Unit for Application Managed Resource Local</description>
+    <non-jta-data-source>jdbc/DB_no_tx</non-jta-data-source>
+    <class>ee.jakarta.tck.persistence.core.annotations.entity.Coffee</class>
+  </persistence-unit>
+</persistence>
+
diff --git a/jpa/spec-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/id/persistence.xml b/jpa/spec-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/id/persistence.xml
new file mode 100644
index 0000000000..341570451e
--- /dev/null
+++ b/jpa/spec-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/id/persistence.xml
@@ -0,0 +1,77 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+
+    Copyright (c) 2018 Oracle and/or its affiliates. All rights reserved.
+
+    This program and the accompanying materials are made available under the
+    terms of the Eclipse Public License v. 2.0, which is available at
+    http://www.eclipse.org/legal/epl-2.0.
+
+    This Source Code may also be made available under the following Secondary
+    Licenses when the conditions for such availability set forth in the
+    Eclipse Public License v. 2.0 are satisfied: GNU General Public License,
+    version 2 with the GNU Classpath Exception, which is available at
+    https://www.gnu.org/software/classpath/license.html.
+
+    SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
+
+-->
+<persistence xmlns="https://jakarta.ee/xml/ns/persistence" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="https://jakarta.ee/xml/ns/persistence     https://jakarta.ee/xml/ns/persistence/persistence_3_0.xsd" version="3.0">
+  <persistence-unit name="CTS-EM" transaction-type="JTA">
+    <description>Persistence Unit for CTS Vehicle Tests</description>
+    <jta-data-source>jdbc/DB1</jta-data-source>
+    <class>ee.jakarta.tck.persistence.core.annotations.id.FieldBigDecimalId</class>
+    <class>ee.jakarta.tck.persistence.core.annotations.id.FieldBigIntegerId</class>
+    <class>ee.jakarta.tck.persistence.core.annotations.id.FieldIntId</class>
+    <class>ee.jakarta.tck.persistence.core.annotations.id.FieldIntegerId</class>
+    <class>ee.jakarta.tck.persistence.core.annotations.id.FieldSQLDateId</class>
+    <class>ee.jakarta.tck.persistence.core.annotations.id.FieldStringId</class>
+    <class>ee.jakarta.tck.persistence.core.annotations.id.FieldUtilDateId</class>
+    <class>ee.jakarta.tck.persistence.core.annotations.id.PropertyBigDecimalId</class>
+    <class>ee.jakarta.tck.persistence.core.annotations.id.PropertyBigIntegerId</class>
+    <class>ee.jakarta.tck.persistence.core.annotations.id.PropertyIntId</class>
+    <class>ee.jakarta.tck.persistence.core.annotations.id.PropertyIntegerId</class>
+    <class>ee.jakarta.tck.persistence.core.annotations.id.PropertySQLDateId</class>
+    <class>ee.jakarta.tck.persistence.core.annotations.id.PropertyStringId</class>
+    <class>ee.jakarta.tck.persistence.core.annotations.id.PropertyUtilDateId</class>
+  </persistence-unit>
+  <persistence-unit name="CTS-EM2" transaction-type="JTA">
+    <description>Persistence Unit for CTS Vehicle Tests</description>
+    <jta-data-source>jdbc/DB1</jta-data-source>
+    <class>ee.jakarta.tck.persistence.core.annotations.id.FieldBigDecimalId</class>
+    <class>ee.jakarta.tck.persistence.core.annotations.id.FieldBigIntegerId</class>
+    <class>ee.jakarta.tck.persistence.core.annotations.id.FieldIntId</class>
+    <class>ee.jakarta.tck.persistence.core.annotations.id.FieldIntegerId</class>
+    <class>ee.jakarta.tck.persistence.core.annotations.id.FieldSQLDateId</class>
+    <class>ee.jakarta.tck.persistence.core.annotations.id.FieldStringId</class>
+    <class>ee.jakarta.tck.persistence.core.annotations.id.FieldUtilDateId</class>
+    <class>ee.jakarta.tck.persistence.core.annotations.id.PropertyBigDecimalId</class>
+    <class>ee.jakarta.tck.persistence.core.annotations.id.PropertyBigIntegerId</class>
+    <class>ee.jakarta.tck.persistence.core.annotations.id.PropertyIntId</class>
+    <class>ee.jakarta.tck.persistence.core.annotations.id.PropertyIntegerId</class>
+    <class>ee.jakarta.tck.persistence.core.annotations.id.PropertySQLDateId</class>
+    <class>ee.jakarta.tck.persistence.core.annotations.id.PropertyStringId</class>
+    <class>ee.jakarta.tck.persistence.core.annotations.id.PropertyUtilDateId</class>
+  </persistence-unit>
+  <persistence-unit name="CTS-EM-NOTX" transaction-type="RESOURCE_LOCAL">
+    <description>The persistence.xml file may be used to designate
+                  more than one persistence unit within the same scope.
+                  Persistence Unit for Application Managed Resource Local</description>
+    <non-jta-data-source>jdbc/DB_no_tx</non-jta-data-source>
+    <class>ee.jakarta.tck.persistence.core.annotations.id.FieldBigDecimalId</class>
+    <class>ee.jakarta.tck.persistence.core.annotations.id.FieldBigIntegerId</class>
+    <class>ee.jakarta.tck.persistence.core.annotations.id.FieldIntId</class>
+    <class>ee.jakarta.tck.persistence.core.annotations.id.FieldIntegerId</class>
+    <class>ee.jakarta.tck.persistence.core.annotations.id.FieldSQLDateId</class>
+    <class>ee.jakarta.tck.persistence.core.annotations.id.FieldStringId</class>
+    <class>ee.jakarta.tck.persistence.core.annotations.id.FieldUtilDateId</class>
+    <class>ee.jakarta.tck.persistence.core.annotations.id.PropertyBigDecimalId</class>
+    <class>ee.jakarta.tck.persistence.core.annotations.id.PropertyBigIntegerId</class>
+    <class>ee.jakarta.tck.persistence.core.annotations.id.PropertyIntId</class>
+    <class>ee.jakarta.tck.persistence.core.annotations.id.PropertyIntegerId</class>
+    <class>ee.jakarta.tck.persistence.core.annotations.id.PropertySQLDateId</class>
+    <class>ee.jakarta.tck.persistence.core.annotations.id.PropertyStringId</class>
+    <class>ee.jakarta.tck.persistence.core.annotations.id.PropertyUtilDateId</class>
+  </persistence-unit>
+</persistence>
+
diff --git a/jpa/spec-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/lob/persistence.xml b/jpa/spec-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/lob/persistence.xml
new file mode 100644
index 0000000000..d83f11701e
--- /dev/null
+++ b/jpa/spec-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/lob/persistence.xml
@@ -0,0 +1,38 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+
+    Copyright (c) 2018 Oracle and/or its affiliates. All rights reserved.
+
+    This program and the accompanying materials are made available under the
+    terms of the Eclipse Public License v. 2.0, which is available at
+    http://www.eclipse.org/legal/epl-2.0.
+
+    This Source Code may also be made available under the following Secondary
+    Licenses when the conditions for such availability set forth in the
+    Eclipse Public License v. 2.0 are satisfied: GNU General Public License,
+    version 2 with the GNU Classpath Exception, which is available at
+    https://www.gnu.org/software/classpath/license.html.
+
+    SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
+
+-->
+<persistence xmlns="https://jakarta.ee/xml/ns/persistence" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="https://jakarta.ee/xml/ns/persistence     https://jakarta.ee/xml/ns/persistence/persistence_3_0.xsd" version="3.0">
+  <persistence-unit name="CTS-EM" transaction-type="JTA">
+    <description>Persistence Unit for CTS Vehicle Tests</description>
+    <jta-data-source>jdbc/DB1</jta-data-source>
+    <class>ee.jakarta.tck.persistence.core.annotations.lob.DataTypes</class>
+  </persistence-unit>
+  <persistence-unit name="CTS-EM2" transaction-type="JTA">
+    <description>Persistence Unit for CTS Vehicle Tests</description>
+    <jta-data-source>jdbc/DB1</jta-data-source>
+    <class>ee.jakarta.tck.persistence.core.annotations.lob.DataTypes</class>
+  </persistence-unit>
+  <persistence-unit name="CTS-EM-NOTX" transaction-type="RESOURCE_LOCAL">
+    <description>The persistence.xml file may be used to designate
+                  more than one persistence unit within the same scope.
+                  Persistence Unit for Application Managed Resource Local</description>
+    <non-jta-data-source>jdbc/DB_no_tx</non-jta-data-source>
+    <class>ee.jakarta.tck.persistence.core.annotations.lob.DataTypes</class>
+  </persistence-unit>
+</persistence>
+
diff --git a/jpa/spec-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/mapkey/persistence.xml b/jpa/spec-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/mapkey/persistence.xml
new file mode 100644
index 0000000000..fecbf34f56
--- /dev/null
+++ b/jpa/spec-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/mapkey/persistence.xml
@@ -0,0 +1,50 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+
+    Copyright (c) 2018 Oracle and/or its affiliates. All rights reserved.
+
+    This program and the accompanying materials are made available under the
+    terms of the Eclipse Public License v. 2.0, which is available at
+    http://www.eclipse.org/legal/epl-2.0.
+
+    This Source Code may also be made available under the following Secondary
+    Licenses when the conditions for such availability set forth in the
+    Eclipse Public License v. 2.0 are satisfied: GNU General Public License,
+    version 2 with the GNU Classpath Exception, which is available at
+    https://www.gnu.org/software/classpath/license.html.
+
+    SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
+
+-->
+<persistence xmlns="https://jakarta.ee/xml/ns/persistence" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="https://jakarta.ee/xml/ns/persistence     https://jakarta.ee/xml/ns/persistence/persistence_3_0.xsd" version="3.0">
+  <persistence-unit name="CTS-EM" transaction-type="JTA">
+    <description>Persistence Unit for CTS Vehicle Tests</description>
+    <jta-data-source>jdbc/DB1</jta-data-source>
+    <class>ee.jakarta.tck.persistence.core.annotations.mapkey.Department</class>
+    <class>ee.jakarta.tck.persistence.core.annotations.mapkey.Employee</class>
+    <class>ee.jakarta.tck.persistence.core.annotations.mapkey.Employee2</class>
+    <class>ee.jakarta.tck.persistence.core.annotations.mapkey.Employee3</class>
+    <class>ee.jakarta.tck.persistence.core.annotations.mapkey.Employee4</class>
+  </persistence-unit>
+  <persistence-unit name="CTS-EM2" transaction-type="JTA">
+    <description>Persistence Unit for CTS Vehicle Tests</description>
+    <jta-data-source>jdbc/DB1</jta-data-source>
+    <class>ee.jakarta.tck.persistence.core.annotations.mapkey.Department</class>
+    <class>ee.jakarta.tck.persistence.core.annotations.mapkey.Employee</class>
+    <class>ee.jakarta.tck.persistence.core.annotations.mapkey.Employee2</class>
+    <class>ee.jakarta.tck.persistence.core.annotations.mapkey.Employee3</class>
+    <class>ee.jakarta.tck.persistence.core.annotations.mapkey.Employee4</class>
+  </persistence-unit>
+  <persistence-unit name="CTS-EM-NOTX" transaction-type="RESOURCE_LOCAL">
+    <description>The persistence.xml file may be used to designate
+                  more than one persistence unit within the same scope.
+                  Persistence Unit for Application Managed Resource Local</description>
+    <non-jta-data-source>jdbc/DB_no_tx</non-jta-data-source>
+    <class>ee.jakarta.tck.persistence.core.annotations.mapkey.Department</class>
+    <class>ee.jakarta.tck.persistence.core.annotations.mapkey.Employee</class>
+    <class>ee.jakarta.tck.persistence.core.annotations.mapkey.Employee2</class>
+    <class>ee.jakarta.tck.persistence.core.annotations.mapkey.Employee3</class>
+    <class>ee.jakarta.tck.persistence.core.annotations.mapkey.Employee4</class>
+  </persistence-unit>
+</persistence>
+
diff --git a/jpa/spec-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/mapkeyclass/persistence.xml b/jpa/spec-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/mapkeyclass/persistence.xml
new file mode 100644
index 0000000000..3e88fd67b4
--- /dev/null
+++ b/jpa/spec-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/mapkeyclass/persistence.xml
@@ -0,0 +1,44 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+
+    Copyright (c) 2018 Oracle and/or its affiliates. All rights reserved.
+
+    This program and the accompanying materials are made available under the
+    terms of the Eclipse Public License v. 2.0, which is available at
+    http://www.eclipse.org/legal/epl-2.0.
+
+    This Source Code may also be made available under the following Secondary
+    Licenses when the conditions for such availability set forth in the
+    Eclipse Public License v. 2.0 are satisfied: GNU General Public License,
+    version 2 with the GNU Classpath Exception, which is available at
+    https://www.gnu.org/software/classpath/license.html.
+
+    SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
+
+-->
+<persistence xmlns="https://jakarta.ee/xml/ns/persistence" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="https://jakarta.ee/xml/ns/persistence     https://jakarta.ee/xml/ns/persistence/persistence_3_0.xsd" version="3.0">
+  <persistence-unit name="CTS-EM" transaction-type="JTA">
+    <description>Persistence Unit for CTS Vehicle Tests</description>
+    <jta-data-source>jdbc/DB1</jta-data-source>
+    <class>ee.jakarta.tck.persistence.core.annotations.mapkeyclass.Course</class>
+    <class>ee.jakarta.tck.persistence.core.annotations.mapkeyclass.Semester</class>
+    <class>ee.jakarta.tck.persistence.core.annotations.mapkeyclass.Student</class>
+  </persistence-unit>
+  <persistence-unit name="CTS-EM2" transaction-type="JTA">
+    <description>Persistence Unit for CTS Vehicle Tests</description>
+    <jta-data-source>jdbc/DB1</jta-data-source>
+    <class>ee.jakarta.tck.persistence.core.annotations.mapkeyclass.Course</class>
+    <class>ee.jakarta.tck.persistence.core.annotations.mapkeyclass.Semester</class>
+    <class>ee.jakarta.tck.persistence.core.annotations.mapkeyclass.Student</class>
+  </persistence-unit>
+  <persistence-unit name="CTS-EM-NOTX" transaction-type="RESOURCE_LOCAL">
+    <description>The persistence.xml file may be used to designate
+                  more than one persistence unit within the same scope.
+                  Persistence Unit for Application Managed Resource Local</description>
+    <non-jta-data-source>jdbc/DB_no_tx</non-jta-data-source>
+    <class>ee.jakarta.tck.persistence.core.annotations.mapkeyclass.Course</class>
+    <class>ee.jakarta.tck.persistence.core.annotations.mapkeyclass.Semester</class>
+    <class>ee.jakarta.tck.persistence.core.annotations.mapkeyclass.Student</class>
+  </persistence-unit>
+</persistence>
+
diff --git a/jpa/spec-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/mapkeycolumn/persistence.xml b/jpa/spec-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/mapkeycolumn/persistence.xml
new file mode 100644
index 0000000000..09ab5dd24a
--- /dev/null
+++ b/jpa/spec-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/mapkeycolumn/persistence.xml
@@ -0,0 +1,44 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+
+    Copyright (c) 2018 Oracle and/or its affiliates. All rights reserved.
+
+    This program and the accompanying materials are made available under the
+    terms of the Eclipse Public License v. 2.0, which is available at
+    http://www.eclipse.org/legal/epl-2.0.
+
+    This Source Code may also be made available under the following Secondary
+    Licenses when the conditions for such availability set forth in the
+    Eclipse Public License v. 2.0 are satisfied: GNU General Public License,
+    version 2 with the GNU Classpath Exception, which is available at
+    https://www.gnu.org/software/classpath/license.html.
+
+    SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
+
+-->
+<persistence xmlns="https://jakarta.ee/xml/ns/persistence" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="https://jakarta.ee/xml/ns/persistence     https://jakarta.ee/xml/ns/persistence/persistence_3_0.xsd" version="3.0">
+  <persistence-unit name="CTS-EM" transaction-type="JTA">
+    <description>Persistence Unit for CTS Vehicle Tests</description>
+    <jta-data-source>jdbc/DB1</jta-data-source>
+    <class>ee.jakarta.tck.persistence.core.annotations.mapkeycolumn.Department</class>
+    <class>ee.jakarta.tck.persistence.core.annotations.mapkeycolumn.Department2</class>
+    <class>ee.jakarta.tck.persistence.core.annotations.mapkeycolumn.Employee</class>
+  </persistence-unit>
+  <persistence-unit name="CTS-EM2" transaction-type="JTA">
+    <description>Persistence Unit for CTS Vehicle Tests</description>
+    <jta-data-source>jdbc/DB1</jta-data-source>
+    <class>ee.jakarta.tck.persistence.core.annotations.mapkeycolumn.Department</class>
+    <class>ee.jakarta.tck.persistence.core.annotations.mapkeycolumn.Department2</class>
+    <class>ee.jakarta.tck.persistence.core.annotations.mapkeycolumn.Employee</class>
+  </persistence-unit>
+  <persistence-unit name="CTS-EM-NOTX" transaction-type="RESOURCE_LOCAL">
+    <description>The persistence.xml file may be used to designate
+                  more than one persistence unit within the same scope.
+                  Persistence Unit for Application Managed Resource Local</description>
+    <non-jta-data-source>jdbc/DB_no_tx</non-jta-data-source>
+    <class>ee.jakarta.tck.persistence.core.annotations.mapkeycolumn.Department</class>
+    <class>ee.jakarta.tck.persistence.core.annotations.mapkeycolumn.Department2</class>
+    <class>ee.jakarta.tck.persistence.core.annotations.mapkeycolumn.Employee</class>
+  </persistence-unit>
+</persistence>
+
diff --git a/jpa/spec-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/mapkeyenumerated/persistence.xml b/jpa/spec-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/mapkeyenumerated/persistence.xml
new file mode 100644
index 0000000000..c7c3046bef
--- /dev/null
+++ b/jpa/spec-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/mapkeyenumerated/persistence.xml
@@ -0,0 +1,68 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+
+    Copyright (c) 2018 Oracle and/or its affiliates. All rights reserved.
+
+    This program and the accompanying materials are made available under the
+    terms of the Eclipse Public License v. 2.0, which is available at
+    http://www.eclipse.org/legal/epl-2.0.
+
+    This Source Code may also be made available under the following Secondary
+    Licenses when the conditions for such availability set forth in the
+    Eclipse Public License v. 2.0 are satisfied: GNU General Public License,
+    version 2 with the GNU Classpath Exception, which is available at
+    https://www.gnu.org/software/classpath/license.html.
+
+    SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
+
+-->
+<persistence xmlns="https://jakarta.ee/xml/ns/persistence" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="https://jakarta.ee/xml/ns/persistence     https://jakarta.ee/xml/ns/persistence/persistence_3_0.xsd" version="3.0">
+  <persistence-unit name="CTS-EM" transaction-type="JTA">
+    <description>Persistence Unit for CTS Vehicle Tests</description>
+    <jta-data-source>jdbc/DB1</jta-data-source>
+    <class>ee.jakarta.tck.persistence.core.annotations.mapkeyenumerated.Department</class>
+    <class>ee.jakarta.tck.persistence.core.annotations.mapkeyenumerated.Department2</class>
+    <class>ee.jakarta.tck.persistence.core.annotations.mapkeyenumerated.Department3</class>
+    <class>ee.jakarta.tck.persistence.core.annotations.mapkeyenumerated.Department4</class>
+    <class>ee.jakarta.tck.persistence.core.annotations.mapkeyenumerated.EmbeddedEmployee</class>
+    <class>ee.jakarta.tck.persistence.core.annotations.mapkeyenumerated.Employee</class>
+    <class>ee.jakarta.tck.persistence.core.annotations.mapkeyenumerated.Employee2</class>
+    <class>ee.jakarta.tck.persistence.core.annotations.mapkeyenumerated.Employee3</class>
+    <class>ee.jakarta.tck.persistence.core.annotations.mapkeyenumerated.Employee4</class>
+    <class>ee.jakarta.tck.persistence.core.annotations.mapkeyenumerated.Numbers</class>
+    <class>ee.jakarta.tck.persistence.core.annotations.mapkeyenumerated.Offices</class>
+  </persistence-unit>
+  <persistence-unit name="CTS-EM2" transaction-type="JTA">
+    <description>Persistence Unit for CTS Vehicle Tests</description>
+    <jta-data-source>jdbc/DB1</jta-data-source>
+    <class>ee.jakarta.tck.persistence.core.annotations.mapkeyenumerated.Department</class>
+    <class>ee.jakarta.tck.persistence.core.annotations.mapkeyenumerated.Department2</class>
+    <class>ee.jakarta.tck.persistence.core.annotations.mapkeyenumerated.Department3</class>
+    <class>ee.jakarta.tck.persistence.core.annotations.mapkeyenumerated.Department4</class>
+    <class>ee.jakarta.tck.persistence.core.annotations.mapkeyenumerated.EmbeddedEmployee</class>
+    <class>ee.jakarta.tck.persistence.core.annotations.mapkeyenumerated.Employee</class>
+    <class>ee.jakarta.tck.persistence.core.annotations.mapkeyenumerated.Employee2</class>
+    <class>ee.jakarta.tck.persistence.core.annotations.mapkeyenumerated.Employee3</class>
+    <class>ee.jakarta.tck.persistence.core.annotations.mapkeyenumerated.Employee4</class>
+    <class>ee.jakarta.tck.persistence.core.annotations.mapkeyenumerated.Numbers</class>
+    <class>ee.jakarta.tck.persistence.core.annotations.mapkeyenumerated.Offices</class>
+  </persistence-unit>
+  <persistence-unit name="CTS-EM-NOTX" transaction-type="RESOURCE_LOCAL">
+    <description>The persistence.xml file may be used to designate
+                  more than one persistence unit within the same scope.
+                  Persistence Unit for Application Managed Resource Local</description>
+    <non-jta-data-source>jdbc/DB_no_tx</non-jta-data-source>
+    <class>ee.jakarta.tck.persistence.core.annotations.mapkeyenumerated.Department</class>
+    <class>ee.jakarta.tck.persistence.core.annotations.mapkeyenumerated.Department2</class>
+    <class>ee.jakarta.tck.persistence.core.annotations.mapkeyenumerated.Department3</class>
+    <class>ee.jakarta.tck.persistence.core.annotations.mapkeyenumerated.Department4</class>
+    <class>ee.jakarta.tck.persistence.core.annotations.mapkeyenumerated.EmbeddedEmployee</class>
+    <class>ee.jakarta.tck.persistence.core.annotations.mapkeyenumerated.Employee</class>
+    <class>ee.jakarta.tck.persistence.core.annotations.mapkeyenumerated.Employee2</class>
+    <class>ee.jakarta.tck.persistence.core.annotations.mapkeyenumerated.Employee3</class>
+    <class>ee.jakarta.tck.persistence.core.annotations.mapkeyenumerated.Employee4</class>
+    <class>ee.jakarta.tck.persistence.core.annotations.mapkeyenumerated.Numbers</class>
+    <class>ee.jakarta.tck.persistence.core.annotations.mapkeyenumerated.Offices</class>
+  </persistence-unit>
+</persistence>
+
diff --git a/jpa/spec-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/mapkeyjoincolumn/persistence.xml b/jpa/spec-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/mapkeyjoincolumn/persistence.xml
new file mode 100644
index 0000000000..1f76c61c85
--- /dev/null
+++ b/jpa/spec-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/mapkeyjoincolumn/persistence.xml
@@ -0,0 +1,44 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+
+    Copyright (c) 2018 Oracle and/or its affiliates. All rights reserved.
+
+    This program and the accompanying materials are made available under the
+    terms of the Eclipse Public License v. 2.0, which is available at
+    http://www.eclipse.org/legal/epl-2.0.
+
+    This Source Code may also be made available under the following Secondary
+    Licenses when the conditions for such availability set forth in the
+    Eclipse Public License v. 2.0 are satisfied: GNU General Public License,
+    version 2 with the GNU Classpath Exception, which is available at
+    https://www.gnu.org/software/classpath/license.html.
+
+    SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
+
+-->
+<persistence xmlns="https://jakarta.ee/xml/ns/persistence" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="https://jakarta.ee/xml/ns/persistence     https://jakarta.ee/xml/ns/persistence/persistence_3_0.xsd" version="3.0">
+  <persistence-unit name="CTS-EM" transaction-type="JTA">
+    <description>Persistence Unit for CTS Vehicle Tests</description>
+    <jta-data-source>jdbc/DB1</jta-data-source>
+    <class>ee.jakarta.tck.persistence.core.annotations.mapkeyjoincolumn.Course</class>
+    <class>ee.jakarta.tck.persistence.core.annotations.mapkeyjoincolumn.Semester</class>
+    <class>ee.jakarta.tck.persistence.core.annotations.mapkeyjoincolumn.Student</class>
+  </persistence-unit>
+  <persistence-unit name="CTS-EM2" transaction-type="JTA">
+    <description>Persistence Unit for CTS Vehicle Tests</description>
+    <jta-data-source>jdbc/DB1</jta-data-source>
+    <class>ee.jakarta.tck.persistence.core.annotations.mapkeyjoincolumn.Course</class>
+    <class>ee.jakarta.tck.persistence.core.annotations.mapkeyjoincolumn.Semester</class>
+    <class>ee.jakarta.tck.persistence.core.annotations.mapkeyjoincolumn.Student</class>
+  </persistence-unit>
+  <persistence-unit name="CTS-EM-NOTX" transaction-type="RESOURCE_LOCAL">
+    <description>The persistence.xml file may be used to designate
+                  more than one persistence unit within the same scope.
+                  Persistence Unit for Application Managed Resource Local</description>
+    <non-jta-data-source>jdbc/DB_no_tx</non-jta-data-source>
+    <class>ee.jakarta.tck.persistence.core.annotations.mapkeyjoincolumn.Course</class>
+    <class>ee.jakarta.tck.persistence.core.annotations.mapkeyjoincolumn.Semester</class>
+    <class>ee.jakarta.tck.persistence.core.annotations.mapkeyjoincolumn.Student</class>
+  </persistence-unit>
+</persistence>
+
diff --git a/jpa/spec-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/mapkeytemporal/persistence.xml b/jpa/spec-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/mapkeytemporal/persistence.xml
new file mode 100644
index 0000000000..ec3095ab66
--- /dev/null
+++ b/jpa/spec-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/mapkeytemporal/persistence.xml
@@ -0,0 +1,56 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+
+    Copyright (c) 2018 Oracle and/or its affiliates. All rights reserved.
+
+    This program and the accompanying materials are made available under the
+    terms of the Eclipse Public License v. 2.0, which is available at
+    http://www.eclipse.org/legal/epl-2.0.
+
+    This Source Code may also be made available under the following Secondary
+    Licenses when the conditions for such availability set forth in the
+    Eclipse Public License v. 2.0 are satisfied: GNU General Public License,
+    version 2 with the GNU Classpath Exception, which is available at
+    https://www.gnu.org/software/classpath/license.html.
+
+    SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
+
+-->
+<persistence xmlns="https://jakarta.ee/xml/ns/persistence" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="https://jakarta.ee/xml/ns/persistence     https://jakarta.ee/xml/ns/persistence/persistence_3_0.xsd" version="3.0">
+  <persistence-unit name="CTS-EM" transaction-type="JTA">
+    <description>Persistence Unit for CTS Vehicle Tests</description>
+    <jta-data-source>jdbc/DB1</jta-data-source>
+    <class>ee.jakarta.tck.persistence.core.annotations.mapkeytemporal.Department</class>
+    <class>ee.jakarta.tck.persistence.core.annotations.mapkeytemporal.Department2</class>
+    <class>ee.jakarta.tck.persistence.core.annotations.mapkeytemporal.Department4</class>
+    <class>ee.jakarta.tck.persistence.core.annotations.mapkeytemporal.EmbeddedEmployee</class>
+    <class>ee.jakarta.tck.persistence.core.annotations.mapkeytemporal.Employee</class>
+    <class>ee.jakarta.tck.persistence.core.annotations.mapkeytemporal.Employee2</class>
+    <class>ee.jakarta.tck.persistence.core.annotations.mapkeytemporal.Employee4</class>
+  </persistence-unit>
+  <persistence-unit name="CTS-EM2" transaction-type="JTA">
+    <description>Persistence Unit for CTS Vehicle Tests</description>
+    <jta-data-source>jdbc/DB1</jta-data-source>
+    <class>ee.jakarta.tck.persistence.core.annotations.mapkeytemporal.Department</class>
+    <class>ee.jakarta.tck.persistence.core.annotations.mapkeytemporal.Department2</class>
+    <class>ee.jakarta.tck.persistence.core.annotations.mapkeytemporal.Department4</class>
+    <class>ee.jakarta.tck.persistence.core.annotations.mapkeytemporal.EmbeddedEmployee</class>
+    <class>ee.jakarta.tck.persistence.core.annotations.mapkeytemporal.Employee</class>
+    <class>ee.jakarta.tck.persistence.core.annotations.mapkeytemporal.Employee2</class>
+    <class>ee.jakarta.tck.persistence.core.annotations.mapkeytemporal.Employee4</class>
+  </persistence-unit>
+  <persistence-unit name="CTS-EM-NOTX" transaction-type="RESOURCE_LOCAL">
+    <description>The persistence.xml file may be used to designate
+                  more than one persistence unit within the same scope.
+                  Persistence Unit for Application Managed Resource Local</description>
+    <non-jta-data-source>jdbc/DB_no_tx</non-jta-data-source>
+    <class>ee.jakarta.tck.persistence.core.annotations.mapkeytemporal.Department</class>
+    <class>ee.jakarta.tck.persistence.core.annotations.mapkeytemporal.Department2</class>
+    <class>ee.jakarta.tck.persistence.core.annotations.mapkeytemporal.Department4</class>
+    <class>ee.jakarta.tck.persistence.core.annotations.mapkeytemporal.EmbeddedEmployee</class>
+    <class>ee.jakarta.tck.persistence.core.annotations.mapkeytemporal.Employee</class>
+    <class>ee.jakarta.tck.persistence.core.annotations.mapkeytemporal.Employee2</class>
+    <class>ee.jakarta.tck.persistence.core.annotations.mapkeytemporal.Employee4</class>
+  </persistence-unit>
+</persistence>
+
diff --git a/jpa/spec-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/mapsid/persistence.xml b/jpa/spec-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/mapsid/persistence.xml
new file mode 100644
index 0000000000..5823d61291
--- /dev/null
+++ b/jpa/spec-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/mapsid/persistence.xml
@@ -0,0 +1,44 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+
+    Copyright (c) 2018 Oracle and/or its affiliates. All rights reserved.
+
+    This program and the accompanying materials are made available under the
+    terms of the Eclipse Public License v. 2.0, which is available at
+    http://www.eclipse.org/legal/epl-2.0.
+
+    This Source Code may also be made available under the following Secondary
+    Licenses when the conditions for such availability set forth in the
+    Eclipse Public License v. 2.0 are satisfied: GNU General Public License,
+    version 2 with the GNU Classpath Exception, which is available at
+    https://www.gnu.org/software/classpath/license.html.
+
+    SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
+
+-->
+<persistence xmlns="https://jakarta.ee/xml/ns/persistence" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="https://jakarta.ee/xml/ns/persistence     https://jakarta.ee/xml/ns/persistence/persistence_3_0.xsd" version="3.0">
+  <persistence-unit name="CTS-EM" transaction-type="JTA">
+    <description>Persistence Unit for CTS Vehicle Tests</description>
+    <jta-data-source>jdbc/DB1</jta-data-source>
+    <class>ee.jakarta.tck.persistence.core.annotations.mapsid.DID1bDependent</class>
+    <class>ee.jakarta.tck.persistence.core.annotations.mapsid.DID1bDependentId</class>
+    <class>ee.jakarta.tck.persistence.core.annotations.mapsid.DID1bEmployee</class>
+  </persistence-unit>
+  <persistence-unit name="CTS-EM2" transaction-type="JTA">
+    <description>Persistence Unit for CTS Vehicle Tests</description>
+    <jta-data-source>jdbc/DB1</jta-data-source>
+    <class>ee.jakarta.tck.persistence.core.annotations.mapsid.DID1bDependent</class>
+    <class>ee.jakarta.tck.persistence.core.annotations.mapsid.DID1bDependentId</class>
+    <class>ee.jakarta.tck.persistence.core.annotations.mapsid.DID1bEmployee</class>
+  </persistence-unit>
+  <persistence-unit name="CTS-EM-NOTX" transaction-type="RESOURCE_LOCAL">
+    <description>The persistence.xml file may be used to designate
+                  more than one persistence unit within the same scope.
+                  Persistence Unit for Application Managed Resource Local</description>
+    <non-jta-data-source>jdbc/DB_no_tx</non-jta-data-source>
+    <class>ee.jakarta.tck.persistence.core.annotations.mapsid.DID1bDependent</class>
+    <class>ee.jakarta.tck.persistence.core.annotations.mapsid.DID1bDependentId</class>
+    <class>ee.jakarta.tck.persistence.core.annotations.mapsid.DID1bEmployee</class>
+  </persistence-unit>
+</persistence>
+
diff --git a/jpa/spec-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/nativequery/persistence.xml b/jpa/spec-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/nativequery/persistence.xml
new file mode 100644
index 0000000000..6942ccc9c4
--- /dev/null
+++ b/jpa/spec-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/nativequery/persistence.xml
@@ -0,0 +1,47 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+
+    Copyright (c) 2018 Oracle and/or its affiliates. All rights reserved.
+
+    This program and the accompanying materials are made available under the
+    terms of the Eclipse Public License v. 2.0, which is available at
+    http://www.eclipse.org/legal/epl-2.0.
+
+    This Source Code may also be made available under the following Secondary
+    Licenses when the conditions for such availability set forth in the
+    Eclipse Public License v. 2.0 are satisfied: GNU General Public License,
+    version 2 with the GNU Classpath Exception, which is available at
+    https://www.gnu.org/software/classpath/license.html.
+
+    SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
+
+-->
+<persistence xmlns="https://jakarta.ee/xml/ns/persistence" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="https://jakarta.ee/xml/ns/persistence     https://jakarta.ee/xml/ns/persistence/persistence_3_0.xsd" version="3.0">
+  <persistence-unit name="CTS-EM" transaction-type="JTA">
+    <description>Persistence Unit for CTS Vehicle Tests</description>
+    <jta-data-source>jdbc/DB1</jta-data-source>
+    <class>ee.jakarta.tck.persistence.core.annotations.nativequery.Item</class>
+    <class>ee.jakarta.tck.persistence.core.annotations.nativequery.Order1</class>
+    <class>ee.jakarta.tck.persistence.core.annotations.nativequery.Order2</class>
+    <class>ee.jakarta.tck.persistence.core.annotations.nativequery.PurchaseOrder</class>
+  </persistence-unit>
+  <persistence-unit name="CTS-EM2" transaction-type="JTA">
+    <description>Persistence Unit for CTS Vehicle Tests</description>
+    <jta-data-source>jdbc/DB1</jta-data-source>
+    <class>ee.jakarta.tck.persistence.core.annotations.nativequery.Item</class>
+    <class>ee.jakarta.tck.persistence.core.annotations.nativequery.Order1</class>
+    <class>ee.jakarta.tck.persistence.core.annotations.nativequery.Order2</class>
+    <class>ee.jakarta.tck.persistence.core.annotations.nativequery.PurchaseOrder</class>
+  </persistence-unit>
+  <persistence-unit name="CTS-EM-NOTX" transaction-type="RESOURCE_LOCAL">
+    <description>The persistence.xml file may be used to designate
+                  more than one persistence unit within the same scope.
+                  Persistence Unit for Application Managed Resource Local</description>
+    <non-jta-data-source>jdbc/DB_no_tx</non-jta-data-source>
+    <class>ee.jakarta.tck.persistence.core.annotations.nativequery.Item</class>
+    <class>ee.jakarta.tck.persistence.core.annotations.nativequery.Order1</class>
+    <class>ee.jakarta.tck.persistence.core.annotations.nativequery.Order2</class>
+    <class>ee.jakarta.tck.persistence.core.annotations.nativequery.PurchaseOrder</class>
+  </persistence-unit>
+</persistence>
+
diff --git a/jpa/spec-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/onexmanyuni/persistence.xml b/jpa/spec-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/onexmanyuni/persistence.xml
new file mode 100644
index 0000000000..8870bb58ad
--- /dev/null
+++ b/jpa/spec-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/onexmanyuni/persistence.xml
@@ -0,0 +1,41 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+
+    Copyright (c) 2018 Oracle and/or its affiliates. All rights reserved.
+
+    This program and the accompanying materials are made available under the
+    terms of the Eclipse Public License v. 2.0, which is available at
+    http://www.eclipse.org/legal/epl-2.0.
+
+    This Source Code may also be made available under the following Secondary
+    Licenses when the conditions for such availability set forth in the
+    Eclipse Public License v. 2.0 are satisfied: GNU General Public License,
+    version 2 with the GNU Classpath Exception, which is available at
+    https://www.gnu.org/software/classpath/license.html.
+
+    SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
+
+-->
+<persistence xmlns="https://jakarta.ee/xml/ns/persistence" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="https://jakarta.ee/xml/ns/persistence     https://jakarta.ee/xml/ns/persistence/persistence_3_0.xsd" version="3.0">
+  <persistence-unit name="CTS-EM" transaction-type="JTA">
+    <description>Persistence Unit for CTS Vehicle Tests</description>
+    <jta-data-source>jdbc/DB1</jta-data-source>
+    <class>ee.jakarta.tck.persistence.core.annotations.onexmanyuni.Customer1</class>
+    <class>ee.jakarta.tck.persistence.core.annotations.onexmanyuni.RetailOrder2</class>
+  </persistence-unit>
+  <persistence-unit name="CTS-EM2" transaction-type="JTA">
+    <description>Persistence Unit for CTS Vehicle Tests</description>
+    <jta-data-source>jdbc/DB1</jta-data-source>
+    <class>ee.jakarta.tck.persistence.core.annotations.onexmanyuni.Customer1</class>
+    <class>ee.jakarta.tck.persistence.core.annotations.onexmanyuni.RetailOrder2</class>
+  </persistence-unit>
+  <persistence-unit name="CTS-EM-NOTX" transaction-type="RESOURCE_LOCAL">
+    <description>The persistence.xml file may be used to designate
+                  more than one persistence unit within the same scope.
+                  Persistence Unit for Application Managed Resource Local</description>
+    <non-jta-data-source>jdbc/DB_no_tx</non-jta-data-source>
+    <class>ee.jakarta.tck.persistence.core.annotations.onexmanyuni.Customer1</class>
+    <class>ee.jakarta.tck.persistence.core.annotations.onexmanyuni.RetailOrder2</class>
+  </persistence-unit>
+</persistence>
+
diff --git a/jpa/spec-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/orderby/persistence.xml b/jpa/spec-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/orderby/persistence.xml
new file mode 100644
index 0000000000..f425628738
--- /dev/null
+++ b/jpa/spec-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/orderby/persistence.xml
@@ -0,0 +1,68 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+
+    Copyright (c) 2018 Oracle and/or its affiliates. All rights reserved.
+
+    This program and the accompanying materials are made available under the
+    terms of the Eclipse Public License v. 2.0, which is available at
+    http://www.eclipse.org/legal/epl-2.0.
+
+    This Source Code may also be made available under the following Secondary
+    Licenses when the conditions for such availability set forth in the
+    Eclipse Public License v. 2.0 are satisfied: GNU General Public License,
+    version 2 with the GNU Classpath Exception, which is available at
+    https://www.gnu.org/software/classpath/license.html.
+
+    SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
+
+-->
+<persistence xmlns="https://jakarta.ee/xml/ns/persistence" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="https://jakarta.ee/xml/ns/persistence     https://jakarta.ee/xml/ns/persistence/persistence_3_0.xsd" version="3.0">
+  <persistence-unit name="CTS-EM" transaction-type="JTA">
+    <description>Persistence Unit for CTS Vehicle Tests</description>
+    <jta-data-source>jdbc/DB1</jta-data-source>
+    <class>ee.jakarta.tck.persistence.core.annotations.orderby.A</class>
+    <class>ee.jakarta.tck.persistence.core.annotations.orderby.A2</class>
+    <class>ee.jakarta.tck.persistence.core.annotations.orderby.Address</class>
+    <class>ee.jakarta.tck.persistence.core.annotations.orderby.Address2</class>
+    <class>ee.jakarta.tck.persistence.core.annotations.orderby.Customer</class>
+    <class>ee.jakarta.tck.persistence.core.annotations.orderby.Customer2</class>
+    <class>ee.jakarta.tck.persistence.core.annotations.orderby.Department</class>
+    <class>ee.jakarta.tck.persistence.core.annotations.orderby.Employee</class>
+    <class>ee.jakarta.tck.persistence.core.annotations.orderby.Insurance</class>
+    <class>ee.jakarta.tck.persistence.core.annotations.orderby.ZipCode</class>
+    <class>ee.jakarta.tck.persistence.core.annotations.orderby.ZipCode2</class>
+  </persistence-unit>
+  <persistence-unit name="CTS-EM2" transaction-type="JTA">
+    <description>Persistence Unit for CTS Vehicle Tests</description>
+    <jta-data-source>jdbc/DB1</jta-data-source>
+    <class>ee.jakarta.tck.persistence.core.annotations.orderby.A</class>
+    <class>ee.jakarta.tck.persistence.core.annotations.orderby.A2</class>
+    <class>ee.jakarta.tck.persistence.core.annotations.orderby.Address</class>
+    <class>ee.jakarta.tck.persistence.core.annotations.orderby.Address2</class>
+    <class>ee.jakarta.tck.persistence.core.annotations.orderby.Customer</class>
+    <class>ee.jakarta.tck.persistence.core.annotations.orderby.Customer2</class>
+    <class>ee.jakarta.tck.persistence.core.annotations.orderby.Department</class>
+    <class>ee.jakarta.tck.persistence.core.annotations.orderby.Employee</class>
+    <class>ee.jakarta.tck.persistence.core.annotations.orderby.Insurance</class>
+    <class>ee.jakarta.tck.persistence.core.annotations.orderby.ZipCode</class>
+    <class>ee.jakarta.tck.persistence.core.annotations.orderby.ZipCode2</class>
+  </persistence-unit>
+  <persistence-unit name="CTS-EM-NOTX" transaction-type="RESOURCE_LOCAL">
+    <description>The persistence.xml file may be used to designate
+                  more than one persistence unit within the same scope.
+                  Persistence Unit for Application Managed Resource Local</description>
+    <non-jta-data-source>jdbc/DB_no_tx</non-jta-data-source>
+    <class>ee.jakarta.tck.persistence.core.annotations.orderby.A</class>
+    <class>ee.jakarta.tck.persistence.core.annotations.orderby.A2</class>
+    <class>ee.jakarta.tck.persistence.core.annotations.orderby.Address</class>
+    <class>ee.jakarta.tck.persistence.core.annotations.orderby.Address2</class>
+    <class>ee.jakarta.tck.persistence.core.annotations.orderby.Customer</class>
+    <class>ee.jakarta.tck.persistence.core.annotations.orderby.Customer2</class>
+    <class>ee.jakarta.tck.persistence.core.annotations.orderby.Department</class>
+    <class>ee.jakarta.tck.persistence.core.annotations.orderby.Employee</class>
+    <class>ee.jakarta.tck.persistence.core.annotations.orderby.Insurance</class>
+    <class>ee.jakarta.tck.persistence.core.annotations.orderby.ZipCode</class>
+    <class>ee.jakarta.tck.persistence.core.annotations.orderby.ZipCode2</class>
+  </persistence-unit>
+</persistence>
+
diff --git a/jpa/spec-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/ordercolumn/persistence.xml b/jpa/spec-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/ordercolumn/persistence.xml
new file mode 100644
index 0000000000..6db1810448
--- /dev/null
+++ b/jpa/spec-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/ordercolumn/persistence.xml
@@ -0,0 +1,53 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+
+    Copyright (c) 2018 Oracle and/or its affiliates. All rights reserved.
+
+    This program and the accompanying materials are made available under the
+    terms of the Eclipse Public License v. 2.0, which is available at
+    http://www.eclipse.org/legal/epl-2.0.
+
+    This Source Code may also be made available under the following Secondary
+    Licenses when the conditions for such availability set forth in the
+    Eclipse Public License v. 2.0 are satisfied: GNU General Public License,
+    version 2 with the GNU Classpath Exception, which is available at
+    https://www.gnu.org/software/classpath/license.html.
+
+    SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
+
+-->
+<persistence xmlns="https://jakarta.ee/xml/ns/persistence" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="https://jakarta.ee/xml/ns/persistence     https://jakarta.ee/xml/ns/persistence/persistence_3_0.xsd" version="3.0">
+  <persistence-unit name="CTS-EM" transaction-type="JTA">
+    <description>Persistence Unit for CTS Vehicle Tests</description>
+    <jta-data-source>jdbc/DB1</jta-data-source>
+    <class>ee.jakarta.tck.persistence.core.annotations.ordercolumn.Course</class>
+    <class>ee.jakarta.tck.persistence.core.annotations.ordercolumn.Department</class>
+    <class>ee.jakarta.tck.persistence.core.annotations.ordercolumn.Department2</class>
+    <class>ee.jakarta.tck.persistence.core.annotations.ordercolumn.Employee</class>
+    <class>ee.jakarta.tck.persistence.core.annotations.ordercolumn.Employee2</class>
+    <class>ee.jakarta.tck.persistence.core.annotations.ordercolumn.Student</class>
+  </persistence-unit>
+  <persistence-unit name="CTS-EM2" transaction-type="JTA">
+    <description>Persistence Unit for CTS Vehicle Tests</description>
+    <jta-data-source>jdbc/DB1</jta-data-source>
+    <class>ee.jakarta.tck.persistence.core.annotations.ordercolumn.Course</class>
+    <class>ee.jakarta.tck.persistence.core.annotations.ordercolumn.Department</class>
+    <class>ee.jakarta.tck.persistence.core.annotations.ordercolumn.Department2</class>
+    <class>ee.jakarta.tck.persistence.core.annotations.ordercolumn.Employee</class>
+    <class>ee.jakarta.tck.persistence.core.annotations.ordercolumn.Employee2</class>
+    <class>ee.jakarta.tck.persistence.core.annotations.ordercolumn.Student</class>
+  </persistence-unit>
+  <persistence-unit name="CTS-EM-NOTX" transaction-type="RESOURCE_LOCAL">
+    <description>The persistence.xml file may be used to designate
+                  more than one persistence unit within the same scope.
+                  Persistence Unit for Application Managed Resource Local</description>
+    <non-jta-data-source>jdbc/DB_no_tx</non-jta-data-source>
+    <class>ee.jakarta.tck.persistence.core.annotations.ordercolumn.Course</class>
+    <class>ee.jakarta.tck.persistence.core.annotations.ordercolumn.Department</class>
+    <class>ee.jakarta.tck.persistence.core.annotations.ordercolumn.Department2</class>
+    <class>ee.jakarta.tck.persistence.core.annotations.ordercolumn.Employee</class>
+    <class>ee.jakarta.tck.persistence.core.annotations.ordercolumn.Employee2</class>
+    <class>ee.jakarta.tck.persistence.core.annotations.ordercolumn.Student</class>
+  </persistence-unit>
+</persistence>
+
diff --git a/jpa/spec-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/tableGenerator/persistence.xml b/jpa/spec-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/tableGenerator/persistence.xml
new file mode 100644
index 0000000000..a0fecf1327
--- /dev/null
+++ b/jpa/spec-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/tableGenerator/persistence.xml
@@ -0,0 +1,47 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+
+    Copyright (c) 2018 Oracle and/or its affiliates. All rights reserved.
+
+    This program and the accompanying materials are made available under the
+    terms of the Eclipse Public License v. 2.0, which is available at
+    http://www.eclipse.org/legal/epl-2.0.
+
+    This Source Code may also be made available under the following Secondary
+    Licenses when the conditions for such availability set forth in the
+    Eclipse Public License v. 2.0 are satisfied: GNU General Public License,
+    version 2 with the GNU Classpath Exception, which is available at
+    https://www.gnu.org/software/classpath/license.html.
+
+    SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
+
+-->
+<persistence xmlns="https://jakarta.ee/xml/ns/persistence" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="https://jakarta.ee/xml/ns/persistence     https://jakarta.ee/xml/ns/persistence/persistence_3_0.xsd" version="3.0">
+  <persistence-unit name="CTS-EM" transaction-type="JTA">
+    <description>Persistence Unit for CTS Vehicle Tests</description>
+    <jta-data-source>jdbc/DB1</jta-data-source>
+    <class>ee.jakarta.tck.persistence.core.annotations.tableGenerator.DataTypes</class>
+    <class>ee.jakarta.tck.persistence.core.annotations.tableGenerator.DataTypes2</class>
+    <class>ee.jakarta.tck.persistence.core.annotations.tableGenerator.DataTypes3</class>
+    <class>ee.jakarta.tck.persistence.core.annotations.tableGenerator.DataTypes4</class>
+  </persistence-unit>
+  <persistence-unit name="CTS-EM2" transaction-type="JTA">
+    <description>Persistence Unit for CTS Vehicle Tests</description>
+    <jta-data-source>jdbc/DB1</jta-data-source>
+    <class>ee.jakarta.tck.persistence.core.annotations.tableGenerator.DataTypes</class>
+    <class>ee.jakarta.tck.persistence.core.annotations.tableGenerator.DataTypes2</class>
+    <class>ee.jakarta.tck.persistence.core.annotations.tableGenerator.DataTypes3</class>
+    <class>ee.jakarta.tck.persistence.core.annotations.tableGenerator.DataTypes4</class>
+  </persistence-unit>
+  <persistence-unit name="CTS-EM-NOTX" transaction-type="RESOURCE_LOCAL">
+    <description>The persistence.xml file may be used to designate
+                  more than one persistence unit within the same scope.
+                  Persistence Unit for Application Managed Resource Local</description>
+    <non-jta-data-source>jdbc/DB_no_tx</non-jta-data-source>
+    <class>ee.jakarta.tck.persistence.core.annotations.tableGenerator.DataTypes</class>
+    <class>ee.jakarta.tck.persistence.core.annotations.tableGenerator.DataTypes2</class>
+    <class>ee.jakarta.tck.persistence.core.annotations.tableGenerator.DataTypes3</class>
+    <class>ee.jakarta.tck.persistence.core.annotations.tableGenerator.DataTypes4</class>
+  </persistence-unit>
+</persistence>
+
diff --git a/jpa/spec-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/temporal/persistence.xml b/jpa/spec-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/temporal/persistence.xml
new file mode 100644
index 0000000000..f9717c1e7d
--- /dev/null
+++ b/jpa/spec-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/temporal/persistence.xml
@@ -0,0 +1,47 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+
+    Copyright (c) 2018 Oracle and/or its affiliates. All rights reserved.
+
+    This program and the accompanying materials are made available under the
+    terms of the Eclipse Public License v. 2.0, which is available at
+    http://www.eclipse.org/legal/epl-2.0.
+
+    This Source Code may also be made available under the following Secondary
+    Licenses when the conditions for such availability set forth in the
+    Eclipse Public License v. 2.0 are satisfied: GNU General Public License,
+    version 2 with the GNU Classpath Exception, which is available at
+    https://www.gnu.org/software/classpath/license.html.
+
+    SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
+
+-->
+<persistence xmlns="https://jakarta.ee/xml/ns/persistence" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="https://jakarta.ee/xml/ns/persistence     https://jakarta.ee/xml/ns/persistence/persistence_3_0.xsd" version="3.0">
+  <persistence-unit name="CTS-EM" transaction-type="JTA">
+    <description>Persistence Unit for CTS Vehicle Tests</description>
+    <jta-data-source>jdbc/DB1</jta-data-source>
+    <class>ee.jakarta.tck.persistence.core.annotations.temporal.A2_Field</class>
+    <class>ee.jakarta.tck.persistence.core.annotations.temporal.A2_Property</class>
+    <class>ee.jakarta.tck.persistence.core.annotations.temporal.A_Field</class>
+    <class>ee.jakarta.tck.persistence.core.annotations.temporal.A_Property</class>
+  </persistence-unit>
+  <persistence-unit name="CTS-EM2" transaction-type="JTA">
+    <description>Persistence Unit for CTS Vehicle Tests</description>
+    <jta-data-source>jdbc/DB1</jta-data-source>
+    <class>ee.jakarta.tck.persistence.core.annotations.temporal.A2_Field</class>
+    <class>ee.jakarta.tck.persistence.core.annotations.temporal.A2_Property</class>
+    <class>ee.jakarta.tck.persistence.core.annotations.temporal.A_Field</class>
+    <class>ee.jakarta.tck.persistence.core.annotations.temporal.A_Property</class>
+  </persistence-unit>
+  <persistence-unit name="CTS-EM-NOTX" transaction-type="RESOURCE_LOCAL">
+    <description>The persistence.xml file may be used to designate
+                  more than one persistence unit within the same scope.
+                  Persistence Unit for Application Managed Resource Local</description>
+    <non-jta-data-source>jdbc/DB_no_tx</non-jta-data-source>
+    <class>ee.jakarta.tck.persistence.core.annotations.temporal.A2_Field</class>
+    <class>ee.jakarta.tck.persistence.core.annotations.temporal.A2_Property</class>
+    <class>ee.jakarta.tck.persistence.core.annotations.temporal.A_Field</class>
+    <class>ee.jakarta.tck.persistence.core.annotations.temporal.A_Property</class>
+  </persistence-unit>
+</persistence>
+
diff --git a/jpa/spec-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/version/persistence.xml b/jpa/spec-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/version/persistence.xml
new file mode 100644
index 0000000000..c06aa5bdd5
--- /dev/null
+++ b/jpa/spec-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/version/persistence.xml
@@ -0,0 +1,77 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+
+    Copyright (c) 2018 Oracle and/or its affiliates. All rights reserved.
+
+    This program and the accompanying materials are made available under the
+    terms of the Eclipse Public License v. 2.0, which is available at
+    http://www.eclipse.org/legal/epl-2.0.
+
+    This Source Code may also be made available under the following Secondary
+    Licenses when the conditions for such availability set forth in the
+    Eclipse Public License v. 2.0 are satisfied: GNU General Public License,
+    version 2 with the GNU Classpath Exception, which is available at
+    https://www.gnu.org/software/classpath/license.html.
+
+    SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
+
+-->
+<persistence xmlns="https://jakarta.ee/xml/ns/persistence" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="https://jakarta.ee/xml/ns/persistence     https://jakarta.ee/xml/ns/persistence/persistence_3_0.xsd" version="3.0">
+  <persistence-unit name="CTS-EM" transaction-type="JTA">
+    <description>Persistence Unit for CTS Vehicle Tests</description>
+    <jta-data-source>jdbc/DB1</jta-data-source>
+    <class>ee.jakarta.tck.persistence.core.annotations.version.Int_Field</class>
+    <class>ee.jakarta.tck.persistence.core.annotations.version.Int_Property</class>
+    <class>ee.jakarta.tck.persistence.core.annotations.version.Integer_Field</class>
+    <class>ee.jakarta.tck.persistence.core.annotations.version.Integer_Property</class>
+    <class>ee.jakarta.tck.persistence.core.annotations.version.LongClass_Field</class>
+    <class>ee.jakarta.tck.persistence.core.annotations.version.LongClass_Property</class>
+    <class>ee.jakarta.tck.persistence.core.annotations.version.Long_Field</class>
+    <class>ee.jakarta.tck.persistence.core.annotations.version.Long_Property</class>
+    <class>ee.jakarta.tck.persistence.core.annotations.version.ShortClass_Field</class>
+    <class>ee.jakarta.tck.persistence.core.annotations.version.ShortClass_Property</class>
+    <class>ee.jakarta.tck.persistence.core.annotations.version.Short_Field</class>
+    <class>ee.jakarta.tck.persistence.core.annotations.version.Short_Property</class>
+    <class>ee.jakarta.tck.persistence.core.annotations.version.Timestamp_Field</class>
+    <class>ee.jakarta.tck.persistence.core.annotations.version.Timestamp_Property</class>
+  </persistence-unit>
+  <persistence-unit name="CTS-EM2" transaction-type="JTA">
+    <description>Persistence Unit for CTS Vehicle Tests</description>
+    <jta-data-source>jdbc/DB1</jta-data-source>
+    <class>ee.jakarta.tck.persistence.core.annotations.version.Int_Field</class>
+    <class>ee.jakarta.tck.persistence.core.annotations.version.Int_Property</class>
+    <class>ee.jakarta.tck.persistence.core.annotations.version.Integer_Field</class>
+    <class>ee.jakarta.tck.persistence.core.annotations.version.Integer_Property</class>
+    <class>ee.jakarta.tck.persistence.core.annotations.version.LongClass_Field</class>
+    <class>ee.jakarta.tck.persistence.core.annotations.version.LongClass_Property</class>
+    <class>ee.jakarta.tck.persistence.core.annotations.version.Long_Field</class>
+    <class>ee.jakarta.tck.persistence.core.annotations.version.Long_Property</class>
+    <class>ee.jakarta.tck.persistence.core.annotations.version.ShortClass_Field</class>
+    <class>ee.jakarta.tck.persistence.core.annotations.version.ShortClass_Property</class>
+    <class>ee.jakarta.tck.persistence.core.annotations.version.Short_Field</class>
+    <class>ee.jakarta.tck.persistence.core.annotations.version.Short_Property</class>
+    <class>ee.jakarta.tck.persistence.core.annotations.version.Timestamp_Field</class>
+    <class>ee.jakarta.tck.persistence.core.annotations.version.Timestamp_Property</class>
+  </persistence-unit>
+  <persistence-unit name="CTS-EM-NOTX" transaction-type="RESOURCE_LOCAL">
+    <description>The persistence.xml file may be used to designate
+                  more than one persistence unit within the same scope.
+                  Persistence Unit for Application Managed Resource Local</description>
+    <non-jta-data-source>jdbc/DB_no_tx</non-jta-data-source>
+    <class>ee.jakarta.tck.persistence.core.annotations.version.Int_Field</class>
+    <class>ee.jakarta.tck.persistence.core.annotations.version.Int_Property</class>
+    <class>ee.jakarta.tck.persistence.core.annotations.version.Integer_Field</class>
+    <class>ee.jakarta.tck.persistence.core.annotations.version.Integer_Property</class>
+    <class>ee.jakarta.tck.persistence.core.annotations.version.LongClass_Field</class>
+    <class>ee.jakarta.tck.persistence.core.annotations.version.LongClass_Property</class>
+    <class>ee.jakarta.tck.persistence.core.annotations.version.Long_Field</class>
+    <class>ee.jakarta.tck.persistence.core.annotations.version.Long_Property</class>
+    <class>ee.jakarta.tck.persistence.core.annotations.version.ShortClass_Field</class>
+    <class>ee.jakarta.tck.persistence.core.annotations.version.ShortClass_Property</class>
+    <class>ee.jakarta.tck.persistence.core.annotations.version.Short_Field</class>
+    <class>ee.jakarta.tck.persistence.core.annotations.version.Short_Property</class>
+    <class>ee.jakarta.tck.persistence.core.annotations.version.Timestamp_Field</class>
+    <class>ee.jakarta.tck.persistence.core.annotations.version.Timestamp_Property</class>
+  </persistence-unit>
+</persistence>
+
diff --git a/jpa/spec-tests/src/main/java/ee/jakarta/tck/persistence/core/basic/persistence.xml b/jpa/spec-tests/src/main/java/ee/jakarta/tck/persistence/core/basic/persistence.xml
new file mode 100644
index 0000000000..98eb3998f5
--- /dev/null
+++ b/jpa/spec-tests/src/main/java/ee/jakarta/tck/persistence/core/basic/persistence.xml
@@ -0,0 +1,38 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+
+    Copyright (c) 2018 Oracle and/or its affiliates. All rights reserved.
+
+    This program and the accompanying materials are made available under the
+    terms of the Eclipse Public License v. 2.0, which is available at
+    http://www.eclipse.org/legal/epl-2.0.
+
+    This Source Code may also be made available under the following Secondary
+    Licenses when the conditions for such availability set forth in the
+    Eclipse Public License v. 2.0 are satisfied: GNU General Public License,
+    version 2 with the GNU Classpath Exception, which is available at
+    https://www.gnu.org/software/classpath/license.html.
+
+    SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
+
+-->
+<persistence xmlns="https://jakarta.ee/xml/ns/persistence" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="https://jakarta.ee/xml/ns/persistence     https://jakarta.ee/xml/ns/persistence/persistence_3_0.xsd" version="3.0">
+  <persistence-unit name="CTS-EM" transaction-type="JTA">
+    <description>Persistence Unit for CTS Vehicle Tests</description>
+    <jta-data-source>jdbc/DB1</jta-data-source>
+    <class>ee.jakarta.tck.persistence.core.basic.Order</class>
+  </persistence-unit>
+  <persistence-unit name="CTS-EM2" transaction-type="JTA">
+    <description>Persistence Unit for CTS Vehicle Tests</description>
+    <jta-data-source>jdbc/DB1</jta-data-source>
+    <class>ee.jakarta.tck.persistence.core.basic.Order</class>
+  </persistence-unit>
+  <persistence-unit name="CTS-EM-NOTX" transaction-type="RESOURCE_LOCAL">
+    <description>The persistence.xml file may be used to designate
+                  more than one persistence unit within the same scope.
+                  Persistence Unit for Application Managed Resource Local</description>
+    <non-jta-data-source>jdbc/DB_no_tx</non-jta-data-source>
+    <class>ee.jakarta.tck.persistence.core.basic.Order</class>
+  </persistence-unit>
+</persistence>
+
diff --git a/jpa/spec-tests/src/main/java/ee/jakarta/tck/persistence/core/callback/inheritance/persistence.xml b/jpa/spec-tests/src/main/java/ee/jakarta/tck/persistence/core/callback/inheritance/persistence.xml
new file mode 100644
index 0000000000..f70214f0ba
--- /dev/null
+++ b/jpa/spec-tests/src/main/java/ee/jakarta/tck/persistence/core/callback/inheritance/persistence.xml
@@ -0,0 +1,95 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+
+    Copyright (c) 2018 Oracle and/or its affiliates. All rights reserved.
+
+    This program and the accompanying materials are made available under the
+    terms of the Eclipse Public License v. 2.0, which is available at
+    http://www.eclipse.org/legal/epl-2.0.
+
+    This Source Code may also be made available under the following Secondary
+    Licenses when the conditions for such availability set forth in the
+    Eclipse Public License v. 2.0 are satisfied: GNU General Public License,
+    version 2 with the GNU Classpath Exception, which is available at
+    https://www.gnu.org/software/classpath/license.html.
+
+    SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
+
+-->
+<persistence xmlns="https://jakarta.ee/xml/ns/persistence" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="https://jakarta.ee/xml/ns/persistence     https://jakarta.ee/xml/ns/persistence/persistence_3_0.xsd" version="3.0">
+  <persistence-unit name="CTS-EM" transaction-type="JTA">
+    <description>Persistence Unit for CTS Vehicle Tests</description>
+    <jta-data-source>jdbc/DB1</jta-data-source>
+    <class>ee.jakarta.tck.persistence.core.callback.common.CallbackStatusIF</class>
+    <class>ee.jakarta.tck.persistence.core.callback.common.CallbackStatusImpl</class>
+    <class>ee.jakarta.tck.persistence.core.callback.common.Constants</class>
+    <class>ee.jakarta.tck.persistence.core.callback.common.GenerictListener</class>
+    <class>ee.jakarta.tck.persistence.core.callback.common.GenerictListenerImpl</class>
+    <class>ee.jakarta.tck.persistence.core.callback.common.ListenerA</class>
+    <class>ee.jakarta.tck.persistence.core.callback.common.ListenerAA</class>
+    <class>ee.jakarta.tck.persistence.core.callback.common.ListenerB</class>
+    <class>ee.jakarta.tck.persistence.core.callback.common.ListenerBB</class>
+    <class>ee.jakarta.tck.persistence.core.callback.common.ListenerBase</class>
+    <class>ee.jakarta.tck.persistence.core.callback.common.ListenerC</class>
+    <class>ee.jakarta.tck.persistence.core.callback.common.ListenerCC</class>
+    <class>ee.jakarta.tck.persistence.core.callback.inheritance.PartProduct</class>
+    <class>ee.jakarta.tck.persistence.core.callback.inheritance.PartProductListener</class>
+    <class>ee.jakarta.tck.persistence.core.callback.inheritance.PricedPartProduct</class>
+    <class>ee.jakarta.tck.persistence.core.callback.inheritance.PricedPartProductCallback</class>
+    <class>ee.jakarta.tck.persistence.core.callback.inheritance.PricedPartProductListener</class>
+    <class>ee.jakarta.tck.persistence.core.callback.inheritance.PricedPartProduct_2</class>
+    <class>ee.jakarta.tck.persistence.core.callback.inheritance.Product</class>
+    <class>ee.jakarta.tck.persistence.core.callback.inheritance.ProductListener</class>
+  </persistence-unit>
+  <persistence-unit name="CTS-EM2" transaction-type="JTA">
+    <description>Persistence Unit for CTS Vehicle Tests</description>
+    <jta-data-source>jdbc/DB1</jta-data-source>
+    <class>ee.jakarta.tck.persistence.core.callback.common.CallbackStatusIF</class>
+    <class>ee.jakarta.tck.persistence.core.callback.common.CallbackStatusImpl</class>
+    <class>ee.jakarta.tck.persistence.core.callback.common.Constants</class>
+    <class>ee.jakarta.tck.persistence.core.callback.common.GenerictListener</class>
+    <class>ee.jakarta.tck.persistence.core.callback.common.GenerictListenerImpl</class>
+    <class>ee.jakarta.tck.persistence.core.callback.common.ListenerA</class>
+    <class>ee.jakarta.tck.persistence.core.callback.common.ListenerAA</class>
+    <class>ee.jakarta.tck.persistence.core.callback.common.ListenerB</class>
+    <class>ee.jakarta.tck.persistence.core.callback.common.ListenerBB</class>
+    <class>ee.jakarta.tck.persistence.core.callback.common.ListenerBase</class>
+    <class>ee.jakarta.tck.persistence.core.callback.common.ListenerC</class>
+    <class>ee.jakarta.tck.persistence.core.callback.common.ListenerCC</class>
+    <class>ee.jakarta.tck.persistence.core.callback.inheritance.PartProduct</class>
+    <class>ee.jakarta.tck.persistence.core.callback.inheritance.PartProductListener</class>
+    <class>ee.jakarta.tck.persistence.core.callback.inheritance.PricedPartProduct</class>
+    <class>ee.jakarta.tck.persistence.core.callback.inheritance.PricedPartProductCallback</class>
+    <class>ee.jakarta.tck.persistence.core.callback.inheritance.PricedPartProductListener</class>
+    <class>ee.jakarta.tck.persistence.core.callback.inheritance.PricedPartProduct_2</class>
+    <class>ee.jakarta.tck.persistence.core.callback.inheritance.Product</class>
+    <class>ee.jakarta.tck.persistence.core.callback.inheritance.ProductListener</class>
+  </persistence-unit>
+  <persistence-unit name="CTS-EM-NOTX" transaction-type="RESOURCE_LOCAL">
+    <description>The persistence.xml file may be used to designate
+                  more than one persistence unit within the same scope.
+                  Persistence Unit for Application Managed Resource Local</description>
+    <non-jta-data-source>jdbc/DB_no_tx</non-jta-data-source>
+    <class>ee.jakarta.tck.persistence.core.callback.common.CallbackStatusIF</class>
+    <class>ee.jakarta.tck.persistence.core.callback.common.CallbackStatusImpl</class>
+    <class>ee.jakarta.tck.persistence.core.callback.common.Constants</class>
+    <class>ee.jakarta.tck.persistence.core.callback.common.GenerictListener</class>
+    <class>ee.jakarta.tck.persistence.core.callback.common.GenerictListenerImpl</class>
+    <class>ee.jakarta.tck.persistence.core.callback.common.ListenerA</class>
+    <class>ee.jakarta.tck.persistence.core.callback.common.ListenerAA</class>
+    <class>ee.jakarta.tck.persistence.core.callback.common.ListenerB</class>
+    <class>ee.jakarta.tck.persistence.core.callback.common.ListenerBB</class>
+    <class>ee.jakarta.tck.persistence.core.callback.common.ListenerBase</class>
+    <class>ee.jakarta.tck.persistence.core.callback.common.ListenerC</class>
+    <class>ee.jakarta.tck.persistence.core.callback.common.ListenerCC</class>
+    <class>ee.jakarta.tck.persistence.core.callback.inheritance.PartProduct</class>
+    <class>ee.jakarta.tck.persistence.core.callback.inheritance.PartProductListener</class>
+    <class>ee.jakarta.tck.persistence.core.callback.inheritance.PricedPartProduct</class>
+    <class>ee.jakarta.tck.persistence.core.callback.inheritance.PricedPartProductCallback</class>
+    <class>ee.jakarta.tck.persistence.core.callback.inheritance.PricedPartProductListener</class>
+    <class>ee.jakarta.tck.persistence.core.callback.inheritance.PricedPartProduct_2</class>
+    <class>ee.jakarta.tck.persistence.core.callback.inheritance.Product</class>
+    <class>ee.jakarta.tck.persistence.core.callback.inheritance.ProductListener</class>
+  </persistence-unit>
+</persistence>
+
diff --git a/jpa/spec-tests/src/main/java/ee/jakarta/tck/persistence/core/callback/listener/persistence.xml b/jpa/spec-tests/src/main/java/ee/jakarta/tck/persistence/core/callback/listener/persistence.xml
new file mode 100644
index 0000000000..48f2698579
--- /dev/null
+++ b/jpa/spec-tests/src/main/java/ee/jakarta/tck/persistence/core/callback/listener/persistence.xml
@@ -0,0 +1,83 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+
+    Copyright (c) 2018 Oracle and/or its affiliates. All rights reserved.
+
+    This program and the accompanying materials are made available under the
+    terms of the Eclipse Public License v. 2.0, which is available at
+    http://www.eclipse.org/legal/epl-2.0.
+
+    This Source Code may also be made available under the following Secondary
+    Licenses when the conditions for such availability set forth in the
+    Eclipse Public License v. 2.0 are satisfied: GNU General Public License,
+    version 2 with the GNU Classpath Exception, which is available at
+    https://www.gnu.org/software/classpath/license.html.
+
+    SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
+
+-->
+<persistence xmlns="https://jakarta.ee/xml/ns/persistence" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="https://jakarta.ee/xml/ns/persistence     https://jakarta.ee/xml/ns/persistence/persistence_3_0.xsd" version="3.0">
+  <persistence-unit name="CTS-EM" transaction-type="JTA">
+    <description>Persistence Unit for CTS Vehicle Tests</description>
+    <jta-data-source>jdbc/DB1</jta-data-source>
+    <class>ee.jakarta.tck.persistence.core.callback.common.CallbackStatusIF</class>
+    <class>ee.jakarta.tck.persistence.core.callback.common.CallbackStatusImpl</class>
+    <class>ee.jakarta.tck.persistence.core.callback.common.Constants</class>
+    <class>ee.jakarta.tck.persistence.core.callback.common.GenerictListener</class>
+    <class>ee.jakarta.tck.persistence.core.callback.common.GenerictListenerImpl</class>
+    <class>ee.jakarta.tck.persistence.core.callback.common.ListenerA</class>
+    <class>ee.jakarta.tck.persistence.core.callback.common.ListenerAA</class>
+    <class>ee.jakarta.tck.persistence.core.callback.common.ListenerB</class>
+    <class>ee.jakarta.tck.persistence.core.callback.common.ListenerBB</class>
+    <class>ee.jakarta.tck.persistence.core.callback.common.ListenerBase</class>
+    <class>ee.jakarta.tck.persistence.core.callback.common.ListenerC</class>
+    <class>ee.jakarta.tck.persistence.core.callback.common.ListenerCC</class>
+    <class>ee.jakarta.tck.persistence.core.callback.listener.LineItem</class>
+    <class>ee.jakarta.tck.persistence.core.callback.listener.LineItemSuper</class>
+    <class>ee.jakarta.tck.persistence.core.callback.listener.Order</class>
+    <class>ee.jakarta.tck.persistence.core.callback.listener.Product</class>
+  </persistence-unit>
+  <persistence-unit name="CTS-EM2" transaction-type="JTA">
+    <description>Persistence Unit for CTS Vehicle Tests</description>
+    <jta-data-source>jdbc/DB1</jta-data-source>
+    <class>ee.jakarta.tck.persistence.core.callback.common.CallbackStatusIF</class>
+    <class>ee.jakarta.tck.persistence.core.callback.common.CallbackStatusImpl</class>
+    <class>ee.jakarta.tck.persistence.core.callback.common.Constants</class>
+    <class>ee.jakarta.tck.persistence.core.callback.common.GenerictListener</class>
+    <class>ee.jakarta.tck.persistence.core.callback.common.GenerictListenerImpl</class>
+    <class>ee.jakarta.tck.persistence.core.callback.common.ListenerA</class>
+    <class>ee.jakarta.tck.persistence.core.callback.common.ListenerAA</class>
+    <class>ee.jakarta.tck.persistence.core.callback.common.ListenerB</class>
+    <class>ee.jakarta.tck.persistence.core.callback.common.ListenerBB</class>
+    <class>ee.jakarta.tck.persistence.core.callback.common.ListenerBase</class>
+    <class>ee.jakarta.tck.persistence.core.callback.common.ListenerC</class>
+    <class>ee.jakarta.tck.persistence.core.callback.common.ListenerCC</class>
+    <class>ee.jakarta.tck.persistence.core.callback.listener.LineItem</class>
+    <class>ee.jakarta.tck.persistence.core.callback.listener.LineItemSuper</class>
+    <class>ee.jakarta.tck.persistence.core.callback.listener.Order</class>
+    <class>ee.jakarta.tck.persistence.core.callback.listener.Product</class>
+  </persistence-unit>
+  <persistence-unit name="CTS-EM-NOTX" transaction-type="RESOURCE_LOCAL">
+    <description>The persistence.xml file may be used to designate
+                  more than one persistence unit within the same scope.
+                  Persistence Unit for Application Managed Resource Local</description>
+    <non-jta-data-source>jdbc/DB_no_tx</non-jta-data-source>
+    <class>ee.jakarta.tck.persistence.core.callback.common.CallbackStatusIF</class>
+    <class>ee.jakarta.tck.persistence.core.callback.common.CallbackStatusImpl</class>
+    <class>ee.jakarta.tck.persistence.core.callback.common.Constants</class>
+    <class>ee.jakarta.tck.persistence.core.callback.common.GenerictListener</class>
+    <class>ee.jakarta.tck.persistence.core.callback.common.GenerictListenerImpl</class>
+    <class>ee.jakarta.tck.persistence.core.callback.common.ListenerA</class>
+    <class>ee.jakarta.tck.persistence.core.callback.common.ListenerAA</class>
+    <class>ee.jakarta.tck.persistence.core.callback.common.ListenerB</class>
+    <class>ee.jakarta.tck.persistence.core.callback.common.ListenerBB</class>
+    <class>ee.jakarta.tck.persistence.core.callback.common.ListenerBase</class>
+    <class>ee.jakarta.tck.persistence.core.callback.common.ListenerC</class>
+    <class>ee.jakarta.tck.persistence.core.callback.common.ListenerCC</class>
+    <class>ee.jakarta.tck.persistence.core.callback.listener.LineItem</class>
+    <class>ee.jakarta.tck.persistence.core.callback.listener.LineItemSuper</class>
+    <class>ee.jakarta.tck.persistence.core.callback.listener.Order</class>
+    <class>ee.jakarta.tck.persistence.core.callback.listener.Product</class>
+  </persistence-unit>
+</persistence>
+
diff --git a/jpa/spec-tests/src/main/java/ee/jakarta/tck/persistence/core/callback/listeneroverride/persistence.xml b/jpa/spec-tests/src/main/java/ee/jakarta/tck/persistence/core/callback/listeneroverride/persistence.xml
new file mode 100644
index 0000000000..43ccd87f12
--- /dev/null
+++ b/jpa/spec-tests/src/main/java/ee/jakarta/tck/persistence/core/callback/listeneroverride/persistence.xml
@@ -0,0 +1,83 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+
+    Copyright (c) 2018 Oracle and/or its affiliates. All rights reserved.
+
+    This program and the accompanying materials are made available under the
+    terms of the Eclipse Public License v. 2.0, which is available at
+    http://www.eclipse.org/legal/epl-2.0.
+
+    This Source Code may also be made available under the following Secondary
+    Licenses when the conditions for such availability set forth in the
+    Eclipse Public License v. 2.0 are satisfied: GNU General Public License,
+    version 2 with the GNU Classpath Exception, which is available at
+    https://www.gnu.org/software/classpath/license.html.
+
+    SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
+
+-->
+<persistence xmlns="https://jakarta.ee/xml/ns/persistence" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="https://jakarta.ee/xml/ns/persistence     https://jakarta.ee/xml/ns/persistence/persistence_3_0.xsd" version="3.0">
+  <persistence-unit name="CTS-EM" transaction-type="JTA">
+    <description>Persistence Unit for CTS Vehicle Tests</description>
+    <jta-data-source>jdbc/DB1</jta-data-source>
+    <class>ee.jakarta.tck.persistence.core.callback.common.CallbackStatusIF</class>
+    <class>ee.jakarta.tck.persistence.core.callback.common.CallbackStatusImpl</class>
+    <class>ee.jakarta.tck.persistence.core.callback.common.Constants</class>
+    <class>ee.jakarta.tck.persistence.core.callback.common.GenerictListener</class>
+    <class>ee.jakarta.tck.persistence.core.callback.common.GenerictListenerImpl</class>
+    <class>ee.jakarta.tck.persistence.core.callback.common.ListenerA</class>
+    <class>ee.jakarta.tck.persistence.core.callback.common.ListenerAA</class>
+    <class>ee.jakarta.tck.persistence.core.callback.common.ListenerB</class>
+    <class>ee.jakarta.tck.persistence.core.callback.common.ListenerBB</class>
+    <class>ee.jakarta.tck.persistence.core.callback.common.ListenerBase</class>
+    <class>ee.jakarta.tck.persistence.core.callback.common.ListenerC</class>
+    <class>ee.jakarta.tck.persistence.core.callback.common.ListenerCC</class>
+    <class>ee.jakarta.tck.persistence.core.callback.listeneroverride.LineItem</class>
+    <class>ee.jakarta.tck.persistence.core.callback.listeneroverride.LineItemSuper</class>
+    <class>ee.jakarta.tck.persistence.core.callback.listeneroverride.Order</class>
+    <class>ee.jakarta.tck.persistence.core.callback.listeneroverride.Product</class>
+  </persistence-unit>
+  <persistence-unit name="CTS-EM2" transaction-type="JTA">
+    <description>Persistence Unit for CTS Vehicle Tests</description>
+    <jta-data-source>jdbc/DB1</jta-data-source>
+    <class>ee.jakarta.tck.persistence.core.callback.common.CallbackStatusIF</class>
+    <class>ee.jakarta.tck.persistence.core.callback.common.CallbackStatusImpl</class>
+    <class>ee.jakarta.tck.persistence.core.callback.common.Constants</class>
+    <class>ee.jakarta.tck.persistence.core.callback.common.GenerictListener</class>
+    <class>ee.jakarta.tck.persistence.core.callback.common.GenerictListenerImpl</class>
+    <class>ee.jakarta.tck.persistence.core.callback.common.ListenerA</class>
+    <class>ee.jakarta.tck.persistence.core.callback.common.ListenerAA</class>
+    <class>ee.jakarta.tck.persistence.core.callback.common.ListenerB</class>
+    <class>ee.jakarta.tck.persistence.core.callback.common.ListenerBB</class>
+    <class>ee.jakarta.tck.persistence.core.callback.common.ListenerBase</class>
+    <class>ee.jakarta.tck.persistence.core.callback.common.ListenerC</class>
+    <class>ee.jakarta.tck.persistence.core.callback.common.ListenerCC</class>
+    <class>ee.jakarta.tck.persistence.core.callback.listeneroverride.LineItem</class>
+    <class>ee.jakarta.tck.persistence.core.callback.listeneroverride.LineItemSuper</class>
+    <class>ee.jakarta.tck.persistence.core.callback.listeneroverride.Order</class>
+    <class>ee.jakarta.tck.persistence.core.callback.listeneroverride.Product</class>
+  </persistence-unit>
+  <persistence-unit name="CTS-EM-NOTX" transaction-type="RESOURCE_LOCAL">
+    <description>The persistence.xml file may be used to designate
+                  more than one persistence unit within the same scope.
+                  Persistence Unit for Application Managed Resource Local</description>
+    <non-jta-data-source>jdbc/DB_no_tx</non-jta-data-source>
+    <class>ee.jakarta.tck.persistence.core.callback.common.CallbackStatusIF</class>
+    <class>ee.jakarta.tck.persistence.core.callback.common.CallbackStatusImpl</class>
+    <class>ee.jakarta.tck.persistence.core.callback.common.Constants</class>
+    <class>ee.jakarta.tck.persistence.core.callback.common.GenerictListener</class>
+    <class>ee.jakarta.tck.persistence.core.callback.common.GenerictListenerImpl</class>
+    <class>ee.jakarta.tck.persistence.core.callback.common.ListenerA</class>
+    <class>ee.jakarta.tck.persistence.core.callback.common.ListenerAA</class>
+    <class>ee.jakarta.tck.persistence.core.callback.common.ListenerB</class>
+    <class>ee.jakarta.tck.persistence.core.callback.common.ListenerBB</class>
+    <class>ee.jakarta.tck.persistence.core.callback.common.ListenerBase</class>
+    <class>ee.jakarta.tck.persistence.core.callback.common.ListenerC</class>
+    <class>ee.jakarta.tck.persistence.core.callback.common.ListenerCC</class>
+    <class>ee.jakarta.tck.persistence.core.callback.listeneroverride.LineItem</class>
+    <class>ee.jakarta.tck.persistence.core.callback.listeneroverride.LineItemSuper</class>
+    <class>ee.jakarta.tck.persistence.core.callback.listeneroverride.Order</class>
+    <class>ee.jakarta.tck.persistence.core.callback.listeneroverride.Product</class>
+  </persistence-unit>
+</persistence>
+
diff --git a/jpa/spec-tests/src/main/java/ee/jakarta/tck/persistence/core/callback/method/persistence.xml b/jpa/spec-tests/src/main/java/ee/jakarta/tck/persistence/core/callback/method/persistence.xml
new file mode 100644
index 0000000000..99eb067919
--- /dev/null
+++ b/jpa/spec-tests/src/main/java/ee/jakarta/tck/persistence/core/callback/method/persistence.xml
@@ -0,0 +1,80 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+
+    Copyright (c) 2018 Oracle and/or its affiliates. All rights reserved.
+
+    This program and the accompanying materials are made available under the
+    terms of the Eclipse Public License v. 2.0, which is available at
+    http://www.eclipse.org/legal/epl-2.0.
+
+    This Source Code may also be made available under the following Secondary
+    Licenses when the conditions for such availability set forth in the
+    Eclipse Public License v. 2.0 are satisfied: GNU General Public License,
+    version 2 with the GNU Classpath Exception, which is available at
+    https://www.gnu.org/software/classpath/license.html.
+
+    SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
+
+-->
+<persistence xmlns="https://jakarta.ee/xml/ns/persistence" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="https://jakarta.ee/xml/ns/persistence     https://jakarta.ee/xml/ns/persistence/persistence_3_0.xsd" version="3.0">
+  <persistence-unit name="CTS-EM" transaction-type="JTA">
+    <description>Persistence Unit for CTS Vehicle Tests</description>
+    <jta-data-source>jdbc/DB1</jta-data-source>
+    <class>ee.jakarta.tck.persistence.core.callback.common.CallbackStatusIF</class>
+    <class>ee.jakarta.tck.persistence.core.callback.common.CallbackStatusImpl</class>
+    <class>ee.jakarta.tck.persistence.core.callback.common.Constants</class>
+    <class>ee.jakarta.tck.persistence.core.callback.common.GenerictListener</class>
+    <class>ee.jakarta.tck.persistence.core.callback.common.GenerictListenerImpl</class>
+    <class>ee.jakarta.tck.persistence.core.callback.common.ListenerA</class>
+    <class>ee.jakarta.tck.persistence.core.callback.common.ListenerAA</class>
+    <class>ee.jakarta.tck.persistence.core.callback.common.ListenerB</class>
+    <class>ee.jakarta.tck.persistence.core.callback.common.ListenerBB</class>
+    <class>ee.jakarta.tck.persistence.core.callback.common.ListenerBase</class>
+    <class>ee.jakarta.tck.persistence.core.callback.common.ListenerC</class>
+    <class>ee.jakarta.tck.persistence.core.callback.common.ListenerCC</class>
+    <class>ee.jakarta.tck.persistence.core.callback.method.LineItem</class>
+    <class>ee.jakarta.tck.persistence.core.callback.method.Order</class>
+    <class>ee.jakarta.tck.persistence.core.callback.method.Product</class>
+  </persistence-unit>
+  <persistence-unit name="CTS-EM2" transaction-type="JTA">
+    <description>Persistence Unit for CTS Vehicle Tests</description>
+    <jta-data-source>jdbc/DB1</jta-data-source>
+    <class>ee.jakarta.tck.persistence.core.callback.common.CallbackStatusIF</class>
+    <class>ee.jakarta.tck.persistence.core.callback.common.CallbackStatusImpl</class>
+    <class>ee.jakarta.tck.persistence.core.callback.common.Constants</class>
+    <class>ee.jakarta.tck.persistence.core.callback.common.GenerictListener</class>
+    <class>ee.jakarta.tck.persistence.core.callback.common.GenerictListenerImpl</class>
+    <class>ee.jakarta.tck.persistence.core.callback.common.ListenerA</class>
+    <class>ee.jakarta.tck.persistence.core.callback.common.ListenerAA</class>
+    <class>ee.jakarta.tck.persistence.core.callback.common.ListenerB</class>
+    <class>ee.jakarta.tck.persistence.core.callback.common.ListenerBB</class>
+    <class>ee.jakarta.tck.persistence.core.callback.common.ListenerBase</class>
+    <class>ee.jakarta.tck.persistence.core.callback.common.ListenerC</class>
+    <class>ee.jakarta.tck.persistence.core.callback.common.ListenerCC</class>
+    <class>ee.jakarta.tck.persistence.core.callback.method.LineItem</class>
+    <class>ee.jakarta.tck.persistence.core.callback.method.Order</class>
+    <class>ee.jakarta.tck.persistence.core.callback.method.Product</class>
+  </persistence-unit>
+  <persistence-unit name="CTS-EM-NOTX" transaction-type="RESOURCE_LOCAL">
+    <description>The persistence.xml file may be used to designate
+                  more than one persistence unit within the same scope.
+                  Persistence Unit for Application Managed Resource Local</description>
+    <non-jta-data-source>jdbc/DB_no_tx</non-jta-data-source>
+    <class>ee.jakarta.tck.persistence.core.callback.common.CallbackStatusIF</class>
+    <class>ee.jakarta.tck.persistence.core.callback.common.CallbackStatusImpl</class>
+    <class>ee.jakarta.tck.persistence.core.callback.common.Constants</class>
+    <class>ee.jakarta.tck.persistence.core.callback.common.GenerictListener</class>
+    <class>ee.jakarta.tck.persistence.core.callback.common.GenerictListenerImpl</class>
+    <class>ee.jakarta.tck.persistence.core.callback.common.ListenerA</class>
+    <class>ee.jakarta.tck.persistence.core.callback.common.ListenerAA</class>
+    <class>ee.jakarta.tck.persistence.core.callback.common.ListenerB</class>
+    <class>ee.jakarta.tck.persistence.core.callback.common.ListenerBB</class>
+    <class>ee.jakarta.tck.persistence.core.callback.common.ListenerBase</class>
+    <class>ee.jakarta.tck.persistence.core.callback.common.ListenerC</class>
+    <class>ee.jakarta.tck.persistence.core.callback.common.ListenerCC</class>
+    <class>ee.jakarta.tck.persistence.core.callback.method.LineItem</class>
+    <class>ee.jakarta.tck.persistence.core.callback.method.Order</class>
+    <class>ee.jakarta.tck.persistence.core.callback.method.Product</class>
+  </persistence-unit>
+</persistence>
+
diff --git a/jpa/spec-tests/src/main/java/ee/jakarta/tck/persistence/core/callback/methodoverride/persistence.xml b/jpa/spec-tests/src/main/java/ee/jakarta/tck/persistence/core/callback/methodoverride/persistence.xml
new file mode 100644
index 0000000000..c10cb03ca5
--- /dev/null
+++ b/jpa/spec-tests/src/main/java/ee/jakarta/tck/persistence/core/callback/methodoverride/persistence.xml
@@ -0,0 +1,80 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+
+    Copyright (c) 2018 Oracle and/or its affiliates. All rights reserved.
+
+    This program and the accompanying materials are made available under the
+    terms of the Eclipse Public License v. 2.0, which is available at
+    http://www.eclipse.org/legal/epl-2.0.
+
+    This Source Code may also be made available under the following Secondary
+    Licenses when the conditions for such availability set forth in the
+    Eclipse Public License v. 2.0 are satisfied: GNU General Public License,
+    version 2 with the GNU Classpath Exception, which is available at
+    https://www.gnu.org/software/classpath/license.html.
+
+    SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
+
+-->
+<persistence xmlns="https://jakarta.ee/xml/ns/persistence" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="https://jakarta.ee/xml/ns/persistence     https://jakarta.ee/xml/ns/persistence/persistence_3_0.xsd" version="3.0">
+  <persistence-unit name="CTS-EM" transaction-type="JTA">
+    <description>Persistence Unit for CTS Vehicle Tests</description>
+    <jta-data-source>jdbc/DB1</jta-data-source>
+    <class>ee.jakarta.tck.persistence.core.callback.common.CallbackStatusIF</class>
+    <class>ee.jakarta.tck.persistence.core.callback.common.CallbackStatusImpl</class>
+    <class>ee.jakarta.tck.persistence.core.callback.common.Constants</class>
+    <class>ee.jakarta.tck.persistence.core.callback.common.GenerictListener</class>
+    <class>ee.jakarta.tck.persistence.core.callback.common.GenerictListenerImpl</class>
+    <class>ee.jakarta.tck.persistence.core.callback.common.ListenerA</class>
+    <class>ee.jakarta.tck.persistence.core.callback.common.ListenerAA</class>
+    <class>ee.jakarta.tck.persistence.core.callback.common.ListenerB</class>
+    <class>ee.jakarta.tck.persistence.core.callback.common.ListenerBB</class>
+    <class>ee.jakarta.tck.persistence.core.callback.common.ListenerBase</class>
+    <class>ee.jakarta.tck.persistence.core.callback.common.ListenerC</class>
+    <class>ee.jakarta.tck.persistence.core.callback.common.ListenerCC</class>
+    <class>ee.jakarta.tck.persistence.core.callback.methodoverride.LineItem</class>
+    <class>ee.jakarta.tck.persistence.core.callback.methodoverride.Order</class>
+    <class>ee.jakarta.tck.persistence.core.callback.methodoverride.Product</class>
+  </persistence-unit>
+  <persistence-unit name="CTS-EM2" transaction-type="JTA">
+    <description>Persistence Unit for CTS Vehicle Tests</description>
+    <jta-data-source>jdbc/DB1</jta-data-source>
+    <class>ee.jakarta.tck.persistence.core.callback.common.CallbackStatusIF</class>
+    <class>ee.jakarta.tck.persistence.core.callback.common.CallbackStatusImpl</class>
+    <class>ee.jakarta.tck.persistence.core.callback.common.Constants</class>
+    <class>ee.jakarta.tck.persistence.core.callback.common.GenerictListener</class>
+    <class>ee.jakarta.tck.persistence.core.callback.common.GenerictListenerImpl</class>
+    <class>ee.jakarta.tck.persistence.core.callback.common.ListenerA</class>
+    <class>ee.jakarta.tck.persistence.core.callback.common.ListenerAA</class>
+    <class>ee.jakarta.tck.persistence.core.callback.common.ListenerB</class>
+    <class>ee.jakarta.tck.persistence.core.callback.common.ListenerBB</class>
+    <class>ee.jakarta.tck.persistence.core.callback.common.ListenerBase</class>
+    <class>ee.jakarta.tck.persistence.core.callback.common.ListenerC</class>
+    <class>ee.jakarta.tck.persistence.core.callback.common.ListenerCC</class>
+    <class>ee.jakarta.tck.persistence.core.callback.methodoverride.LineItem</class>
+    <class>ee.jakarta.tck.persistence.core.callback.methodoverride.Order</class>
+    <class>ee.jakarta.tck.persistence.core.callback.methodoverride.Product</class>
+  </persistence-unit>
+  <persistence-unit name="CTS-EM-NOTX" transaction-type="RESOURCE_LOCAL">
+    <description>The persistence.xml file may be used to designate
+                  more than one persistence unit within the same scope.
+                  Persistence Unit for Application Managed Resource Local</description>
+    <non-jta-data-source>jdbc/DB_no_tx</non-jta-data-source>
+    <class>ee.jakarta.tck.persistence.core.callback.common.CallbackStatusIF</class>
+    <class>ee.jakarta.tck.persistence.core.callback.common.CallbackStatusImpl</class>
+    <class>ee.jakarta.tck.persistence.core.callback.common.Constants</class>
+    <class>ee.jakarta.tck.persistence.core.callback.common.GenerictListener</class>
+    <class>ee.jakarta.tck.persistence.core.callback.common.GenerictListenerImpl</class>
+    <class>ee.jakarta.tck.persistence.core.callback.common.ListenerA</class>
+    <class>ee.jakarta.tck.persistence.core.callback.common.ListenerAA</class>
+    <class>ee.jakarta.tck.persistence.core.callback.common.ListenerB</class>
+    <class>ee.jakarta.tck.persistence.core.callback.common.ListenerBB</class>
+    <class>ee.jakarta.tck.persistence.core.callback.common.ListenerBase</class>
+    <class>ee.jakarta.tck.persistence.core.callback.common.ListenerC</class>
+    <class>ee.jakarta.tck.persistence.core.callback.common.ListenerCC</class>
+    <class>ee.jakarta.tck.persistence.core.callback.methodoverride.LineItem</class>
+    <class>ee.jakarta.tck.persistence.core.callback.methodoverride.Order</class>
+    <class>ee.jakarta.tck.persistence.core.callback.methodoverride.Product</class>
+  </persistence-unit>
+</persistence>
+
diff --git a/jpa/spec-tests/src/main/java/ee/jakarta/tck/persistence/core/callback/xml/persistence.xml b/jpa/spec-tests/src/main/java/ee/jakarta/tck/persistence/core/callback/xml/persistence.xml
new file mode 100644
index 0000000000..f9ca845e54
--- /dev/null
+++ b/jpa/spec-tests/src/main/java/ee/jakarta/tck/persistence/core/callback/xml/persistence.xml
@@ -0,0 +1,86 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+
+    Copyright (c) 2018 Oracle and/or its affiliates. All rights reserved.
+
+    This program and the accompanying materials are made available under the
+    terms of the Eclipse Public License v. 2.0, which is available at
+    http://www.eclipse.org/legal/epl-2.0.
+
+    This Source Code may also be made available under the following Secondary
+    Licenses when the conditions for such availability set forth in the
+    Eclipse Public License v. 2.0 are satisfied: GNU General Public License,
+    version 2 with the GNU Classpath Exception, which is available at
+    https://www.gnu.org/software/classpath/license.html.
+
+    SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
+
+-->
+<persistence xmlns="https://jakarta.ee/xml/ns/persistence" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="https://jakarta.ee/xml/ns/persistence     https://jakarta.ee/xml/ns/persistence/persistence_3_0.xsd" version="3.0">
+  <persistence-unit name="CTS-EM" transaction-type="JTA">
+    <description>Persistence Unit for CTS Vehicle Tests</description>
+    <jta-data-source>jdbc/DB1</jta-data-source>
+    <class>ee.jakarta.tck.persistence.core.callback.common.CallbackStatusIF</class>
+    <class>ee.jakarta.tck.persistence.core.callback.common.CallbackStatusImpl</class>
+    <class>ee.jakarta.tck.persistence.core.callback.common.Constants</class>
+    <class>ee.jakarta.tck.persistence.core.callback.common.GenerictListener</class>
+    <class>ee.jakarta.tck.persistence.core.callback.common.GenerictListenerImpl</class>
+    <class>ee.jakarta.tck.persistence.core.callback.common.ListenerA</class>
+    <class>ee.jakarta.tck.persistence.core.callback.common.ListenerAA</class>
+    <class>ee.jakarta.tck.persistence.core.callback.common.ListenerB</class>
+    <class>ee.jakarta.tck.persistence.core.callback.common.ListenerBB</class>
+    <class>ee.jakarta.tck.persistence.core.callback.common.ListenerBase</class>
+    <class>ee.jakarta.tck.persistence.core.callback.common.ListenerC</class>
+    <class>ee.jakarta.tck.persistence.core.callback.common.ListenerCC</class>
+    <class>ee.jakarta.tck.persistence.core.callback.xml.Customer</class>
+    <class>ee.jakarta.tck.persistence.core.callback.xml.LineItem</class>
+    <class>ee.jakarta.tck.persistence.core.callback.xml.LineItemSuper</class>
+    <class>ee.jakarta.tck.persistence.core.callback.xml.Order</class>
+    <class>ee.jakarta.tck.persistence.core.callback.xml.Product</class>
+  </persistence-unit>
+  <persistence-unit name="CTS-EM2" transaction-type="JTA">
+    <description>Persistence Unit for CTS Vehicle Tests</description>
+    <jta-data-source>jdbc/DB1</jta-data-source>
+    <class>ee.jakarta.tck.persistence.core.callback.common.CallbackStatusIF</class>
+    <class>ee.jakarta.tck.persistence.core.callback.common.CallbackStatusImpl</class>
+    <class>ee.jakarta.tck.persistence.core.callback.common.Constants</class>
+    <class>ee.jakarta.tck.persistence.core.callback.common.GenerictListener</class>
+    <class>ee.jakarta.tck.persistence.core.callback.common.GenerictListenerImpl</class>
+    <class>ee.jakarta.tck.persistence.core.callback.common.ListenerA</class>
+    <class>ee.jakarta.tck.persistence.core.callback.common.ListenerAA</class>
+    <class>ee.jakarta.tck.persistence.core.callback.common.ListenerB</class>
+    <class>ee.jakarta.tck.persistence.core.callback.common.ListenerBB</class>
+    <class>ee.jakarta.tck.persistence.core.callback.common.ListenerBase</class>
+    <class>ee.jakarta.tck.persistence.core.callback.common.ListenerC</class>
+    <class>ee.jakarta.tck.persistence.core.callback.common.ListenerCC</class>
+    <class>ee.jakarta.tck.persistence.core.callback.xml.Customer</class>
+    <class>ee.jakarta.tck.persistence.core.callback.xml.LineItem</class>
+    <class>ee.jakarta.tck.persistence.core.callback.xml.LineItemSuper</class>
+    <class>ee.jakarta.tck.persistence.core.callback.xml.Order</class>
+    <class>ee.jakarta.tck.persistence.core.callback.xml.Product</class>
+  </persistence-unit>
+  <persistence-unit name="CTS-EM-NOTX" transaction-type="RESOURCE_LOCAL">
+    <description>The persistence.xml file may be used to designate
+                  more than one persistence unit within the same scope.
+                  Persistence Unit for Application Managed Resource Local</description>
+    <non-jta-data-source>jdbc/DB_no_tx</non-jta-data-source>
+    <class>ee.jakarta.tck.persistence.core.callback.common.CallbackStatusIF</class>
+    <class>ee.jakarta.tck.persistence.core.callback.common.CallbackStatusImpl</class>
+    <class>ee.jakarta.tck.persistence.core.callback.common.Constants</class>
+    <class>ee.jakarta.tck.persistence.core.callback.common.GenerictListener</class>
+    <class>ee.jakarta.tck.persistence.core.callback.common.GenerictListenerImpl</class>
+    <class>ee.jakarta.tck.persistence.core.callback.common.ListenerA</class>
+    <class>ee.jakarta.tck.persistence.core.callback.common.ListenerAA</class>
+    <class>ee.jakarta.tck.persistence.core.callback.common.ListenerB</class>
+    <class>ee.jakarta.tck.persistence.core.callback.common.ListenerBB</class>
+    <class>ee.jakarta.tck.persistence.core.callback.common.ListenerBase</class>
+    <class>ee.jakarta.tck.persistence.core.callback.common.ListenerC</class>
+    <class>ee.jakarta.tck.persistence.core.callback.common.ListenerCC</class>
+    <class>ee.jakarta.tck.persistence.core.callback.xml.Customer</class>
+    <class>ee.jakarta.tck.persistence.core.callback.xml.LineItem</class>
+    <class>ee.jakarta.tck.persistence.core.callback.xml.LineItemSuper</class>
+    <class>ee.jakarta.tck.persistence.core.callback.xml.Order</class>
+    <class>ee.jakarta.tck.persistence.core.callback.xml.Product</class>
+  </persistence-unit>
+</persistence>
+
diff --git a/jpa/spec-tests/src/main/java/ee/jakarta/tck/persistence/core/criteriaapi/CriteriaBuilder/persistence.xml b/jpa/spec-tests/src/main/java/ee/jakarta/tck/persistence/core/criteriaapi/CriteriaBuilder/persistence.xml
new file mode 100644
index 0000000000..69e68d3b95
--- /dev/null
+++ b/jpa/spec-tests/src/main/java/ee/jakarta/tck/persistence/core/criteriaapi/CriteriaBuilder/persistence.xml
@@ -0,0 +1,140 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+
+    Copyright (c) 2018 Oracle and/or its affiliates. All rights reserved.
+
+    This program and the accompanying materials are made available under the
+    terms of the Eclipse Public License v. 2.0, which is available at
+    http://www.eclipse.org/legal/epl-2.0.
+
+    This Source Code may also be made available under the following Secondary
+    Licenses when the conditions for such availability set forth in the
+    Eclipse Public License v. 2.0 are satisfied: GNU General Public License,
+    version 2 with the GNU Classpath Exception, which is available at
+    https://www.gnu.org/software/classpath/license.html.
+
+    SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
+
+-->
+<persistence xmlns="https://jakarta.ee/xml/ns/persistence" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="https://jakarta.ee/xml/ns/persistence     https://jakarta.ee/xml/ns/persistence/persistence_3_0.xsd" version="3.0">
+  <persistence-unit name="CTS-EM" transaction-type="JTA">
+    <description>Persistence Unit for CTS Vehicle Tests</description>
+    <jta-data-source>jdbc/DB1</jta-data-source>
+    <class>ee.jakarta.tck.persistence.common.schema30.Address</class>
+    <class>ee.jakarta.tck.persistence.common.schema30.Address_</class>
+    <class>ee.jakarta.tck.persistence.common.schema30.Alias</class>
+    <class>ee.jakarta.tck.persistence.common.schema30.Alias_</class>
+    <class>ee.jakarta.tck.persistence.common.schema30.Country</class>
+    <class>ee.jakarta.tck.persistence.common.schema30.Country_</class>
+    <class>ee.jakarta.tck.persistence.common.schema30.CreditCard</class>
+    <class>ee.jakarta.tck.persistence.common.schema30.CreditCard_</class>
+    <class>ee.jakarta.tck.persistence.common.schema30.Customer</class>
+    <class>ee.jakarta.tck.persistence.common.schema30.Customer_</class>
+    <class>ee.jakarta.tck.persistence.common.schema30.Department</class>
+    <class>ee.jakarta.tck.persistence.common.schema30.Department_</class>
+    <class>ee.jakarta.tck.persistence.common.schema30.Employee</class>
+    <class>ee.jakarta.tck.persistence.common.schema30.Employee_</class>
+    <class>ee.jakarta.tck.persistence.common.schema30.HardwareProduct</class>
+    <class>ee.jakarta.tck.persistence.common.schema30.HardwareProduct_</class>
+    <class>ee.jakarta.tck.persistence.common.schema30.Info</class>
+    <class>ee.jakarta.tck.persistence.common.schema30.Info_</class>
+    <class>ee.jakarta.tck.persistence.common.schema30.LineItem</class>
+    <class>ee.jakarta.tck.persistence.common.schema30.LineItemException</class>
+    <class>ee.jakarta.tck.persistence.common.schema30.LineItem_</class>
+    <class>ee.jakarta.tck.persistence.common.schema30.Order</class>
+    <class>ee.jakarta.tck.persistence.common.schema30.Order_</class>
+    <class>ee.jakarta.tck.persistence.common.schema30.Phone</class>
+    <class>ee.jakarta.tck.persistence.common.schema30.Phone_</class>
+    <class>ee.jakarta.tck.persistence.common.schema30.Product</class>
+    <class>ee.jakarta.tck.persistence.common.schema30.Product_</class>
+    <class>ee.jakarta.tck.persistence.common.schema30.ShelfLife</class>
+    <class>ee.jakarta.tck.persistence.common.schema30.ShelfLife_</class>
+    <class>ee.jakarta.tck.persistence.common.schema30.SoftwareProduct</class>
+    <class>ee.jakarta.tck.persistence.common.schema30.SoftwareProduct_</class>
+    <class>ee.jakarta.tck.persistence.common.schema30.Spouse</class>
+    <class>ee.jakarta.tck.persistence.common.schema30.Spouse_</class>
+    <class>ee.jakarta.tck.persistence.common.schema30.Trim</class>
+    <class>ee.jakarta.tck.persistence.common.schema30.Trim_</class>
+  </persistence-unit>
+  <persistence-unit name="CTS-EM2" transaction-type="JTA">
+    <description>Persistence Unit for CTS Vehicle Tests</description>
+    <jta-data-source>jdbc/DB1</jta-data-source>
+    <class>ee.jakarta.tck.persistence.common.schema30.Address</class>
+    <class>ee.jakarta.tck.persistence.common.schema30.Address_</class>
+    <class>ee.jakarta.tck.persistence.common.schema30.Alias</class>
+    <class>ee.jakarta.tck.persistence.common.schema30.Alias_</class>
+    <class>ee.jakarta.tck.persistence.common.schema30.Country</class>
+    <class>ee.jakarta.tck.persistence.common.schema30.Country_</class>
+    <class>ee.jakarta.tck.persistence.common.schema30.CreditCard</class>
+    <class>ee.jakarta.tck.persistence.common.schema30.CreditCard_</class>
+    <class>ee.jakarta.tck.persistence.common.schema30.Customer</class>
+    <class>ee.jakarta.tck.persistence.common.schema30.Customer_</class>
+    <class>ee.jakarta.tck.persistence.common.schema30.Department</class>
+    <class>ee.jakarta.tck.persistence.common.schema30.Department_</class>
+    <class>ee.jakarta.tck.persistence.common.schema30.Employee</class>
+    <class>ee.jakarta.tck.persistence.common.schema30.Employee_</class>
+    <class>ee.jakarta.tck.persistence.common.schema30.HardwareProduct</class>
+    <class>ee.jakarta.tck.persistence.common.schema30.HardwareProduct_</class>
+    <class>ee.jakarta.tck.persistence.common.schema30.Info</class>
+    <class>ee.jakarta.tck.persistence.common.schema30.Info_</class>
+    <class>ee.jakarta.tck.persistence.common.schema30.LineItem</class>
+    <class>ee.jakarta.tck.persistence.common.schema30.LineItemException</class>
+    <class>ee.jakarta.tck.persistence.common.schema30.LineItem_</class>
+    <class>ee.jakarta.tck.persistence.common.schema30.Order</class>
+    <class>ee.jakarta.tck.persistence.common.schema30.Order_</class>
+    <class>ee.jakarta.tck.persistence.common.schema30.Phone</class>
+    <class>ee.jakarta.tck.persistence.common.schema30.Phone_</class>
+    <class>ee.jakarta.tck.persistence.common.schema30.Product</class>
+    <class>ee.jakarta.tck.persistence.common.schema30.Product_</class>
+    <class>ee.jakarta.tck.persistence.common.schema30.ShelfLife</class>
+    <class>ee.jakarta.tck.persistence.common.schema30.ShelfLife_</class>
+    <class>ee.jakarta.tck.persistence.common.schema30.SoftwareProduct</class>
+    <class>ee.jakarta.tck.persistence.common.schema30.SoftwareProduct_</class>
+    <class>ee.jakarta.tck.persistence.common.schema30.Spouse</class>
+    <class>ee.jakarta.tck.persistence.common.schema30.Spouse_</class>
+    <class>ee.jakarta.tck.persistence.common.schema30.Trim</class>
+    <class>ee.jakarta.tck.persistence.common.schema30.Trim_</class>
+  </persistence-unit>
+  <persistence-unit name="CTS-EM-NOTX" transaction-type="RESOURCE_LOCAL">
+    <description>The persistence.xml file may be used to designate
+                  more than one persistence unit within the same scope.
+                  Persistence Unit for Application Managed Resource Local</description>
+    <non-jta-data-source>jdbc/DB_no_tx</non-jta-data-source>
+    <class>ee.jakarta.tck.persistence.common.schema30.Address</class>
+    <class>ee.jakarta.tck.persistence.common.schema30.Address_</class>
+    <class>ee.jakarta.tck.persistence.common.schema30.Alias</class>
+    <class>ee.jakarta.tck.persistence.common.schema30.Alias_</class>
+    <class>ee.jakarta.tck.persistence.common.schema30.Country</class>
+    <class>ee.jakarta.tck.persistence.common.schema30.Country_</class>
+    <class>ee.jakarta.tck.persistence.common.schema30.CreditCard</class>
+    <class>ee.jakarta.tck.persistence.common.schema30.CreditCard_</class>
+    <class>ee.jakarta.tck.persistence.common.schema30.Customer</class>
+    <class>ee.jakarta.tck.persistence.common.schema30.Customer_</class>
+    <class>ee.jakarta.tck.persistence.common.schema30.Department</class>
+    <class>ee.jakarta.tck.persistence.common.schema30.Department_</class>
+    <class>ee.jakarta.tck.persistence.common.schema30.Employee</class>
+    <class>ee.jakarta.tck.persistence.common.schema30.Employee_</class>
+    <class>ee.jakarta.tck.persistence.common.schema30.HardwareProduct</class>
+    <class>ee.jakarta.tck.persistence.common.schema30.HardwareProduct_</class>
+    <class>ee.jakarta.tck.persistence.common.schema30.Info</class>
+    <class>ee.jakarta.tck.persistence.common.schema30.Info_</class>
+    <class>ee.jakarta.tck.persistence.common.schema30.LineItem</class>
+    <class>ee.jakarta.tck.persistence.common.schema30.LineItemException</class>
+    <class>ee.jakarta.tck.persistence.common.schema30.LineItem_</class>
+    <class>ee.jakarta.tck.persistence.common.schema30.Order</class>
+    <class>ee.jakarta.tck.persistence.common.schema30.Order_</class>
+    <class>ee.jakarta.tck.persistence.common.schema30.Phone</class>
+    <class>ee.jakarta.tck.persistence.common.schema30.Phone_</class>
+    <class>ee.jakarta.tck.persistence.common.schema30.Product</class>
+    <class>ee.jakarta.tck.persistence.common.schema30.Product_</class>
+    <class>ee.jakarta.tck.persistence.common.schema30.ShelfLife</class>
+    <class>ee.jakarta.tck.persistence.common.schema30.ShelfLife_</class>
+    <class>ee.jakarta.tck.persistence.common.schema30.SoftwareProduct</class>
+    <class>ee.jakarta.tck.persistence.common.schema30.SoftwareProduct_</class>
+    <class>ee.jakarta.tck.persistence.common.schema30.Spouse</class>
+    <class>ee.jakarta.tck.persistence.common.schema30.Spouse_</class>
+    <class>ee.jakarta.tck.persistence.common.schema30.Trim</class>
+    <class>ee.jakarta.tck.persistence.common.schema30.Trim_</class>
+  </persistence-unit>
+</persistence>
+
diff --git a/jpa/spec-tests/src/main/java/ee/jakarta/tck/persistence/core/criteriaapi/CriteriaDelete/persistence.xml b/jpa/spec-tests/src/main/java/ee/jakarta/tck/persistence/core/criteriaapi/CriteriaDelete/persistence.xml
new file mode 100644
index 0000000000..69e68d3b95
--- /dev/null
+++ b/jpa/spec-tests/src/main/java/ee/jakarta/tck/persistence/core/criteriaapi/CriteriaDelete/persistence.xml
@@ -0,0 +1,140 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+
+    Copyright (c) 2018 Oracle and/or its affiliates. All rights reserved.
+
+    This program and the accompanying materials are made available under the
+    terms of the Eclipse Public License v. 2.0, which is available at
+    http://www.eclipse.org/legal/epl-2.0.
+
+    This Source Code may also be made available under the following Secondary
+    Licenses when the conditions for such availability set forth in the
+    Eclipse Public License v. 2.0 are satisfied: GNU General Public License,
+    version 2 with the GNU Classpath Exception, which is available at
+    https://www.gnu.org/software/classpath/license.html.
+
+    SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
+
+-->
+<persistence xmlns="https://jakarta.ee/xml/ns/persistence" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="https://jakarta.ee/xml/ns/persistence     https://jakarta.ee/xml/ns/persistence/persistence_3_0.xsd" version="3.0">
+  <persistence-unit name="CTS-EM" transaction-type="JTA">
+    <description>Persistence Unit for CTS Vehicle Tests</description>
+    <jta-data-source>jdbc/DB1</jta-data-source>
+    <class>ee.jakarta.tck.persistence.common.schema30.Address</class>
+    <class>ee.jakarta.tck.persistence.common.schema30.Address_</class>
+    <class>ee.jakarta.tck.persistence.common.schema30.Alias</class>
+    <class>ee.jakarta.tck.persistence.common.schema30.Alias_</class>
+    <class>ee.jakarta.tck.persistence.common.schema30.Country</class>
+    <class>ee.jakarta.tck.persistence.common.schema30.Country_</class>
+    <class>ee.jakarta.tck.persistence.common.schema30.CreditCard</class>
+    <class>ee.jakarta.tck.persistence.common.schema30.CreditCard_</class>
+    <class>ee.jakarta.tck.persistence.common.schema30.Customer</class>
+    <class>ee.jakarta.tck.persistence.common.schema30.Customer_</class>
+    <class>ee.jakarta.tck.persistence.common.schema30.Department</class>
+    <class>ee.jakarta.tck.persistence.common.schema30.Department_</class>
+    <class>ee.jakarta.tck.persistence.common.schema30.Employee</class>
+    <class>ee.jakarta.tck.persistence.common.schema30.Employee_</class>
+    <class>ee.jakarta.tck.persistence.common.schema30.HardwareProduct</class>
+    <class>ee.jakarta.tck.persistence.common.schema30.HardwareProduct_</class>
+    <class>ee.jakarta.tck.persistence.common.schema30.Info</class>
+    <class>ee.jakarta.tck.persistence.common.schema30.Info_</class>
+    <class>ee.jakarta.tck.persistence.common.schema30.LineItem</class>
+    <class>ee.jakarta.tck.persistence.common.schema30.LineItemException</class>
+    <class>ee.jakarta.tck.persistence.common.schema30.LineItem_</class>
+    <class>ee.jakarta.tck.persistence.common.schema30.Order</class>
+    <class>ee.jakarta.tck.persistence.common.schema30.Order_</class>
+    <class>ee.jakarta.tck.persistence.common.schema30.Phone</class>
+    <class>ee.jakarta.tck.persistence.common.schema30.Phone_</class>
+    <class>ee.jakarta.tck.persistence.common.schema30.Product</class>
+    <class>ee.jakarta.tck.persistence.common.schema30.Product_</class>
+    <class>ee.jakarta.tck.persistence.common.schema30.ShelfLife</class>
+    <class>ee.jakarta.tck.persistence.common.schema30.ShelfLife_</class>
+    <class>ee.jakarta.tck.persistence.common.schema30.SoftwareProduct</class>
+    <class>ee.jakarta.tck.persistence.common.schema30.SoftwareProduct_</class>
+    <class>ee.jakarta.tck.persistence.common.schema30.Spouse</class>
+    <class>ee.jakarta.tck.persistence.common.schema30.Spouse_</class>
+    <class>ee.jakarta.tck.persistence.common.schema30.Trim</class>
+    <class>ee.jakarta.tck.persistence.common.schema30.Trim_</class>
+  </persistence-unit>
+  <persistence-unit name="CTS-EM2" transaction-type="JTA">
+    <description>Persistence Unit for CTS Vehicle Tests</description>
+    <jta-data-source>jdbc/DB1</jta-data-source>
+    <class>ee.jakarta.tck.persistence.common.schema30.Address</class>
+    <class>ee.jakarta.tck.persistence.common.schema30.Address_</class>
+    <class>ee.jakarta.tck.persistence.common.schema30.Alias</class>
+    <class>ee.jakarta.tck.persistence.common.schema30.Alias_</class>
+    <class>ee.jakarta.tck.persistence.common.schema30.Country</class>
+    <class>ee.jakarta.tck.persistence.common.schema30.Country_</class>
+    <class>ee.jakarta.tck.persistence.common.schema30.CreditCard</class>
+    <class>ee.jakarta.tck.persistence.common.schema30.CreditCard_</class>
+    <class>ee.jakarta.tck.persistence.common.schema30.Customer</class>
+    <class>ee.jakarta.tck.persistence.common.schema30.Customer_</class>
+    <class>ee.jakarta.tck.persistence.common.schema30.Department</class>
+    <class>ee.jakarta.tck.persistence.common.schema30.Department_</class>
+    <class>ee.jakarta.tck.persistence.common.schema30.Employee</class>
+    <class>ee.jakarta.tck.persistence.common.schema30.Employee_</class>
+    <class>ee.jakarta.tck.persistence.common.schema30.HardwareProduct</class>
+    <class>ee.jakarta.tck.persistence.common.schema30.HardwareProduct_</class>
+    <class>ee.jakarta.tck.persistence.common.schema30.Info</class>
+    <class>ee.jakarta.tck.persistence.common.schema30.Info_</class>
+    <class>ee.jakarta.tck.persistence.common.schema30.LineItem</class>
+    <class>ee.jakarta.tck.persistence.common.schema30.LineItemException</class>
+    <class>ee.jakarta.tck.persistence.common.schema30.LineItem_</class>
+    <class>ee.jakarta.tck.persistence.common.schema30.Order</class>
+    <class>ee.jakarta.tck.persistence.common.schema30.Order_</class>
+    <class>ee.jakarta.tck.persistence.common.schema30.Phone</class>
+    <class>ee.jakarta.tck.persistence.common.schema30.Phone_</class>
+    <class>ee.jakarta.tck.persistence.common.schema30.Product</class>
+    <class>ee.jakarta.tck.persistence.common.schema30.Product_</class>
+    <class>ee.jakarta.tck.persistence.common.schema30.ShelfLife</class>
+    <class>ee.jakarta.tck.persistence.common.schema30.ShelfLife_</class>
+    <class>ee.jakarta.tck.persistence.common.schema30.SoftwareProduct</class>
+    <class>ee.jakarta.tck.persistence.common.schema30.SoftwareProduct_</class>
+    <class>ee.jakarta.tck.persistence.common.schema30.Spouse</class>
+    <class>ee.jakarta.tck.persistence.common.schema30.Spouse_</class>
+    <class>ee.jakarta.tck.persistence.common.schema30.Trim</class>
+    <class>ee.jakarta.tck.persistence.common.schema30.Trim_</class>
+  </persistence-unit>
+  <persistence-unit name="CTS-EM-NOTX" transaction-type="RESOURCE_LOCAL">
+    <description>The persistence.xml file may be used to designate
+                  more than one persistence unit within the same scope.
+                  Persistence Unit for Application Managed Resource Local</description>
+    <non-jta-data-source>jdbc/DB_no_tx</non-jta-data-source>
+    <class>ee.jakarta.tck.persistence.common.schema30.Address</class>
+    <class>ee.jakarta.tck.persistence.common.schema30.Address_</class>
+    <class>ee.jakarta.tck.persistence.common.schema30.Alias</class>
+    <class>ee.jakarta.tck.persistence.common.schema30.Alias_</class>
+    <class>ee.jakarta.tck.persistence.common.schema30.Country</class>
+    <class>ee.jakarta.tck.persistence.common.schema30.Country_</class>
+    <class>ee.jakarta.tck.persistence.common.schema30.CreditCard</class>
+    <class>ee.jakarta.tck.persistence.common.schema30.CreditCard_</class>
+    <class>ee.jakarta.tck.persistence.common.schema30.Customer</class>
+    <class>ee.jakarta.tck.persistence.common.schema30.Customer_</class>
+    <class>ee.jakarta.tck.persistence.common.schema30.Department</class>
+    <class>ee.jakarta.tck.persistence.common.schema30.Department_</class>
+    <class>ee.jakarta.tck.persistence.common.schema30.Employee</class>
+    <class>ee.jakarta.tck.persistence.common.schema30.Employee_</class>
+    <class>ee.jakarta.tck.persistence.common.schema30.HardwareProduct</class>
+    <class>ee.jakarta.tck.persistence.common.schema30.HardwareProduct_</class>
+    <class>ee.jakarta.tck.persistence.common.schema30.Info</class>
+    <class>ee.jakarta.tck.persistence.common.schema30.Info_</class>
+    <class>ee.jakarta.tck.persistence.common.schema30.LineItem</class>
+    <class>ee.jakarta.tck.persistence.common.schema30.LineItemException</class>
+    <class>ee.jakarta.tck.persistence.common.schema30.LineItem_</class>
+    <class>ee.jakarta.tck.persistence.common.schema30.Order</class>
+    <class>ee.jakarta.tck.persistence.common.schema30.Order_</class>
+    <class>ee.jakarta.tck.persistence.common.schema30.Phone</class>
+    <class>ee.jakarta.tck.persistence.common.schema30.Phone_</class>
+    <class>ee.jakarta.tck.persistence.common.schema30.Product</class>
+    <class>ee.jakarta.tck.persistence.common.schema30.Product_</class>
+    <class>ee.jakarta.tck.persistence.common.schema30.ShelfLife</class>
+    <class>ee.jakarta.tck.persistence.common.schema30.ShelfLife_</class>
+    <class>ee.jakarta.tck.persistence.common.schema30.SoftwareProduct</class>
+    <class>ee.jakarta.tck.persistence.common.schema30.SoftwareProduct_</class>
+    <class>ee.jakarta.tck.persistence.common.schema30.Spouse</class>
+    <class>ee.jakarta.tck.persistence.common.schema30.Spouse_</class>
+    <class>ee.jakarta.tck.persistence.common.schema30.Trim</class>
+    <class>ee.jakarta.tck.persistence.common.schema30.Trim_</class>
+  </persistence-unit>
+</persistence>
+
diff --git a/jpa/spec-tests/src/main/java/ee/jakarta/tck/persistence/core/criteriaapi/CriteriaQuery/persistence.xml b/jpa/spec-tests/src/main/java/ee/jakarta/tck/persistence/core/criteriaapi/CriteriaQuery/persistence.xml
new file mode 100644
index 0000000000..ca49332c22
--- /dev/null
+++ b/jpa/spec-tests/src/main/java/ee/jakarta/tck/persistence/core/criteriaapi/CriteriaQuery/persistence.xml
@@ -0,0 +1,143 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+
+    Copyright (c) 2018 Oracle and/or its affiliates. All rights reserved.
+
+    This program and the accompanying materials are made available under the
+    terms of the Eclipse Public License v. 2.0, which is available at
+    http://www.eclipse.org/legal/epl-2.0.
+
+    This Source Code may also be made available under the following Secondary
+    Licenses when the conditions for such availability set forth in the
+    Eclipse Public License v. 2.0 are satisfied: GNU General Public License,
+    version 2 with the GNU Classpath Exception, which is available at
+    https://www.gnu.org/software/classpath/license.html.
+
+    SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
+
+-->
+<persistence xmlns="https://jakarta.ee/xml/ns/persistence" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="https://jakarta.ee/xml/ns/persistence     https://jakarta.ee/xml/ns/persistence/persistence_3_0.xsd" version="3.0">
+  <persistence-unit name="CTS-EM" transaction-type="JTA">
+    <description>Persistence Unit for CTS Vehicle Tests</description>
+    <jta-data-source>jdbc/DB1</jta-data-source>
+    <class>ee.jakarta.tck.persistence.common.schema30.Address</class>
+    <class>ee.jakarta.tck.persistence.common.schema30.Address_</class>
+    <class>ee.jakarta.tck.persistence.common.schema30.Alias</class>
+    <class>ee.jakarta.tck.persistence.common.schema30.Alias_</class>
+    <class>ee.jakarta.tck.persistence.common.schema30.Country</class>
+    <class>ee.jakarta.tck.persistence.common.schema30.Country_</class>
+    <class>ee.jakarta.tck.persistence.common.schema30.CreditCard</class>
+    <class>ee.jakarta.tck.persistence.common.schema30.CreditCard_</class>
+    <class>ee.jakarta.tck.persistence.common.schema30.Customer</class>
+    <class>ee.jakarta.tck.persistence.common.schema30.Customer_</class>
+    <class>ee.jakarta.tck.persistence.common.schema30.Department</class>
+    <class>ee.jakarta.tck.persistence.common.schema30.Department_</class>
+    <class>ee.jakarta.tck.persistence.common.schema30.Employee</class>
+    <class>ee.jakarta.tck.persistence.common.schema30.Employee_</class>
+    <class>ee.jakarta.tck.persistence.common.schema30.HardwareProduct</class>
+    <class>ee.jakarta.tck.persistence.common.schema30.HardwareProduct_</class>
+    <class>ee.jakarta.tck.persistence.common.schema30.Info</class>
+    <class>ee.jakarta.tck.persistence.common.schema30.Info_</class>
+    <class>ee.jakarta.tck.persistence.common.schema30.LineItem</class>
+    <class>ee.jakarta.tck.persistence.common.schema30.LineItemException</class>
+    <class>ee.jakarta.tck.persistence.common.schema30.LineItem_</class>
+    <class>ee.jakarta.tck.persistence.common.schema30.Order</class>
+    <class>ee.jakarta.tck.persistence.common.schema30.Order_</class>
+    <class>ee.jakarta.tck.persistence.common.schema30.Phone</class>
+    <class>ee.jakarta.tck.persistence.common.schema30.Phone_</class>
+    <class>ee.jakarta.tck.persistence.common.schema30.Product</class>
+    <class>ee.jakarta.tck.persistence.common.schema30.Product_</class>
+    <class>ee.jakarta.tck.persistence.common.schema30.ShelfLife</class>
+    <class>ee.jakarta.tck.persistence.common.schema30.ShelfLife_</class>
+    <class>ee.jakarta.tck.persistence.common.schema30.SoftwareProduct</class>
+    <class>ee.jakarta.tck.persistence.common.schema30.SoftwareProduct_</class>
+    <class>ee.jakarta.tck.persistence.common.schema30.Spouse</class>
+    <class>ee.jakarta.tck.persistence.common.schema30.Spouse_</class>
+    <class>ee.jakarta.tck.persistence.common.schema30.Trim</class>
+    <class>ee.jakarta.tck.persistence.common.schema30.Trim_</class>
+    <class>ee.jakarta.tck.persistence.core.criteriaapi.CriteriaQuery.A</class>
+  </persistence-unit>
+  <persistence-unit name="CTS-EM2" transaction-type="JTA">
+    <description>Persistence Unit for CTS Vehicle Tests</description>
+    <jta-data-source>jdbc/DB1</jta-data-source>
+    <class>ee.jakarta.tck.persistence.common.schema30.Address</class>
+    <class>ee.jakarta.tck.persistence.common.schema30.Address_</class>
+    <class>ee.jakarta.tck.persistence.common.schema30.Alias</class>
+    <class>ee.jakarta.tck.persistence.common.schema30.Alias_</class>
+    <class>ee.jakarta.tck.persistence.common.schema30.Country</class>
+    <class>ee.jakarta.tck.persistence.common.schema30.Country_</class>
+    <class>ee.jakarta.tck.persistence.common.schema30.CreditCard</class>
+    <class>ee.jakarta.tck.persistence.common.schema30.CreditCard_</class>
+    <class>ee.jakarta.tck.persistence.common.schema30.Customer</class>
+    <class>ee.jakarta.tck.persistence.common.schema30.Customer_</class>
+    <class>ee.jakarta.tck.persistence.common.schema30.Department</class>
+    <class>ee.jakarta.tck.persistence.common.schema30.Department_</class>
+    <class>ee.jakarta.tck.persistence.common.schema30.Employee</class>
+    <class>ee.jakarta.tck.persistence.common.schema30.Employee_</class>
+    <class>ee.jakarta.tck.persistence.common.schema30.HardwareProduct</class>
+    <class>ee.jakarta.tck.persistence.common.schema30.HardwareProduct_</class>
+    <class>ee.jakarta.tck.persistence.common.schema30.Info</class>
+    <class>ee.jakarta.tck.persistence.common.schema30.Info_</class>
+    <class>ee.jakarta.tck.persistence.common.schema30.LineItem</class>
+    <class>ee.jakarta.tck.persistence.common.schema30.LineItemException</class>
+    <class>ee.jakarta.tck.persistence.common.schema30.LineItem_</class>
+    <class>ee.jakarta.tck.persistence.common.schema30.Order</class>
+    <class>ee.jakarta.tck.persistence.common.schema30.Order_</class>
+    <class>ee.jakarta.tck.persistence.common.schema30.Phone</class>
+    <class>ee.jakarta.tck.persistence.common.schema30.Phone_</class>
+    <class>ee.jakarta.tck.persistence.common.schema30.Product</class>
+    <class>ee.jakarta.tck.persistence.common.schema30.Product_</class>
+    <class>ee.jakarta.tck.persistence.common.schema30.ShelfLife</class>
+    <class>ee.jakarta.tck.persistence.common.schema30.ShelfLife_</class>
+    <class>ee.jakarta.tck.persistence.common.schema30.SoftwareProduct</class>
+    <class>ee.jakarta.tck.persistence.common.schema30.SoftwareProduct_</class>
+    <class>ee.jakarta.tck.persistence.common.schema30.Spouse</class>
+    <class>ee.jakarta.tck.persistence.common.schema30.Spouse_</class>
+    <class>ee.jakarta.tck.persistence.common.schema30.Trim</class>
+    <class>ee.jakarta.tck.persistence.common.schema30.Trim_</class>
+    <class>ee.jakarta.tck.persistence.core.criteriaapi.CriteriaQuery.A</class>
+  </persistence-unit>
+  <persistence-unit name="CTS-EM-NOTX" transaction-type="RESOURCE_LOCAL">
+    <description>The persistence.xml file may be used to designate
+                  more than one persistence unit within the same scope.
+                  Persistence Unit for Application Managed Resource Local</description>
+    <non-jta-data-source>jdbc/DB_no_tx</non-jta-data-source>
+    <class>ee.jakarta.tck.persistence.common.schema30.Address</class>
+    <class>ee.jakarta.tck.persistence.common.schema30.Address_</class>
+    <class>ee.jakarta.tck.persistence.common.schema30.Alias</class>
+    <class>ee.jakarta.tck.persistence.common.schema30.Alias_</class>
+    <class>ee.jakarta.tck.persistence.common.schema30.Country</class>
+    <class>ee.jakarta.tck.persistence.common.schema30.Country_</class>
+    <class>ee.jakarta.tck.persistence.common.schema30.CreditCard</class>
+    <class>ee.jakarta.tck.persistence.common.schema30.CreditCard_</class>
+    <class>ee.jakarta.tck.persistence.common.schema30.Customer</class>
+    <class>ee.jakarta.tck.persistence.common.schema30.Customer_</class>
+    <class>ee.jakarta.tck.persistence.common.schema30.Department</class>
+    <class>ee.jakarta.tck.persistence.common.schema30.Department_</class>
+    <class>ee.jakarta.tck.persistence.common.schema30.Employee</class>
+    <class>ee.jakarta.tck.persistence.common.schema30.Employee_</class>
+    <class>ee.jakarta.tck.persistence.common.schema30.HardwareProduct</class>
+    <class>ee.jakarta.tck.persistence.common.schema30.HardwareProduct_</class>
+    <class>ee.jakarta.tck.persistence.common.schema30.Info</class>
+    <class>ee.jakarta.tck.persistence.common.schema30.Info_</class>
+    <class>ee.jakarta.tck.persistence.common.schema30.LineItem</class>
+    <class>ee.jakarta.tck.persistence.common.schema30.LineItemException</class>
+    <class>ee.jakarta.tck.persistence.common.schema30.LineItem_</class>
+    <class>ee.jakarta.tck.persistence.common.schema30.Order</class>
+    <class>ee.jakarta.tck.persistence.common.schema30.Order_</class>
+    <class>ee.jakarta.tck.persistence.common.schema30.Phone</class>
+    <class>ee.jakarta.tck.persistence.common.schema30.Phone_</class>
+    <class>ee.jakarta.tck.persistence.common.schema30.Product</class>
+    <class>ee.jakarta.tck.persistence.common.schema30.Product_</class>
+    <class>ee.jakarta.tck.persistence.common.schema30.ShelfLife</class>
+    <class>ee.jakarta.tck.persistence.common.schema30.ShelfLife_</class>
+    <class>ee.jakarta.tck.persistence.common.schema30.SoftwareProduct</class>
+    <class>ee.jakarta.tck.persistence.common.schema30.SoftwareProduct_</class>
+    <class>ee.jakarta.tck.persistence.common.schema30.Spouse</class>
+    <class>ee.jakarta.tck.persistence.common.schema30.Spouse_</class>
+    <class>ee.jakarta.tck.persistence.common.schema30.Trim</class>
+    <class>ee.jakarta.tck.persistence.common.schema30.Trim_</class>
+    <class>ee.jakarta.tck.persistence.core.criteriaapi.CriteriaQuery.A</class>
+  </persistence-unit>
+</persistence>
+
diff --git a/jpa/spec-tests/src/main/java/ee/jakarta/tck/persistence/core/criteriaapi/CriteriaUpdate/persistence.xml b/jpa/spec-tests/src/main/java/ee/jakarta/tck/persistence/core/criteriaapi/CriteriaUpdate/persistence.xml
new file mode 100644
index 0000000000..69e68d3b95
--- /dev/null
+++ b/jpa/spec-tests/src/main/java/ee/jakarta/tck/persistence/core/criteriaapi/CriteriaUpdate/persistence.xml
@@ -0,0 +1,140 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+
+    Copyright (c) 2018 Oracle and/or its affiliates. All rights reserved.
+
+    This program and the accompanying materials are made available under the
+    terms of the Eclipse Public License v. 2.0, which is available at
+    http://www.eclipse.org/legal/epl-2.0.
+
+    This Source Code may also be made available under the following Secondary
+    Licenses when the conditions for such availability set forth in the
+    Eclipse Public License v. 2.0 are satisfied: GNU General Public License,
+    version 2 with the GNU Classpath Exception, which is available at
+    https://www.gnu.org/software/classpath/license.html.
+
+    SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
+
+-->
+<persistence xmlns="https://jakarta.ee/xml/ns/persistence" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="https://jakarta.ee/xml/ns/persistence     https://jakarta.ee/xml/ns/persistence/persistence_3_0.xsd" version="3.0">
+  <persistence-unit name="CTS-EM" transaction-type="JTA">
+    <description>Persistence Unit for CTS Vehicle Tests</description>
+    <jta-data-source>jdbc/DB1</jta-data-source>
+    <class>ee.jakarta.tck.persistence.common.schema30.Address</class>
+    <class>ee.jakarta.tck.persistence.common.schema30.Address_</class>
+    <class>ee.jakarta.tck.persistence.common.schema30.Alias</class>
+    <class>ee.jakarta.tck.persistence.common.schema30.Alias_</class>
+    <class>ee.jakarta.tck.persistence.common.schema30.Country</class>
+    <class>ee.jakarta.tck.persistence.common.schema30.Country_</class>
+    <class>ee.jakarta.tck.persistence.common.schema30.CreditCard</class>
+    <class>ee.jakarta.tck.persistence.common.schema30.CreditCard_</class>
+    <class>ee.jakarta.tck.persistence.common.schema30.Customer</class>
+    <class>ee.jakarta.tck.persistence.common.schema30.Customer_</class>
+    <class>ee.jakarta.tck.persistence.common.schema30.Department</class>
+    <class>ee.jakarta.tck.persistence.common.schema30.Department_</class>
+    <class>ee.jakarta.tck.persistence.common.schema30.Employee</class>
+    <class>ee.jakarta.tck.persistence.common.schema30.Employee_</class>
+    <class>ee.jakarta.tck.persistence.common.schema30.HardwareProduct</class>
+    <class>ee.jakarta.tck.persistence.common.schema30.HardwareProduct_</class>
+    <class>ee.jakarta.tck.persistence.common.schema30.Info</class>
+    <class>ee.jakarta.tck.persistence.common.schema30.Info_</class>
+    <class>ee.jakarta.tck.persistence.common.schema30.LineItem</class>
+    <class>ee.jakarta.tck.persistence.common.schema30.LineItemException</class>
+    <class>ee.jakarta.tck.persistence.common.schema30.LineItem_</class>
+    <class>ee.jakarta.tck.persistence.common.schema30.Order</class>
+    <class>ee.jakarta.tck.persistence.common.schema30.Order_</class>
+    <class>ee.jakarta.tck.persistence.common.schema30.Phone</class>
+    <class>ee.jakarta.tck.persistence.common.schema30.Phone_</class>
+    <class>ee.jakarta.tck.persistence.common.schema30.Product</class>
+    <class>ee.jakarta.tck.persistence.common.schema30.Product_</class>
+    <class>ee.jakarta.tck.persistence.common.schema30.ShelfLife</class>
+    <class>ee.jakarta.tck.persistence.common.schema30.ShelfLife_</class>
+    <class>ee.jakarta.tck.persistence.common.schema30.SoftwareProduct</class>
+    <class>ee.jakarta.tck.persistence.common.schema30.SoftwareProduct_</class>
+    <class>ee.jakarta.tck.persistence.common.schema30.Spouse</class>
+    <class>ee.jakarta.tck.persistence.common.schema30.Spouse_</class>
+    <class>ee.jakarta.tck.persistence.common.schema30.Trim</class>
+    <class>ee.jakarta.tck.persistence.common.schema30.Trim_</class>
+  </persistence-unit>
+  <persistence-unit name="CTS-EM2" transaction-type="JTA">
+    <description>Persistence Unit for CTS Vehicle Tests</description>
+    <jta-data-source>jdbc/DB1</jta-data-source>
+    <class>ee.jakarta.tck.persistence.common.schema30.Address</class>
+    <class>ee.jakarta.tck.persistence.common.schema30.Address_</class>
+    <class>ee.jakarta.tck.persistence.common.schema30.Alias</class>
+    <class>ee.jakarta.tck.persistence.common.schema30.Alias_</class>
+    <class>ee.jakarta.tck.persistence.common.schema30.Country</class>
+    <class>ee.jakarta.tck.persistence.common.schema30.Country_</class>
+    <class>ee.jakarta.tck.persistence.common.schema30.CreditCard</class>
+    <class>ee.jakarta.tck.persistence.common.schema30.CreditCard_</class>
+    <class>ee.jakarta.tck.persistence.common.schema30.Customer</class>
+    <class>ee.jakarta.tck.persistence.common.schema30.Customer_</class>
+    <class>ee.jakarta.tck.persistence.common.schema30.Department</class>
+    <class>ee.jakarta.tck.persistence.common.schema30.Department_</class>
+    <class>ee.jakarta.tck.persistence.common.schema30.Employee</class>
+    <class>ee.jakarta.tck.persistence.common.schema30.Employee_</class>
+    <class>ee.jakarta.tck.persistence.common.schema30.HardwareProduct</class>
+    <class>ee.jakarta.tck.persistence.common.schema30.HardwareProduct_</class>
+    <class>ee.jakarta.tck.persistence.common.schema30.Info</class>
+    <class>ee.jakarta.tck.persistence.common.schema30.Info_</class>
+    <class>ee.jakarta.tck.persistence.common.schema30.LineItem</class>
+    <class>ee.jakarta.tck.persistence.common.schema30.LineItemException</class>
+    <class>ee.jakarta.tck.persistence.common.schema30.LineItem_</class>
+    <class>ee.jakarta.tck.persistence.common.schema30.Order</class>
+    <class>ee.jakarta.tck.persistence.common.schema30.Order_</class>
+    <class>ee.jakarta.tck.persistence.common.schema30.Phone</class>
+    <class>ee.jakarta.tck.persistence.common.schema30.Phone_</class>
+    <class>ee.jakarta.tck.persistence.common.schema30.Product</class>
+    <class>ee.jakarta.tck.persistence.common.schema30.Product_</class>
+    <class>ee.jakarta.tck.persistence.common.schema30.ShelfLife</class>
+    <class>ee.jakarta.tck.persistence.common.schema30.ShelfLife_</class>
+    <class>ee.jakarta.tck.persistence.common.schema30.SoftwareProduct</class>
+    <class>ee.jakarta.tck.persistence.common.schema30.SoftwareProduct_</class>
+    <class>ee.jakarta.tck.persistence.common.schema30.Spouse</class>
+    <class>ee.jakarta.tck.persistence.common.schema30.Spouse_</class>
+    <class>ee.jakarta.tck.persistence.common.schema30.Trim</class>
+    <class>ee.jakarta.tck.persistence.common.schema30.Trim_</class>
+  </persistence-unit>
+  <persistence-unit name="CTS-EM-NOTX" transaction-type="RESOURCE_LOCAL">
+    <description>The persistence.xml file may be used to designate
+                  more than one persistence unit within the same scope.
+                  Persistence Unit for Application Managed Resource Local</description>
+    <non-jta-data-source>jdbc/DB_no_tx</non-jta-data-source>
+    <class>ee.jakarta.tck.persistence.common.schema30.Address</class>
+    <class>ee.jakarta.tck.persistence.common.schema30.Address_</class>
+    <class>ee.jakarta.tck.persistence.common.schema30.Alias</class>
+    <class>ee.jakarta.tck.persistence.common.schema30.Alias_</class>
+    <class>ee.jakarta.tck.persistence.common.schema30.Country</class>
+    <class>ee.jakarta.tck.persistence.common.schema30.Country_</class>
+    <class>ee.jakarta.tck.persistence.common.schema30.CreditCard</class>
+    <class>ee.jakarta.tck.persistence.common.schema30.CreditCard_</class>
+    <class>ee.jakarta.tck.persistence.common.schema30.Customer</class>
+    <class>ee.jakarta.tck.persistence.common.schema30.Customer_</class>
+    <class>ee.jakarta.tck.persistence.common.schema30.Department</class>
+    <class>ee.jakarta.tck.persistence.common.schema30.Department_</class>
+    <class>ee.jakarta.tck.persistence.common.schema30.Employee</class>
+    <class>ee.jakarta.tck.persistence.common.schema30.Employee_</class>
+    <class>ee.jakarta.tck.persistence.common.schema30.HardwareProduct</class>
+    <class>ee.jakarta.tck.persistence.common.schema30.HardwareProduct_</class>
+    <class>ee.jakarta.tck.persistence.common.schema30.Info</class>
+    <class>ee.jakarta.tck.persistence.common.schema30.Info_</class>
+    <class>ee.jakarta.tck.persistence.common.schema30.LineItem</class>
+    <class>ee.jakarta.tck.persistence.common.schema30.LineItemException</class>
+    <class>ee.jakarta.tck.persistence.common.schema30.LineItem_</class>
+    <class>ee.jakarta.tck.persistence.common.schema30.Order</class>
+    <class>ee.jakarta.tck.persistence.common.schema30.Order_</class>
+    <class>ee.jakarta.tck.persistence.common.schema30.Phone</class>
+    <class>ee.jakarta.tck.persistence.common.schema30.Phone_</class>
+    <class>ee.jakarta.tck.persistence.common.schema30.Product</class>
+    <class>ee.jakarta.tck.persistence.common.schema30.Product_</class>
+    <class>ee.jakarta.tck.persistence.common.schema30.ShelfLife</class>
+    <class>ee.jakarta.tck.persistence.common.schema30.ShelfLife_</class>
+    <class>ee.jakarta.tck.persistence.common.schema30.SoftwareProduct</class>
+    <class>ee.jakarta.tck.persistence.common.schema30.SoftwareProduct_</class>
+    <class>ee.jakarta.tck.persistence.common.schema30.Spouse</class>
+    <class>ee.jakarta.tck.persistence.common.schema30.Spouse_</class>
+    <class>ee.jakarta.tck.persistence.common.schema30.Trim</class>
+    <class>ee.jakarta.tck.persistence.common.schema30.Trim_</class>
+  </persistence-unit>
+</persistence>
+
diff --git a/jpa/spec-tests/src/main/java/ee/jakarta/tck/persistence/core/criteriaapi/From/persistence.xml b/jpa/spec-tests/src/main/java/ee/jakarta/tck/persistence/core/criteriaapi/From/persistence.xml
new file mode 100644
index 0000000000..69e68d3b95
--- /dev/null
+++ b/jpa/spec-tests/src/main/java/ee/jakarta/tck/persistence/core/criteriaapi/From/persistence.xml
@@ -0,0 +1,140 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+
+    Copyright (c) 2018 Oracle and/or its affiliates. All rights reserved.
+
+    This program and the accompanying materials are made available under the
+    terms of the Eclipse Public License v. 2.0, which is available at
+    http://www.eclipse.org/legal/epl-2.0.
+
+    This Source Code may also be made available under the following Secondary
+    Licenses when the conditions for such availability set forth in the
+    Eclipse Public License v. 2.0 are satisfied: GNU General Public License,
+    version 2 with the GNU Classpath Exception, which is available at
+    https://www.gnu.org/software/classpath/license.html.
+
+    SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
+
+-->
+<persistence xmlns="https://jakarta.ee/xml/ns/persistence" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="https://jakarta.ee/xml/ns/persistence     https://jakarta.ee/xml/ns/persistence/persistence_3_0.xsd" version="3.0">
+  <persistence-unit name="CTS-EM" transaction-type="JTA">
+    <description>Persistence Unit for CTS Vehicle Tests</description>
+    <jta-data-source>jdbc/DB1</jta-data-source>
+    <class>ee.jakarta.tck.persistence.common.schema30.Address</class>
+    <class>ee.jakarta.tck.persistence.common.schema30.Address_</class>
+    <class>ee.jakarta.tck.persistence.common.schema30.Alias</class>
+    <class>ee.jakarta.tck.persistence.common.schema30.Alias_</class>
+    <class>ee.jakarta.tck.persistence.common.schema30.Country</class>
+    <class>ee.jakarta.tck.persistence.common.schema30.Country_</class>
+    <class>ee.jakarta.tck.persistence.common.schema30.CreditCard</class>
+    <class>ee.jakarta.tck.persistence.common.schema30.CreditCard_</class>
+    <class>ee.jakarta.tck.persistence.common.schema30.Customer</class>
+    <class>ee.jakarta.tck.persistence.common.schema30.Customer_</class>
+    <class>ee.jakarta.tck.persistence.common.schema30.Department</class>
+    <class>ee.jakarta.tck.persistence.common.schema30.Department_</class>
+    <class>ee.jakarta.tck.persistence.common.schema30.Employee</class>
+    <class>ee.jakarta.tck.persistence.common.schema30.Employee_</class>
+    <class>ee.jakarta.tck.persistence.common.schema30.HardwareProduct</class>
+    <class>ee.jakarta.tck.persistence.common.schema30.HardwareProduct_</class>
+    <class>ee.jakarta.tck.persistence.common.schema30.Info</class>
+    <class>ee.jakarta.tck.persistence.common.schema30.Info_</class>
+    <class>ee.jakarta.tck.persistence.common.schema30.LineItem</class>
+    <class>ee.jakarta.tck.persistence.common.schema30.LineItemException</class>
+    <class>ee.jakarta.tck.persistence.common.schema30.LineItem_</class>
+    <class>ee.jakarta.tck.persistence.common.schema30.Order</class>
+    <class>ee.jakarta.tck.persistence.common.schema30.Order_</class>
+    <class>ee.jakarta.tck.persistence.common.schema30.Phone</class>
+    <class>ee.jakarta.tck.persistence.common.schema30.Phone_</class>
+    <class>ee.jakarta.tck.persistence.common.schema30.Product</class>
+    <class>ee.jakarta.tck.persistence.common.schema30.Product_</class>
+    <class>ee.jakarta.tck.persistence.common.schema30.ShelfLife</class>
+    <class>ee.jakarta.tck.persistence.common.schema30.ShelfLife_</class>
+    <class>ee.jakarta.tck.persistence.common.schema30.SoftwareProduct</class>
+    <class>ee.jakarta.tck.persistence.common.schema30.SoftwareProduct_</class>
+    <class>ee.jakarta.tck.persistence.common.schema30.Spouse</class>
+    <class>ee.jakarta.tck.persistence.common.schema30.Spouse_</class>
+    <class>ee.jakarta.tck.persistence.common.schema30.Trim</class>
+    <class>ee.jakarta.tck.persistence.common.schema30.Trim_</class>
+  </persistence-unit>
+  <persistence-unit name="CTS-EM2" transaction-type="JTA">
+    <description>Persistence Unit for CTS Vehicle Tests</description>
+    <jta-data-source>jdbc/DB1</jta-data-source>
+    <class>ee.jakarta.tck.persistence.common.schema30.Address</class>
+    <class>ee.jakarta.tck.persistence.common.schema30.Address_</class>
+    <class>ee.jakarta.tck.persistence.common.schema30.Alias</class>
+    <class>ee.jakarta.tck.persistence.common.schema30.Alias_</class>
+    <class>ee.jakarta.tck.persistence.common.schema30.Country</class>
+    <class>ee.jakarta.tck.persistence.common.schema30.Country_</class>
+    <class>ee.jakarta.tck.persistence.common.schema30.CreditCard</class>
+    <class>ee.jakarta.tck.persistence.common.schema30.CreditCard_</class>
+    <class>ee.jakarta.tck.persistence.common.schema30.Customer</class>
+    <class>ee.jakarta.tck.persistence.common.schema30.Customer_</class>
+    <class>ee.jakarta.tck.persistence.common.schema30.Department</class>
+    <class>ee.jakarta.tck.persistence.common.schema30.Department_</class>
+    <class>ee.jakarta.tck.persistence.common.schema30.Employee</class>
+    <class>ee.jakarta.tck.persistence.common.schema30.Employee_</class>
+    <class>ee.jakarta.tck.persistence.common.schema30.HardwareProduct</class>
+    <class>ee.jakarta.tck.persistence.common.schema30.HardwareProduct_</class>
+    <class>ee.jakarta.tck.persistence.common.schema30.Info</class>
+    <class>ee.jakarta.tck.persistence.common.schema30.Info_</class>
+    <class>ee.jakarta.tck.persistence.common.schema30.LineItem</class>
+    <class>ee.jakarta.tck.persistence.common.schema30.LineItemException</class>
+    <class>ee.jakarta.tck.persistence.common.schema30.LineItem_</class>
+    <class>ee.jakarta.tck.persistence.common.schema30.Order</class>
+    <class>ee.jakarta.tck.persistence.common.schema30.Order_</class>
+    <class>ee.jakarta.tck.persistence.common.schema30.Phone</class>
+    <class>ee.jakarta.tck.persistence.common.schema30.Phone_</class>
+    <class>ee.jakarta.tck.persistence.common.schema30.Product</class>
+    <class>ee.jakarta.tck.persistence.common.schema30.Product_</class>
+    <class>ee.jakarta.tck.persistence.common.schema30.ShelfLife</class>
+    <class>ee.jakarta.tck.persistence.common.schema30.ShelfLife_</class>
+    <class>ee.jakarta.tck.persistence.common.schema30.SoftwareProduct</class>
+    <class>ee.jakarta.tck.persistence.common.schema30.SoftwareProduct_</class>
+    <class>ee.jakarta.tck.persistence.common.schema30.Spouse</class>
+    <class>ee.jakarta.tck.persistence.common.schema30.Spouse_</class>
+    <class>ee.jakarta.tck.persistence.common.schema30.Trim</class>
+    <class>ee.jakarta.tck.persistence.common.schema30.Trim_</class>
+  </persistence-unit>
+  <persistence-unit name="CTS-EM-NOTX" transaction-type="RESOURCE_LOCAL">
+    <description>The persistence.xml file may be used to designate
+                  more than one persistence unit within the same scope.
+                  Persistence Unit for Application Managed Resource Local</description>
+    <non-jta-data-source>jdbc/DB_no_tx</non-jta-data-source>
+    <class>ee.jakarta.tck.persistence.common.schema30.Address</class>
+    <class>ee.jakarta.tck.persistence.common.schema30.Address_</class>
+    <class>ee.jakarta.tck.persistence.common.schema30.Alias</class>
+    <class>ee.jakarta.tck.persistence.common.schema30.Alias_</class>
+    <class>ee.jakarta.tck.persistence.common.schema30.Country</class>
+    <class>ee.jakarta.tck.persistence.common.schema30.Country_</class>
+    <class>ee.jakarta.tck.persistence.common.schema30.CreditCard</class>
+    <class>ee.jakarta.tck.persistence.common.schema30.CreditCard_</class>
+    <class>ee.jakarta.tck.persistence.common.schema30.Customer</class>
+    <class>ee.jakarta.tck.persistence.common.schema30.Customer_</class>
+    <class>ee.jakarta.tck.persistence.common.schema30.Department</class>
+    <class>ee.jakarta.tck.persistence.common.schema30.Department_</class>
+    <class>ee.jakarta.tck.persistence.common.schema30.Employee</class>
+    <class>ee.jakarta.tck.persistence.common.schema30.Employee_</class>
+    <class>ee.jakarta.tck.persistence.common.schema30.HardwareProduct</class>
+    <class>ee.jakarta.tck.persistence.common.schema30.HardwareProduct_</class>
+    <class>ee.jakarta.tck.persistence.common.schema30.Info</class>
+    <class>ee.jakarta.tck.persistence.common.schema30.Info_</class>
+    <class>ee.jakarta.tck.persistence.common.schema30.LineItem</class>
+    <class>ee.jakarta.tck.persistence.common.schema30.LineItemException</class>
+    <class>ee.jakarta.tck.persistence.common.schema30.LineItem_</class>
+    <class>ee.jakarta.tck.persistence.common.schema30.Order</class>
+    <class>ee.jakarta.tck.persistence.common.schema30.Order_</class>
+    <class>ee.jakarta.tck.persistence.common.schema30.Phone</class>
+    <class>ee.jakarta.tck.persistence.common.schema30.Phone_</class>
+    <class>ee.jakarta.tck.persistence.common.schema30.Product</class>
+    <class>ee.jakarta.tck.persistence.common.schema30.Product_</class>
+    <class>ee.jakarta.tck.persistence.common.schema30.ShelfLife</class>
+    <class>ee.jakarta.tck.persistence.common.schema30.ShelfLife_</class>
+    <class>ee.jakarta.tck.persistence.common.schema30.SoftwareProduct</class>
+    <class>ee.jakarta.tck.persistence.common.schema30.SoftwareProduct_</class>
+    <class>ee.jakarta.tck.persistence.common.schema30.Spouse</class>
+    <class>ee.jakarta.tck.persistence.common.schema30.Spouse_</class>
+    <class>ee.jakarta.tck.persistence.common.schema30.Trim</class>
+    <class>ee.jakarta.tck.persistence.common.schema30.Trim_</class>
+  </persistence-unit>
+</persistence>
+
diff --git a/jpa/spec-tests/src/main/java/ee/jakarta/tck/persistence/core/criteriaapi/Join/persistence.xml b/jpa/spec-tests/src/main/java/ee/jakarta/tck/persistence/core/criteriaapi/Join/persistence.xml
new file mode 100644
index 0000000000..69e68d3b95
--- /dev/null
+++ b/jpa/spec-tests/src/main/java/ee/jakarta/tck/persistence/core/criteriaapi/Join/persistence.xml
@@ -0,0 +1,140 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+
+    Copyright (c) 2018 Oracle and/or its affiliates. All rights reserved.
+
+    This program and the accompanying materials are made available under the
+    terms of the Eclipse Public License v. 2.0, which is available at
+    http://www.eclipse.org/legal/epl-2.0.
+
+    This Source Code may also be made available under the following Secondary
+    Licenses when the conditions for such availability set forth in the
+    Eclipse Public License v. 2.0 are satisfied: GNU General Public License,
+    version 2 with the GNU Classpath Exception, which is available at
+    https://www.gnu.org/software/classpath/license.html.
+
+    SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
+
+-->
+<persistence xmlns="https://jakarta.ee/xml/ns/persistence" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="https://jakarta.ee/xml/ns/persistence     https://jakarta.ee/xml/ns/persistence/persistence_3_0.xsd" version="3.0">
+  <persistence-unit name="CTS-EM" transaction-type="JTA">
+    <description>Persistence Unit for CTS Vehicle Tests</description>
+    <jta-data-source>jdbc/DB1</jta-data-source>
+    <class>ee.jakarta.tck.persistence.common.schema30.Address</class>
+    <class>ee.jakarta.tck.persistence.common.schema30.Address_</class>
+    <class>ee.jakarta.tck.persistence.common.schema30.Alias</class>
+    <class>ee.jakarta.tck.persistence.common.schema30.Alias_</class>
+    <class>ee.jakarta.tck.persistence.common.schema30.Country</class>
+    <class>ee.jakarta.tck.persistence.common.schema30.Country_</class>
+    <class>ee.jakarta.tck.persistence.common.schema30.CreditCard</class>
+    <class>ee.jakarta.tck.persistence.common.schema30.CreditCard_</class>
+    <class>ee.jakarta.tck.persistence.common.schema30.Customer</class>
+    <class>ee.jakarta.tck.persistence.common.schema30.Customer_</class>
+    <class>ee.jakarta.tck.persistence.common.schema30.Department</class>
+    <class>ee.jakarta.tck.persistence.common.schema30.Department_</class>
+    <class>ee.jakarta.tck.persistence.common.schema30.Employee</class>
+    <class>ee.jakarta.tck.persistence.common.schema30.Employee_</class>
+    <class>ee.jakarta.tck.persistence.common.schema30.HardwareProduct</class>
+    <class>ee.jakarta.tck.persistence.common.schema30.HardwareProduct_</class>
+    <class>ee.jakarta.tck.persistence.common.schema30.Info</class>
+    <class>ee.jakarta.tck.persistence.common.schema30.Info_</class>
+    <class>ee.jakarta.tck.persistence.common.schema30.LineItem</class>
+    <class>ee.jakarta.tck.persistence.common.schema30.LineItemException</class>
+    <class>ee.jakarta.tck.persistence.common.schema30.LineItem_</class>
+    <class>ee.jakarta.tck.persistence.common.schema30.Order</class>
+    <class>ee.jakarta.tck.persistence.common.schema30.Order_</class>
+    <class>ee.jakarta.tck.persistence.common.schema30.Phone</class>
+    <class>ee.jakarta.tck.persistence.common.schema30.Phone_</class>
+    <class>ee.jakarta.tck.persistence.common.schema30.Product</class>
+    <class>ee.jakarta.tck.persistence.common.schema30.Product_</class>
+    <class>ee.jakarta.tck.persistence.common.schema30.ShelfLife</class>
+    <class>ee.jakarta.tck.persistence.common.schema30.ShelfLife_</class>
+    <class>ee.jakarta.tck.persistence.common.schema30.SoftwareProduct</class>
+    <class>ee.jakarta.tck.persistence.common.schema30.SoftwareProduct_</class>
+    <class>ee.jakarta.tck.persistence.common.schema30.Spouse</class>
+    <class>ee.jakarta.tck.persistence.common.schema30.Spouse_</class>
+    <class>ee.jakarta.tck.persistence.common.schema30.Trim</class>
+    <class>ee.jakarta.tck.persistence.common.schema30.Trim_</class>
+  </persistence-unit>
+  <persistence-unit name="CTS-EM2" transaction-type="JTA">
+    <description>Persistence Unit for CTS Vehicle Tests</description>
+    <jta-data-source>jdbc/DB1</jta-data-source>
+    <class>ee.jakarta.tck.persistence.common.schema30.Address</class>
+    <class>ee.jakarta.tck.persistence.common.schema30.Address_</class>
+    <class>ee.jakarta.tck.persistence.common.schema30.Alias</class>
+    <class>ee.jakarta.tck.persistence.common.schema30.Alias_</class>
+    <class>ee.jakarta.tck.persistence.common.schema30.Country</class>
+    <class>ee.jakarta.tck.persistence.common.schema30.Country_</class>
+    <class>ee.jakarta.tck.persistence.common.schema30.CreditCard</class>
+    <class>ee.jakarta.tck.persistence.common.schema30.CreditCard_</class>
+    <class>ee.jakarta.tck.persistence.common.schema30.Customer</class>
+    <class>ee.jakarta.tck.persistence.common.schema30.Customer_</class>
+    <class>ee.jakarta.tck.persistence.common.schema30.Department</class>
+    <class>ee.jakarta.tck.persistence.common.schema30.Department_</class>
+    <class>ee.jakarta.tck.persistence.common.schema30.Employee</class>
+    <class>ee.jakarta.tck.persistence.common.schema30.Employee_</class>
+    <class>ee.jakarta.tck.persistence.common.schema30.HardwareProduct</class>
+    <class>ee.jakarta.tck.persistence.common.schema30.HardwareProduct_</class>
+    <class>ee.jakarta.tck.persistence.common.schema30.Info</class>
+    <class>ee.jakarta.tck.persistence.common.schema30.Info_</class>
+    <class>ee.jakarta.tck.persistence.common.schema30.LineItem</class>
+    <class>ee.jakarta.tck.persistence.common.schema30.LineItemException</class>
+    <class>ee.jakarta.tck.persistence.common.schema30.LineItem_</class>
+    <class>ee.jakarta.tck.persistence.common.schema30.Order</class>
+    <class>ee.jakarta.tck.persistence.common.schema30.Order_</class>
+    <class>ee.jakarta.tck.persistence.common.schema30.Phone</class>
+    <class>ee.jakarta.tck.persistence.common.schema30.Phone_</class>
+    <class>ee.jakarta.tck.persistence.common.schema30.Product</class>
+    <class>ee.jakarta.tck.persistence.common.schema30.Product_</class>
+    <class>ee.jakarta.tck.persistence.common.schema30.ShelfLife</class>
+    <class>ee.jakarta.tck.persistence.common.schema30.ShelfLife_</class>
+    <class>ee.jakarta.tck.persistence.common.schema30.SoftwareProduct</class>
+    <class>ee.jakarta.tck.persistence.common.schema30.SoftwareProduct_</class>
+    <class>ee.jakarta.tck.persistence.common.schema30.Spouse</class>
+    <class>ee.jakarta.tck.persistence.common.schema30.Spouse_</class>
+    <class>ee.jakarta.tck.persistence.common.schema30.Trim</class>
+    <class>ee.jakarta.tck.persistence.common.schema30.Trim_</class>
+  </persistence-unit>
+  <persistence-unit name="CTS-EM-NOTX" transaction-type="RESOURCE_LOCAL">
+    <description>The persistence.xml file may be used to designate
+                  more than one persistence unit within the same scope.
+                  Persistence Unit for Application Managed Resource Local</description>
+    <non-jta-data-source>jdbc/DB_no_tx</non-jta-data-source>
+    <class>ee.jakarta.tck.persistence.common.schema30.Address</class>
+    <class>ee.jakarta.tck.persistence.common.schema30.Address_</class>
+    <class>ee.jakarta.tck.persistence.common.schema30.Alias</class>
+    <class>ee.jakarta.tck.persistence.common.schema30.Alias_</class>
+    <class>ee.jakarta.tck.persistence.common.schema30.Country</class>
+    <class>ee.jakarta.tck.persistence.common.schema30.Country_</class>
+    <class>ee.jakarta.tck.persistence.common.schema30.CreditCard</class>
+    <class>ee.jakarta.tck.persistence.common.schema30.CreditCard_</class>
+    <class>ee.jakarta.tck.persistence.common.schema30.Customer</class>
+    <class>ee.jakarta.tck.persistence.common.schema30.Customer_</class>
+    <class>ee.jakarta.tck.persistence.common.schema30.Department</class>
+    <class>ee.jakarta.tck.persistence.common.schema30.Department_</class>
+    <class>ee.jakarta.tck.persistence.common.schema30.Employee</class>
+    <class>ee.jakarta.tck.persistence.common.schema30.Employee_</class>
+    <class>ee.jakarta.tck.persistence.common.schema30.HardwareProduct</class>
+    <class>ee.jakarta.tck.persistence.common.schema30.HardwareProduct_</class>
+    <class>ee.jakarta.tck.persistence.common.schema30.Info</class>
+    <class>ee.jakarta.tck.persistence.common.schema30.Info_</class>
+    <class>ee.jakarta.tck.persistence.common.schema30.LineItem</class>
+    <class>ee.jakarta.tck.persistence.common.schema30.LineItemException</class>
+    <class>ee.jakarta.tck.persistence.common.schema30.LineItem_</class>
+    <class>ee.jakarta.tck.persistence.common.schema30.Order</class>
+    <class>ee.jakarta.tck.persistence.common.schema30.Order_</class>
+    <class>ee.jakarta.tck.persistence.common.schema30.Phone</class>
+    <class>ee.jakarta.tck.persistence.common.schema30.Phone_</class>
+    <class>ee.jakarta.tck.persistence.common.schema30.Product</class>
+    <class>ee.jakarta.tck.persistence.common.schema30.Product_</class>
+    <class>ee.jakarta.tck.persistence.common.schema30.ShelfLife</class>
+    <class>ee.jakarta.tck.persistence.common.schema30.ShelfLife_</class>
+    <class>ee.jakarta.tck.persistence.common.schema30.SoftwareProduct</class>
+    <class>ee.jakarta.tck.persistence.common.schema30.SoftwareProduct_</class>
+    <class>ee.jakarta.tck.persistence.common.schema30.Spouse</class>
+    <class>ee.jakarta.tck.persistence.common.schema30.Spouse_</class>
+    <class>ee.jakarta.tck.persistence.common.schema30.Trim</class>
+    <class>ee.jakarta.tck.persistence.common.schema30.Trim_</class>
+  </persistence-unit>
+</persistence>
+
diff --git a/jpa/spec-tests/src/main/java/ee/jakarta/tck/persistence/core/criteriaapi/Root/persistence.xml b/jpa/spec-tests/src/main/java/ee/jakarta/tck/persistence/core/criteriaapi/Root/persistence.xml
new file mode 100644
index 0000000000..69e68d3b95
--- /dev/null
+++ b/jpa/spec-tests/src/main/java/ee/jakarta/tck/persistence/core/criteriaapi/Root/persistence.xml
@@ -0,0 +1,140 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+
+    Copyright (c) 2018 Oracle and/or its affiliates. All rights reserved.
+
+    This program and the accompanying materials are made available under the
+    terms of the Eclipse Public License v. 2.0, which is available at
+    http://www.eclipse.org/legal/epl-2.0.
+
+    This Source Code may also be made available under the following Secondary
+    Licenses when the conditions for such availability set forth in the
+    Eclipse Public License v. 2.0 are satisfied: GNU General Public License,
+    version 2 with the GNU Classpath Exception, which is available at
+    https://www.gnu.org/software/classpath/license.html.
+
+    SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
+
+-->
+<persistence xmlns="https://jakarta.ee/xml/ns/persistence" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="https://jakarta.ee/xml/ns/persistence     https://jakarta.ee/xml/ns/persistence/persistence_3_0.xsd" version="3.0">
+  <persistence-unit name="CTS-EM" transaction-type="JTA">
+    <description>Persistence Unit for CTS Vehicle Tests</description>
+    <jta-data-source>jdbc/DB1</jta-data-source>
+    <class>ee.jakarta.tck.persistence.common.schema30.Address</class>
+    <class>ee.jakarta.tck.persistence.common.schema30.Address_</class>
+    <class>ee.jakarta.tck.persistence.common.schema30.Alias</class>
+    <class>ee.jakarta.tck.persistence.common.schema30.Alias_</class>
+    <class>ee.jakarta.tck.persistence.common.schema30.Country</class>
+    <class>ee.jakarta.tck.persistence.common.schema30.Country_</class>
+    <class>ee.jakarta.tck.persistence.common.schema30.CreditCard</class>
+    <class>ee.jakarta.tck.persistence.common.schema30.CreditCard_</class>
+    <class>ee.jakarta.tck.persistence.common.schema30.Customer</class>
+    <class>ee.jakarta.tck.persistence.common.schema30.Customer_</class>
+    <class>ee.jakarta.tck.persistence.common.schema30.Department</class>
+    <class>ee.jakarta.tck.persistence.common.schema30.Department_</class>
+    <class>ee.jakarta.tck.persistence.common.schema30.Employee</class>
+    <class>ee.jakarta.tck.persistence.common.schema30.Employee_</class>
+    <class>ee.jakarta.tck.persistence.common.schema30.HardwareProduct</class>
+    <class>ee.jakarta.tck.persistence.common.schema30.HardwareProduct_</class>
+    <class>ee.jakarta.tck.persistence.common.schema30.Info</class>
+    <class>ee.jakarta.tck.persistence.common.schema30.Info_</class>
+    <class>ee.jakarta.tck.persistence.common.schema30.LineItem</class>
+    <class>ee.jakarta.tck.persistence.common.schema30.LineItemException</class>
+    <class>ee.jakarta.tck.persistence.common.schema30.LineItem_</class>
+    <class>ee.jakarta.tck.persistence.common.schema30.Order</class>
+    <class>ee.jakarta.tck.persistence.common.schema30.Order_</class>
+    <class>ee.jakarta.tck.persistence.common.schema30.Phone</class>
+    <class>ee.jakarta.tck.persistence.common.schema30.Phone_</class>
+    <class>ee.jakarta.tck.persistence.common.schema30.Product</class>
+    <class>ee.jakarta.tck.persistence.common.schema30.Product_</class>
+    <class>ee.jakarta.tck.persistence.common.schema30.ShelfLife</class>
+    <class>ee.jakarta.tck.persistence.common.schema30.ShelfLife_</class>
+    <class>ee.jakarta.tck.persistence.common.schema30.SoftwareProduct</class>
+    <class>ee.jakarta.tck.persistence.common.schema30.SoftwareProduct_</class>
+    <class>ee.jakarta.tck.persistence.common.schema30.Spouse</class>
+    <class>ee.jakarta.tck.persistence.common.schema30.Spouse_</class>
+    <class>ee.jakarta.tck.persistence.common.schema30.Trim</class>
+    <class>ee.jakarta.tck.persistence.common.schema30.Trim_</class>
+  </persistence-unit>
+  <persistence-unit name="CTS-EM2" transaction-type="JTA">
+    <description>Persistence Unit for CTS Vehicle Tests</description>
+    <jta-data-source>jdbc/DB1</jta-data-source>
+    <class>ee.jakarta.tck.persistence.common.schema30.Address</class>
+    <class>ee.jakarta.tck.persistence.common.schema30.Address_</class>
+    <class>ee.jakarta.tck.persistence.common.schema30.Alias</class>
+    <class>ee.jakarta.tck.persistence.common.schema30.Alias_</class>
+    <class>ee.jakarta.tck.persistence.common.schema30.Country</class>
+    <class>ee.jakarta.tck.persistence.common.schema30.Country_</class>
+    <class>ee.jakarta.tck.persistence.common.schema30.CreditCard</class>
+    <class>ee.jakarta.tck.persistence.common.schema30.CreditCard_</class>
+    <class>ee.jakarta.tck.persistence.common.schema30.Customer</class>
+    <class>ee.jakarta.tck.persistence.common.schema30.Customer_</class>
+    <class>ee.jakarta.tck.persistence.common.schema30.Department</class>
+    <class>ee.jakarta.tck.persistence.common.schema30.Department_</class>
+    <class>ee.jakarta.tck.persistence.common.schema30.Employee</class>
+    <class>ee.jakarta.tck.persistence.common.schema30.Employee_</class>
+    <class>ee.jakarta.tck.persistence.common.schema30.HardwareProduct</class>
+    <class>ee.jakarta.tck.persistence.common.schema30.HardwareProduct_</class>
+    <class>ee.jakarta.tck.persistence.common.schema30.Info</class>
+    <class>ee.jakarta.tck.persistence.common.schema30.Info_</class>
+    <class>ee.jakarta.tck.persistence.common.schema30.LineItem</class>
+    <class>ee.jakarta.tck.persistence.common.schema30.LineItemException</class>
+    <class>ee.jakarta.tck.persistence.common.schema30.LineItem_</class>
+    <class>ee.jakarta.tck.persistence.common.schema30.Order</class>
+    <class>ee.jakarta.tck.persistence.common.schema30.Order_</class>
+    <class>ee.jakarta.tck.persistence.common.schema30.Phone</class>
+    <class>ee.jakarta.tck.persistence.common.schema30.Phone_</class>
+    <class>ee.jakarta.tck.persistence.common.schema30.Product</class>
+    <class>ee.jakarta.tck.persistence.common.schema30.Product_</class>
+    <class>ee.jakarta.tck.persistence.common.schema30.ShelfLife</class>
+    <class>ee.jakarta.tck.persistence.common.schema30.ShelfLife_</class>
+    <class>ee.jakarta.tck.persistence.common.schema30.SoftwareProduct</class>
+    <class>ee.jakarta.tck.persistence.common.schema30.SoftwareProduct_</class>
+    <class>ee.jakarta.tck.persistence.common.schema30.Spouse</class>
+    <class>ee.jakarta.tck.persistence.common.schema30.Spouse_</class>
+    <class>ee.jakarta.tck.persistence.common.schema30.Trim</class>
+    <class>ee.jakarta.tck.persistence.common.schema30.Trim_</class>
+  </persistence-unit>
+  <persistence-unit name="CTS-EM-NOTX" transaction-type="RESOURCE_LOCAL">
+    <description>The persistence.xml file may be used to designate
+                  more than one persistence unit within the same scope.
+                  Persistence Unit for Application Managed Resource Local</description>
+    <non-jta-data-source>jdbc/DB_no_tx</non-jta-data-source>
+    <class>ee.jakarta.tck.persistence.common.schema30.Address</class>
+    <class>ee.jakarta.tck.persistence.common.schema30.Address_</class>
+    <class>ee.jakarta.tck.persistence.common.schema30.Alias</class>
+    <class>ee.jakarta.tck.persistence.common.schema30.Alias_</class>
+    <class>ee.jakarta.tck.persistence.common.schema30.Country</class>
+    <class>ee.jakarta.tck.persistence.common.schema30.Country_</class>
+    <class>ee.jakarta.tck.persistence.common.schema30.CreditCard</class>
+    <class>ee.jakarta.tck.persistence.common.schema30.CreditCard_</class>
+    <class>ee.jakarta.tck.persistence.common.schema30.Customer</class>
+    <class>ee.jakarta.tck.persistence.common.schema30.Customer_</class>
+    <class>ee.jakarta.tck.persistence.common.schema30.Department</class>
+    <class>ee.jakarta.tck.persistence.common.schema30.Department_</class>
+    <class>ee.jakarta.tck.persistence.common.schema30.Employee</class>
+    <class>ee.jakarta.tck.persistence.common.schema30.Employee_</class>
+    <class>ee.jakarta.tck.persistence.common.schema30.HardwareProduct</class>
+    <class>ee.jakarta.tck.persistence.common.schema30.HardwareProduct_</class>
+    <class>ee.jakarta.tck.persistence.common.schema30.Info</class>
+    <class>ee.jakarta.tck.persistence.common.schema30.Info_</class>
+    <class>ee.jakarta.tck.persistence.common.schema30.LineItem</class>
+    <class>ee.jakarta.tck.persistence.common.schema30.LineItemException</class>
+    <class>ee.jakarta.tck.persistence.common.schema30.LineItem_</class>
+    <class>ee.jakarta.tck.persistence.common.schema30.Order</class>
+    <class>ee.jakarta.tck.persistence.common.schema30.Order_</class>
+    <class>ee.jakarta.tck.persistence.common.schema30.Phone</class>
+    <class>ee.jakarta.tck.persistence.common.schema30.Phone_</class>
+    <class>ee.jakarta.tck.persistence.common.schema30.Product</class>
+    <class>ee.jakarta.tck.persistence.common.schema30.Product_</class>
+    <class>ee.jakarta.tck.persistence.common.schema30.ShelfLife</class>
+    <class>ee.jakarta.tck.persistence.common.schema30.ShelfLife_</class>
+    <class>ee.jakarta.tck.persistence.common.schema30.SoftwareProduct</class>
+    <class>ee.jakarta.tck.persistence.common.schema30.SoftwareProduct_</class>
+    <class>ee.jakarta.tck.persistence.common.schema30.Spouse</class>
+    <class>ee.jakarta.tck.persistence.common.schema30.Spouse_</class>
+    <class>ee.jakarta.tck.persistence.common.schema30.Trim</class>
+    <class>ee.jakarta.tck.persistence.common.schema30.Trim_</class>
+  </persistence-unit>
+</persistence>
+
diff --git a/jpa/spec-tests/src/main/java/ee/jakarta/tck/persistence/core/criteriaapi/metamodelquery/persistence.xml b/jpa/spec-tests/src/main/java/ee/jakarta/tck/persistence/core/criteriaapi/metamodelquery/persistence.xml
new file mode 100644
index 0000000000..69e68d3b95
--- /dev/null
+++ b/jpa/spec-tests/src/main/java/ee/jakarta/tck/persistence/core/criteriaapi/metamodelquery/persistence.xml
@@ -0,0 +1,140 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+
+    Copyright (c) 2018 Oracle and/or its affiliates. All rights reserved.
+
+    This program and the accompanying materials are made available under the
+    terms of the Eclipse Public License v. 2.0, which is available at
+    http://www.eclipse.org/legal/epl-2.0.
+
+    This Source Code may also be made available under the following Secondary
+    Licenses when the conditions for such availability set forth in the
+    Eclipse Public License v. 2.0 are satisfied: GNU General Public License,
+    version 2 with the GNU Classpath Exception, which is available at
+    https://www.gnu.org/software/classpath/license.html.
+
+    SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
+
+-->
+<persistence xmlns="https://jakarta.ee/xml/ns/persistence" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="https://jakarta.ee/xml/ns/persistence     https://jakarta.ee/xml/ns/persistence/persistence_3_0.xsd" version="3.0">
+  <persistence-unit name="CTS-EM" transaction-type="JTA">
+    <description>Persistence Unit for CTS Vehicle Tests</description>
+    <jta-data-source>jdbc/DB1</jta-data-source>
+    <class>ee.jakarta.tck.persistence.common.schema30.Address</class>
+    <class>ee.jakarta.tck.persistence.common.schema30.Address_</class>
+    <class>ee.jakarta.tck.persistence.common.schema30.Alias</class>
+    <class>ee.jakarta.tck.persistence.common.schema30.Alias_</class>
+    <class>ee.jakarta.tck.persistence.common.schema30.Country</class>
+    <class>ee.jakarta.tck.persistence.common.schema30.Country_</class>
+    <class>ee.jakarta.tck.persistence.common.schema30.CreditCard</class>
+    <class>ee.jakarta.tck.persistence.common.schema30.CreditCard_</class>
+    <class>ee.jakarta.tck.persistence.common.schema30.Customer</class>
+    <class>ee.jakarta.tck.persistence.common.schema30.Customer_</class>
+    <class>ee.jakarta.tck.persistence.common.schema30.Department</class>
+    <class>ee.jakarta.tck.persistence.common.schema30.Department_</class>
+    <class>ee.jakarta.tck.persistence.common.schema30.Employee</class>
+    <class>ee.jakarta.tck.persistence.common.schema30.Employee_</class>
+    <class>ee.jakarta.tck.persistence.common.schema30.HardwareProduct</class>
+    <class>ee.jakarta.tck.persistence.common.schema30.HardwareProduct_</class>
+    <class>ee.jakarta.tck.persistence.common.schema30.Info</class>
+    <class>ee.jakarta.tck.persistence.common.schema30.Info_</class>
+    <class>ee.jakarta.tck.persistence.common.schema30.LineItem</class>
+    <class>ee.jakarta.tck.persistence.common.schema30.LineItemException</class>
+    <class>ee.jakarta.tck.persistence.common.schema30.LineItem_</class>
+    <class>ee.jakarta.tck.persistence.common.schema30.Order</class>
+    <class>ee.jakarta.tck.persistence.common.schema30.Order_</class>
+    <class>ee.jakarta.tck.persistence.common.schema30.Phone</class>
+    <class>ee.jakarta.tck.persistence.common.schema30.Phone_</class>
+    <class>ee.jakarta.tck.persistence.common.schema30.Product</class>
+    <class>ee.jakarta.tck.persistence.common.schema30.Product_</class>
+    <class>ee.jakarta.tck.persistence.common.schema30.ShelfLife</class>
+    <class>ee.jakarta.tck.persistence.common.schema30.ShelfLife_</class>
+    <class>ee.jakarta.tck.persistence.common.schema30.SoftwareProduct</class>
+    <class>ee.jakarta.tck.persistence.common.schema30.SoftwareProduct_</class>
+    <class>ee.jakarta.tck.persistence.common.schema30.Spouse</class>
+    <class>ee.jakarta.tck.persistence.common.schema30.Spouse_</class>
+    <class>ee.jakarta.tck.persistence.common.schema30.Trim</class>
+    <class>ee.jakarta.tck.persistence.common.schema30.Trim_</class>
+  </persistence-unit>
+  <persistence-unit name="CTS-EM2" transaction-type="JTA">
+    <description>Persistence Unit for CTS Vehicle Tests</description>
+    <jta-data-source>jdbc/DB1</jta-data-source>
+    <class>ee.jakarta.tck.persistence.common.schema30.Address</class>
+    <class>ee.jakarta.tck.persistence.common.schema30.Address_</class>
+    <class>ee.jakarta.tck.persistence.common.schema30.Alias</class>
+    <class>ee.jakarta.tck.persistence.common.schema30.Alias_</class>
+    <class>ee.jakarta.tck.persistence.common.schema30.Country</class>
+    <class>ee.jakarta.tck.persistence.common.schema30.Country_</class>
+    <class>ee.jakarta.tck.persistence.common.schema30.CreditCard</class>
+    <class>ee.jakarta.tck.persistence.common.schema30.CreditCard_</class>
+    <class>ee.jakarta.tck.persistence.common.schema30.Customer</class>
+    <class>ee.jakarta.tck.persistence.common.schema30.Customer_</class>
+    <class>ee.jakarta.tck.persistence.common.schema30.Department</class>
+    <class>ee.jakarta.tck.persistence.common.schema30.Department_</class>
+    <class>ee.jakarta.tck.persistence.common.schema30.Employee</class>
+    <class>ee.jakarta.tck.persistence.common.schema30.Employee_</class>
+    <class>ee.jakarta.tck.persistence.common.schema30.HardwareProduct</class>
+    <class>ee.jakarta.tck.persistence.common.schema30.HardwareProduct_</class>
+    <class>ee.jakarta.tck.persistence.common.schema30.Info</class>
+    <class>ee.jakarta.tck.persistence.common.schema30.Info_</class>
+    <class>ee.jakarta.tck.persistence.common.schema30.LineItem</class>
+    <class>ee.jakarta.tck.persistence.common.schema30.LineItemException</class>
+    <class>ee.jakarta.tck.persistence.common.schema30.LineItem_</class>
+    <class>ee.jakarta.tck.persistence.common.schema30.Order</class>
+    <class>ee.jakarta.tck.persistence.common.schema30.Order_</class>
+    <class>ee.jakarta.tck.persistence.common.schema30.Phone</class>
+    <class>ee.jakarta.tck.persistence.common.schema30.Phone_</class>
+    <class>ee.jakarta.tck.persistence.common.schema30.Product</class>
+    <class>ee.jakarta.tck.persistence.common.schema30.Product_</class>
+    <class>ee.jakarta.tck.persistence.common.schema30.ShelfLife</class>
+    <class>ee.jakarta.tck.persistence.common.schema30.ShelfLife_</class>
+    <class>ee.jakarta.tck.persistence.common.schema30.SoftwareProduct</class>
+    <class>ee.jakarta.tck.persistence.common.schema30.SoftwareProduct_</class>
+    <class>ee.jakarta.tck.persistence.common.schema30.Spouse</class>
+    <class>ee.jakarta.tck.persistence.common.schema30.Spouse_</class>
+    <class>ee.jakarta.tck.persistence.common.schema30.Trim</class>
+    <class>ee.jakarta.tck.persistence.common.schema30.Trim_</class>
+  </persistence-unit>
+  <persistence-unit name="CTS-EM-NOTX" transaction-type="RESOURCE_LOCAL">
+    <description>The persistence.xml file may be used to designate
+                  more than one persistence unit within the same scope.
+                  Persistence Unit for Application Managed Resource Local</description>
+    <non-jta-data-source>jdbc/DB_no_tx</non-jta-data-source>
+    <class>ee.jakarta.tck.persistence.common.schema30.Address</class>
+    <class>ee.jakarta.tck.persistence.common.schema30.Address_</class>
+    <class>ee.jakarta.tck.persistence.common.schema30.Alias</class>
+    <class>ee.jakarta.tck.persistence.common.schema30.Alias_</class>
+    <class>ee.jakarta.tck.persistence.common.schema30.Country</class>
+    <class>ee.jakarta.tck.persistence.common.schema30.Country_</class>
+    <class>ee.jakarta.tck.persistence.common.schema30.CreditCard</class>
+    <class>ee.jakarta.tck.persistence.common.schema30.CreditCard_</class>
+    <class>ee.jakarta.tck.persistence.common.schema30.Customer</class>
+    <class>ee.jakarta.tck.persistence.common.schema30.Customer_</class>
+    <class>ee.jakarta.tck.persistence.common.schema30.Department</class>
+    <class>ee.jakarta.tck.persistence.common.schema30.Department_</class>
+    <class>ee.jakarta.tck.persistence.common.schema30.Employee</class>
+    <class>ee.jakarta.tck.persistence.common.schema30.Employee_</class>
+    <class>ee.jakarta.tck.persistence.common.schema30.HardwareProduct</class>
+    <class>ee.jakarta.tck.persistence.common.schema30.HardwareProduct_</class>
+    <class>ee.jakarta.tck.persistence.common.schema30.Info</class>
+    <class>ee.jakarta.tck.persistence.common.schema30.Info_</class>
+    <class>ee.jakarta.tck.persistence.common.schema30.LineItem</class>
+    <class>ee.jakarta.tck.persistence.common.schema30.LineItemException</class>
+    <class>ee.jakarta.tck.persistence.common.schema30.LineItem_</class>
+    <class>ee.jakarta.tck.persistence.common.schema30.Order</class>
+    <class>ee.jakarta.tck.persistence.common.schema30.Order_</class>
+    <class>ee.jakarta.tck.persistence.common.schema30.Phone</class>
+    <class>ee.jakarta.tck.persistence.common.schema30.Phone_</class>
+    <class>ee.jakarta.tck.persistence.common.schema30.Product</class>
+    <class>ee.jakarta.tck.persistence.common.schema30.Product_</class>
+    <class>ee.jakarta.tck.persistence.common.schema30.ShelfLife</class>
+    <class>ee.jakarta.tck.persistence.common.schema30.ShelfLife_</class>
+    <class>ee.jakarta.tck.persistence.common.schema30.SoftwareProduct</class>
+    <class>ee.jakarta.tck.persistence.common.schema30.SoftwareProduct_</class>
+    <class>ee.jakarta.tck.persistence.common.schema30.Spouse</class>
+    <class>ee.jakarta.tck.persistence.common.schema30.Spouse_</class>
+    <class>ee.jakarta.tck.persistence.common.schema30.Trim</class>
+    <class>ee.jakarta.tck.persistence.common.schema30.Trim_</class>
+  </persistence-unit>
+</persistence>
+
diff --git a/jpa/spec-tests/src/main/java/ee/jakarta/tck/persistence/core/criteriaapi/misc/persistence.xml b/jpa/spec-tests/src/main/java/ee/jakarta/tck/persistence/core/criteriaapi/misc/persistence.xml
new file mode 100644
index 0000000000..69e68d3b95
--- /dev/null
+++ b/jpa/spec-tests/src/main/java/ee/jakarta/tck/persistence/core/criteriaapi/misc/persistence.xml
@@ -0,0 +1,140 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+
+    Copyright (c) 2018 Oracle and/or its affiliates. All rights reserved.
+
+    This program and the accompanying materials are made available under the
+    terms of the Eclipse Public License v. 2.0, which is available at
+    http://www.eclipse.org/legal/epl-2.0.
+
+    This Source Code may also be made available under the following Secondary
+    Licenses when the conditions for such availability set forth in the
+    Eclipse Public License v. 2.0 are satisfied: GNU General Public License,
+    version 2 with the GNU Classpath Exception, which is available at
+    https://www.gnu.org/software/classpath/license.html.
+
+    SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
+
+-->
+<persistence xmlns="https://jakarta.ee/xml/ns/persistence" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="https://jakarta.ee/xml/ns/persistence     https://jakarta.ee/xml/ns/persistence/persistence_3_0.xsd" version="3.0">
+  <persistence-unit name="CTS-EM" transaction-type="JTA">
+    <description>Persistence Unit for CTS Vehicle Tests</description>
+    <jta-data-source>jdbc/DB1</jta-data-source>
+    <class>ee.jakarta.tck.persistence.common.schema30.Address</class>
+    <class>ee.jakarta.tck.persistence.common.schema30.Address_</class>
+    <class>ee.jakarta.tck.persistence.common.schema30.Alias</class>
+    <class>ee.jakarta.tck.persistence.common.schema30.Alias_</class>
+    <class>ee.jakarta.tck.persistence.common.schema30.Country</class>
+    <class>ee.jakarta.tck.persistence.common.schema30.Country_</class>
+    <class>ee.jakarta.tck.persistence.common.schema30.CreditCard</class>
+    <class>ee.jakarta.tck.persistence.common.schema30.CreditCard_</class>
+    <class>ee.jakarta.tck.persistence.common.schema30.Customer</class>
+    <class>ee.jakarta.tck.persistence.common.schema30.Customer_</class>
+    <class>ee.jakarta.tck.persistence.common.schema30.Department</class>
+    <class>ee.jakarta.tck.persistence.common.schema30.Department_</class>
+    <class>ee.jakarta.tck.persistence.common.schema30.Employee</class>
+    <class>ee.jakarta.tck.persistence.common.schema30.Employee_</class>
+    <class>ee.jakarta.tck.persistence.common.schema30.HardwareProduct</class>
+    <class>ee.jakarta.tck.persistence.common.schema30.HardwareProduct_</class>
+    <class>ee.jakarta.tck.persistence.common.schema30.Info</class>
+    <class>ee.jakarta.tck.persistence.common.schema30.Info_</class>
+    <class>ee.jakarta.tck.persistence.common.schema30.LineItem</class>
+    <class>ee.jakarta.tck.persistence.common.schema30.LineItemException</class>
+    <class>ee.jakarta.tck.persistence.common.schema30.LineItem_</class>
+    <class>ee.jakarta.tck.persistence.common.schema30.Order</class>
+    <class>ee.jakarta.tck.persistence.common.schema30.Order_</class>
+    <class>ee.jakarta.tck.persistence.common.schema30.Phone</class>
+    <class>ee.jakarta.tck.persistence.common.schema30.Phone_</class>
+    <class>ee.jakarta.tck.persistence.common.schema30.Product</class>
+    <class>ee.jakarta.tck.persistence.common.schema30.Product_</class>
+    <class>ee.jakarta.tck.persistence.common.schema30.ShelfLife</class>
+    <class>ee.jakarta.tck.persistence.common.schema30.ShelfLife_</class>
+    <class>ee.jakarta.tck.persistence.common.schema30.SoftwareProduct</class>
+    <class>ee.jakarta.tck.persistence.common.schema30.SoftwareProduct_</class>
+    <class>ee.jakarta.tck.persistence.common.schema30.Spouse</class>
+    <class>ee.jakarta.tck.persistence.common.schema30.Spouse_</class>
+    <class>ee.jakarta.tck.persistence.common.schema30.Trim</class>
+    <class>ee.jakarta.tck.persistence.common.schema30.Trim_</class>
+  </persistence-unit>
+  <persistence-unit name="CTS-EM2" transaction-type="JTA">
+    <description>Persistence Unit for CTS Vehicle Tests</description>
+    <jta-data-source>jdbc/DB1</jta-data-source>
+    <class>ee.jakarta.tck.persistence.common.schema30.Address</class>
+    <class>ee.jakarta.tck.persistence.common.schema30.Address_</class>
+    <class>ee.jakarta.tck.persistence.common.schema30.Alias</class>
+    <class>ee.jakarta.tck.persistence.common.schema30.Alias_</class>
+    <class>ee.jakarta.tck.persistence.common.schema30.Country</class>
+    <class>ee.jakarta.tck.persistence.common.schema30.Country_</class>
+    <class>ee.jakarta.tck.persistence.common.schema30.CreditCard</class>
+    <class>ee.jakarta.tck.persistence.common.schema30.CreditCard_</class>
+    <class>ee.jakarta.tck.persistence.common.schema30.Customer</class>
+    <class>ee.jakarta.tck.persistence.common.schema30.Customer_</class>
+    <class>ee.jakarta.tck.persistence.common.schema30.Department</class>
+    <class>ee.jakarta.tck.persistence.common.schema30.Department_</class>
+    <class>ee.jakarta.tck.persistence.common.schema30.Employee</class>
+    <class>ee.jakarta.tck.persistence.common.schema30.Employee_</class>
+    <class>ee.jakarta.tck.persistence.common.schema30.HardwareProduct</class>
+    <class>ee.jakarta.tck.persistence.common.schema30.HardwareProduct_</class>
+    <class>ee.jakarta.tck.persistence.common.schema30.Info</class>
+    <class>ee.jakarta.tck.persistence.common.schema30.Info_</class>
+    <class>ee.jakarta.tck.persistence.common.schema30.LineItem</class>
+    <class>ee.jakarta.tck.persistence.common.schema30.LineItemException</class>
+    <class>ee.jakarta.tck.persistence.common.schema30.LineItem_</class>
+    <class>ee.jakarta.tck.persistence.common.schema30.Order</class>
+    <class>ee.jakarta.tck.persistence.common.schema30.Order_</class>
+    <class>ee.jakarta.tck.persistence.common.schema30.Phone</class>
+    <class>ee.jakarta.tck.persistence.common.schema30.Phone_</class>
+    <class>ee.jakarta.tck.persistence.common.schema30.Product</class>
+    <class>ee.jakarta.tck.persistence.common.schema30.Product_</class>
+    <class>ee.jakarta.tck.persistence.common.schema30.ShelfLife</class>
+    <class>ee.jakarta.tck.persistence.common.schema30.ShelfLife_</class>
+    <class>ee.jakarta.tck.persistence.common.schema30.SoftwareProduct</class>
+    <class>ee.jakarta.tck.persistence.common.schema30.SoftwareProduct_</class>
+    <class>ee.jakarta.tck.persistence.common.schema30.Spouse</class>
+    <class>ee.jakarta.tck.persistence.common.schema30.Spouse_</class>
+    <class>ee.jakarta.tck.persistence.common.schema30.Trim</class>
+    <class>ee.jakarta.tck.persistence.common.schema30.Trim_</class>
+  </persistence-unit>
+  <persistence-unit name="CTS-EM-NOTX" transaction-type="RESOURCE_LOCAL">
+    <description>The persistence.xml file may be used to designate
+                  more than one persistence unit within the same scope.
+                  Persistence Unit for Application Managed Resource Local</description>
+    <non-jta-data-source>jdbc/DB_no_tx</non-jta-data-source>
+    <class>ee.jakarta.tck.persistence.common.schema30.Address</class>
+    <class>ee.jakarta.tck.persistence.common.schema30.Address_</class>
+    <class>ee.jakarta.tck.persistence.common.schema30.Alias</class>
+    <class>ee.jakarta.tck.persistence.common.schema30.Alias_</class>
+    <class>ee.jakarta.tck.persistence.common.schema30.Country</class>
+    <class>ee.jakarta.tck.persistence.common.schema30.Country_</class>
+    <class>ee.jakarta.tck.persistence.common.schema30.CreditCard</class>
+    <class>ee.jakarta.tck.persistence.common.schema30.CreditCard_</class>
+    <class>ee.jakarta.tck.persistence.common.schema30.Customer</class>
+    <class>ee.jakarta.tck.persistence.common.schema30.Customer_</class>
+    <class>ee.jakarta.tck.persistence.common.schema30.Department</class>
+    <class>ee.jakarta.tck.persistence.common.schema30.Department_</class>
+    <class>ee.jakarta.tck.persistence.common.schema30.Employee</class>
+    <class>ee.jakarta.tck.persistence.common.schema30.Employee_</class>
+    <class>ee.jakarta.tck.persistence.common.schema30.HardwareProduct</class>
+    <class>ee.jakarta.tck.persistence.common.schema30.HardwareProduct_</class>
+    <class>ee.jakarta.tck.persistence.common.schema30.Info</class>
+    <class>ee.jakarta.tck.persistence.common.schema30.Info_</class>
+    <class>ee.jakarta.tck.persistence.common.schema30.LineItem</class>
+    <class>ee.jakarta.tck.persistence.common.schema30.LineItemException</class>
+    <class>ee.jakarta.tck.persistence.common.schema30.LineItem_</class>
+    <class>ee.jakarta.tck.persistence.common.schema30.Order</class>
+    <class>ee.jakarta.tck.persistence.common.schema30.Order_</class>
+    <class>ee.jakarta.tck.persistence.common.schema30.Phone</class>
+    <class>ee.jakarta.tck.persistence.common.schema30.Phone_</class>
+    <class>ee.jakarta.tck.persistence.common.schema30.Product</class>
+    <class>ee.jakarta.tck.persistence.common.schema30.Product_</class>
+    <class>ee.jakarta.tck.persistence.common.schema30.ShelfLife</class>
+    <class>ee.jakarta.tck.persistence.common.schema30.ShelfLife_</class>
+    <class>ee.jakarta.tck.persistence.common.schema30.SoftwareProduct</class>
+    <class>ee.jakarta.tck.persistence.common.schema30.SoftwareProduct_</class>
+    <class>ee.jakarta.tck.persistence.common.schema30.Spouse</class>
+    <class>ee.jakarta.tck.persistence.common.schema30.Spouse_</class>
+    <class>ee.jakarta.tck.persistence.common.schema30.Trim</class>
+    <class>ee.jakarta.tck.persistence.common.schema30.Trim_</class>
+  </persistence-unit>
+</persistence>
+
diff --git a/jpa/spec-tests/src/main/java/ee/jakarta/tck/persistence/core/criteriaapi/parameter/persistence.xml b/jpa/spec-tests/src/main/java/ee/jakarta/tck/persistence/core/criteriaapi/parameter/persistence.xml
new file mode 100644
index 0000000000..1f6fc8be46
--- /dev/null
+++ b/jpa/spec-tests/src/main/java/ee/jakarta/tck/persistence/core/criteriaapi/parameter/persistence.xml
@@ -0,0 +1,38 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+
+    Copyright (c) 2018 Oracle and/or its affiliates. All rights reserved.
+
+    This program and the accompanying materials are made available under the
+    terms of the Eclipse Public License v. 2.0, which is available at
+    http://www.eclipse.org/legal/epl-2.0.
+
+    This Source Code may also be made available under the following Secondary
+    Licenses when the conditions for such availability set forth in the
+    Eclipse Public License v. 2.0 are satisfied: GNU General Public License,
+    version 2 with the GNU Classpath Exception, which is available at
+    https://www.gnu.org/software/classpath/license.html.
+
+    SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
+
+-->
+<persistence xmlns="https://jakarta.ee/xml/ns/persistence" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="https://jakarta.ee/xml/ns/persistence     https://jakarta.ee/xml/ns/persistence/persistence_3_0.xsd" version="3.0">
+  <persistence-unit name="CTS-EM" transaction-type="JTA">
+    <description>Persistence Unit for CTS Vehicle Tests</description>
+    <jta-data-source>jdbc/DB1</jta-data-source>
+    <class>ee.jakarta.tck.persistence.core.criteriaapi.parameter.Employee</class>
+  </persistence-unit>
+  <persistence-unit name="CTS-EM2" transaction-type="JTA">
+    <description>Persistence Unit for CTS Vehicle Tests</description>
+    <jta-data-source>jdbc/DB1</jta-data-source>
+    <class>ee.jakarta.tck.persistence.core.criteriaapi.parameter.Employee</class>
+  </persistence-unit>
+  <persistence-unit name="CTS-EM-NOTX" transaction-type="RESOURCE_LOCAL">
+    <description>The persistence.xml file may be used to designate
+                  more than one persistence unit within the same scope.
+                  Persistence Unit for Application Managed Resource Local</description>
+    <non-jta-data-source>jdbc/DB_no_tx</non-jta-data-source>
+    <class>ee.jakarta.tck.persistence.core.criteriaapi.parameter.Employee</class>
+  </persistence-unit>
+</persistence>
+
diff --git a/jpa/spec-tests/src/main/java/ee/jakarta/tck/persistence/core/criteriaapi/strquery/persistence.xml b/jpa/spec-tests/src/main/java/ee/jakarta/tck/persistence/core/criteriaapi/strquery/persistence.xml
new file mode 100644
index 0000000000..69e68d3b95
--- /dev/null
+++ b/jpa/spec-tests/src/main/java/ee/jakarta/tck/persistence/core/criteriaapi/strquery/persistence.xml
@@ -0,0 +1,140 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+
+    Copyright (c) 2018 Oracle and/or its affiliates. All rights reserved.
+
+    This program and the accompanying materials are made available under the
+    terms of the Eclipse Public License v. 2.0, which is available at
+    http://www.eclipse.org/legal/epl-2.0.
+
+    This Source Code may also be made available under the following Secondary
+    Licenses when the conditions for such availability set forth in the
+    Eclipse Public License v. 2.0 are satisfied: GNU General Public License,
+    version 2 with the GNU Classpath Exception, which is available at
+    https://www.gnu.org/software/classpath/license.html.
+
+    SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
+
+-->
+<persistence xmlns="https://jakarta.ee/xml/ns/persistence" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="https://jakarta.ee/xml/ns/persistence     https://jakarta.ee/xml/ns/persistence/persistence_3_0.xsd" version="3.0">
+  <persistence-unit name="CTS-EM" transaction-type="JTA">
+    <description>Persistence Unit for CTS Vehicle Tests</description>
+    <jta-data-source>jdbc/DB1</jta-data-source>
+    <class>ee.jakarta.tck.persistence.common.schema30.Address</class>
+    <class>ee.jakarta.tck.persistence.common.schema30.Address_</class>
+    <class>ee.jakarta.tck.persistence.common.schema30.Alias</class>
+    <class>ee.jakarta.tck.persistence.common.schema30.Alias_</class>
+    <class>ee.jakarta.tck.persistence.common.schema30.Country</class>
+    <class>ee.jakarta.tck.persistence.common.schema30.Country_</class>
+    <class>ee.jakarta.tck.persistence.common.schema30.CreditCard</class>
+    <class>ee.jakarta.tck.persistence.common.schema30.CreditCard_</class>
+    <class>ee.jakarta.tck.persistence.common.schema30.Customer</class>
+    <class>ee.jakarta.tck.persistence.common.schema30.Customer_</class>
+    <class>ee.jakarta.tck.persistence.common.schema30.Department</class>
+    <class>ee.jakarta.tck.persistence.common.schema30.Department_</class>
+    <class>ee.jakarta.tck.persistence.common.schema30.Employee</class>
+    <class>ee.jakarta.tck.persistence.common.schema30.Employee_</class>
+    <class>ee.jakarta.tck.persistence.common.schema30.HardwareProduct</class>
+    <class>ee.jakarta.tck.persistence.common.schema30.HardwareProduct_</class>
+    <class>ee.jakarta.tck.persistence.common.schema30.Info</class>
+    <class>ee.jakarta.tck.persistence.common.schema30.Info_</class>
+    <class>ee.jakarta.tck.persistence.common.schema30.LineItem</class>
+    <class>ee.jakarta.tck.persistence.common.schema30.LineItemException</class>
+    <class>ee.jakarta.tck.persistence.common.schema30.LineItem_</class>
+    <class>ee.jakarta.tck.persistence.common.schema30.Order</class>
+    <class>ee.jakarta.tck.persistence.common.schema30.Order_</class>
+    <class>ee.jakarta.tck.persistence.common.schema30.Phone</class>
+    <class>ee.jakarta.tck.persistence.common.schema30.Phone_</class>
+    <class>ee.jakarta.tck.persistence.common.schema30.Product</class>
+    <class>ee.jakarta.tck.persistence.common.schema30.Product_</class>
+    <class>ee.jakarta.tck.persistence.common.schema30.ShelfLife</class>
+    <class>ee.jakarta.tck.persistence.common.schema30.ShelfLife_</class>
+    <class>ee.jakarta.tck.persistence.common.schema30.SoftwareProduct</class>
+    <class>ee.jakarta.tck.persistence.common.schema30.SoftwareProduct_</class>
+    <class>ee.jakarta.tck.persistence.common.schema30.Spouse</class>
+    <class>ee.jakarta.tck.persistence.common.schema30.Spouse_</class>
+    <class>ee.jakarta.tck.persistence.common.schema30.Trim</class>
+    <class>ee.jakarta.tck.persistence.common.schema30.Trim_</class>
+  </persistence-unit>
+  <persistence-unit name="CTS-EM2" transaction-type="JTA">
+    <description>Persistence Unit for CTS Vehicle Tests</description>
+    <jta-data-source>jdbc/DB1</jta-data-source>
+    <class>ee.jakarta.tck.persistence.common.schema30.Address</class>
+    <class>ee.jakarta.tck.persistence.common.schema30.Address_</class>
+    <class>ee.jakarta.tck.persistence.common.schema30.Alias</class>
+    <class>ee.jakarta.tck.persistence.common.schema30.Alias_</class>
+    <class>ee.jakarta.tck.persistence.common.schema30.Country</class>
+    <class>ee.jakarta.tck.persistence.common.schema30.Country_</class>
+    <class>ee.jakarta.tck.persistence.common.schema30.CreditCard</class>
+    <class>ee.jakarta.tck.persistence.common.schema30.CreditCard_</class>
+    <class>ee.jakarta.tck.persistence.common.schema30.Customer</class>
+    <class>ee.jakarta.tck.persistence.common.schema30.Customer_</class>
+    <class>ee.jakarta.tck.persistence.common.schema30.Department</class>
+    <class>ee.jakarta.tck.persistence.common.schema30.Department_</class>
+    <class>ee.jakarta.tck.persistence.common.schema30.Employee</class>
+    <class>ee.jakarta.tck.persistence.common.schema30.Employee_</class>
+    <class>ee.jakarta.tck.persistence.common.schema30.HardwareProduct</class>
+    <class>ee.jakarta.tck.persistence.common.schema30.HardwareProduct_</class>
+    <class>ee.jakarta.tck.persistence.common.schema30.Info</class>
+    <class>ee.jakarta.tck.persistence.common.schema30.Info_</class>
+    <class>ee.jakarta.tck.persistence.common.schema30.LineItem</class>
+    <class>ee.jakarta.tck.persistence.common.schema30.LineItemException</class>
+    <class>ee.jakarta.tck.persistence.common.schema30.LineItem_</class>
+    <class>ee.jakarta.tck.persistence.common.schema30.Order</class>
+    <class>ee.jakarta.tck.persistence.common.schema30.Order_</class>
+    <class>ee.jakarta.tck.persistence.common.schema30.Phone</class>
+    <class>ee.jakarta.tck.persistence.common.schema30.Phone_</class>
+    <class>ee.jakarta.tck.persistence.common.schema30.Product</class>
+    <class>ee.jakarta.tck.persistence.common.schema30.Product_</class>
+    <class>ee.jakarta.tck.persistence.common.schema30.ShelfLife</class>
+    <class>ee.jakarta.tck.persistence.common.schema30.ShelfLife_</class>
+    <class>ee.jakarta.tck.persistence.common.schema30.SoftwareProduct</class>
+    <class>ee.jakarta.tck.persistence.common.schema30.SoftwareProduct_</class>
+    <class>ee.jakarta.tck.persistence.common.schema30.Spouse</class>
+    <class>ee.jakarta.tck.persistence.common.schema30.Spouse_</class>
+    <class>ee.jakarta.tck.persistence.common.schema30.Trim</class>
+    <class>ee.jakarta.tck.persistence.common.schema30.Trim_</class>
+  </persistence-unit>
+  <persistence-unit name="CTS-EM-NOTX" transaction-type="RESOURCE_LOCAL">
+    <description>The persistence.xml file may be used to designate
+                  more than one persistence unit within the same scope.
+                  Persistence Unit for Application Managed Resource Local</description>
+    <non-jta-data-source>jdbc/DB_no_tx</non-jta-data-source>
+    <class>ee.jakarta.tck.persistence.common.schema30.Address</class>
+    <class>ee.jakarta.tck.persistence.common.schema30.Address_</class>
+    <class>ee.jakarta.tck.persistence.common.schema30.Alias</class>
+    <class>ee.jakarta.tck.persistence.common.schema30.Alias_</class>
+    <class>ee.jakarta.tck.persistence.common.schema30.Country</class>
+    <class>ee.jakarta.tck.persistence.common.schema30.Country_</class>
+    <class>ee.jakarta.tck.persistence.common.schema30.CreditCard</class>
+    <class>ee.jakarta.tck.persistence.common.schema30.CreditCard_</class>
+    <class>ee.jakarta.tck.persistence.common.schema30.Customer</class>
+    <class>ee.jakarta.tck.persistence.common.schema30.Customer_</class>
+    <class>ee.jakarta.tck.persistence.common.schema30.Department</class>
+    <class>ee.jakarta.tck.persistence.common.schema30.Department_</class>
+    <class>ee.jakarta.tck.persistence.common.schema30.Employee</class>
+    <class>ee.jakarta.tck.persistence.common.schema30.Employee_</class>
+    <class>ee.jakarta.tck.persistence.common.schema30.HardwareProduct</class>
+    <class>ee.jakarta.tck.persistence.common.schema30.HardwareProduct_</class>
+    <class>ee.jakarta.tck.persistence.common.schema30.Info</class>
+    <class>ee.jakarta.tck.persistence.common.schema30.Info_</class>
+    <class>ee.jakarta.tck.persistence.common.schema30.LineItem</class>
+    <class>ee.jakarta.tck.persistence.common.schema30.LineItemException</class>
+    <class>ee.jakarta.tck.persistence.common.schema30.LineItem_</class>
+    <class>ee.jakarta.tck.persistence.common.schema30.Order</class>
+    <class>ee.jakarta.tck.persistence.common.schema30.Order_</class>
+    <class>ee.jakarta.tck.persistence.common.schema30.Phone</class>
+    <class>ee.jakarta.tck.persistence.common.schema30.Phone_</class>
+    <class>ee.jakarta.tck.persistence.common.schema30.Product</class>
+    <class>ee.jakarta.tck.persistence.common.schema30.Product_</class>
+    <class>ee.jakarta.tck.persistence.common.schema30.ShelfLife</class>
+    <class>ee.jakarta.tck.persistence.common.schema30.ShelfLife_</class>
+    <class>ee.jakarta.tck.persistence.common.schema30.SoftwareProduct</class>
+    <class>ee.jakarta.tck.persistence.common.schema30.SoftwareProduct_</class>
+    <class>ee.jakarta.tck.persistence.common.schema30.Spouse</class>
+    <class>ee.jakarta.tck.persistence.common.schema30.Spouse_</class>
+    <class>ee.jakarta.tck.persistence.common.schema30.Trim</class>
+    <class>ee.jakarta.tck.persistence.common.schema30.Trim_</class>
+  </persistence-unit>
+</persistence>
+
diff --git a/jpa/spec-tests/src/main/java/ee/jakarta/tck/persistence/core/derivedid/ex1a/persistence.xml b/jpa/spec-tests/src/main/java/ee/jakarta/tck/persistence/core/derivedid/ex1a/persistence.xml
new file mode 100644
index 0000000000..eb91871e99
--- /dev/null
+++ b/jpa/spec-tests/src/main/java/ee/jakarta/tck/persistence/core/derivedid/ex1a/persistence.xml
@@ -0,0 +1,44 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+
+    Copyright (c) 2018 Oracle and/or its affiliates. All rights reserved.
+
+    This program and the accompanying materials are made available under the
+    terms of the Eclipse Public License v. 2.0, which is available at
+    http://www.eclipse.org/legal/epl-2.0.
+
+    This Source Code may also be made available under the following Secondary
+    Licenses when the conditions for such availability set forth in the
+    Eclipse Public License v. 2.0 are satisfied: GNU General Public License,
+    version 2 with the GNU Classpath Exception, which is available at
+    https://www.gnu.org/software/classpath/license.html.
+
+    SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
+
+-->
+<persistence xmlns="https://jakarta.ee/xml/ns/persistence" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="https://jakarta.ee/xml/ns/persistence     https://jakarta.ee/xml/ns/persistence/persistence_3_0.xsd" version="3.0">
+  <persistence-unit name="CTS-EM" transaction-type="JTA">
+    <description>Persistence Unit for CTS Vehicle Tests</description>
+    <jta-data-source>jdbc/DB1</jta-data-source>
+    <class>ee.jakarta.tck.persistence.core.derivedid.ex1a.DID1Dependent</class>
+    <class>ee.jakarta.tck.persistence.core.derivedid.ex1a.DID1DependentId</class>
+    <class>ee.jakarta.tck.persistence.core.derivedid.ex1a.DID1Employee</class>
+  </persistence-unit>
+  <persistence-unit name="CTS-EM2" transaction-type="JTA">
+    <description>Persistence Unit for CTS Vehicle Tests</description>
+    <jta-data-source>jdbc/DB1</jta-data-source>
+    <class>ee.jakarta.tck.persistence.core.derivedid.ex1a.DID1Dependent</class>
+    <class>ee.jakarta.tck.persistence.core.derivedid.ex1a.DID1DependentId</class>
+    <class>ee.jakarta.tck.persistence.core.derivedid.ex1a.DID1Employee</class>
+  </persistence-unit>
+  <persistence-unit name="CTS-EM-NOTX" transaction-type="RESOURCE_LOCAL">
+    <description>The persistence.xml file may be used to designate
+                  more than one persistence unit within the same scope.
+                  Persistence Unit for Application Managed Resource Local</description>
+    <non-jta-data-source>jdbc/DB_no_tx</non-jta-data-source>
+    <class>ee.jakarta.tck.persistence.core.derivedid.ex1a.DID1Dependent</class>
+    <class>ee.jakarta.tck.persistence.core.derivedid.ex1a.DID1DependentId</class>
+    <class>ee.jakarta.tck.persistence.core.derivedid.ex1a.DID1Employee</class>
+  </persistence-unit>
+</persistence>
+
diff --git a/jpa/spec-tests/src/main/java/ee/jakarta/tck/persistence/core/derivedid/ex1b/persistence.xml b/jpa/spec-tests/src/main/java/ee/jakarta/tck/persistence/core/derivedid/ex1b/persistence.xml
new file mode 100644
index 0000000000..69b17b3e2a
--- /dev/null
+++ b/jpa/spec-tests/src/main/java/ee/jakarta/tck/persistence/core/derivedid/ex1b/persistence.xml
@@ -0,0 +1,44 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+
+    Copyright (c) 2018 Oracle and/or its affiliates. All rights reserved.
+
+    This program and the accompanying materials are made available under the
+    terms of the Eclipse Public License v. 2.0, which is available at
+    http://www.eclipse.org/legal/epl-2.0.
+
+    This Source Code may also be made available under the following Secondary
+    Licenses when the conditions for such availability set forth in the
+    Eclipse Public License v. 2.0 are satisfied: GNU General Public License,
+    version 2 with the GNU Classpath Exception, which is available at
+    https://www.gnu.org/software/classpath/license.html.
+
+    SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
+
+-->
+<persistence xmlns="https://jakarta.ee/xml/ns/persistence" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="https://jakarta.ee/xml/ns/persistence     https://jakarta.ee/xml/ns/persistence/persistence_3_0.xsd" version="3.0">
+  <persistence-unit name="CTS-EM" transaction-type="JTA">
+    <description>Persistence Unit for CTS Vehicle Tests</description>
+    <jta-data-source>jdbc/DB1</jta-data-source>
+    <class>ee.jakarta.tck.persistence.core.derivedid.ex1b.DID1bDependent</class>
+    <class>ee.jakarta.tck.persistence.core.derivedid.ex1b.DID1bDependentId</class>
+    <class>ee.jakarta.tck.persistence.core.derivedid.ex1b.DID1bEmployee</class>
+  </persistence-unit>
+  <persistence-unit name="CTS-EM2" transaction-type="JTA">
+    <description>Persistence Unit for CTS Vehicle Tests</description>
+    <jta-data-source>jdbc/DB1</jta-data-source>
+    <class>ee.jakarta.tck.persistence.core.derivedid.ex1b.DID1bDependent</class>
+    <class>ee.jakarta.tck.persistence.core.derivedid.ex1b.DID1bDependentId</class>
+    <class>ee.jakarta.tck.persistence.core.derivedid.ex1b.DID1bEmployee</class>
+  </persistence-unit>
+  <persistence-unit name="CTS-EM-NOTX" transaction-type="RESOURCE_LOCAL">
+    <description>The persistence.xml file may be used to designate
+                  more than one persistence unit within the same scope.
+                  Persistence Unit for Application Managed Resource Local</description>
+    <non-jta-data-source>jdbc/DB_no_tx</non-jta-data-source>
+    <class>ee.jakarta.tck.persistence.core.derivedid.ex1b.DID1bDependent</class>
+    <class>ee.jakarta.tck.persistence.core.derivedid.ex1b.DID1bDependentId</class>
+    <class>ee.jakarta.tck.persistence.core.derivedid.ex1b.DID1bEmployee</class>
+  </persistence-unit>
+</persistence>
+
diff --git a/jpa/spec-tests/src/main/java/ee/jakarta/tck/persistence/core/derivedid/ex2a/persistence.xml b/jpa/spec-tests/src/main/java/ee/jakarta/tck/persistence/core/derivedid/ex2a/persistence.xml
new file mode 100644
index 0000000000..72fb05d564
--- /dev/null
+++ b/jpa/spec-tests/src/main/java/ee/jakarta/tck/persistence/core/derivedid/ex2a/persistence.xml
@@ -0,0 +1,47 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+
+    Copyright (c) 2018 Oracle and/or its affiliates. All rights reserved.
+
+    This program and the accompanying materials are made available under the
+    terms of the Eclipse Public License v. 2.0, which is available at
+    http://www.eclipse.org/legal/epl-2.0.
+
+    This Source Code may also be made available under the following Secondary
+    Licenses when the conditions for such availability set forth in the
+    Eclipse Public License v. 2.0 are satisfied: GNU General Public License,
+    version 2 with the GNU Classpath Exception, which is available at
+    https://www.gnu.org/software/classpath/license.html.
+
+    SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
+
+-->
+<persistence xmlns="https://jakarta.ee/xml/ns/persistence" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="https://jakarta.ee/xml/ns/persistence     https://jakarta.ee/xml/ns/persistence/persistence_3_0.xsd" version="3.0">
+  <persistence-unit name="CTS-EM" transaction-type="JTA">
+    <description>Persistence Unit for CTS Vehicle Tests</description>
+    <jta-data-source>jdbc/DB1</jta-data-source>
+    <class>ee.jakarta.tck.persistence.core.derivedid.ex2a.DID2Dependent</class>
+    <class>ee.jakarta.tck.persistence.core.derivedid.ex2a.DID2DependentId</class>
+    <class>ee.jakarta.tck.persistence.core.derivedid.ex2a.DID2Employee</class>
+    <class>ee.jakarta.tck.persistence.core.derivedid.ex2a.DID2EmployeeId</class>
+  </persistence-unit>
+  <persistence-unit name="CTS-EM2" transaction-type="JTA">
+    <description>Persistence Unit for CTS Vehicle Tests</description>
+    <jta-data-source>jdbc/DB1</jta-data-source>
+    <class>ee.jakarta.tck.persistence.core.derivedid.ex2a.DID2Dependent</class>
+    <class>ee.jakarta.tck.persistence.core.derivedid.ex2a.DID2DependentId</class>
+    <class>ee.jakarta.tck.persistence.core.derivedid.ex2a.DID2Employee</class>
+    <class>ee.jakarta.tck.persistence.core.derivedid.ex2a.DID2EmployeeId</class>
+  </persistence-unit>
+  <persistence-unit name="CTS-EM-NOTX" transaction-type="RESOURCE_LOCAL">
+    <description>The persistence.xml file may be used to designate
+                  more than one persistence unit within the same scope.
+                  Persistence Unit for Application Managed Resource Local</description>
+    <non-jta-data-source>jdbc/DB_no_tx</non-jta-data-source>
+    <class>ee.jakarta.tck.persistence.core.derivedid.ex2a.DID2Dependent</class>
+    <class>ee.jakarta.tck.persistence.core.derivedid.ex2a.DID2DependentId</class>
+    <class>ee.jakarta.tck.persistence.core.derivedid.ex2a.DID2Employee</class>
+    <class>ee.jakarta.tck.persistence.core.derivedid.ex2a.DID2EmployeeId</class>
+  </persistence-unit>
+</persistence>
+
diff --git a/jpa/spec-tests/src/main/java/ee/jakarta/tck/persistence/core/derivedid/ex2b/persistence.xml b/jpa/spec-tests/src/main/java/ee/jakarta/tck/persistence/core/derivedid/ex2b/persistence.xml
new file mode 100644
index 0000000000..0509ccfd20
--- /dev/null
+++ b/jpa/spec-tests/src/main/java/ee/jakarta/tck/persistence/core/derivedid/ex2b/persistence.xml
@@ -0,0 +1,47 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+
+    Copyright (c) 2018 Oracle and/or its affiliates. All rights reserved.
+
+    This program and the accompanying materials are made available under the
+    terms of the Eclipse Public License v. 2.0, which is available at
+    http://www.eclipse.org/legal/epl-2.0.
+
+    This Source Code may also be made available under the following Secondary
+    Licenses when the conditions for such availability set forth in the
+    Eclipse Public License v. 2.0 are satisfied: GNU General Public License,
+    version 2 with the GNU Classpath Exception, which is available at
+    https://www.gnu.org/software/classpath/license.html.
+
+    SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
+
+-->
+<persistence xmlns="https://jakarta.ee/xml/ns/persistence" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="https://jakarta.ee/xml/ns/persistence     https://jakarta.ee/xml/ns/persistence/persistence_3_0.xsd" version="3.0">
+  <persistence-unit name="CTS-EM" transaction-type="JTA">
+    <description>Persistence Unit for CTS Vehicle Tests</description>
+    <jta-data-source>jdbc/DB1</jta-data-source>
+    <class>ee.jakarta.tck.persistence.core.derivedid.ex2b.DID2bDependent</class>
+    <class>ee.jakarta.tck.persistence.core.derivedid.ex2b.DID2bDependentId</class>
+    <class>ee.jakarta.tck.persistence.core.derivedid.ex2b.DID2bEmployee</class>
+    <class>ee.jakarta.tck.persistence.core.derivedid.ex2b.DID2bEmployeeId</class>
+  </persistence-unit>
+  <persistence-unit name="CTS-EM2" transaction-type="JTA">
+    <description>Persistence Unit for CTS Vehicle Tests</description>
+    <jta-data-source>jdbc/DB1</jta-data-source>
+    <class>ee.jakarta.tck.persistence.core.derivedid.ex2b.DID2bDependent</class>
+    <class>ee.jakarta.tck.persistence.core.derivedid.ex2b.DID2bDependentId</class>
+    <class>ee.jakarta.tck.persistence.core.derivedid.ex2b.DID2bEmployee</class>
+    <class>ee.jakarta.tck.persistence.core.derivedid.ex2b.DID2bEmployeeId</class>
+  </persistence-unit>
+  <persistence-unit name="CTS-EM-NOTX" transaction-type="RESOURCE_LOCAL">
+    <description>The persistence.xml file may be used to designate
+                  more than one persistence unit within the same scope.
+                  Persistence Unit for Application Managed Resource Local</description>
+    <non-jta-data-source>jdbc/DB_no_tx</non-jta-data-source>
+    <class>ee.jakarta.tck.persistence.core.derivedid.ex2b.DID2bDependent</class>
+    <class>ee.jakarta.tck.persistence.core.derivedid.ex2b.DID2bDependentId</class>
+    <class>ee.jakarta.tck.persistence.core.derivedid.ex2b.DID2bEmployee</class>
+    <class>ee.jakarta.tck.persistence.core.derivedid.ex2b.DID2bEmployeeId</class>
+  </persistence-unit>
+</persistence>
+
diff --git a/jpa/spec-tests/src/main/java/ee/jakarta/tck/persistence/core/derivedid/ex3a/persistence.xml b/jpa/spec-tests/src/main/java/ee/jakarta/tck/persistence/core/derivedid/ex3a/persistence.xml
new file mode 100644
index 0000000000..18fa3b5572
--- /dev/null
+++ b/jpa/spec-tests/src/main/java/ee/jakarta/tck/persistence/core/derivedid/ex3a/persistence.xml
@@ -0,0 +1,47 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+
+    Copyright (c) 2018 Oracle and/or its affiliates. All rights reserved.
+
+    This program and the accompanying materials are made available under the
+    terms of the Eclipse Public License v. 2.0, which is available at
+    http://www.eclipse.org/legal/epl-2.0.
+
+    This Source Code may also be made available under the following Secondary
+    Licenses when the conditions for such availability set forth in the
+    Eclipse Public License v. 2.0 are satisfied: GNU General Public License,
+    version 2 with the GNU Classpath Exception, which is available at
+    https://www.gnu.org/software/classpath/license.html.
+
+    SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
+
+-->
+<persistence xmlns="https://jakarta.ee/xml/ns/persistence" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="https://jakarta.ee/xml/ns/persistence     https://jakarta.ee/xml/ns/persistence/persistence_3_0.xsd" version="3.0">
+  <persistence-unit name="CTS-EM" transaction-type="JTA">
+    <description>Persistence Unit for CTS Vehicle Tests</description>
+    <jta-data-source>jdbc/DB1</jta-data-source>
+    <class>ee.jakarta.tck.persistence.core.derivedid.ex3a.DID3Dependent</class>
+    <class>ee.jakarta.tck.persistence.core.derivedid.ex3a.DID3DependentId</class>
+    <class>ee.jakarta.tck.persistence.core.derivedid.ex3a.DID3Employee</class>
+    <class>ee.jakarta.tck.persistence.core.derivedid.ex3a.DID3EmployeeId</class>
+  </persistence-unit>
+  <persistence-unit name="CTS-EM2" transaction-type="JTA">
+    <description>Persistence Unit for CTS Vehicle Tests</description>
+    <jta-data-source>jdbc/DB1</jta-data-source>
+    <class>ee.jakarta.tck.persistence.core.derivedid.ex3a.DID3Dependent</class>
+    <class>ee.jakarta.tck.persistence.core.derivedid.ex3a.DID3DependentId</class>
+    <class>ee.jakarta.tck.persistence.core.derivedid.ex3a.DID3Employee</class>
+    <class>ee.jakarta.tck.persistence.core.derivedid.ex3a.DID3EmployeeId</class>
+  </persistence-unit>
+  <persistence-unit name="CTS-EM-NOTX" transaction-type="RESOURCE_LOCAL">
+    <description>The persistence.xml file may be used to designate
+                  more than one persistence unit within the same scope.
+                  Persistence Unit for Application Managed Resource Local</description>
+    <non-jta-data-source>jdbc/DB_no_tx</non-jta-data-source>
+    <class>ee.jakarta.tck.persistence.core.derivedid.ex3a.DID3Dependent</class>
+    <class>ee.jakarta.tck.persistence.core.derivedid.ex3a.DID3DependentId</class>
+    <class>ee.jakarta.tck.persistence.core.derivedid.ex3a.DID3Employee</class>
+    <class>ee.jakarta.tck.persistence.core.derivedid.ex3a.DID3EmployeeId</class>
+  </persistence-unit>
+</persistence>
+
diff --git a/jpa/spec-tests/src/main/java/ee/jakarta/tck/persistence/core/derivedid/ex3b/persistence.xml b/jpa/spec-tests/src/main/java/ee/jakarta/tck/persistence/core/derivedid/ex3b/persistence.xml
new file mode 100644
index 0000000000..8b17ec3ae9
--- /dev/null
+++ b/jpa/spec-tests/src/main/java/ee/jakarta/tck/persistence/core/derivedid/ex3b/persistence.xml
@@ -0,0 +1,47 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+
+    Copyright (c) 2018 Oracle and/or its affiliates. All rights reserved.
+
+    This program and the accompanying materials are made available under the
+    terms of the Eclipse Public License v. 2.0, which is available at
+    http://www.eclipse.org/legal/epl-2.0.
+
+    This Source Code may also be made available under the following Secondary
+    Licenses when the conditions for such availability set forth in the
+    Eclipse Public License v. 2.0 are satisfied: GNU General Public License,
+    version 2 with the GNU Classpath Exception, which is available at
+    https://www.gnu.org/software/classpath/license.html.
+
+    SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
+
+-->
+<persistence xmlns="https://jakarta.ee/xml/ns/persistence" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="https://jakarta.ee/xml/ns/persistence     https://jakarta.ee/xml/ns/persistence/persistence_3_0.xsd" version="3.0">
+  <persistence-unit name="CTS-EM" transaction-type="JTA">
+    <description>Persistence Unit for CTS Vehicle Tests</description>
+    <jta-data-source>jdbc/DB1</jta-data-source>
+    <class>ee.jakarta.tck.persistence.core.derivedid.ex3b.DID3bDependent</class>
+    <class>ee.jakarta.tck.persistence.core.derivedid.ex3b.DID3bDependentId</class>
+    <class>ee.jakarta.tck.persistence.core.derivedid.ex3b.DID3bEmployee</class>
+    <class>ee.jakarta.tck.persistence.core.derivedid.ex3b.DID3bEmployeeId</class>
+  </persistence-unit>
+  <persistence-unit name="CTS-EM2" transaction-type="JTA">
+    <description>Persistence Unit for CTS Vehicle Tests</description>
+    <jta-data-source>jdbc/DB1</jta-data-source>
+    <class>ee.jakarta.tck.persistence.core.derivedid.ex3b.DID3bDependent</class>
+    <class>ee.jakarta.tck.persistence.core.derivedid.ex3b.DID3bDependentId</class>
+    <class>ee.jakarta.tck.persistence.core.derivedid.ex3b.DID3bEmployee</class>
+    <class>ee.jakarta.tck.persistence.core.derivedid.ex3b.DID3bEmployeeId</class>
+  </persistence-unit>
+  <persistence-unit name="CTS-EM-NOTX" transaction-type="RESOURCE_LOCAL">
+    <description>The persistence.xml file may be used to designate
+                  more than one persistence unit within the same scope.
+                  Persistence Unit for Application Managed Resource Local</description>
+    <non-jta-data-source>jdbc/DB_no_tx</non-jta-data-source>
+    <class>ee.jakarta.tck.persistence.core.derivedid.ex3b.DID3bDependent</class>
+    <class>ee.jakarta.tck.persistence.core.derivedid.ex3b.DID3bDependentId</class>
+    <class>ee.jakarta.tck.persistence.core.derivedid.ex3b.DID3bEmployee</class>
+    <class>ee.jakarta.tck.persistence.core.derivedid.ex3b.DID3bEmployeeId</class>
+  </persistence-unit>
+</persistence>
+
diff --git a/jpa/spec-tests/src/main/java/ee/jakarta/tck/persistence/core/derivedid/ex4a/persistence.xml b/jpa/spec-tests/src/main/java/ee/jakarta/tck/persistence/core/derivedid/ex4a/persistence.xml
new file mode 100644
index 0000000000..e3cb9c7dfd
--- /dev/null
+++ b/jpa/spec-tests/src/main/java/ee/jakarta/tck/persistence/core/derivedid/ex4a/persistence.xml
@@ -0,0 +1,41 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+
+    Copyright (c) 2018 Oracle and/or its affiliates. All rights reserved.
+
+    This program and the accompanying materials are made available under the
+    terms of the Eclipse Public License v. 2.0, which is available at
+    http://www.eclipse.org/legal/epl-2.0.
+
+    This Source Code may also be made available under the following Secondary
+    Licenses when the conditions for such availability set forth in the
+    Eclipse Public License v. 2.0 are satisfied: GNU General Public License,
+    version 2 with the GNU Classpath Exception, which is available at
+    https://www.gnu.org/software/classpath/license.html.
+
+    SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
+
+-->
+<persistence xmlns="https://jakarta.ee/xml/ns/persistence" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="https://jakarta.ee/xml/ns/persistence     https://jakarta.ee/xml/ns/persistence/persistence_3_0.xsd" version="3.0">
+  <persistence-unit name="CTS-EM" transaction-type="JTA">
+    <description>Persistence Unit for CTS Vehicle Tests</description>
+    <jta-data-source>jdbc/DB1</jta-data-source>
+    <class>ee.jakarta.tck.persistence.core.derivedid.ex4a.DID4MedicalHistory</class>
+    <class>ee.jakarta.tck.persistence.core.derivedid.ex4a.DID4Person</class>
+  </persistence-unit>
+  <persistence-unit name="CTS-EM2" transaction-type="JTA">
+    <description>Persistence Unit for CTS Vehicle Tests</description>
+    <jta-data-source>jdbc/DB1</jta-data-source>
+    <class>ee.jakarta.tck.persistence.core.derivedid.ex4a.DID4MedicalHistory</class>
+    <class>ee.jakarta.tck.persistence.core.derivedid.ex4a.DID4Person</class>
+  </persistence-unit>
+  <persistence-unit name="CTS-EM-NOTX" transaction-type="RESOURCE_LOCAL">
+    <description>The persistence.xml file may be used to designate
+                  more than one persistence unit within the same scope.
+                  Persistence Unit for Application Managed Resource Local</description>
+    <non-jta-data-source>jdbc/DB_no_tx</non-jta-data-source>
+    <class>ee.jakarta.tck.persistence.core.derivedid.ex4a.DID4MedicalHistory</class>
+    <class>ee.jakarta.tck.persistence.core.derivedid.ex4a.DID4Person</class>
+  </persistence-unit>
+</persistence>
+
diff --git a/jpa/spec-tests/src/main/java/ee/jakarta/tck/persistence/core/derivedid/ex4b/persistence.xml b/jpa/spec-tests/src/main/java/ee/jakarta/tck/persistence/core/derivedid/ex4b/persistence.xml
new file mode 100644
index 0000000000..026f117422
--- /dev/null
+++ b/jpa/spec-tests/src/main/java/ee/jakarta/tck/persistence/core/derivedid/ex4b/persistence.xml
@@ -0,0 +1,41 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+
+    Copyright (c) 2018 Oracle and/or its affiliates. All rights reserved.
+
+    This program and the accompanying materials are made available under the
+    terms of the Eclipse Public License v. 2.0, which is available at
+    http://www.eclipse.org/legal/epl-2.0.
+
+    This Source Code may also be made available under the following Secondary
+    Licenses when the conditions for such availability set forth in the
+    Eclipse Public License v. 2.0 are satisfied: GNU General Public License,
+    version 2 with the GNU Classpath Exception, which is available at
+    https://www.gnu.org/software/classpath/license.html.
+
+    SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
+
+-->
+<persistence xmlns="https://jakarta.ee/xml/ns/persistence" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="https://jakarta.ee/xml/ns/persistence     https://jakarta.ee/xml/ns/persistence/persistence_3_0.xsd" version="3.0">
+  <persistence-unit name="CTS-EM" transaction-type="JTA">
+    <description>Persistence Unit for CTS Vehicle Tests</description>
+    <jta-data-source>jdbc/DB1</jta-data-source>
+    <class>ee.jakarta.tck.persistence.core.derivedid.ex4b.DID4bMedicalHistory</class>
+    <class>ee.jakarta.tck.persistence.core.derivedid.ex4b.DID4bPerson</class>
+  </persistence-unit>
+  <persistence-unit name="CTS-EM2" transaction-type="JTA">
+    <description>Persistence Unit for CTS Vehicle Tests</description>
+    <jta-data-source>jdbc/DB1</jta-data-source>
+    <class>ee.jakarta.tck.persistence.core.derivedid.ex4b.DID4bMedicalHistory</class>
+    <class>ee.jakarta.tck.persistence.core.derivedid.ex4b.DID4bPerson</class>
+  </persistence-unit>
+  <persistence-unit name="CTS-EM-NOTX" transaction-type="RESOURCE_LOCAL">
+    <description>The persistence.xml file may be used to designate
+                  more than one persistence unit within the same scope.
+                  Persistence Unit for Application Managed Resource Local</description>
+    <non-jta-data-source>jdbc/DB_no_tx</non-jta-data-source>
+    <class>ee.jakarta.tck.persistence.core.derivedid.ex4b.DID4bMedicalHistory</class>
+    <class>ee.jakarta.tck.persistence.core.derivedid.ex4b.DID4bPerson</class>
+  </persistence-unit>
+</persistence>
+
diff --git a/jpa/spec-tests/src/main/java/ee/jakarta/tck/persistence/core/derivedid/ex5a/persistence.xml b/jpa/spec-tests/src/main/java/ee/jakarta/tck/persistence/core/derivedid/ex5a/persistence.xml
new file mode 100644
index 0000000000..7575524c62
--- /dev/null
+++ b/jpa/spec-tests/src/main/java/ee/jakarta/tck/persistence/core/derivedid/ex5a/persistence.xml
@@ -0,0 +1,44 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+
+    Copyright (c) 2018 Oracle and/or its affiliates. All rights reserved.
+
+    This program and the accompanying materials are made available under the
+    terms of the Eclipse Public License v. 2.0, which is available at
+    http://www.eclipse.org/legal/epl-2.0.
+
+    This Source Code may also be made available under the following Secondary
+    Licenses when the conditions for such availability set forth in the
+    Eclipse Public License v. 2.0 are satisfied: GNU General Public License,
+    version 2 with the GNU Classpath Exception, which is available at
+    https://www.gnu.org/software/classpath/license.html.
+
+    SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
+
+-->
+<persistence xmlns="https://jakarta.ee/xml/ns/persistence" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="https://jakarta.ee/xml/ns/persistence     https://jakarta.ee/xml/ns/persistence/persistence_3_0.xsd" version="3.0">
+  <persistence-unit name="CTS-EM" transaction-type="JTA">
+    <description>Persistence Unit for CTS Vehicle Tests</description>
+    <jta-data-source>jdbc/DB1</jta-data-source>
+    <class>ee.jakarta.tck.persistence.core.derivedid.ex5a.DID5MedicalHistory</class>
+    <class>ee.jakarta.tck.persistence.core.derivedid.ex5a.DID5Person</class>
+    <class>ee.jakarta.tck.persistence.core.derivedid.ex5a.DID5PersonId</class>
+  </persistence-unit>
+  <persistence-unit name="CTS-EM2" transaction-type="JTA">
+    <description>Persistence Unit for CTS Vehicle Tests</description>
+    <jta-data-source>jdbc/DB1</jta-data-source>
+    <class>ee.jakarta.tck.persistence.core.derivedid.ex5a.DID5MedicalHistory</class>
+    <class>ee.jakarta.tck.persistence.core.derivedid.ex5a.DID5Person</class>
+    <class>ee.jakarta.tck.persistence.core.derivedid.ex5a.DID5PersonId</class>
+  </persistence-unit>
+  <persistence-unit name="CTS-EM-NOTX" transaction-type="RESOURCE_LOCAL">
+    <description>The persistence.xml file may be used to designate
+                  more than one persistence unit within the same scope.
+                  Persistence Unit for Application Managed Resource Local</description>
+    <non-jta-data-source>jdbc/DB_no_tx</non-jta-data-source>
+    <class>ee.jakarta.tck.persistence.core.derivedid.ex5a.DID5MedicalHistory</class>
+    <class>ee.jakarta.tck.persistence.core.derivedid.ex5a.DID5Person</class>
+    <class>ee.jakarta.tck.persistence.core.derivedid.ex5a.DID5PersonId</class>
+  </persistence-unit>
+</persistence>
+
diff --git a/jpa/spec-tests/src/main/java/ee/jakarta/tck/persistence/core/derivedid/ex5b/persistence.xml b/jpa/spec-tests/src/main/java/ee/jakarta/tck/persistence/core/derivedid/ex5b/persistence.xml
new file mode 100644
index 0000000000..4c9d670414
--- /dev/null
+++ b/jpa/spec-tests/src/main/java/ee/jakarta/tck/persistence/core/derivedid/ex5b/persistence.xml
@@ -0,0 +1,44 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+
+    Copyright (c) 2018 Oracle and/or its affiliates. All rights reserved.
+
+    This program and the accompanying materials are made available under the
+    terms of the Eclipse Public License v. 2.0, which is available at
+    http://www.eclipse.org/legal/epl-2.0.
+
+    This Source Code may also be made available under the following Secondary
+    Licenses when the conditions for such availability set forth in the
+    Eclipse Public License v. 2.0 are satisfied: GNU General Public License,
+    version 2 with the GNU Classpath Exception, which is available at
+    https://www.gnu.org/software/classpath/license.html.
+
+    SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
+
+-->
+<persistence xmlns="https://jakarta.ee/xml/ns/persistence" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="https://jakarta.ee/xml/ns/persistence     https://jakarta.ee/xml/ns/persistence/persistence_3_0.xsd" version="3.0">
+  <persistence-unit name="CTS-EM" transaction-type="JTA">
+    <description>Persistence Unit for CTS Vehicle Tests</description>
+    <jta-data-source>jdbc/DB1</jta-data-source>
+    <class>ee.jakarta.tck.persistence.core.derivedid.ex5b.DID5bMedicalHistory</class>
+    <class>ee.jakarta.tck.persistence.core.derivedid.ex5b.DID5bPerson</class>
+    <class>ee.jakarta.tck.persistence.core.derivedid.ex5b.DID5bPersonId</class>
+  </persistence-unit>
+  <persistence-unit name="CTS-EM2" transaction-type="JTA">
+    <description>Persistence Unit for CTS Vehicle Tests</description>
+    <jta-data-source>jdbc/DB1</jta-data-source>
+    <class>ee.jakarta.tck.persistence.core.derivedid.ex5b.DID5bMedicalHistory</class>
+    <class>ee.jakarta.tck.persistence.core.derivedid.ex5b.DID5bPerson</class>
+    <class>ee.jakarta.tck.persistence.core.derivedid.ex5b.DID5bPersonId</class>
+  </persistence-unit>
+  <persistence-unit name="CTS-EM-NOTX" transaction-type="RESOURCE_LOCAL">
+    <description>The persistence.xml file may be used to designate
+                  more than one persistence unit within the same scope.
+                  Persistence Unit for Application Managed Resource Local</description>
+    <non-jta-data-source>jdbc/DB_no_tx</non-jta-data-source>
+    <class>ee.jakarta.tck.persistence.core.derivedid.ex5b.DID5bMedicalHistory</class>
+    <class>ee.jakarta.tck.persistence.core.derivedid.ex5b.DID5bPerson</class>
+    <class>ee.jakarta.tck.persistence.core.derivedid.ex5b.DID5bPersonId</class>
+  </persistence-unit>
+</persistence>
+
diff --git a/jpa/spec-tests/src/main/java/ee/jakarta/tck/persistence/core/derivedid/ex6a/persistence.xml b/jpa/spec-tests/src/main/java/ee/jakarta/tck/persistence/core/derivedid/ex6a/persistence.xml
new file mode 100644
index 0000000000..1ba06e9e64
--- /dev/null
+++ b/jpa/spec-tests/src/main/java/ee/jakarta/tck/persistence/core/derivedid/ex6a/persistence.xml
@@ -0,0 +1,44 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+
+    Copyright (c) 2018 Oracle and/or its affiliates. All rights reserved.
+
+    This program and the accompanying materials are made available under the
+    terms of the Eclipse Public License v. 2.0, which is available at
+    http://www.eclipse.org/legal/epl-2.0.
+
+    This Source Code may also be made available under the following Secondary
+    Licenses when the conditions for such availability set forth in the
+    Eclipse Public License v. 2.0 are satisfied: GNU General Public License,
+    version 2 with the GNU Classpath Exception, which is available at
+    https://www.gnu.org/software/classpath/license.html.
+
+    SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
+
+-->
+<persistence xmlns="https://jakarta.ee/xml/ns/persistence" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="https://jakarta.ee/xml/ns/persistence     https://jakarta.ee/xml/ns/persistence/persistence_3_0.xsd" version="3.0">
+  <persistence-unit name="CTS-EM" transaction-type="JTA">
+    <description>Persistence Unit for CTS Vehicle Tests</description>
+    <jta-data-source>jdbc/DB1</jta-data-source>
+    <class>ee.jakarta.tck.persistence.core.derivedid.ex6a.DID6MedicalHistory</class>
+    <class>ee.jakarta.tck.persistence.core.derivedid.ex6a.DID6Person</class>
+    <class>ee.jakarta.tck.persistence.core.derivedid.ex6a.DID6PersonId</class>
+  </persistence-unit>
+  <persistence-unit name="CTS-EM2" transaction-type="JTA">
+    <description>Persistence Unit for CTS Vehicle Tests</description>
+    <jta-data-source>jdbc/DB1</jta-data-source>
+    <class>ee.jakarta.tck.persistence.core.derivedid.ex6a.DID6MedicalHistory</class>
+    <class>ee.jakarta.tck.persistence.core.derivedid.ex6a.DID6Person</class>
+    <class>ee.jakarta.tck.persistence.core.derivedid.ex6a.DID6PersonId</class>
+  </persistence-unit>
+  <persistence-unit name="CTS-EM-NOTX" transaction-type="RESOURCE_LOCAL">
+    <description>The persistence.xml file may be used to designate
+                  more than one persistence unit within the same scope.
+                  Persistence Unit for Application Managed Resource Local</description>
+    <non-jta-data-source>jdbc/DB_no_tx</non-jta-data-source>
+    <class>ee.jakarta.tck.persistence.core.derivedid.ex6a.DID6MedicalHistory</class>
+    <class>ee.jakarta.tck.persistence.core.derivedid.ex6a.DID6Person</class>
+    <class>ee.jakarta.tck.persistence.core.derivedid.ex6a.DID6PersonId</class>
+  </persistence-unit>
+</persistence>
+
diff --git a/jpa/spec-tests/src/main/java/ee/jakarta/tck/persistence/core/derivedid/ex6b/persistence.xml b/jpa/spec-tests/src/main/java/ee/jakarta/tck/persistence/core/derivedid/ex6b/persistence.xml
new file mode 100644
index 0000000000..bda43a9a74
--- /dev/null
+++ b/jpa/spec-tests/src/main/java/ee/jakarta/tck/persistence/core/derivedid/ex6b/persistence.xml
@@ -0,0 +1,44 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+
+    Copyright (c) 2018 Oracle and/or its affiliates. All rights reserved.
+
+    This program and the accompanying materials are made available under the
+    terms of the Eclipse Public License v. 2.0, which is available at
+    http://www.eclipse.org/legal/epl-2.0.
+
+    This Source Code may also be made available under the following Secondary
+    Licenses when the conditions for such availability set forth in the
+    Eclipse Public License v. 2.0 are satisfied: GNU General Public License,
+    version 2 with the GNU Classpath Exception, which is available at
+    https://www.gnu.org/software/classpath/license.html.
+
+    SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
+
+-->
+<persistence xmlns="https://jakarta.ee/xml/ns/persistence" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="https://jakarta.ee/xml/ns/persistence     https://jakarta.ee/xml/ns/persistence/persistence_3_0.xsd" version="3.0">
+  <persistence-unit name="CTS-EM" transaction-type="JTA">
+    <description>Persistence Unit for CTS Vehicle Tests</description>
+    <jta-data-source>jdbc/DB1</jta-data-source>
+    <class>ee.jakarta.tck.persistence.core.derivedid.ex6b.DID6bMedicalHistory</class>
+    <class>ee.jakarta.tck.persistence.core.derivedid.ex6b.DID6bPerson</class>
+    <class>ee.jakarta.tck.persistence.core.derivedid.ex6b.DID6bPersonId</class>
+  </persistence-unit>
+  <persistence-unit name="CTS-EM2" transaction-type="JTA">
+    <description>Persistence Unit for CTS Vehicle Tests</description>
+    <jta-data-source>jdbc/DB1</jta-data-source>
+    <class>ee.jakarta.tck.persistence.core.derivedid.ex6b.DID6bMedicalHistory</class>
+    <class>ee.jakarta.tck.persistence.core.derivedid.ex6b.DID6bPerson</class>
+    <class>ee.jakarta.tck.persistence.core.derivedid.ex6b.DID6bPersonId</class>
+  </persistence-unit>
+  <persistence-unit name="CTS-EM-NOTX" transaction-type="RESOURCE_LOCAL">
+    <description>The persistence.xml file may be used to designate
+                  more than one persistence unit within the same scope.
+                  Persistence Unit for Application Managed Resource Local</description>
+    <non-jta-data-source>jdbc/DB_no_tx</non-jta-data-source>
+    <class>ee.jakarta.tck.persistence.core.derivedid.ex6b.DID6bMedicalHistory</class>
+    <class>ee.jakarta.tck.persistence.core.derivedid.ex6b.DID6bPerson</class>
+    <class>ee.jakarta.tck.persistence.core.derivedid.ex6b.DID6bPersonId</class>
+  </persistence-unit>
+</persistence>
+
diff --git a/jpa/spec-tests/src/main/java/ee/jakarta/tck/persistence/core/entityManager/persistence.xml b/jpa/spec-tests/src/main/java/ee/jakarta/tck/persistence/core/entityManager/persistence.xml
new file mode 100644
index 0000000000..f563e726cc
--- /dev/null
+++ b/jpa/spec-tests/src/main/java/ee/jakarta/tck/persistence/core/entityManager/persistence.xml
@@ -0,0 +1,41 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+
+    Copyright (c) 2018 Oracle and/or its affiliates. All rights reserved.
+
+    This program and the accompanying materials are made available under the
+    terms of the Eclipse Public License v. 2.0, which is available at
+    http://www.eclipse.org/legal/epl-2.0.
+
+    This Source Code may also be made available under the following Secondary
+    Licenses when the conditions for such availability set forth in the
+    Eclipse Public License v. 2.0 are satisfied: GNU General Public License,
+    version 2 with the GNU Classpath Exception, which is available at
+    https://www.gnu.org/software/classpath/license.html.
+
+    SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
+
+-->
+<persistence xmlns="https://jakarta.ee/xml/ns/persistence" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="https://jakarta.ee/xml/ns/persistence     https://jakarta.ee/xml/ns/persistence/persistence_3_0.xsd" version="3.0">
+  <persistence-unit name="CTS-EM" transaction-type="JTA">
+    <description>Persistence Unit for CTS Vehicle Tests</description>
+    <jta-data-source>jdbc/DB1</jta-data-source>
+    <class>ee.jakarta.tck.persistence.core.entityManager.Employee</class>
+    <class>ee.jakarta.tck.persistence.core.entityManager.Order</class>
+  </persistence-unit>
+  <persistence-unit name="CTS-EM2" transaction-type="JTA">
+    <description>Persistence Unit for CTS Vehicle Tests</description>
+    <jta-data-source>jdbc/DB1</jta-data-source>
+    <class>ee.jakarta.tck.persistence.core.entityManager.Employee</class>
+    <class>ee.jakarta.tck.persistence.core.entityManager.Order</class>
+  </persistence-unit>
+  <persistence-unit name="CTS-EM-NOTX" transaction-type="RESOURCE_LOCAL">
+    <description>The persistence.xml file may be used to designate
+                  more than one persistence unit within the same scope.
+                  Persistence Unit for Application Managed Resource Local</description>
+    <non-jta-data-source>jdbc/DB_no_tx</non-jta-data-source>
+    <class>ee.jakarta.tck.persistence.core.entityManager.Employee</class>
+    <class>ee.jakarta.tck.persistence.core.entityManager.Order</class>
+  </persistence-unit>
+</persistence>
+
diff --git a/jpa/spec-tests/src/main/java/ee/jakarta/tck/persistence/core/entityManager2/persistence.xml b/jpa/spec-tests/src/main/java/ee/jakarta/tck/persistence/core/entityManager2/persistence.xml
new file mode 100644
index 0000000000..682135dd4a
--- /dev/null
+++ b/jpa/spec-tests/src/main/java/ee/jakarta/tck/persistence/core/entityManager2/persistence.xml
@@ -0,0 +1,44 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+
+    Copyright (c) 2018 Oracle and/or its affiliates. All rights reserved.
+
+    This program and the accompanying materials are made available under the
+    terms of the Eclipse Public License v. 2.0, which is available at
+    http://www.eclipse.org/legal/epl-2.0.
+
+    This Source Code may also be made available under the following Secondary
+    Licenses when the conditions for such availability set forth in the
+    Eclipse Public License v. 2.0 are satisfied: GNU General Public License,
+    version 2 with the GNU Classpath Exception, which is available at
+    https://www.gnu.org/software/classpath/license.html.
+
+    SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
+
+-->
+<persistence xmlns="https://jakarta.ee/xml/ns/persistence" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="https://jakarta.ee/xml/ns/persistence     https://jakarta.ee/xml/ns/persistence/persistence_3_0.xsd" version="3.0">
+  <persistence-unit name="CTS-EM" transaction-type="JTA">
+    <description>Persistence Unit for CTS Vehicle Tests</description>
+    <jta-data-source>jdbc/DB1</jta-data-source>
+    <class>ee.jakarta.tck.persistence.core.entityManager2.DoesNotExist</class>
+    <class>ee.jakarta.tck.persistence.core.entityManager2.Employee</class>
+    <class>ee.jakarta.tck.persistence.core.entityManager2.Order</class>
+  </persistence-unit>
+  <persistence-unit name="CTS-EM2" transaction-type="JTA">
+    <description>Persistence Unit for CTS Vehicle Tests</description>
+    <jta-data-source>jdbc/DB1</jta-data-source>
+    <class>ee.jakarta.tck.persistence.core.entityManager2.DoesNotExist</class>
+    <class>ee.jakarta.tck.persistence.core.entityManager2.Employee</class>
+    <class>ee.jakarta.tck.persistence.core.entityManager2.Order</class>
+  </persistence-unit>
+  <persistence-unit name="CTS-EM-NOTX" transaction-type="RESOURCE_LOCAL">
+    <description>The persistence.xml file may be used to designate
+                  more than one persistence unit within the same scope.
+                  Persistence Unit for Application Managed Resource Local</description>
+    <non-jta-data-source>jdbc/DB_no_tx</non-jta-data-source>
+    <class>ee.jakarta.tck.persistence.core.entityManager2.DoesNotExist</class>
+    <class>ee.jakarta.tck.persistence.core.entityManager2.Employee</class>
+    <class>ee.jakarta.tck.persistence.core.entityManager2.Order</class>
+  </persistence-unit>
+</persistence>
+
diff --git a/jpa/spec-tests/src/main/java/ee/jakarta/tck/persistence/core/entityManagerFactory/persistence.xml b/jpa/spec-tests/src/main/java/ee/jakarta/tck/persistence/core/entityManagerFactory/persistence.xml
new file mode 100644
index 0000000000..e8fe2bbb8d
--- /dev/null
+++ b/jpa/spec-tests/src/main/java/ee/jakarta/tck/persistence/core/entityManagerFactory/persistence.xml
@@ -0,0 +1,47 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+
+    Copyright (c) 2018 Oracle and/or its affiliates. All rights reserved.
+
+    This program and the accompanying materials are made available under the
+    terms of the Eclipse Public License v. 2.0, which is available at
+    http://www.eclipse.org/legal/epl-2.0.
+
+    This Source Code may also be made available under the following Secondary
+    Licenses when the conditions for such availability set forth in the
+    Eclipse Public License v. 2.0 are satisfied: GNU General Public License,
+    version 2 with the GNU Classpath Exception, which is available at
+    https://www.gnu.org/software/classpath/license.html.
+
+    SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
+
+-->
+<persistence xmlns="https://jakarta.ee/xml/ns/persistence" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="https://jakarta.ee/xml/ns/persistence     https://jakarta.ee/xml/ns/persistence/persistence_3_0.xsd" version="3.0">
+  <persistence-unit name="CTS-EM" transaction-type="JTA">
+    <description>Persistence Unit for CTS Vehicle Tests</description>
+    <jta-data-source>jdbc/DB1</jta-data-source>
+    <class>ee.jakarta.tck.persistence.core.entityManagerFactory.Member</class>
+    <class>ee.jakarta.tck.persistence.core.entityManagerFactory.Member_</class>
+    <class>ee.jakarta.tck.persistence.core.entityManagerFactory.Order</class>
+    <class>ee.jakarta.tck.persistence.core.entityManagerFactory.Order_</class>
+  </persistence-unit>
+  <persistence-unit name="CTS-EM2" transaction-type="JTA">
+    <description>Persistence Unit for CTS Vehicle Tests</description>
+    <jta-data-source>jdbc/DB1</jta-data-source>
+    <class>ee.jakarta.tck.persistence.core.entityManagerFactory.Member</class>
+    <class>ee.jakarta.tck.persistence.core.entityManagerFactory.Member_</class>
+    <class>ee.jakarta.tck.persistence.core.entityManagerFactory.Order</class>
+    <class>ee.jakarta.tck.persistence.core.entityManagerFactory.Order_</class>
+  </persistence-unit>
+  <persistence-unit name="CTS-EM-NOTX" transaction-type="RESOURCE_LOCAL">
+    <description>The persistence.xml file may be used to designate
+                  more than one persistence unit within the same scope.
+                  Persistence Unit for Application Managed Resource Local</description>
+    <non-jta-data-source>jdbc/DB_no_tx</non-jta-data-source>
+    <class>ee.jakarta.tck.persistence.core.entityManagerFactory.Member</class>
+    <class>ee.jakarta.tck.persistence.core.entityManagerFactory.Member_</class>
+    <class>ee.jakarta.tck.persistence.core.entityManagerFactory.Order</class>
+    <class>ee.jakarta.tck.persistence.core.entityManagerFactory.Order_</class>
+  </persistence-unit>
+</persistence>
+
diff --git a/jpa/spec-tests/src/main/java/ee/jakarta/tck/persistence/core/entityTransaction/persistence.xml b/jpa/spec-tests/src/main/java/ee/jakarta/tck/persistence/core/entityTransaction/persistence.xml
new file mode 100644
index 0000000000..239923b87c
--- /dev/null
+++ b/jpa/spec-tests/src/main/java/ee/jakarta/tck/persistence/core/entityTransaction/persistence.xml
@@ -0,0 +1,35 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+
+    Copyright (c) 2018 Oracle and/or its affiliates. All rights reserved.
+
+    This program and the accompanying materials are made available under the
+    terms of the Eclipse Public License v. 2.0, which is available at
+    http://www.eclipse.org/legal/epl-2.0.
+
+    This Source Code may also be made available under the following Secondary
+    Licenses when the conditions for such availability set forth in the
+    Eclipse Public License v. 2.0 are satisfied: GNU General Public License,
+    version 2 with the GNU Classpath Exception, which is available at
+    https://www.gnu.org/software/classpath/license.html.
+
+    SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
+
+-->
+<persistence xmlns="https://jakarta.ee/xml/ns/persistence" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="https://jakarta.ee/xml/ns/persistence     https://jakarta.ee/xml/ns/persistence/persistence_3_0.xsd" version="3.0">
+  <persistence-unit name="CTS-EM" transaction-type="JTA">
+    <description>Persistence Unit for CTS Vehicle Tests</description>
+    <jta-data-source>jdbc/DB1</jta-data-source>
+  </persistence-unit>
+  <persistence-unit name="CTS-EM2" transaction-type="JTA">
+    <description>Persistence Unit for CTS Vehicle Tests</description>
+    <jta-data-source>jdbc/DB1</jta-data-source>
+  </persistence-unit>
+  <persistence-unit name="CTS-EM-NOTX" transaction-type="RESOURCE_LOCAL">
+    <description>The persistence.xml file may be used to designate
+                  more than one persistence unit within the same scope.
+                  Persistence Unit for Application Managed Resource Local</description>
+    <non-jta-data-source>jdbc/DB_no_tx</non-jta-data-source>
+  </persistence-unit>
+</persistence>
+
diff --git a/jpa/spec-tests/src/main/java/ee/jakarta/tck/persistence/core/entitytest/apitests/persistence.xml b/jpa/spec-tests/src/main/java/ee/jakarta/tck/persistence/core/entitytest/apitests/persistence.xml
new file mode 100644
index 0000000000..59935fae74
--- /dev/null
+++ b/jpa/spec-tests/src/main/java/ee/jakarta/tck/persistence/core/entitytest/apitests/persistence.xml
@@ -0,0 +1,50 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+
+    Copyright (c) 2018 Oracle and/or its affiliates. All rights reserved.
+
+    This program and the accompanying materials are made available under the
+    terms of the Eclipse Public License v. 2.0, which is available at
+    http://www.eclipse.org/legal/epl-2.0.
+
+    This Source Code may also be made available under the following Secondary
+    Licenses when the conditions for such availability set forth in the
+    Eclipse Public License v. 2.0 are satisfied: GNU General Public License,
+    version 2 with the GNU Classpath Exception, which is available at
+    https://www.gnu.org/software/classpath/license.html.
+
+    SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
+
+-->
+<persistence xmlns="https://jakarta.ee/xml/ns/persistence" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="https://jakarta.ee/xml/ns/persistence     https://jakarta.ee/xml/ns/persistence/persistence_3_0.xsd" version="3.0">
+  <persistence-unit name="CTS-EM" transaction-type="JTA">
+    <description>Persistence Unit for CTS Vehicle Tests</description>
+    <jta-data-source>jdbc/DB1</jta-data-source>
+    <mapping-file>myMappingFile.xml</mapping-file>
+    <class>ee.jakarta.tck.persistence.core.entitytest.apitests.Bar</class>
+    <class>ee.jakarta.tck.persistence.core.entitytest.apitests.Coffee</class>
+    <class>ee.jakarta.tck.persistence.core.entitytest.apitests.CoffeeMappedSC</class>
+    <class>ee.jakarta.tck.persistence.core.entitytest.apitests.Foo</class>
+  </persistence-unit>
+  <persistence-unit name="CTS-EM2" transaction-type="JTA">
+    <description>Persistence Unit for CTS Vehicle Tests</description>
+    <jta-data-source>jdbc/DB1</jta-data-source>
+    <mapping-file>myMappingFile.xml</mapping-file>
+    <class>ee.jakarta.tck.persistence.core.entitytest.apitests.Bar</class>
+    <class>ee.jakarta.tck.persistence.core.entitytest.apitests.Coffee</class>
+    <class>ee.jakarta.tck.persistence.core.entitytest.apitests.CoffeeMappedSC</class>
+    <class>ee.jakarta.tck.persistence.core.entitytest.apitests.Foo</class>
+  </persistence-unit>
+  <persistence-unit name="CTS-EM-NOTX" transaction-type="RESOURCE_LOCAL">
+    <description>The persistence.xml file may be used to designate
+                  more than one persistence unit within the same scope.
+                  Persistence Unit for Application Managed Resource Local</description>
+    <non-jta-data-source>jdbc/DB_no_tx</non-jta-data-source>
+    <mapping-file>myMappingFile.xml</mapping-file>
+    <class>ee.jakarta.tck.persistence.core.entitytest.apitests.Bar</class>
+    <class>ee.jakarta.tck.persistence.core.entitytest.apitests.Coffee</class>
+    <class>ee.jakarta.tck.persistence.core.entitytest.apitests.CoffeeMappedSC</class>
+    <class>ee.jakarta.tck.persistence.core.entitytest.apitests.Foo</class>
+  </persistence-unit>
+</persistence>
+
diff --git a/jpa/spec-tests/src/main/java/ee/jakarta/tck/persistence/core/entitytest/bigdecimal/persistence.xml b/jpa/spec-tests/src/main/java/ee/jakarta/tck/persistence/core/entitytest/bigdecimal/persistence.xml
new file mode 100644
index 0000000000..f6010b6005
--- /dev/null
+++ b/jpa/spec-tests/src/main/java/ee/jakarta/tck/persistence/core/entitytest/bigdecimal/persistence.xml
@@ -0,0 +1,38 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+
+    Copyright (c) 2018 Oracle and/or its affiliates. All rights reserved.
+
+    This program and the accompanying materials are made available under the
+    terms of the Eclipse Public License v. 2.0, which is available at
+    http://www.eclipse.org/legal/epl-2.0.
+
+    This Source Code may also be made available under the following Secondary
+    Licenses when the conditions for such availability set forth in the
+    Eclipse Public License v. 2.0 are satisfied: GNU General Public License,
+    version 2 with the GNU Classpath Exception, which is available at
+    https://www.gnu.org/software/classpath/license.html.
+
+    SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
+
+-->
+<persistence xmlns="https://jakarta.ee/xml/ns/persistence" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="https://jakarta.ee/xml/ns/persistence     https://jakarta.ee/xml/ns/persistence/persistence_3_0.xsd" version="3.0">
+  <persistence-unit name="CTS-EM" transaction-type="JTA">
+    <description>Persistence Unit for CTS Vehicle Tests</description>
+    <jta-data-source>jdbc/DB1</jta-data-source>
+    <class>ee.jakarta.tck.persistence.core.entitytest.bigdecimal.A</class>
+  </persistence-unit>
+  <persistence-unit name="CTS-EM2" transaction-type="JTA">
+    <description>Persistence Unit for CTS Vehicle Tests</description>
+    <jta-data-source>jdbc/DB1</jta-data-source>
+    <class>ee.jakarta.tck.persistence.core.entitytest.bigdecimal.A</class>
+  </persistence-unit>
+  <persistence-unit name="CTS-EM-NOTX" transaction-type="RESOURCE_LOCAL">
+    <description>The persistence.xml file may be used to designate
+                  more than one persistence unit within the same scope.
+                  Persistence Unit for Application Managed Resource Local</description>
+    <non-jta-data-source>jdbc/DB_no_tx</non-jta-data-source>
+    <class>ee.jakarta.tck.persistence.core.entitytest.bigdecimal.A</class>
+  </persistence-unit>
+</persistence>
+
diff --git a/jpa/spec-tests/src/main/java/ee/jakarta/tck/persistence/core/entitytest/biginteger/persistence.xml b/jpa/spec-tests/src/main/java/ee/jakarta/tck/persistence/core/entitytest/biginteger/persistence.xml
new file mode 100644
index 0000000000..b23d32cf3a
--- /dev/null
+++ b/jpa/spec-tests/src/main/java/ee/jakarta/tck/persistence/core/entitytest/biginteger/persistence.xml
@@ -0,0 +1,38 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+
+    Copyright (c) 2018 Oracle and/or its affiliates. All rights reserved.
+
+    This program and the accompanying materials are made available under the
+    terms of the Eclipse Public License v. 2.0, which is available at
+    http://www.eclipse.org/legal/epl-2.0.
+
+    This Source Code may also be made available under the following Secondary
+    Licenses when the conditions for such availability set forth in the
+    Eclipse Public License v. 2.0 are satisfied: GNU General Public License,
+    version 2 with the GNU Classpath Exception, which is available at
+    https://www.gnu.org/software/classpath/license.html.
+
+    SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
+
+-->
+<persistence xmlns="https://jakarta.ee/xml/ns/persistence" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="https://jakarta.ee/xml/ns/persistence     https://jakarta.ee/xml/ns/persistence/persistence_3_0.xsd" version="3.0">
+  <persistence-unit name="CTS-EM" transaction-type="JTA">
+    <description>Persistence Unit for CTS Vehicle Tests</description>
+    <jta-data-source>jdbc/DB1</jta-data-source>
+    <class>ee.jakarta.tck.persistence.core.entitytest.biginteger.A</class>
+  </persistence-unit>
+  <persistence-unit name="CTS-EM2" transaction-type="JTA">
+    <description>Persistence Unit for CTS Vehicle Tests</description>
+    <jta-data-source>jdbc/DB1</jta-data-source>
+    <class>ee.jakarta.tck.persistence.core.entitytest.biginteger.A</class>
+  </persistence-unit>
+  <persistence-unit name="CTS-EM-NOTX" transaction-type="RESOURCE_LOCAL">
+    <description>The persistence.xml file may be used to designate
+                  more than one persistence unit within the same scope.
+                  Persistence Unit for Application Managed Resource Local</description>
+    <non-jta-data-source>jdbc/DB_no_tx</non-jta-data-source>
+    <class>ee.jakarta.tck.persistence.core.entitytest.biginteger.A</class>
+  </persistence-unit>
+</persistence>
+
diff --git a/jpa/spec-tests/src/main/java/ee/jakarta/tck/persistence/core/entitytest/cascadeall/manyXmany/persistence.xml b/jpa/spec-tests/src/main/java/ee/jakarta/tck/persistence/core/entitytest/cascadeall/manyXmany/persistence.xml
new file mode 100644
index 0000000000..cec03a20a3
--- /dev/null
+++ b/jpa/spec-tests/src/main/java/ee/jakarta/tck/persistence/core/entitytest/cascadeall/manyXmany/persistence.xml
@@ -0,0 +1,41 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+
+    Copyright (c) 2018 Oracle and/or its affiliates. All rights reserved.
+
+    This program and the accompanying materials are made available under the
+    terms of the Eclipse Public License v. 2.0, which is available at
+    http://www.eclipse.org/legal/epl-2.0.
+
+    This Source Code may also be made available under the following Secondary
+    Licenses when the conditions for such availability set forth in the
+    Eclipse Public License v. 2.0 are satisfied: GNU General Public License,
+    version 2 with the GNU Classpath Exception, which is available at
+    https://www.gnu.org/software/classpath/license.html.
+
+    SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
+
+-->
+<persistence xmlns="https://jakarta.ee/xml/ns/persistence" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="https://jakarta.ee/xml/ns/persistence     https://jakarta.ee/xml/ns/persistence/persistence_3_0.xsd" version="3.0">
+  <persistence-unit name="CTS-EM" transaction-type="JTA">
+    <description>Persistence Unit for CTS Vehicle Tests</description>
+    <jta-data-source>jdbc/DB1</jta-data-source>
+    <class>ee.jakarta.tck.persistence.core.entitytest.cascadeall.manyXmany.A</class>
+    <class>ee.jakarta.tck.persistence.core.entitytest.cascadeall.manyXmany.B</class>
+  </persistence-unit>
+  <persistence-unit name="CTS-EM2" transaction-type="JTA">
+    <description>Persistence Unit for CTS Vehicle Tests</description>
+    <jta-data-source>jdbc/DB1</jta-data-source>
+    <class>ee.jakarta.tck.persistence.core.entitytest.cascadeall.manyXmany.A</class>
+    <class>ee.jakarta.tck.persistence.core.entitytest.cascadeall.manyXmany.B</class>
+  </persistence-unit>
+  <persistence-unit name="CTS-EM-NOTX" transaction-type="RESOURCE_LOCAL">
+    <description>The persistence.xml file may be used to designate
+                  more than one persistence unit within the same scope.
+                  Persistence Unit for Application Managed Resource Local</description>
+    <non-jta-data-source>jdbc/DB_no_tx</non-jta-data-source>
+    <class>ee.jakarta.tck.persistence.core.entitytest.cascadeall.manyXmany.A</class>
+    <class>ee.jakarta.tck.persistence.core.entitytest.cascadeall.manyXmany.B</class>
+  </persistence-unit>
+</persistence>
+
diff --git a/jpa/spec-tests/src/main/java/ee/jakarta/tck/persistence/core/entitytest/cascadeall/manyXone/persistence.xml b/jpa/spec-tests/src/main/java/ee/jakarta/tck/persistence/core/entitytest/cascadeall/manyXone/persistence.xml
new file mode 100644
index 0000000000..a27f644ed3
--- /dev/null
+++ b/jpa/spec-tests/src/main/java/ee/jakarta/tck/persistence/core/entitytest/cascadeall/manyXone/persistence.xml
@@ -0,0 +1,41 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+
+    Copyright (c) 2018 Oracle and/or its affiliates. All rights reserved.
+
+    This program and the accompanying materials are made available under the
+    terms of the Eclipse Public License v. 2.0, which is available at
+    http://www.eclipse.org/legal/epl-2.0.
+
+    This Source Code may also be made available under the following Secondary
+    Licenses when the conditions for such availability set forth in the
+    Eclipse Public License v. 2.0 are satisfied: GNU General Public License,
+    version 2 with the GNU Classpath Exception, which is available at
+    https://www.gnu.org/software/classpath/license.html.
+
+    SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
+
+-->
+<persistence xmlns="https://jakarta.ee/xml/ns/persistence" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="https://jakarta.ee/xml/ns/persistence     https://jakarta.ee/xml/ns/persistence/persistence_3_0.xsd" version="3.0">
+  <persistence-unit name="CTS-EM" transaction-type="JTA">
+    <description>Persistence Unit for CTS Vehicle Tests</description>
+    <jta-data-source>jdbc/DB1</jta-data-source>
+    <class>ee.jakarta.tck.persistence.core.entitytest.cascadeall.manyXone.A</class>
+    <class>ee.jakarta.tck.persistence.core.entitytest.cascadeall.manyXone.B</class>
+  </persistence-unit>
+  <persistence-unit name="CTS-EM2" transaction-type="JTA">
+    <description>Persistence Unit for CTS Vehicle Tests</description>
+    <jta-data-source>jdbc/DB1</jta-data-source>
+    <class>ee.jakarta.tck.persistence.core.entitytest.cascadeall.manyXone.A</class>
+    <class>ee.jakarta.tck.persistence.core.entitytest.cascadeall.manyXone.B</class>
+  </persistence-unit>
+  <persistence-unit name="CTS-EM-NOTX" transaction-type="RESOURCE_LOCAL">
+    <description>The persistence.xml file may be used to designate
+                  more than one persistence unit within the same scope.
+                  Persistence Unit for Application Managed Resource Local</description>
+    <non-jta-data-source>jdbc/DB_no_tx</non-jta-data-source>
+    <class>ee.jakarta.tck.persistence.core.entitytest.cascadeall.manyXone.A</class>
+    <class>ee.jakarta.tck.persistence.core.entitytest.cascadeall.manyXone.B</class>
+  </persistence-unit>
+</persistence>
+
diff --git a/jpa/spec-tests/src/main/java/ee/jakarta/tck/persistence/core/entitytest/cascadeall/oneXmany/persistence.xml b/jpa/spec-tests/src/main/java/ee/jakarta/tck/persistence/core/entitytest/cascadeall/oneXmany/persistence.xml
new file mode 100644
index 0000000000..05e1d4b442
--- /dev/null
+++ b/jpa/spec-tests/src/main/java/ee/jakarta/tck/persistence/core/entitytest/cascadeall/oneXmany/persistence.xml
@@ -0,0 +1,41 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+
+    Copyright (c) 2018 Oracle and/or its affiliates. All rights reserved.
+
+    This program and the accompanying materials are made available under the
+    terms of the Eclipse Public License v. 2.0, which is available at
+    http://www.eclipse.org/legal/epl-2.0.
+
+    This Source Code may also be made available under the following Secondary
+    Licenses when the conditions for such availability set forth in the
+    Eclipse Public License v. 2.0 are satisfied: GNU General Public License,
+    version 2 with the GNU Classpath Exception, which is available at
+    https://www.gnu.org/software/classpath/license.html.
+
+    SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
+
+-->
+<persistence xmlns="https://jakarta.ee/xml/ns/persistence" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="https://jakarta.ee/xml/ns/persistence     https://jakarta.ee/xml/ns/persistence/persistence_3_0.xsd" version="3.0">
+  <persistence-unit name="CTS-EM" transaction-type="JTA">
+    <description>Persistence Unit for CTS Vehicle Tests</description>
+    <jta-data-source>jdbc/DB1</jta-data-source>
+    <class>ee.jakarta.tck.persistence.core.entitytest.cascadeall.oneXmany.A</class>
+    <class>ee.jakarta.tck.persistence.core.entitytest.cascadeall.oneXmany.B</class>
+  </persistence-unit>
+  <persistence-unit name="CTS-EM2" transaction-type="JTA">
+    <description>Persistence Unit for CTS Vehicle Tests</description>
+    <jta-data-source>jdbc/DB1</jta-data-source>
+    <class>ee.jakarta.tck.persistence.core.entitytest.cascadeall.oneXmany.A</class>
+    <class>ee.jakarta.tck.persistence.core.entitytest.cascadeall.oneXmany.B</class>
+  </persistence-unit>
+  <persistence-unit name="CTS-EM-NOTX" transaction-type="RESOURCE_LOCAL">
+    <description>The persistence.xml file may be used to designate
+                  more than one persistence unit within the same scope.
+                  Persistence Unit for Application Managed Resource Local</description>
+    <non-jta-data-source>jdbc/DB_no_tx</non-jta-data-source>
+    <class>ee.jakarta.tck.persistence.core.entitytest.cascadeall.oneXmany.A</class>
+    <class>ee.jakarta.tck.persistence.core.entitytest.cascadeall.oneXmany.B</class>
+  </persistence-unit>
+</persistence>
+
diff --git a/jpa/spec-tests/src/main/java/ee/jakarta/tck/persistence/core/entitytest/cascadeall/oneXone/persistence.xml b/jpa/spec-tests/src/main/java/ee/jakarta/tck/persistence/core/entitytest/cascadeall/oneXone/persistence.xml
new file mode 100644
index 0000000000..b751bf2e80
--- /dev/null
+++ b/jpa/spec-tests/src/main/java/ee/jakarta/tck/persistence/core/entitytest/cascadeall/oneXone/persistence.xml
@@ -0,0 +1,41 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+
+    Copyright (c) 2018 Oracle and/or its affiliates. All rights reserved.
+
+    This program and the accompanying materials are made available under the
+    terms of the Eclipse Public License v. 2.0, which is available at
+    http://www.eclipse.org/legal/epl-2.0.
+
+    This Source Code may also be made available under the following Secondary
+    Licenses when the conditions for such availability set forth in the
+    Eclipse Public License v. 2.0 are satisfied: GNU General Public License,
+    version 2 with the GNU Classpath Exception, which is available at
+    https://www.gnu.org/software/classpath/license.html.
+
+    SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
+
+-->
+<persistence xmlns="https://jakarta.ee/xml/ns/persistence" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="https://jakarta.ee/xml/ns/persistence     https://jakarta.ee/xml/ns/persistence/persistence_3_0.xsd" version="3.0">
+  <persistence-unit name="CTS-EM" transaction-type="JTA">
+    <description>Persistence Unit for CTS Vehicle Tests</description>
+    <jta-data-source>jdbc/DB1</jta-data-source>
+    <class>ee.jakarta.tck.persistence.core.entitytest.cascadeall.oneXone.A</class>
+    <class>ee.jakarta.tck.persistence.core.entitytest.cascadeall.oneXone.B</class>
+  </persistence-unit>
+  <persistence-unit name="CTS-EM2" transaction-type="JTA">
+    <description>Persistence Unit for CTS Vehicle Tests</description>
+    <jta-data-source>jdbc/DB1</jta-data-source>
+    <class>ee.jakarta.tck.persistence.core.entitytest.cascadeall.oneXone.A</class>
+    <class>ee.jakarta.tck.persistence.core.entitytest.cascadeall.oneXone.B</class>
+  </persistence-unit>
+  <persistence-unit name="CTS-EM-NOTX" transaction-type="RESOURCE_LOCAL">
+    <description>The persistence.xml file may be used to designate
+                  more than one persistence unit within the same scope.
+                  Persistence Unit for Application Managed Resource Local</description>
+    <non-jta-data-source>jdbc/DB_no_tx</non-jta-data-source>
+    <class>ee.jakarta.tck.persistence.core.entitytest.cascadeall.oneXone.A</class>
+    <class>ee.jakarta.tck.persistence.core.entitytest.cascadeall.oneXone.B</class>
+  </persistence-unit>
+</persistence>
+
diff --git a/jpa/spec-tests/src/main/java/ee/jakarta/tck/persistence/core/entitytest/detach/basic/persistence.xml b/jpa/spec-tests/src/main/java/ee/jakarta/tck/persistence/core/entitytest/detach/basic/persistence.xml
new file mode 100644
index 0000000000..ab8eac9a12
--- /dev/null
+++ b/jpa/spec-tests/src/main/java/ee/jakarta/tck/persistence/core/entitytest/detach/basic/persistence.xml
@@ -0,0 +1,38 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+
+    Copyright (c) 2018 Oracle and/or its affiliates. All rights reserved.
+
+    This program and the accompanying materials are made available under the
+    terms of the Eclipse Public License v. 2.0, which is available at
+    http://www.eclipse.org/legal/epl-2.0.
+
+    This Source Code may also be made available under the following Secondary
+    Licenses when the conditions for such availability set forth in the
+    Eclipse Public License v. 2.0 are satisfied: GNU General Public License,
+    version 2 with the GNU Classpath Exception, which is available at
+    https://www.gnu.org/software/classpath/license.html.
+
+    SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
+
+-->
+<persistence xmlns="https://jakarta.ee/xml/ns/persistence" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="https://jakarta.ee/xml/ns/persistence     https://jakarta.ee/xml/ns/persistence/persistence_3_0.xsd" version="3.0">
+  <persistence-unit name="CTS-EM" transaction-type="JTA">
+    <description>Persistence Unit for CTS Vehicle Tests</description>
+    <jta-data-source>jdbc/DB1</jta-data-source>
+    <class>ee.jakarta.tck.persistence.core.entitytest.detach.basic.A</class>
+  </persistence-unit>
+  <persistence-unit name="CTS-EM2" transaction-type="JTA">
+    <description>Persistence Unit for CTS Vehicle Tests</description>
+    <jta-data-source>jdbc/DB1</jta-data-source>
+    <class>ee.jakarta.tck.persistence.core.entitytest.detach.basic.A</class>
+  </persistence-unit>
+  <persistence-unit name="CTS-EM-NOTX" transaction-type="RESOURCE_LOCAL">
+    <description>The persistence.xml file may be used to designate
+                  more than one persistence unit within the same scope.
+                  Persistence Unit for Application Managed Resource Local</description>
+    <non-jta-data-source>jdbc/DB_no_tx</non-jta-data-source>
+    <class>ee.jakarta.tck.persistence.core.entitytest.detach.basic.A</class>
+  </persistence-unit>
+</persistence>
+
diff --git a/jpa/spec-tests/src/main/java/ee/jakarta/tck/persistence/core/entitytest/detach/manyXmany/persistence.xml b/jpa/spec-tests/src/main/java/ee/jakarta/tck/persistence/core/entitytest/detach/manyXmany/persistence.xml
new file mode 100644
index 0000000000..b41c3212f2
--- /dev/null
+++ b/jpa/spec-tests/src/main/java/ee/jakarta/tck/persistence/core/entitytest/detach/manyXmany/persistence.xml
@@ -0,0 +1,41 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+
+    Copyright (c) 2018 Oracle and/or its affiliates. All rights reserved.
+
+    This program and the accompanying materials are made available under the
+    terms of the Eclipse Public License v. 2.0, which is available at
+    http://www.eclipse.org/legal/epl-2.0.
+
+    This Source Code may also be made available under the following Secondary
+    Licenses when the conditions for such availability set forth in the
+    Eclipse Public License v. 2.0 are satisfied: GNU General Public License,
+    version 2 with the GNU Classpath Exception, which is available at
+    https://www.gnu.org/software/classpath/license.html.
+
+    SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
+
+-->
+<persistence xmlns="https://jakarta.ee/xml/ns/persistence" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="https://jakarta.ee/xml/ns/persistence     https://jakarta.ee/xml/ns/persistence/persistence_3_0.xsd" version="3.0">
+  <persistence-unit name="CTS-EM" transaction-type="JTA">
+    <description>Persistence Unit for CTS Vehicle Tests</description>
+    <jta-data-source>jdbc/DB1</jta-data-source>
+    <class>ee.jakarta.tck.persistence.core.entitytest.detach.manyXmany.A</class>
+    <class>ee.jakarta.tck.persistence.core.entitytest.detach.manyXmany.B</class>
+  </persistence-unit>
+  <persistence-unit name="CTS-EM2" transaction-type="JTA">
+    <description>Persistence Unit for CTS Vehicle Tests</description>
+    <jta-data-source>jdbc/DB1</jta-data-source>
+    <class>ee.jakarta.tck.persistence.core.entitytest.detach.manyXmany.A</class>
+    <class>ee.jakarta.tck.persistence.core.entitytest.detach.manyXmany.B</class>
+  </persistence-unit>
+  <persistence-unit name="CTS-EM-NOTX" transaction-type="RESOURCE_LOCAL">
+    <description>The persistence.xml file may be used to designate
+                  more than one persistence unit within the same scope.
+                  Persistence Unit for Application Managed Resource Local</description>
+    <non-jta-data-source>jdbc/DB_no_tx</non-jta-data-source>
+    <class>ee.jakarta.tck.persistence.core.entitytest.detach.manyXmany.A</class>
+    <class>ee.jakarta.tck.persistence.core.entitytest.detach.manyXmany.B</class>
+  </persistence-unit>
+</persistence>
+
diff --git a/jpa/spec-tests/src/main/java/ee/jakarta/tck/persistence/core/entitytest/detach/manyXone/persistence.xml b/jpa/spec-tests/src/main/java/ee/jakarta/tck/persistence/core/entitytest/detach/manyXone/persistence.xml
new file mode 100644
index 0000000000..a4e6422e83
--- /dev/null
+++ b/jpa/spec-tests/src/main/java/ee/jakarta/tck/persistence/core/entitytest/detach/manyXone/persistence.xml
@@ -0,0 +1,41 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+
+    Copyright (c) 2018 Oracle and/or its affiliates. All rights reserved.
+
+    This program and the accompanying materials are made available under the
+    terms of the Eclipse Public License v. 2.0, which is available at
+    http://www.eclipse.org/legal/epl-2.0.
+
+    This Source Code may also be made available under the following Secondary
+    Licenses when the conditions for such availability set forth in the
+    Eclipse Public License v. 2.0 are satisfied: GNU General Public License,
+    version 2 with the GNU Classpath Exception, which is available at
+    https://www.gnu.org/software/classpath/license.html.
+
+    SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
+
+-->
+<persistence xmlns="https://jakarta.ee/xml/ns/persistence" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="https://jakarta.ee/xml/ns/persistence     https://jakarta.ee/xml/ns/persistence/persistence_3_0.xsd" version="3.0">
+  <persistence-unit name="CTS-EM" transaction-type="JTA">
+    <description>Persistence Unit for CTS Vehicle Tests</description>
+    <jta-data-source>jdbc/DB1</jta-data-source>
+    <class>ee.jakarta.tck.persistence.core.entitytest.detach.manyXone.A</class>
+    <class>ee.jakarta.tck.persistence.core.entitytest.detach.manyXone.B</class>
+  </persistence-unit>
+  <persistence-unit name="CTS-EM2" transaction-type="JTA">
+    <description>Persistence Unit for CTS Vehicle Tests</description>
+    <jta-data-source>jdbc/DB1</jta-data-source>
+    <class>ee.jakarta.tck.persistence.core.entitytest.detach.manyXone.A</class>
+    <class>ee.jakarta.tck.persistence.core.entitytest.detach.manyXone.B</class>
+  </persistence-unit>
+  <persistence-unit name="CTS-EM-NOTX" transaction-type="RESOURCE_LOCAL">
+    <description>The persistence.xml file may be used to designate
+                  more than one persistence unit within the same scope.
+                  Persistence Unit for Application Managed Resource Local</description>
+    <non-jta-data-source>jdbc/DB_no_tx</non-jta-data-source>
+    <class>ee.jakarta.tck.persistence.core.entitytest.detach.manyXone.A</class>
+    <class>ee.jakarta.tck.persistence.core.entitytest.detach.manyXone.B</class>
+  </persistence-unit>
+</persistence>
+
diff --git a/jpa/spec-tests/src/main/java/ee/jakarta/tck/persistence/core/entitytest/detach/oneXmany/persistence.xml b/jpa/spec-tests/src/main/java/ee/jakarta/tck/persistence/core/entitytest/detach/oneXmany/persistence.xml
new file mode 100644
index 0000000000..14743c57bb
--- /dev/null
+++ b/jpa/spec-tests/src/main/java/ee/jakarta/tck/persistence/core/entitytest/detach/oneXmany/persistence.xml
@@ -0,0 +1,41 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+
+    Copyright (c) 2018 Oracle and/or its affiliates. All rights reserved.
+
+    This program and the accompanying materials are made available under the
+    terms of the Eclipse Public License v. 2.0, which is available at
+    http://www.eclipse.org/legal/epl-2.0.
+
+    This Source Code may also be made available under the following Secondary
+    Licenses when the conditions for such availability set forth in the
+    Eclipse Public License v. 2.0 are satisfied: GNU General Public License,
+    version 2 with the GNU Classpath Exception, which is available at
+    https://www.gnu.org/software/classpath/license.html.
+
+    SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
+
+-->
+<persistence xmlns="https://jakarta.ee/xml/ns/persistence" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="https://jakarta.ee/xml/ns/persistence     https://jakarta.ee/xml/ns/persistence/persistence_3_0.xsd" version="3.0">
+  <persistence-unit name="CTS-EM" transaction-type="JTA">
+    <description>Persistence Unit for CTS Vehicle Tests</description>
+    <jta-data-source>jdbc/DB1</jta-data-source>
+    <class>ee.jakarta.tck.persistence.core.entitytest.detach.oneXmany.A</class>
+    <class>ee.jakarta.tck.persistence.core.entitytest.detach.oneXmany.B</class>
+  </persistence-unit>
+  <persistence-unit name="CTS-EM2" transaction-type="JTA">
+    <description>Persistence Unit for CTS Vehicle Tests</description>
+    <jta-data-source>jdbc/DB1</jta-data-source>
+    <class>ee.jakarta.tck.persistence.core.entitytest.detach.oneXmany.A</class>
+    <class>ee.jakarta.tck.persistence.core.entitytest.detach.oneXmany.B</class>
+  </persistence-unit>
+  <persistence-unit name="CTS-EM-NOTX" transaction-type="RESOURCE_LOCAL">
+    <description>The persistence.xml file may be used to designate
+                  more than one persistence unit within the same scope.
+                  Persistence Unit for Application Managed Resource Local</description>
+    <non-jta-data-source>jdbc/DB_no_tx</non-jta-data-source>
+    <class>ee.jakarta.tck.persistence.core.entitytest.detach.oneXmany.A</class>
+    <class>ee.jakarta.tck.persistence.core.entitytest.detach.oneXmany.B</class>
+  </persistence-unit>
+</persistence>
+
diff --git a/jpa/spec-tests/src/main/java/ee/jakarta/tck/persistence/core/entitytest/detach/oneXone/persistence.xml b/jpa/spec-tests/src/main/java/ee/jakarta/tck/persistence/core/entitytest/detach/oneXone/persistence.xml
new file mode 100644
index 0000000000..b8a3bd58a0
--- /dev/null
+++ b/jpa/spec-tests/src/main/java/ee/jakarta/tck/persistence/core/entitytest/detach/oneXone/persistence.xml
@@ -0,0 +1,41 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+
+    Copyright (c) 2018 Oracle and/or its affiliates. All rights reserved.
+
+    This program and the accompanying materials are made available under the
+    terms of the Eclipse Public License v. 2.0, which is available at
+    http://www.eclipse.org/legal/epl-2.0.
+
+    This Source Code may also be made available under the following Secondary
+    Licenses when the conditions for such availability set forth in the
+    Eclipse Public License v. 2.0 are satisfied: GNU General Public License,
+    version 2 with the GNU Classpath Exception, which is available at
+    https://www.gnu.org/software/classpath/license.html.
+
+    SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
+
+-->
+<persistence xmlns="https://jakarta.ee/xml/ns/persistence" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="https://jakarta.ee/xml/ns/persistence     https://jakarta.ee/xml/ns/persistence/persistence_3_0.xsd" version="3.0">
+  <persistence-unit name="CTS-EM" transaction-type="JTA">
+    <description>Persistence Unit for CTS Vehicle Tests</description>
+    <jta-data-source>jdbc/DB1</jta-data-source>
+    <class>ee.jakarta.tck.persistence.core.entitytest.detach.oneXone.A</class>
+    <class>ee.jakarta.tck.persistence.core.entitytest.detach.oneXone.B</class>
+  </persistence-unit>
+  <persistence-unit name="CTS-EM2" transaction-type="JTA">
+    <description>Persistence Unit for CTS Vehicle Tests</description>
+    <jta-data-source>jdbc/DB1</jta-data-source>
+    <class>ee.jakarta.tck.persistence.core.entitytest.detach.oneXone.A</class>
+    <class>ee.jakarta.tck.persistence.core.entitytest.detach.oneXone.B</class>
+  </persistence-unit>
+  <persistence-unit name="CTS-EM-NOTX" transaction-type="RESOURCE_LOCAL">
+    <description>The persistence.xml file may be used to designate
+                  more than one persistence unit within the same scope.
+                  Persistence Unit for Application Managed Resource Local</description>
+    <non-jta-data-source>jdbc/DB_no_tx</non-jta-data-source>
+    <class>ee.jakarta.tck.persistence.core.entitytest.detach.oneXone.A</class>
+    <class>ee.jakarta.tck.persistence.core.entitytest.detach.oneXone.B</class>
+  </persistence-unit>
+</persistence>
+
diff --git a/jpa/spec-tests/src/main/java/ee/jakarta/tck/persistence/core/entitytest/persist/basic/persistence.xml b/jpa/spec-tests/src/main/java/ee/jakarta/tck/persistence/core/entitytest/persist/basic/persistence.xml
new file mode 100644
index 0000000000..2e83d3c0d5
--- /dev/null
+++ b/jpa/spec-tests/src/main/java/ee/jakarta/tck/persistence/core/entitytest/persist/basic/persistence.xml
@@ -0,0 +1,38 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+
+    Copyright (c) 2018 Oracle and/or its affiliates. All rights reserved.
+
+    This program and the accompanying materials are made available under the
+    terms of the Eclipse Public License v. 2.0, which is available at
+    http://www.eclipse.org/legal/epl-2.0.
+
+    This Source Code may also be made available under the following Secondary
+    Licenses when the conditions for such availability set forth in the
+    Eclipse Public License v. 2.0 are satisfied: GNU General Public License,
+    version 2 with the GNU Classpath Exception, which is available at
+    https://www.gnu.org/software/classpath/license.html.
+
+    SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
+
+-->
+<persistence xmlns="https://jakarta.ee/xml/ns/persistence" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="https://jakarta.ee/xml/ns/persistence     https://jakarta.ee/xml/ns/persistence/persistence_3_0.xsd" version="3.0">
+  <persistence-unit name="CTS-EM" transaction-type="JTA">
+    <description>Persistence Unit for CTS Vehicle Tests</description>
+    <jta-data-source>jdbc/DB1</jta-data-source>
+    <class>ee.jakarta.tck.persistence.core.entitytest.persist.basic.A</class>
+  </persistence-unit>
+  <persistence-unit name="CTS-EM2" transaction-type="JTA">
+    <description>Persistence Unit for CTS Vehicle Tests</description>
+    <jta-data-source>jdbc/DB1</jta-data-source>
+    <class>ee.jakarta.tck.persistence.core.entitytest.persist.basic.A</class>
+  </persistence-unit>
+  <persistence-unit name="CTS-EM-NOTX" transaction-type="RESOURCE_LOCAL">
+    <description>The persistence.xml file may be used to designate
+                  more than one persistence unit within the same scope.
+                  Persistence Unit for Application Managed Resource Local</description>
+    <non-jta-data-source>jdbc/DB_no_tx</non-jta-data-source>
+    <class>ee.jakarta.tck.persistence.core.entitytest.persist.basic.A</class>
+  </persistence-unit>
+</persistence>
+
diff --git a/jpa/spec-tests/src/main/java/ee/jakarta/tck/persistence/core/entitytest/persist/manyXmany/persistence.xml b/jpa/spec-tests/src/main/java/ee/jakarta/tck/persistence/core/entitytest/persist/manyXmany/persistence.xml
new file mode 100644
index 0000000000..dd5a74326c
--- /dev/null
+++ b/jpa/spec-tests/src/main/java/ee/jakarta/tck/persistence/core/entitytest/persist/manyXmany/persistence.xml
@@ -0,0 +1,41 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+
+    Copyright (c) 2018 Oracle and/or its affiliates. All rights reserved.
+
+    This program and the accompanying materials are made available under the
+    terms of the Eclipse Public License v. 2.0, which is available at
+    http://www.eclipse.org/legal/epl-2.0.
+
+    This Source Code may also be made available under the following Secondary
+    Licenses when the conditions for such availability set forth in the
+    Eclipse Public License v. 2.0 are satisfied: GNU General Public License,
+    version 2 with the GNU Classpath Exception, which is available at
+    https://www.gnu.org/software/classpath/license.html.
+
+    SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
+
+-->
+<persistence xmlns="https://jakarta.ee/xml/ns/persistence" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="https://jakarta.ee/xml/ns/persistence     https://jakarta.ee/xml/ns/persistence/persistence_3_0.xsd" version="3.0">
+  <persistence-unit name="CTS-EM" transaction-type="JTA">
+    <description>Persistence Unit for CTS Vehicle Tests</description>
+    <jta-data-source>jdbc/DB1</jta-data-source>
+    <class>ee.jakarta.tck.persistence.core.entitytest.persist.manyXmany.A</class>
+    <class>ee.jakarta.tck.persistence.core.entitytest.persist.manyXmany.B</class>
+  </persistence-unit>
+  <persistence-unit name="CTS-EM2" transaction-type="JTA">
+    <description>Persistence Unit for CTS Vehicle Tests</description>
+    <jta-data-source>jdbc/DB1</jta-data-source>
+    <class>ee.jakarta.tck.persistence.core.entitytest.persist.manyXmany.A</class>
+    <class>ee.jakarta.tck.persistence.core.entitytest.persist.manyXmany.B</class>
+  </persistence-unit>
+  <persistence-unit name="CTS-EM-NOTX" transaction-type="RESOURCE_LOCAL">
+    <description>The persistence.xml file may be used to designate
+                  more than one persistence unit within the same scope.
+                  Persistence Unit for Application Managed Resource Local</description>
+    <non-jta-data-source>jdbc/DB_no_tx</non-jta-data-source>
+    <class>ee.jakarta.tck.persistence.core.entitytest.persist.manyXmany.A</class>
+    <class>ee.jakarta.tck.persistence.core.entitytest.persist.manyXmany.B</class>
+  </persistence-unit>
+</persistence>
+
diff --git a/jpa/spec-tests/src/main/java/ee/jakarta/tck/persistence/core/entitytest/persist/manyXone/persistence.xml b/jpa/spec-tests/src/main/java/ee/jakarta/tck/persistence/core/entitytest/persist/manyXone/persistence.xml
new file mode 100644
index 0000000000..dcb9b54860
--- /dev/null
+++ b/jpa/spec-tests/src/main/java/ee/jakarta/tck/persistence/core/entitytest/persist/manyXone/persistence.xml
@@ -0,0 +1,41 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+
+    Copyright (c) 2018 Oracle and/or its affiliates. All rights reserved.
+
+    This program and the accompanying materials are made available under the
+    terms of the Eclipse Public License v. 2.0, which is available at
+    http://www.eclipse.org/legal/epl-2.0.
+
+    This Source Code may also be made available under the following Secondary
+    Licenses when the conditions for such availability set forth in the
+    Eclipse Public License v. 2.0 are satisfied: GNU General Public License,
+    version 2 with the GNU Classpath Exception, which is available at
+    https://www.gnu.org/software/classpath/license.html.
+
+    SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
+
+-->
+<persistence xmlns="https://jakarta.ee/xml/ns/persistence" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="https://jakarta.ee/xml/ns/persistence     https://jakarta.ee/xml/ns/persistence/persistence_3_0.xsd" version="3.0">
+  <persistence-unit name="CTS-EM" transaction-type="JTA">
+    <description>Persistence Unit for CTS Vehicle Tests</description>
+    <jta-data-source>jdbc/DB1</jta-data-source>
+    <class>ee.jakarta.tck.persistence.core.entitytest.persist.manyXone.A</class>
+    <class>ee.jakarta.tck.persistence.core.entitytest.persist.manyXone.B</class>
+  </persistence-unit>
+  <persistence-unit name="CTS-EM2" transaction-type="JTA">
+    <description>Persistence Unit for CTS Vehicle Tests</description>
+    <jta-data-source>jdbc/DB1</jta-data-source>
+    <class>ee.jakarta.tck.persistence.core.entitytest.persist.manyXone.A</class>
+    <class>ee.jakarta.tck.persistence.core.entitytest.persist.manyXone.B</class>
+  </persistence-unit>
+  <persistence-unit name="CTS-EM-NOTX" transaction-type="RESOURCE_LOCAL">
+    <description>The persistence.xml file may be used to designate
+                  more than one persistence unit within the same scope.
+                  Persistence Unit for Application Managed Resource Local</description>
+    <non-jta-data-source>jdbc/DB_no_tx</non-jta-data-source>
+    <class>ee.jakarta.tck.persistence.core.entitytest.persist.manyXone.A</class>
+    <class>ee.jakarta.tck.persistence.core.entitytest.persist.manyXone.B</class>
+  </persistence-unit>
+</persistence>
+
diff --git a/jpa/spec-tests/src/main/java/ee/jakarta/tck/persistence/core/entitytest/persist/oneXmany/persistence.xml b/jpa/spec-tests/src/main/java/ee/jakarta/tck/persistence/core/entitytest/persist/oneXmany/persistence.xml
new file mode 100644
index 0000000000..5f75a2f0a9
--- /dev/null
+++ b/jpa/spec-tests/src/main/java/ee/jakarta/tck/persistence/core/entitytest/persist/oneXmany/persistence.xml
@@ -0,0 +1,41 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+
+    Copyright (c) 2018 Oracle and/or its affiliates. All rights reserved.
+
+    This program and the accompanying materials are made available under the
+    terms of the Eclipse Public License v. 2.0, which is available at
+    http://www.eclipse.org/legal/epl-2.0.
+
+    This Source Code may also be made available under the following Secondary
+    Licenses when the conditions for such availability set forth in the
+    Eclipse Public License v. 2.0 are satisfied: GNU General Public License,
+    version 2 with the GNU Classpath Exception, which is available at
+    https://www.gnu.org/software/classpath/license.html.
+
+    SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
+
+-->
+<persistence xmlns="https://jakarta.ee/xml/ns/persistence" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="https://jakarta.ee/xml/ns/persistence     https://jakarta.ee/xml/ns/persistence/persistence_3_0.xsd" version="3.0">
+  <persistence-unit name="CTS-EM" transaction-type="JTA">
+    <description>Persistence Unit for CTS Vehicle Tests</description>
+    <jta-data-source>jdbc/DB1</jta-data-source>
+    <class>ee.jakarta.tck.persistence.core.entitytest.persist.oneXmany.A</class>
+    <class>ee.jakarta.tck.persistence.core.entitytest.persist.oneXmany.B</class>
+  </persistence-unit>
+  <persistence-unit name="CTS-EM2" transaction-type="JTA">
+    <description>Persistence Unit for CTS Vehicle Tests</description>
+    <jta-data-source>jdbc/DB1</jta-data-source>
+    <class>ee.jakarta.tck.persistence.core.entitytest.persist.oneXmany.A</class>
+    <class>ee.jakarta.tck.persistence.core.entitytest.persist.oneXmany.B</class>
+  </persistence-unit>
+  <persistence-unit name="CTS-EM-NOTX" transaction-type="RESOURCE_LOCAL">
+    <description>The persistence.xml file may be used to designate
+                  more than one persistence unit within the same scope.
+                  Persistence Unit for Application Managed Resource Local</description>
+    <non-jta-data-source>jdbc/DB_no_tx</non-jta-data-source>
+    <class>ee.jakarta.tck.persistence.core.entitytest.persist.oneXmany.A</class>
+    <class>ee.jakarta.tck.persistence.core.entitytest.persist.oneXmany.B</class>
+  </persistence-unit>
+</persistence>
+
diff --git a/jpa/spec-tests/src/main/java/ee/jakarta/tck/persistence/core/entitytest/persist/oneXone/persistence.xml b/jpa/spec-tests/src/main/java/ee/jakarta/tck/persistence/core/entitytest/persist/oneXone/persistence.xml
new file mode 100644
index 0000000000..10c995f258
--- /dev/null
+++ b/jpa/spec-tests/src/main/java/ee/jakarta/tck/persistence/core/entitytest/persist/oneXone/persistence.xml
@@ -0,0 +1,41 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+
+    Copyright (c) 2018 Oracle and/or its affiliates. All rights reserved.
+
+    This program and the accompanying materials are made available under the
+    terms of the Eclipse Public License v. 2.0, which is available at
+    http://www.eclipse.org/legal/epl-2.0.
+
+    This Source Code may also be made available under the following Secondary
+    Licenses when the conditions for such availability set forth in the
+    Eclipse Public License v. 2.0 are satisfied: GNU General Public License,
+    version 2 with the GNU Classpath Exception, which is available at
+    https://www.gnu.org/software/classpath/license.html.
+
+    SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
+
+-->
+<persistence xmlns="https://jakarta.ee/xml/ns/persistence" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="https://jakarta.ee/xml/ns/persistence     https://jakarta.ee/xml/ns/persistence/persistence_3_0.xsd" version="3.0">
+  <persistence-unit name="CTS-EM" transaction-type="JTA">
+    <description>Persistence Unit for CTS Vehicle Tests</description>
+    <jta-data-source>jdbc/DB1</jta-data-source>
+    <class>ee.jakarta.tck.persistence.core.entitytest.persist.oneXone.A</class>
+    <class>ee.jakarta.tck.persistence.core.entitytest.persist.oneXone.B</class>
+  </persistence-unit>
+  <persistence-unit name="CTS-EM2" transaction-type="JTA">
+    <description>Persistence Unit for CTS Vehicle Tests</description>
+    <jta-data-source>jdbc/DB1</jta-data-source>
+    <class>ee.jakarta.tck.persistence.core.entitytest.persist.oneXone.A</class>
+    <class>ee.jakarta.tck.persistence.core.entitytest.persist.oneXone.B</class>
+  </persistence-unit>
+  <persistence-unit name="CTS-EM-NOTX" transaction-type="RESOURCE_LOCAL">
+    <description>The persistence.xml file may be used to designate
+                  more than one persistence unit within the same scope.
+                  Persistence Unit for Application Managed Resource Local</description>
+    <non-jta-data-source>jdbc/DB_no_tx</non-jta-data-source>
+    <class>ee.jakarta.tck.persistence.core.entitytest.persist.oneXone.A</class>
+    <class>ee.jakarta.tck.persistence.core.entitytest.persist.oneXone.B</class>
+  </persistence-unit>
+</persistence>
+
diff --git a/jpa/spec-tests/src/main/java/ee/jakarta/tck/persistence/core/entitytest/remove/basic/persistence.xml b/jpa/spec-tests/src/main/java/ee/jakarta/tck/persistence/core/entitytest/remove/basic/persistence.xml
new file mode 100644
index 0000000000..6e32bca478
--- /dev/null
+++ b/jpa/spec-tests/src/main/java/ee/jakarta/tck/persistence/core/entitytest/remove/basic/persistence.xml
@@ -0,0 +1,38 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+
+    Copyright (c) 2018 Oracle and/or its affiliates. All rights reserved.
+
+    This program and the accompanying materials are made available under the
+    terms of the Eclipse Public License v. 2.0, which is available at
+    http://www.eclipse.org/legal/epl-2.0.
+
+    This Source Code may also be made available under the following Secondary
+    Licenses when the conditions for such availability set forth in the
+    Eclipse Public License v. 2.0 are satisfied: GNU General Public License,
+    version 2 with the GNU Classpath Exception, which is available at
+    https://www.gnu.org/software/classpath/license.html.
+
+    SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
+
+-->
+<persistence xmlns="https://jakarta.ee/xml/ns/persistence" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="https://jakarta.ee/xml/ns/persistence     https://jakarta.ee/xml/ns/persistence/persistence_3_0.xsd" version="3.0">
+  <persistence-unit name="CTS-EM" transaction-type="JTA">
+    <description>Persistence Unit for CTS Vehicle Tests</description>
+    <jta-data-source>jdbc/DB1</jta-data-source>
+    <class>ee.jakarta.tck.persistence.core.entitytest.remove.basic.A</class>
+  </persistence-unit>
+  <persistence-unit name="CTS-EM2" transaction-type="JTA">
+    <description>Persistence Unit for CTS Vehicle Tests</description>
+    <jta-data-source>jdbc/DB1</jta-data-source>
+    <class>ee.jakarta.tck.persistence.core.entitytest.remove.basic.A</class>
+  </persistence-unit>
+  <persistence-unit name="CTS-EM-NOTX" transaction-type="RESOURCE_LOCAL">
+    <description>The persistence.xml file may be used to designate
+                  more than one persistence unit within the same scope.
+                  Persistence Unit for Application Managed Resource Local</description>
+    <non-jta-data-source>jdbc/DB_no_tx</non-jta-data-source>
+    <class>ee.jakarta.tck.persistence.core.entitytest.remove.basic.A</class>
+  </persistence-unit>
+</persistence>
+
diff --git a/jpa/spec-tests/src/main/java/ee/jakarta/tck/persistence/core/entitytest/remove/oneXmany/persistence.xml b/jpa/spec-tests/src/main/java/ee/jakarta/tck/persistence/core/entitytest/remove/oneXmany/persistence.xml
new file mode 100644
index 0000000000..e8b45686df
--- /dev/null
+++ b/jpa/spec-tests/src/main/java/ee/jakarta/tck/persistence/core/entitytest/remove/oneXmany/persistence.xml
@@ -0,0 +1,41 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+
+    Copyright (c) 2018 Oracle and/or its affiliates. All rights reserved.
+
+    This program and the accompanying materials are made available under the
+    terms of the Eclipse Public License v. 2.0, which is available at
+    http://www.eclipse.org/legal/epl-2.0.
+
+    This Source Code may also be made available under the following Secondary
+    Licenses when the conditions for such availability set forth in the
+    Eclipse Public License v. 2.0 are satisfied: GNU General Public License,
+    version 2 with the GNU Classpath Exception, which is available at
+    https://www.gnu.org/software/classpath/license.html.
+
+    SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
+
+-->
+<persistence xmlns="https://jakarta.ee/xml/ns/persistence" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="https://jakarta.ee/xml/ns/persistence     https://jakarta.ee/xml/ns/persistence/persistence_3_0.xsd" version="3.0">
+  <persistence-unit name="CTS-EM" transaction-type="JTA">
+    <description>Persistence Unit for CTS Vehicle Tests</description>
+    <jta-data-source>jdbc/DB1</jta-data-source>
+    <class>ee.jakarta.tck.persistence.core.entitytest.remove.oneXmany.A</class>
+    <class>ee.jakarta.tck.persistence.core.entitytest.remove.oneXmany.B</class>
+  </persistence-unit>
+  <persistence-unit name="CTS-EM2" transaction-type="JTA">
+    <description>Persistence Unit for CTS Vehicle Tests</description>
+    <jta-data-source>jdbc/DB1</jta-data-source>
+    <class>ee.jakarta.tck.persistence.core.entitytest.remove.oneXmany.A</class>
+    <class>ee.jakarta.tck.persistence.core.entitytest.remove.oneXmany.B</class>
+  </persistence-unit>
+  <persistence-unit name="CTS-EM-NOTX" transaction-type="RESOURCE_LOCAL">
+    <description>The persistence.xml file may be used to designate
+                  more than one persistence unit within the same scope.
+                  Persistence Unit for Application Managed Resource Local</description>
+    <non-jta-data-source>jdbc/DB_no_tx</non-jta-data-source>
+    <class>ee.jakarta.tck.persistence.core.entitytest.remove.oneXmany.A</class>
+    <class>ee.jakarta.tck.persistence.core.entitytest.remove.oneXmany.B</class>
+  </persistence-unit>
+</persistence>
+
diff --git a/jpa/spec-tests/src/main/java/ee/jakarta/tck/persistence/core/entitytest/remove/oneXone/persistence.xml b/jpa/spec-tests/src/main/java/ee/jakarta/tck/persistence/core/entitytest/remove/oneXone/persistence.xml
new file mode 100644
index 0000000000..9e3b2fb0dc
--- /dev/null
+++ b/jpa/spec-tests/src/main/java/ee/jakarta/tck/persistence/core/entitytest/remove/oneXone/persistence.xml
@@ -0,0 +1,41 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+
+    Copyright (c) 2018 Oracle and/or its affiliates. All rights reserved.
+
+    This program and the accompanying materials are made available under the
+    terms of the Eclipse Public License v. 2.0, which is available at
+    http://www.eclipse.org/legal/epl-2.0.
+
+    This Source Code may also be made available under the following Secondary
+    Licenses when the conditions for such availability set forth in the
+    Eclipse Public License v. 2.0 are satisfied: GNU General Public License,
+    version 2 with the GNU Classpath Exception, which is available at
+    https://www.gnu.org/software/classpath/license.html.
+
+    SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
+
+-->
+<persistence xmlns="https://jakarta.ee/xml/ns/persistence" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="https://jakarta.ee/xml/ns/persistence     https://jakarta.ee/xml/ns/persistence/persistence_3_0.xsd" version="3.0">
+  <persistence-unit name="CTS-EM" transaction-type="JTA">
+    <description>Persistence Unit for CTS Vehicle Tests</description>
+    <jta-data-source>jdbc/DB1</jta-data-source>
+    <class>ee.jakarta.tck.persistence.core.entitytest.remove.oneXone.A</class>
+    <class>ee.jakarta.tck.persistence.core.entitytest.remove.oneXone.B</class>
+  </persistence-unit>
+  <persistence-unit name="CTS-EM2" transaction-type="JTA">
+    <description>Persistence Unit for CTS Vehicle Tests</description>
+    <jta-data-source>jdbc/DB1</jta-data-source>
+    <class>ee.jakarta.tck.persistence.core.entitytest.remove.oneXone.A</class>
+    <class>ee.jakarta.tck.persistence.core.entitytest.remove.oneXone.B</class>
+  </persistence-unit>
+  <persistence-unit name="CTS-EM-NOTX" transaction-type="RESOURCE_LOCAL">
+    <description>The persistence.xml file may be used to designate
+                  more than one persistence unit within the same scope.
+                  Persistence Unit for Application Managed Resource Local</description>
+    <non-jta-data-source>jdbc/DB_no_tx</non-jta-data-source>
+    <class>ee.jakarta.tck.persistence.core.entitytest.remove.oneXone.A</class>
+    <class>ee.jakarta.tck.persistence.core.entitytest.remove.oneXone.B</class>
+  </persistence-unit>
+</persistence>
+
diff --git a/jpa/spec-tests/src/main/java/ee/jakarta/tck/persistence/core/enums/persistence.xml b/jpa/spec-tests/src/main/java/ee/jakarta/tck/persistence/core/enums/persistence.xml
new file mode 100644
index 0000000000..087e707d08
--- /dev/null
+++ b/jpa/spec-tests/src/main/java/ee/jakarta/tck/persistence/core/enums/persistence.xml
@@ -0,0 +1,38 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+
+    Copyright (c) 2018 Oracle and/or its affiliates. All rights reserved.
+
+    This program and the accompanying materials are made available under the
+    terms of the Eclipse Public License v. 2.0, which is available at
+    http://www.eclipse.org/legal/epl-2.0.
+
+    This Source Code may also be made available under the following Secondary
+    Licenses when the conditions for such availability set forth in the
+    Eclipse Public License v. 2.0 are satisfied: GNU General Public License,
+    version 2 with the GNU Classpath Exception, which is available at
+    https://www.gnu.org/software/classpath/license.html.
+
+    SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
+
+-->
+<persistence xmlns="https://jakarta.ee/xml/ns/persistence" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="https://jakarta.ee/xml/ns/persistence     https://jakarta.ee/xml/ns/persistence/persistence_3_0.xsd" version="3.0">
+  <persistence-unit name="CTS-EM" transaction-type="JTA">
+    <description>Persistence Unit for CTS Vehicle Tests</description>
+    <jta-data-source>jdbc/DB1</jta-data-source>
+    <class>ee.jakarta.tck.persistence.core.enums.Order</class>
+  </persistence-unit>
+  <persistence-unit name="CTS-EM2" transaction-type="JTA">
+    <description>Persistence Unit for CTS Vehicle Tests</description>
+    <jta-data-source>jdbc/DB1</jta-data-source>
+    <class>ee.jakarta.tck.persistence.core.enums.Order</class>
+  </persistence-unit>
+  <persistence-unit name="CTS-EM-NOTX" transaction-type="RESOURCE_LOCAL">
+    <description>The persistence.xml file may be used to designate
+                  more than one persistence unit within the same scope.
+                  Persistence Unit for Application Managed Resource Local</description>
+    <non-jta-data-source>jdbc/DB_no_tx</non-jta-data-source>
+    <class>ee.jakarta.tck.persistence.core.enums.Order</class>
+  </persistence-unit>
+</persistence>
+
diff --git a/jpa/spec-tests/src/main/java/ee/jakarta/tck/persistence/core/exceptions/persistence.xml b/jpa/spec-tests/src/main/java/ee/jakarta/tck/persistence/core/exceptions/persistence.xml
new file mode 100644
index 0000000000..6ee7b5b1e5
--- /dev/null
+++ b/jpa/spec-tests/src/main/java/ee/jakarta/tck/persistence/core/exceptions/persistence.xml
@@ -0,0 +1,38 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+
+    Copyright (c) 2018 Oracle and/or its affiliates. All rights reserved.
+
+    This program and the accompanying materials are made available under the
+    terms of the Eclipse Public License v. 2.0, which is available at
+    http://www.eclipse.org/legal/epl-2.0.
+
+    This Source Code may also be made available under the following Secondary
+    Licenses when the conditions for such availability set forth in the
+    Eclipse Public License v. 2.0 are satisfied: GNU General Public License,
+    version 2 with the GNU Classpath Exception, which is available at
+    https://www.gnu.org/software/classpath/license.html.
+
+    SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
+
+-->
+<persistence xmlns="https://jakarta.ee/xml/ns/persistence" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="https://jakarta.ee/xml/ns/persistence     https://jakarta.ee/xml/ns/persistence/persistence_3_0.xsd" version="3.0">
+  <persistence-unit name="CTS-EM" transaction-type="JTA">
+    <description>Persistence Unit for CTS Vehicle Tests</description>
+    <jta-data-source>jdbc/DB1</jta-data-source>
+    <class>ee.jakarta.tck.persistence.core.exceptions.Coffee</class>
+  </persistence-unit>
+  <persistence-unit name="CTS-EM2" transaction-type="JTA">
+    <description>Persistence Unit for CTS Vehicle Tests</description>
+    <jta-data-source>jdbc/DB1</jta-data-source>
+    <class>ee.jakarta.tck.persistence.core.exceptions.Coffee</class>
+  </persistence-unit>
+  <persistence-unit name="CTS-EM-NOTX" transaction-type="RESOURCE_LOCAL">
+    <description>The persistence.xml file may be used to designate
+                  more than one persistence unit within the same scope.
+                  Persistence Unit for Application Managed Resource Local</description>
+    <non-jta-data-source>jdbc/DB_no_tx</non-jta-data-source>
+    <class>ee.jakarta.tck.persistence.core.exceptions.Coffee</class>
+  </persistence-unit>
+</persistence>
+
diff --git a/jpa/spec-tests/src/main/java/ee/jakarta/tck/persistence/core/inheritance/abstractentity/persistence.xml b/jpa/spec-tests/src/main/java/ee/jakarta/tck/persistence/core/inheritance/abstractentity/persistence.xml
new file mode 100644
index 0000000000..78db6f206a
--- /dev/null
+++ b/jpa/spec-tests/src/main/java/ee/jakarta/tck/persistence/core/inheritance/abstractentity/persistence.xml
@@ -0,0 +1,53 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+
+    Copyright (c) 2018 Oracle and/or its affiliates. All rights reserved.
+
+    This program and the accompanying materials are made available under the
+    terms of the Eclipse Public License v. 2.0, which is available at
+    http://www.eclipse.org/legal/epl-2.0.
+
+    This Source Code may also be made available under the following Secondary
+    Licenses when the conditions for such availability set forth in the
+    Eclipse Public License v. 2.0 are satisfied: GNU General Public License,
+    version 2 with the GNU Classpath Exception, which is available at
+    https://www.gnu.org/software/classpath/license.html.
+
+    SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
+
+-->
+<persistence xmlns="https://jakarta.ee/xml/ns/persistence" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="https://jakarta.ee/xml/ns/persistence     https://jakarta.ee/xml/ns/persistence/persistence_3_0.xsd" version="3.0">
+  <persistence-unit name="CTS-EM" transaction-type="JTA">
+    <description>Persistence Unit for CTS Vehicle Tests</description>
+    <jta-data-source>jdbc/DB1</jta-data-source>
+    <class>ee.jakarta.tck.persistence.core.inheritance.abstractentity.AbstractPersonnel</class>
+    <class>ee.jakarta.tck.persistence.core.inheritance.abstractentity.Department</class>
+    <class>ee.jakarta.tck.persistence.core.inheritance.abstractentity.Employee</class>
+    <class>ee.jakarta.tck.persistence.core.inheritance.abstractentity.FullTimeEmployee</class>
+    <class>ee.jakarta.tck.persistence.core.inheritance.abstractentity.PartTimeEmployee</class>
+    <class>ee.jakarta.tck.persistence.core.inheritance.abstractentity.Project</class>
+  </persistence-unit>
+  <persistence-unit name="CTS-EM2" transaction-type="JTA">
+    <description>Persistence Unit for CTS Vehicle Tests</description>
+    <jta-data-source>jdbc/DB1</jta-data-source>
+    <class>ee.jakarta.tck.persistence.core.inheritance.abstractentity.AbstractPersonnel</class>
+    <class>ee.jakarta.tck.persistence.core.inheritance.abstractentity.Department</class>
+    <class>ee.jakarta.tck.persistence.core.inheritance.abstractentity.Employee</class>
+    <class>ee.jakarta.tck.persistence.core.inheritance.abstractentity.FullTimeEmployee</class>
+    <class>ee.jakarta.tck.persistence.core.inheritance.abstractentity.PartTimeEmployee</class>
+    <class>ee.jakarta.tck.persistence.core.inheritance.abstractentity.Project</class>
+  </persistence-unit>
+  <persistence-unit name="CTS-EM-NOTX" transaction-type="RESOURCE_LOCAL">
+    <description>The persistence.xml file may be used to designate
+                  more than one persistence unit within the same scope.
+                  Persistence Unit for Application Managed Resource Local</description>
+    <non-jta-data-source>jdbc/DB_no_tx</non-jta-data-source>
+    <class>ee.jakarta.tck.persistence.core.inheritance.abstractentity.AbstractPersonnel</class>
+    <class>ee.jakarta.tck.persistence.core.inheritance.abstractentity.Department</class>
+    <class>ee.jakarta.tck.persistence.core.inheritance.abstractentity.Employee</class>
+    <class>ee.jakarta.tck.persistence.core.inheritance.abstractentity.FullTimeEmployee</class>
+    <class>ee.jakarta.tck.persistence.core.inheritance.abstractentity.PartTimeEmployee</class>
+    <class>ee.jakarta.tck.persistence.core.inheritance.abstractentity.Project</class>
+  </persistence-unit>
+</persistence>
+
diff --git a/jpa/spec-tests/src/main/java/ee/jakarta/tck/persistence/core/inheritance/mappedsc/annotation/persistence.xml b/jpa/spec-tests/src/main/java/ee/jakarta/tck/persistence/core/inheritance/mappedsc/annotation/persistence.xml
new file mode 100644
index 0000000000..80eced0626
--- /dev/null
+++ b/jpa/spec-tests/src/main/java/ee/jakarta/tck/persistence/core/inheritance/mappedsc/annotation/persistence.xml
@@ -0,0 +1,53 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+
+    Copyright (c) 2018 Oracle and/or its affiliates. All rights reserved.
+
+    This program and the accompanying materials are made available under the
+    terms of the Eclipse Public License v. 2.0, which is available at
+    http://www.eclipse.org/legal/epl-2.0.
+
+    This Source Code may also be made available under the following Secondary
+    Licenses when the conditions for such availability set forth in the
+    Eclipse Public License v. 2.0 are satisfied: GNU General Public License,
+    version 2 with the GNU Classpath Exception, which is available at
+    https://www.gnu.org/software/classpath/license.html.
+
+    SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
+
+-->
+<persistence xmlns="https://jakarta.ee/xml/ns/persistence" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="https://jakarta.ee/xml/ns/persistence     https://jakarta.ee/xml/ns/persistence/persistence_3_0.xsd" version="3.0">
+  <persistence-unit name="CTS-EM" transaction-type="JTA">
+    <description>Persistence Unit for CTS Vehicle Tests</description>
+    <jta-data-source>jdbc/DB1</jta-data-source>
+    <class>ee.jakarta.tck.persistence.core.inheritance.mappedsc.annotation.AbstractPersonnel</class>
+    <class>ee.jakarta.tck.persistence.core.inheritance.mappedsc.annotation.Department</class>
+    <class>ee.jakarta.tck.persistence.core.inheritance.mappedsc.annotation.Employee</class>
+    <class>ee.jakarta.tck.persistence.core.inheritance.mappedsc.annotation.FullTimeEmployee</class>
+    <class>ee.jakarta.tck.persistence.core.inheritance.mappedsc.annotation.PartTimeEmployee</class>
+    <class>ee.jakarta.tck.persistence.core.inheritance.mappedsc.annotation.Project</class>
+  </persistence-unit>
+  <persistence-unit name="CTS-EM2" transaction-type="JTA">
+    <description>Persistence Unit for CTS Vehicle Tests</description>
+    <jta-data-source>jdbc/DB1</jta-data-source>
+    <class>ee.jakarta.tck.persistence.core.inheritance.mappedsc.annotation.AbstractPersonnel</class>
+    <class>ee.jakarta.tck.persistence.core.inheritance.mappedsc.annotation.Department</class>
+    <class>ee.jakarta.tck.persistence.core.inheritance.mappedsc.annotation.Employee</class>
+    <class>ee.jakarta.tck.persistence.core.inheritance.mappedsc.annotation.FullTimeEmployee</class>
+    <class>ee.jakarta.tck.persistence.core.inheritance.mappedsc.annotation.PartTimeEmployee</class>
+    <class>ee.jakarta.tck.persistence.core.inheritance.mappedsc.annotation.Project</class>
+  </persistence-unit>
+  <persistence-unit name="CTS-EM-NOTX" transaction-type="RESOURCE_LOCAL">
+    <description>The persistence.xml file may be used to designate
+                  more than one persistence unit within the same scope.
+                  Persistence Unit for Application Managed Resource Local</description>
+    <non-jta-data-source>jdbc/DB_no_tx</non-jta-data-source>
+    <class>ee.jakarta.tck.persistence.core.inheritance.mappedsc.annotation.AbstractPersonnel</class>
+    <class>ee.jakarta.tck.persistence.core.inheritance.mappedsc.annotation.Department</class>
+    <class>ee.jakarta.tck.persistence.core.inheritance.mappedsc.annotation.Employee</class>
+    <class>ee.jakarta.tck.persistence.core.inheritance.mappedsc.annotation.FullTimeEmployee</class>
+    <class>ee.jakarta.tck.persistence.core.inheritance.mappedsc.annotation.PartTimeEmployee</class>
+    <class>ee.jakarta.tck.persistence.core.inheritance.mappedsc.annotation.Project</class>
+  </persistence-unit>
+</persistence>
+
diff --git a/jpa/spec-tests/src/main/java/ee/jakarta/tck/persistence/core/inheritance/mappedsc/descriptors/persistence.xml b/jpa/spec-tests/src/main/java/ee/jakarta/tck/persistence/core/inheritance/mappedsc/descriptors/persistence.xml
new file mode 100644
index 0000000000..78e135d1e3
--- /dev/null
+++ b/jpa/spec-tests/src/main/java/ee/jakarta/tck/persistence/core/inheritance/mappedsc/descriptors/persistence.xml
@@ -0,0 +1,53 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+
+    Copyright (c) 2018 Oracle and/or its affiliates. All rights reserved.
+
+    This program and the accompanying materials are made available under the
+    terms of the Eclipse Public License v. 2.0, which is available at
+    http://www.eclipse.org/legal/epl-2.0.
+
+    This Source Code may also be made available under the following Secondary
+    Licenses when the conditions for such availability set forth in the
+    Eclipse Public License v. 2.0 are satisfied: GNU General Public License,
+    version 2 with the GNU Classpath Exception, which is available at
+    https://www.gnu.org/software/classpath/license.html.
+
+    SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
+
+-->
+<persistence xmlns="https://jakarta.ee/xml/ns/persistence" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="https://jakarta.ee/xml/ns/persistence     https://jakarta.ee/xml/ns/persistence/persistence_3_0.xsd" version="3.0">
+  <persistence-unit name="CTS-EM" transaction-type="JTA">
+    <description>Persistence Unit for CTS Vehicle Tests</description>
+    <jta-data-source>jdbc/DB1</jta-data-source>
+    <class>ee.jakarta.tck.persistence.core.inheritance.mappedsc.descriptors.AbstractPersonnel</class>
+    <class>ee.jakarta.tck.persistence.core.inheritance.mappedsc.descriptors.Department</class>
+    <class>ee.jakarta.tck.persistence.core.inheritance.mappedsc.descriptors.Employee</class>
+    <class>ee.jakarta.tck.persistence.core.inheritance.mappedsc.descriptors.FullTimeEmployee</class>
+    <class>ee.jakarta.tck.persistence.core.inheritance.mappedsc.descriptors.PartTimeEmployee</class>
+    <class>ee.jakarta.tck.persistence.core.inheritance.mappedsc.descriptors.Project</class>
+  </persistence-unit>
+  <persistence-unit name="CTS-EM2" transaction-type="JTA">
+    <description>Persistence Unit for CTS Vehicle Tests</description>
+    <jta-data-source>jdbc/DB1</jta-data-source>
+    <class>ee.jakarta.tck.persistence.core.inheritance.mappedsc.descriptors.AbstractPersonnel</class>
+    <class>ee.jakarta.tck.persistence.core.inheritance.mappedsc.descriptors.Department</class>
+    <class>ee.jakarta.tck.persistence.core.inheritance.mappedsc.descriptors.Employee</class>
+    <class>ee.jakarta.tck.persistence.core.inheritance.mappedsc.descriptors.FullTimeEmployee</class>
+    <class>ee.jakarta.tck.persistence.core.inheritance.mappedsc.descriptors.PartTimeEmployee</class>
+    <class>ee.jakarta.tck.persistence.core.inheritance.mappedsc.descriptors.Project</class>
+  </persistence-unit>
+  <persistence-unit name="CTS-EM-NOTX" transaction-type="RESOURCE_LOCAL">
+    <description>The persistence.xml file may be used to designate
+                  more than one persistence unit within the same scope.
+                  Persistence Unit for Application Managed Resource Local</description>
+    <non-jta-data-source>jdbc/DB_no_tx</non-jta-data-source>
+    <class>ee.jakarta.tck.persistence.core.inheritance.mappedsc.descriptors.AbstractPersonnel</class>
+    <class>ee.jakarta.tck.persistence.core.inheritance.mappedsc.descriptors.Department</class>
+    <class>ee.jakarta.tck.persistence.core.inheritance.mappedsc.descriptors.Employee</class>
+    <class>ee.jakarta.tck.persistence.core.inheritance.mappedsc.descriptors.FullTimeEmployee</class>
+    <class>ee.jakarta.tck.persistence.core.inheritance.mappedsc.descriptors.PartTimeEmployee</class>
+    <class>ee.jakarta.tck.persistence.core.inheritance.mappedsc.descriptors.Project</class>
+  </persistence-unit>
+</persistence>
+
diff --git a/jpa/spec-tests/src/main/java/ee/jakarta/tck/persistence/core/inheritance/nonentity/persistence.xml b/jpa/spec-tests/src/main/java/ee/jakarta/tck/persistence/core/inheritance/nonentity/persistence.xml
new file mode 100644
index 0000000000..80e8b66d0b
--- /dev/null
+++ b/jpa/spec-tests/src/main/java/ee/jakarta/tck/persistence/core/inheritance/nonentity/persistence.xml
@@ -0,0 +1,56 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+
+    Copyright (c) 2018 Oracle and/or its affiliates. All rights reserved.
+
+    This program and the accompanying materials are made available under the
+    terms of the Eclipse Public License v. 2.0, which is available at
+    http://www.eclipse.org/legal/epl-2.0.
+
+    This Source Code may also be made available under the following Secondary
+    Licenses when the conditions for such availability set forth in the
+    Eclipse Public License v. 2.0 are satisfied: GNU General Public License,
+    version 2 with the GNU Classpath Exception, which is available at
+    https://www.gnu.org/software/classpath/license.html.
+
+    SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
+
+-->
+<persistence xmlns="https://jakarta.ee/xml/ns/persistence" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="https://jakarta.ee/xml/ns/persistence     https://jakarta.ee/xml/ns/persistence/persistence_3_0.xsd" version="3.0">
+  <persistence-unit name="CTS-EM" transaction-type="JTA">
+    <description>Persistence Unit for CTS Vehicle Tests</description>
+    <jta-data-source>jdbc/DB1</jta-data-source>
+    <class>ee.jakarta.tck.persistence.core.inheritance.nonentity.Department</class>
+    <class>ee.jakarta.tck.persistence.core.inheritance.nonentity.Employee</class>
+    <class>ee.jakarta.tck.persistence.core.inheritance.nonentity.FTEmployee</class>
+    <class>ee.jakarta.tck.persistence.core.inheritance.nonentity.FullTimeEmployee</class>
+    <class>ee.jakarta.tck.persistence.core.inheritance.nonentity.PartTimeEmployee</class>
+    <class>ee.jakarta.tck.persistence.core.inheritance.nonentity.Personnel</class>
+    <class>ee.jakarta.tck.persistence.core.inheritance.nonentity.Project</class>
+  </persistence-unit>
+  <persistence-unit name="CTS-EM2" transaction-type="JTA">
+    <description>Persistence Unit for CTS Vehicle Tests</description>
+    <jta-data-source>jdbc/DB1</jta-data-source>
+    <class>ee.jakarta.tck.persistence.core.inheritance.nonentity.Department</class>
+    <class>ee.jakarta.tck.persistence.core.inheritance.nonentity.Employee</class>
+    <class>ee.jakarta.tck.persistence.core.inheritance.nonentity.FTEmployee</class>
+    <class>ee.jakarta.tck.persistence.core.inheritance.nonentity.FullTimeEmployee</class>
+    <class>ee.jakarta.tck.persistence.core.inheritance.nonentity.PartTimeEmployee</class>
+    <class>ee.jakarta.tck.persistence.core.inheritance.nonentity.Personnel</class>
+    <class>ee.jakarta.tck.persistence.core.inheritance.nonentity.Project</class>
+  </persistence-unit>
+  <persistence-unit name="CTS-EM-NOTX" transaction-type="RESOURCE_LOCAL">
+    <description>The persistence.xml file may be used to designate
+                  more than one persistence unit within the same scope.
+                  Persistence Unit for Application Managed Resource Local</description>
+    <non-jta-data-source>jdbc/DB_no_tx</non-jta-data-source>
+    <class>ee.jakarta.tck.persistence.core.inheritance.nonentity.Department</class>
+    <class>ee.jakarta.tck.persistence.core.inheritance.nonentity.Employee</class>
+    <class>ee.jakarta.tck.persistence.core.inheritance.nonentity.FTEmployee</class>
+    <class>ee.jakarta.tck.persistence.core.inheritance.nonentity.FullTimeEmployee</class>
+    <class>ee.jakarta.tck.persistence.core.inheritance.nonentity.PartTimeEmployee</class>
+    <class>ee.jakarta.tck.persistence.core.inheritance.nonentity.Personnel</class>
+    <class>ee.jakarta.tck.persistence.core.inheritance.nonentity.Project</class>
+  </persistence-unit>
+</persistence>
+
diff --git a/jpa/spec-tests/src/main/java/ee/jakarta/tck/persistence/core/lock/entitymanager/persistence.xml b/jpa/spec-tests/src/main/java/ee/jakarta/tck/persistence/core/lock/entitymanager/persistence.xml
new file mode 100644
index 0000000000..eb628c0c11
--- /dev/null
+++ b/jpa/spec-tests/src/main/java/ee/jakarta/tck/persistence/core/lock/entitymanager/persistence.xml
@@ -0,0 +1,38 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+
+    Copyright (c) 2018 Oracle and/or its affiliates. All rights reserved.
+
+    This program and the accompanying materials are made available under the
+    terms of the Eclipse Public License v. 2.0, which is available at
+    http://www.eclipse.org/legal/epl-2.0.
+
+    This Source Code may also be made available under the following Secondary
+    Licenses when the conditions for such availability set forth in the
+    Eclipse Public License v. 2.0 are satisfied: GNU General Public License,
+    version 2 with the GNU Classpath Exception, which is available at
+    https://www.gnu.org/software/classpath/license.html.
+
+    SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
+
+-->
+<persistence xmlns="https://jakarta.ee/xml/ns/persistence" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="https://jakarta.ee/xml/ns/persistence     https://jakarta.ee/xml/ns/persistence/persistence_3_0.xsd" version="3.0">
+  <persistence-unit name="CTS-EM" transaction-type="JTA">
+    <description>Persistence Unit for CTS Vehicle Tests</description>
+    <jta-data-source>jdbc/DB1</jta-data-source>
+    <class>ee.jakarta.tck.persistence.core.lock.entitymanager.Coffee</class>
+  </persistence-unit>
+  <persistence-unit name="CTS-EM2" transaction-type="JTA">
+    <description>Persistence Unit for CTS Vehicle Tests</description>
+    <jta-data-source>jdbc/DB1</jta-data-source>
+    <class>ee.jakarta.tck.persistence.core.lock.entitymanager.Coffee</class>
+  </persistence-unit>
+  <persistence-unit name="CTS-EM-NOTX" transaction-type="RESOURCE_LOCAL">
+    <description>The persistence.xml file may be used to designate
+                  more than one persistence unit within the same scope.
+                  Persistence Unit for Application Managed Resource Local</description>
+    <non-jta-data-source>jdbc/DB_no_tx</non-jta-data-source>
+    <class>ee.jakarta.tck.persistence.core.lock.entitymanager.Coffee</class>
+  </persistence-unit>
+</persistence>
+
diff --git a/jpa/spec-tests/src/main/java/ee/jakarta/tck/persistence/core/lock/query/persistence.xml b/jpa/spec-tests/src/main/java/ee/jakarta/tck/persistence/core/lock/query/persistence.xml
new file mode 100644
index 0000000000..1f6d2ffa35
--- /dev/null
+++ b/jpa/spec-tests/src/main/java/ee/jakarta/tck/persistence/core/lock/query/persistence.xml
@@ -0,0 +1,44 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+
+    Copyright (c) 2018 Oracle and/or its affiliates. All rights reserved.
+
+    This program and the accompanying materials are made available under the
+    terms of the Eclipse Public License v. 2.0, which is available at
+    http://www.eclipse.org/legal/epl-2.0.
+
+    This Source Code may also be made available under the following Secondary
+    Licenses when the conditions for such availability set forth in the
+    Eclipse Public License v. 2.0 are satisfied: GNU General Public License,
+    version 2 with the GNU Classpath Exception, which is available at
+    https://www.gnu.org/software/classpath/license.html.
+
+    SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
+
+-->
+<persistence xmlns="https://jakarta.ee/xml/ns/persistence" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="https://jakarta.ee/xml/ns/persistence     https://jakarta.ee/xml/ns/persistence/persistence_3_0.xsd" version="3.0">
+  <persistence-unit name="CTS-EM" transaction-type="JTA">
+    <description>Persistence Unit for CTS Vehicle Tests</description>
+    <jta-data-source>jdbc/DB1</jta-data-source>
+    <class>ee.jakarta.tck.persistence.core.lock.query.Department</class>
+    <class>ee.jakarta.tck.persistence.core.lock.query.Employee</class>
+    <class>ee.jakarta.tck.persistence.core.lock.query.Insurance</class>
+  </persistence-unit>
+  <persistence-unit name="CTS-EM2" transaction-type="JTA">
+    <description>Persistence Unit for CTS Vehicle Tests</description>
+    <jta-data-source>jdbc/DB1</jta-data-source>
+    <class>ee.jakarta.tck.persistence.core.lock.query.Department</class>
+    <class>ee.jakarta.tck.persistence.core.lock.query.Employee</class>
+    <class>ee.jakarta.tck.persistence.core.lock.query.Insurance</class>
+  </persistence-unit>
+  <persistence-unit name="CTS-EM-NOTX" transaction-type="RESOURCE_LOCAL">
+    <description>The persistence.xml file may be used to designate
+                  more than one persistence unit within the same scope.
+                  Persistence Unit for Application Managed Resource Local</description>
+    <non-jta-data-source>jdbc/DB_no_tx</non-jta-data-source>
+    <class>ee.jakarta.tck.persistence.core.lock.query.Department</class>
+    <class>ee.jakarta.tck.persistence.core.lock.query.Employee</class>
+    <class>ee.jakarta.tck.persistence.core.lock.query.Insurance</class>
+  </persistence-unit>
+</persistence>
+
diff --git a/jpa/spec-tests/src/main/java/ee/jakarta/tck/persistence/core/metamodelapi/attribute/persistence.xml b/jpa/spec-tests/src/main/java/ee/jakarta/tck/persistence/core/metamodelapi/attribute/persistence.xml
new file mode 100644
index 0000000000..ee98b959d3
--- /dev/null
+++ b/jpa/spec-tests/src/main/java/ee/jakarta/tck/persistence/core/metamodelapi/attribute/persistence.xml
@@ -0,0 +1,38 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+
+    Copyright (c) 2018 Oracle and/or its affiliates. All rights reserved.
+
+    This program and the accompanying materials are made available under the
+    terms of the Eclipse Public License v. 2.0, which is available at
+    http://www.eclipse.org/legal/epl-2.0.
+
+    This Source Code may also be made available under the following Secondary
+    Licenses when the conditions for such availability set forth in the
+    Eclipse Public License v. 2.0 are satisfied: GNU General Public License,
+    version 2 with the GNU Classpath Exception, which is available at
+    https://www.gnu.org/software/classpath/license.html.
+
+    SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
+
+-->
+<persistence xmlns="https://jakarta.ee/xml/ns/persistence" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="https://jakarta.ee/xml/ns/persistence     https://jakarta.ee/xml/ns/persistence/persistence_3_0.xsd" version="3.0">
+  <persistence-unit name="CTS-EM" transaction-type="JTA">
+    <description>Persistence Unit for CTS Vehicle Tests</description>
+    <jta-data-source>jdbc/DB1</jta-data-source>
+    <class>ee.jakarta.tck.persistence.core.metamodelapi.attribute.Order</class>
+  </persistence-unit>
+  <persistence-unit name="CTS-EM2" transaction-type="JTA">
+    <description>Persistence Unit for CTS Vehicle Tests</description>
+    <jta-data-source>jdbc/DB1</jta-data-source>
+    <class>ee.jakarta.tck.persistence.core.metamodelapi.attribute.Order</class>
+  </persistence-unit>
+  <persistence-unit name="CTS-EM-NOTX" transaction-type="RESOURCE_LOCAL">
+    <description>The persistence.xml file may be used to designate
+                  more than one persistence unit within the same scope.
+                  Persistence Unit for Application Managed Resource Local</description>
+    <non-jta-data-source>jdbc/DB_no_tx</non-jta-data-source>
+    <class>ee.jakarta.tck.persistence.core.metamodelapi.attribute.Order</class>
+  </persistence-unit>
+</persistence>
+
diff --git a/jpa/spec-tests/src/main/java/ee/jakarta/tck/persistence/core/metamodelapi/basictype/persistence.xml b/jpa/spec-tests/src/main/java/ee/jakarta/tck/persistence/core/metamodelapi/basictype/persistence.xml
new file mode 100644
index 0000000000..f79e321f4e
--- /dev/null
+++ b/jpa/spec-tests/src/main/java/ee/jakarta/tck/persistence/core/metamodelapi/basictype/persistence.xml
@@ -0,0 +1,38 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+
+    Copyright (c) 2018 Oracle and/or its affiliates. All rights reserved.
+
+    This program and the accompanying materials are made available under the
+    terms of the Eclipse Public License v. 2.0, which is available at
+    http://www.eclipse.org/legal/epl-2.0.
+
+    This Source Code may also be made available under the following Secondary
+    Licenses when the conditions for such availability set forth in the
+    Eclipse Public License v. 2.0 are satisfied: GNU General Public License,
+    version 2 with the GNU Classpath Exception, which is available at
+    https://www.gnu.org/software/classpath/license.html.
+
+    SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
+
+-->
+<persistence xmlns="https://jakarta.ee/xml/ns/persistence" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="https://jakarta.ee/xml/ns/persistence     https://jakarta.ee/xml/ns/persistence/persistence_3_0.xsd" version="3.0">
+  <persistence-unit name="CTS-EM" transaction-type="JTA">
+    <description>Persistence Unit for CTS Vehicle Tests</description>
+    <jta-data-source>jdbc/DB1</jta-data-source>
+    <class>ee.jakarta.tck.persistence.core.metamodelapi.basictype.Order</class>
+  </persistence-unit>
+  <persistence-unit name="CTS-EM2" transaction-type="JTA">
+    <description>Persistence Unit for CTS Vehicle Tests</description>
+    <jta-data-source>jdbc/DB1</jta-data-source>
+    <class>ee.jakarta.tck.persistence.core.metamodelapi.basictype.Order</class>
+  </persistence-unit>
+  <persistence-unit name="CTS-EM-NOTX" transaction-type="RESOURCE_LOCAL">
+    <description>The persistence.xml file may be used to designate
+                  more than one persistence unit within the same scope.
+                  Persistence Unit for Application Managed Resource Local</description>
+    <non-jta-data-source>jdbc/DB_no_tx</non-jta-data-source>
+    <class>ee.jakarta.tck.persistence.core.metamodelapi.basictype.Order</class>
+  </persistence-unit>
+</persistence>
+
diff --git a/jpa/spec-tests/src/main/java/ee/jakarta/tck/persistence/core/metamodelapi/bindable/persistence.xml b/jpa/spec-tests/src/main/java/ee/jakarta/tck/persistence/core/metamodelapi/bindable/persistence.xml
new file mode 100644
index 0000000000..05eb24f815
--- /dev/null
+++ b/jpa/spec-tests/src/main/java/ee/jakarta/tck/persistence/core/metamodelapi/bindable/persistence.xml
@@ -0,0 +1,44 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+
+    Copyright (c) 2018 Oracle and/or its affiliates. All rights reserved.
+
+    This program and the accompanying materials are made available under the
+    terms of the Eclipse Public License v. 2.0, which is available at
+    http://www.eclipse.org/legal/epl-2.0.
+
+    This Source Code may also be made available under the following Secondary
+    Licenses when the conditions for such availability set forth in the
+    Eclipse Public License v. 2.0 are satisfied: GNU General Public License,
+    version 2 with the GNU Classpath Exception, which is available at
+    https://www.gnu.org/software/classpath/license.html.
+
+    SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
+
+-->
+<persistence xmlns="https://jakarta.ee/xml/ns/persistence" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="https://jakarta.ee/xml/ns/persistence     https://jakarta.ee/xml/ns/persistence/persistence_3_0.xsd" version="3.0">
+  <persistence-unit name="CTS-EM" transaction-type="JTA">
+    <description>Persistence Unit for CTS Vehicle Tests</description>
+    <jta-data-source>jdbc/DB1</jta-data-source>
+    <class>ee.jakarta.tck.persistence.core.metamodelapi.bindable.A</class>
+    <class>ee.jakarta.tck.persistence.core.metamodelapi.bindable.Address</class>
+    <class>ee.jakarta.tck.persistence.core.metamodelapi.bindable.ZipCode</class>
+  </persistence-unit>
+  <persistence-unit name="CTS-EM2" transaction-type="JTA">
+    <description>Persistence Unit for CTS Vehicle Tests</description>
+    <jta-data-source>jdbc/DB1</jta-data-source>
+    <class>ee.jakarta.tck.persistence.core.metamodelapi.bindable.A</class>
+    <class>ee.jakarta.tck.persistence.core.metamodelapi.bindable.Address</class>
+    <class>ee.jakarta.tck.persistence.core.metamodelapi.bindable.ZipCode</class>
+  </persistence-unit>
+  <persistence-unit name="CTS-EM-NOTX" transaction-type="RESOURCE_LOCAL">
+    <description>The persistence.xml file may be used to designate
+                  more than one persistence unit within the same scope.
+                  Persistence Unit for Application Managed Resource Local</description>
+    <non-jta-data-source>jdbc/DB_no_tx</non-jta-data-source>
+    <class>ee.jakarta.tck.persistence.core.metamodelapi.bindable.A</class>
+    <class>ee.jakarta.tck.persistence.core.metamodelapi.bindable.Address</class>
+    <class>ee.jakarta.tck.persistence.core.metamodelapi.bindable.ZipCode</class>
+  </persistence-unit>
+</persistence>
+
diff --git a/jpa/spec-tests/src/main/java/ee/jakarta/tck/persistence/core/metamodelapi/collectionattribute/persistence.xml b/jpa/spec-tests/src/main/java/ee/jakarta/tck/persistence/core/metamodelapi/collectionattribute/persistence.xml
new file mode 100644
index 0000000000..aaaece502d
--- /dev/null
+++ b/jpa/spec-tests/src/main/java/ee/jakarta/tck/persistence/core/metamodelapi/collectionattribute/persistence.xml
@@ -0,0 +1,41 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+
+    Copyright (c) 2018 Oracle and/or its affiliates. All rights reserved.
+
+    This program and the accompanying materials are made available under the
+    terms of the Eclipse Public License v. 2.0, which is available at
+    http://www.eclipse.org/legal/epl-2.0.
+
+    This Source Code may also be made available under the following Secondary
+    Licenses when the conditions for such availability set forth in the
+    Eclipse Public License v. 2.0 are satisfied: GNU General Public License,
+    version 2 with the GNU Classpath Exception, which is available at
+    https://www.gnu.org/software/classpath/license.html.
+
+    SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
+
+-->
+<persistence xmlns="https://jakarta.ee/xml/ns/persistence" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="https://jakarta.ee/xml/ns/persistence     https://jakarta.ee/xml/ns/persistence/persistence_3_0.xsd" version="3.0">
+  <persistence-unit name="CTS-EM" transaction-type="JTA">
+    <description>Persistence Unit for CTS Vehicle Tests</description>
+    <jta-data-source>jdbc/DB1</jta-data-source>
+    <class>ee.jakarta.tck.persistence.core.metamodelapi.collectionattribute.Uni1XMPerson</class>
+    <class>ee.jakarta.tck.persistence.core.metamodelapi.collectionattribute.Uni1XMProject</class>
+  </persistence-unit>
+  <persistence-unit name="CTS-EM2" transaction-type="JTA">
+    <description>Persistence Unit for CTS Vehicle Tests</description>
+    <jta-data-source>jdbc/DB1</jta-data-source>
+    <class>ee.jakarta.tck.persistence.core.metamodelapi.collectionattribute.Uni1XMPerson</class>
+    <class>ee.jakarta.tck.persistence.core.metamodelapi.collectionattribute.Uni1XMProject</class>
+  </persistence-unit>
+  <persistence-unit name="CTS-EM-NOTX" transaction-type="RESOURCE_LOCAL">
+    <description>The persistence.xml file may be used to designate
+                  more than one persistence unit within the same scope.
+                  Persistence Unit for Application Managed Resource Local</description>
+    <non-jta-data-source>jdbc/DB_no_tx</non-jta-data-source>
+    <class>ee.jakarta.tck.persistence.core.metamodelapi.collectionattribute.Uni1XMPerson</class>
+    <class>ee.jakarta.tck.persistence.core.metamodelapi.collectionattribute.Uni1XMProject</class>
+  </persistence-unit>
+</persistence>
+
diff --git a/jpa/spec-tests/src/main/java/ee/jakarta/tck/persistence/core/metamodelapi/embeddabletype/persistence.xml b/jpa/spec-tests/src/main/java/ee/jakarta/tck/persistence/core/metamodelapi/embeddabletype/persistence.xml
new file mode 100644
index 0000000000..d18c09556f
--- /dev/null
+++ b/jpa/spec-tests/src/main/java/ee/jakarta/tck/persistence/core/metamodelapi/embeddabletype/persistence.xml
@@ -0,0 +1,44 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+
+    Copyright (c) 2018 Oracle and/or its affiliates. All rights reserved.
+
+    This program and the accompanying materials are made available under the
+    terms of the Eclipse Public License v. 2.0, which is available at
+    http://www.eclipse.org/legal/epl-2.0.
+
+    This Source Code may also be made available under the following Secondary
+    Licenses when the conditions for such availability set forth in the
+    Eclipse Public License v. 2.0 are satisfied: GNU General Public License,
+    version 2 with the GNU Classpath Exception, which is available at
+    https://www.gnu.org/software/classpath/license.html.
+
+    SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
+
+-->
+<persistence xmlns="https://jakarta.ee/xml/ns/persistence" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="https://jakarta.ee/xml/ns/persistence     https://jakarta.ee/xml/ns/persistence/persistence_3_0.xsd" version="3.0">
+  <persistence-unit name="CTS-EM" transaction-type="JTA">
+    <description>Persistence Unit for CTS Vehicle Tests</description>
+    <jta-data-source>jdbc/DB1</jta-data-source>
+    <class>ee.jakarta.tck.persistence.core.metamodelapi.embeddabletype.A</class>
+    <class>ee.jakarta.tck.persistence.core.metamodelapi.embeddabletype.Address</class>
+    <class>ee.jakarta.tck.persistence.core.metamodelapi.embeddabletype.ZipCode</class>
+  </persistence-unit>
+  <persistence-unit name="CTS-EM2" transaction-type="JTA">
+    <description>Persistence Unit for CTS Vehicle Tests</description>
+    <jta-data-source>jdbc/DB1</jta-data-source>
+    <class>ee.jakarta.tck.persistence.core.metamodelapi.embeddabletype.A</class>
+    <class>ee.jakarta.tck.persistence.core.metamodelapi.embeddabletype.Address</class>
+    <class>ee.jakarta.tck.persistence.core.metamodelapi.embeddabletype.ZipCode</class>
+  </persistence-unit>
+  <persistence-unit name="CTS-EM-NOTX" transaction-type="RESOURCE_LOCAL">
+    <description>The persistence.xml file may be used to designate
+                  more than one persistence unit within the same scope.
+                  Persistence Unit for Application Managed Resource Local</description>
+    <non-jta-data-source>jdbc/DB_no_tx</non-jta-data-source>
+    <class>ee.jakarta.tck.persistence.core.metamodelapi.embeddabletype.A</class>
+    <class>ee.jakarta.tck.persistence.core.metamodelapi.embeddabletype.Address</class>
+    <class>ee.jakarta.tck.persistence.core.metamodelapi.embeddabletype.ZipCode</class>
+  </persistence-unit>
+</persistence>
+
diff --git a/jpa/spec-tests/src/main/java/ee/jakarta/tck/persistence/core/metamodelapi/entitytype/persistence.xml b/jpa/spec-tests/src/main/java/ee/jakarta/tck/persistence/core/metamodelapi/entitytype/persistence.xml
new file mode 100644
index 0000000000..8ff20b4308
--- /dev/null
+++ b/jpa/spec-tests/src/main/java/ee/jakarta/tck/persistence/core/metamodelapi/entitytype/persistence.xml
@@ -0,0 +1,53 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+
+    Copyright (c) 2018 Oracle and/or its affiliates. All rights reserved.
+
+    This program and the accompanying materials are made available under the
+    terms of the Eclipse Public License v. 2.0, which is available at
+    http://www.eclipse.org/legal/epl-2.0.
+
+    This Source Code may also be made available under the following Secondary
+    Licenses when the conditions for such availability set forth in the
+    Eclipse Public License v. 2.0 are satisfied: GNU General Public License,
+    version 2 with the GNU Classpath Exception, which is available at
+    https://www.gnu.org/software/classpath/license.html.
+
+    SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
+
+-->
+<persistence xmlns="https://jakarta.ee/xml/ns/persistence" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="https://jakarta.ee/xml/ns/persistence     https://jakarta.ee/xml/ns/persistence/persistence_3_0.xsd" version="3.0">
+  <persistence-unit name="CTS-EM" transaction-type="JTA">
+    <description>Persistence Unit for CTS Vehicle Tests</description>
+    <jta-data-source>jdbc/DB1</jta-data-source>
+    <class>ee.jakarta.tck.persistence.core.metamodelapi.entitytype.A</class>
+    <class>ee.jakarta.tck.persistence.core.metamodelapi.entitytype.Address</class>
+    <class>ee.jakarta.tck.persistence.core.metamodelapi.entitytype.B</class>
+    <class>ee.jakarta.tck.persistence.core.metamodelapi.entitytype.DID2Employee</class>
+    <class>ee.jakarta.tck.persistence.core.metamodelapi.entitytype.DID2EmployeeId</class>
+    <class>ee.jakarta.tck.persistence.core.metamodelapi.entitytype.ZipCode</class>
+  </persistence-unit>
+  <persistence-unit name="CTS-EM2" transaction-type="JTA">
+    <description>Persistence Unit for CTS Vehicle Tests</description>
+    <jta-data-source>jdbc/DB1</jta-data-source>
+    <class>ee.jakarta.tck.persistence.core.metamodelapi.entitytype.A</class>
+    <class>ee.jakarta.tck.persistence.core.metamodelapi.entitytype.Address</class>
+    <class>ee.jakarta.tck.persistence.core.metamodelapi.entitytype.B</class>
+    <class>ee.jakarta.tck.persistence.core.metamodelapi.entitytype.DID2Employee</class>
+    <class>ee.jakarta.tck.persistence.core.metamodelapi.entitytype.DID2EmployeeId</class>
+    <class>ee.jakarta.tck.persistence.core.metamodelapi.entitytype.ZipCode</class>
+  </persistence-unit>
+  <persistence-unit name="CTS-EM-NOTX" transaction-type="RESOURCE_LOCAL">
+    <description>The persistence.xml file may be used to designate
+                  more than one persistence unit within the same scope.
+                  Persistence Unit for Application Managed Resource Local</description>
+    <non-jta-data-source>jdbc/DB_no_tx</non-jta-data-source>
+    <class>ee.jakarta.tck.persistence.core.metamodelapi.entitytype.A</class>
+    <class>ee.jakarta.tck.persistence.core.metamodelapi.entitytype.Address</class>
+    <class>ee.jakarta.tck.persistence.core.metamodelapi.entitytype.B</class>
+    <class>ee.jakarta.tck.persistence.core.metamodelapi.entitytype.DID2Employee</class>
+    <class>ee.jakarta.tck.persistence.core.metamodelapi.entitytype.DID2EmployeeId</class>
+    <class>ee.jakarta.tck.persistence.core.metamodelapi.entitytype.ZipCode</class>
+  </persistence-unit>
+</persistence>
+
diff --git a/jpa/spec-tests/src/main/java/ee/jakarta/tck/persistence/core/metamodelapi/identifiabletype/persistence.xml b/jpa/spec-tests/src/main/java/ee/jakarta/tck/persistence/core/metamodelapi/identifiabletype/persistence.xml
new file mode 100644
index 0000000000..a79eab568a
--- /dev/null
+++ b/jpa/spec-tests/src/main/java/ee/jakarta/tck/persistence/core/metamodelapi/identifiabletype/persistence.xml
@@ -0,0 +1,53 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+
+    Copyright (c) 2018 Oracle and/or its affiliates. All rights reserved.
+
+    This program and the accompanying materials are made available under the
+    terms of the Eclipse Public License v. 2.0, which is available at
+    http://www.eclipse.org/legal/epl-2.0.
+
+    This Source Code may also be made available under the following Secondary
+    Licenses when the conditions for such availability set forth in the
+    Eclipse Public License v. 2.0 are satisfied: GNU General Public License,
+    version 2 with the GNU Classpath Exception, which is available at
+    https://www.gnu.org/software/classpath/license.html.
+
+    SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
+
+-->
+<persistence xmlns="https://jakarta.ee/xml/ns/persistence" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="https://jakarta.ee/xml/ns/persistence     https://jakarta.ee/xml/ns/persistence/persistence_3_0.xsd" version="3.0">
+  <persistence-unit name="CTS-EM" transaction-type="JTA">
+    <description>Persistence Unit for CTS Vehicle Tests</description>
+    <jta-data-source>jdbc/DB1</jta-data-source>
+    <class>ee.jakarta.tck.persistence.core.metamodelapi.identifiabletype.A</class>
+    <class>ee.jakarta.tck.persistence.core.metamodelapi.identifiabletype.Address</class>
+    <class>ee.jakarta.tck.persistence.core.metamodelapi.identifiabletype.B</class>
+    <class>ee.jakarta.tck.persistence.core.metamodelapi.identifiabletype.DID2Employee</class>
+    <class>ee.jakarta.tck.persistence.core.metamodelapi.identifiabletype.DID2EmployeeId</class>
+    <class>ee.jakarta.tck.persistence.core.metamodelapi.identifiabletype.ZipCode</class>
+  </persistence-unit>
+  <persistence-unit name="CTS-EM2" transaction-type="JTA">
+    <description>Persistence Unit for CTS Vehicle Tests</description>
+    <jta-data-source>jdbc/DB1</jta-data-source>
+    <class>ee.jakarta.tck.persistence.core.metamodelapi.identifiabletype.A</class>
+    <class>ee.jakarta.tck.persistence.core.metamodelapi.identifiabletype.Address</class>
+    <class>ee.jakarta.tck.persistence.core.metamodelapi.identifiabletype.B</class>
+    <class>ee.jakarta.tck.persistence.core.metamodelapi.identifiabletype.DID2Employee</class>
+    <class>ee.jakarta.tck.persistence.core.metamodelapi.identifiabletype.DID2EmployeeId</class>
+    <class>ee.jakarta.tck.persistence.core.metamodelapi.identifiabletype.ZipCode</class>
+  </persistence-unit>
+  <persistence-unit name="CTS-EM-NOTX" transaction-type="RESOURCE_LOCAL">
+    <description>The persistence.xml file may be used to designate
+                  more than one persistence unit within the same scope.
+                  Persistence Unit for Application Managed Resource Local</description>
+    <non-jta-data-source>jdbc/DB_no_tx</non-jta-data-source>
+    <class>ee.jakarta.tck.persistence.core.metamodelapi.identifiabletype.A</class>
+    <class>ee.jakarta.tck.persistence.core.metamodelapi.identifiabletype.Address</class>
+    <class>ee.jakarta.tck.persistence.core.metamodelapi.identifiabletype.B</class>
+    <class>ee.jakarta.tck.persistence.core.metamodelapi.identifiabletype.DID2Employee</class>
+    <class>ee.jakarta.tck.persistence.core.metamodelapi.identifiabletype.DID2EmployeeId</class>
+    <class>ee.jakarta.tck.persistence.core.metamodelapi.identifiabletype.ZipCode</class>
+  </persistence-unit>
+</persistence>
+
diff --git a/jpa/spec-tests/src/main/java/ee/jakarta/tck/persistence/core/metamodelapi/listattribute/persistence.xml b/jpa/spec-tests/src/main/java/ee/jakarta/tck/persistence/core/metamodelapi/listattribute/persistence.xml
new file mode 100644
index 0000000000..51ff4c8302
--- /dev/null
+++ b/jpa/spec-tests/src/main/java/ee/jakarta/tck/persistence/core/metamodelapi/listattribute/persistence.xml
@@ -0,0 +1,41 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+
+    Copyright (c) 2018 Oracle and/or its affiliates. All rights reserved.
+
+    This program and the accompanying materials are made available under the
+    terms of the Eclipse Public License v. 2.0, which is available at
+    http://www.eclipse.org/legal/epl-2.0.
+
+    This Source Code may also be made available under the following Secondary
+    Licenses when the conditions for such availability set forth in the
+    Eclipse Public License v. 2.0 are satisfied: GNU General Public License,
+    version 2 with the GNU Classpath Exception, which is available at
+    https://www.gnu.org/software/classpath/license.html.
+
+    SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
+
+-->
+<persistence xmlns="https://jakarta.ee/xml/ns/persistence" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="https://jakarta.ee/xml/ns/persistence     https://jakarta.ee/xml/ns/persistence/persistence_3_0.xsd" version="3.0">
+  <persistence-unit name="CTS-EM" transaction-type="JTA">
+    <description>Persistence Unit for CTS Vehicle Tests</description>
+    <jta-data-source>jdbc/DB1</jta-data-source>
+    <class>ee.jakarta.tck.persistence.core.metamodelapi.listattribute.BiDirMX1Person</class>
+    <class>ee.jakarta.tck.persistence.core.metamodelapi.listattribute.BiDirMX1Project</class>
+  </persistence-unit>
+  <persistence-unit name="CTS-EM2" transaction-type="JTA">
+    <description>Persistence Unit for CTS Vehicle Tests</description>
+    <jta-data-source>jdbc/DB1</jta-data-source>
+    <class>ee.jakarta.tck.persistence.core.metamodelapi.listattribute.BiDirMX1Person</class>
+    <class>ee.jakarta.tck.persistence.core.metamodelapi.listattribute.BiDirMX1Project</class>
+  </persistence-unit>
+  <persistence-unit name="CTS-EM-NOTX" transaction-type="RESOURCE_LOCAL">
+    <description>The persistence.xml file may be used to designate
+                  more than one persistence unit within the same scope.
+                  Persistence Unit for Application Managed Resource Local</description>
+    <non-jta-data-source>jdbc/DB_no_tx</non-jta-data-source>
+    <class>ee.jakarta.tck.persistence.core.metamodelapi.listattribute.BiDirMX1Person</class>
+    <class>ee.jakarta.tck.persistence.core.metamodelapi.listattribute.BiDirMX1Project</class>
+  </persistence-unit>
+</persistence>
+
diff --git a/jpa/spec-tests/src/main/java/ee/jakarta/tck/persistence/core/metamodelapi/managedtype/persistence.xml b/jpa/spec-tests/src/main/java/ee/jakarta/tck/persistence/core/metamodelapi/managedtype/persistence.xml
new file mode 100644
index 0000000000..12107979a4
--- /dev/null
+++ b/jpa/spec-tests/src/main/java/ee/jakarta/tck/persistence/core/metamodelapi/managedtype/persistence.xml
@@ -0,0 +1,68 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+
+    Copyright (c) 2018 Oracle and/or its affiliates. All rights reserved.
+
+    This program and the accompanying materials are made available under the
+    terms of the Eclipse Public License v. 2.0, which is available at
+    http://www.eclipse.org/legal/epl-2.0.
+
+    This Source Code may also be made available under the following Secondary
+    Licenses when the conditions for such availability set forth in the
+    Eclipse Public License v. 2.0 are satisfied: GNU General Public License,
+    version 2 with the GNU Classpath Exception, which is available at
+    https://www.gnu.org/software/classpath/license.html.
+
+    SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
+
+-->
+<persistence xmlns="https://jakarta.ee/xml/ns/persistence" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="https://jakarta.ee/xml/ns/persistence     https://jakarta.ee/xml/ns/persistence/persistence_3_0.xsd" version="3.0">
+  <persistence-unit name="CTS-EM" transaction-type="JTA">
+    <description>Persistence Unit for CTS Vehicle Tests</description>
+    <jta-data-source>jdbc/DB1</jta-data-source>
+    <class>ee.jakarta.tck.persistence.core.metamodelapi.managedtype.A</class>
+    <class>ee.jakarta.tck.persistence.core.metamodelapi.managedtype.Address</class>
+    <class>ee.jakarta.tck.persistence.core.metamodelapi.managedtype.B</class>
+    <class>ee.jakarta.tck.persistence.core.metamodelapi.managedtype.BiDirMX1Person</class>
+    <class>ee.jakarta.tck.persistence.core.metamodelapi.managedtype.BiDirMX1Project</class>
+    <class>ee.jakarta.tck.persistence.core.metamodelapi.managedtype.Department</class>
+    <class>ee.jakarta.tck.persistence.core.metamodelapi.managedtype.Employee</class>
+    <class>ee.jakarta.tck.persistence.core.metamodelapi.managedtype.Order</class>
+    <class>ee.jakarta.tck.persistence.core.metamodelapi.managedtype.Uni1XMPerson</class>
+    <class>ee.jakarta.tck.persistence.core.metamodelapi.managedtype.Uni1XMProject</class>
+    <class>ee.jakarta.tck.persistence.core.metamodelapi.managedtype.ZipCode</class>
+  </persistence-unit>
+  <persistence-unit name="CTS-EM2" transaction-type="JTA">
+    <description>Persistence Unit for CTS Vehicle Tests</description>
+    <jta-data-source>jdbc/DB1</jta-data-source>
+    <class>ee.jakarta.tck.persistence.core.metamodelapi.managedtype.A</class>
+    <class>ee.jakarta.tck.persistence.core.metamodelapi.managedtype.Address</class>
+    <class>ee.jakarta.tck.persistence.core.metamodelapi.managedtype.B</class>
+    <class>ee.jakarta.tck.persistence.core.metamodelapi.managedtype.BiDirMX1Person</class>
+    <class>ee.jakarta.tck.persistence.core.metamodelapi.managedtype.BiDirMX1Project</class>
+    <class>ee.jakarta.tck.persistence.core.metamodelapi.managedtype.Department</class>
+    <class>ee.jakarta.tck.persistence.core.metamodelapi.managedtype.Employee</class>
+    <class>ee.jakarta.tck.persistence.core.metamodelapi.managedtype.Order</class>
+    <class>ee.jakarta.tck.persistence.core.metamodelapi.managedtype.Uni1XMPerson</class>
+    <class>ee.jakarta.tck.persistence.core.metamodelapi.managedtype.Uni1XMProject</class>
+    <class>ee.jakarta.tck.persistence.core.metamodelapi.managedtype.ZipCode</class>
+  </persistence-unit>
+  <persistence-unit name="CTS-EM-NOTX" transaction-type="RESOURCE_LOCAL">
+    <description>The persistence.xml file may be used to designate
+                  more than one persistence unit within the same scope.
+                  Persistence Unit for Application Managed Resource Local</description>
+    <non-jta-data-source>jdbc/DB_no_tx</non-jta-data-source>
+    <class>ee.jakarta.tck.persistence.core.metamodelapi.managedtype.A</class>
+    <class>ee.jakarta.tck.persistence.core.metamodelapi.managedtype.Address</class>
+    <class>ee.jakarta.tck.persistence.core.metamodelapi.managedtype.B</class>
+    <class>ee.jakarta.tck.persistence.core.metamodelapi.managedtype.BiDirMX1Person</class>
+    <class>ee.jakarta.tck.persistence.core.metamodelapi.managedtype.BiDirMX1Project</class>
+    <class>ee.jakarta.tck.persistence.core.metamodelapi.managedtype.Department</class>
+    <class>ee.jakarta.tck.persistence.core.metamodelapi.managedtype.Employee</class>
+    <class>ee.jakarta.tck.persistence.core.metamodelapi.managedtype.Order</class>
+    <class>ee.jakarta.tck.persistence.core.metamodelapi.managedtype.Uni1XMPerson</class>
+    <class>ee.jakarta.tck.persistence.core.metamodelapi.managedtype.Uni1XMProject</class>
+    <class>ee.jakarta.tck.persistence.core.metamodelapi.managedtype.ZipCode</class>
+  </persistence-unit>
+</persistence>
+
diff --git a/jpa/spec-tests/src/main/java/ee/jakarta/tck/persistence/core/metamodelapi/mapattribute/persistence.xml b/jpa/spec-tests/src/main/java/ee/jakarta/tck/persistence/core/metamodelapi/mapattribute/persistence.xml
new file mode 100644
index 0000000000..66193c9024
--- /dev/null
+++ b/jpa/spec-tests/src/main/java/ee/jakarta/tck/persistence/core/metamodelapi/mapattribute/persistence.xml
@@ -0,0 +1,41 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+
+    Copyright (c) 2018 Oracle and/or its affiliates. All rights reserved.
+
+    This program and the accompanying materials are made available under the
+    terms of the Eclipse Public License v. 2.0, which is available at
+    http://www.eclipse.org/legal/epl-2.0.
+
+    This Source Code may also be made available under the following Secondary
+    Licenses when the conditions for such availability set forth in the
+    Eclipse Public License v. 2.0 are satisfied: GNU General Public License,
+    version 2 with the GNU Classpath Exception, which is available at
+    https://www.gnu.org/software/classpath/license.html.
+
+    SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
+
+-->
+<persistence xmlns="https://jakarta.ee/xml/ns/persistence" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="https://jakarta.ee/xml/ns/persistence     https://jakarta.ee/xml/ns/persistence/persistence_3_0.xsd" version="3.0">
+  <persistence-unit name="CTS-EM" transaction-type="JTA">
+    <description>Persistence Unit for CTS Vehicle Tests</description>
+    <jta-data-source>jdbc/DB1</jta-data-source>
+    <class>ee.jakarta.tck.persistence.core.metamodelapi.mapattribute.Department</class>
+    <class>ee.jakarta.tck.persistence.core.metamodelapi.mapattribute.Employee</class>
+  </persistence-unit>
+  <persistence-unit name="CTS-EM2" transaction-type="JTA">
+    <description>Persistence Unit for CTS Vehicle Tests</description>
+    <jta-data-source>jdbc/DB1</jta-data-source>
+    <class>ee.jakarta.tck.persistence.core.metamodelapi.mapattribute.Department</class>
+    <class>ee.jakarta.tck.persistence.core.metamodelapi.mapattribute.Employee</class>
+  </persistence-unit>
+  <persistence-unit name="CTS-EM-NOTX" transaction-type="RESOURCE_LOCAL">
+    <description>The persistence.xml file may be used to designate
+                  more than one persistence unit within the same scope.
+                  Persistence Unit for Application Managed Resource Local</description>
+    <non-jta-data-source>jdbc/DB_no_tx</non-jta-data-source>
+    <class>ee.jakarta.tck.persistence.core.metamodelapi.mapattribute.Department</class>
+    <class>ee.jakarta.tck.persistence.core.metamodelapi.mapattribute.Employee</class>
+  </persistence-unit>
+</persistence>
+
diff --git a/jpa/spec-tests/src/main/java/ee/jakarta/tck/persistence/core/metamodelapi/mappedsuperclasstype/persistence.xml b/jpa/spec-tests/src/main/java/ee/jakarta/tck/persistence/core/metamodelapi/mappedsuperclasstype/persistence.xml
new file mode 100644
index 0000000000..e39c922d3e
--- /dev/null
+++ b/jpa/spec-tests/src/main/java/ee/jakarta/tck/persistence/core/metamodelapi/mappedsuperclasstype/persistence.xml
@@ -0,0 +1,50 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+
+    Copyright (c) 2018 Oracle and/or its affiliates. All rights reserved.
+
+    This program and the accompanying materials are made available under the
+    terms of the Eclipse Public License v. 2.0, which is available at
+    http://www.eclipse.org/legal/epl-2.0.
+
+    This Source Code may also be made available under the following Secondary
+    Licenses when the conditions for such availability set forth in the
+    Eclipse Public License v. 2.0 are satisfied: GNU General Public License,
+    version 2 with the GNU Classpath Exception, which is available at
+    https://www.gnu.org/software/classpath/license.html.
+
+    SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
+
+-->
+<persistence xmlns="https://jakarta.ee/xml/ns/persistence" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="https://jakarta.ee/xml/ns/persistence     https://jakarta.ee/xml/ns/persistence/persistence_3_0.xsd" version="3.0">
+  <persistence-unit name="CTS-EM" transaction-type="JTA">
+    <description>Persistence Unit for CTS Vehicle Tests</description>
+    <jta-data-source>jdbc/DB1</jta-data-source>
+    <class>ee.jakarta.tck.persistence.core.metamodelapi.mappedsuperclasstype.Employee</class>
+    <class>ee.jakarta.tck.persistence.core.metamodelapi.mappedsuperclasstype.Employee2</class>
+    <class>ee.jakarta.tck.persistence.core.metamodelapi.mappedsuperclasstype.EmployeeId</class>
+    <class>ee.jakarta.tck.persistence.core.metamodelapi.mappedsuperclasstype.FullTimeEmployee</class>
+    <class>ee.jakarta.tck.persistence.core.metamodelapi.mappedsuperclasstype.FullTimeEmployee2</class>
+  </persistence-unit>
+  <persistence-unit name="CTS-EM2" transaction-type="JTA">
+    <description>Persistence Unit for CTS Vehicle Tests</description>
+    <jta-data-source>jdbc/DB1</jta-data-source>
+    <class>ee.jakarta.tck.persistence.core.metamodelapi.mappedsuperclasstype.Employee</class>
+    <class>ee.jakarta.tck.persistence.core.metamodelapi.mappedsuperclasstype.Employee2</class>
+    <class>ee.jakarta.tck.persistence.core.metamodelapi.mappedsuperclasstype.EmployeeId</class>
+    <class>ee.jakarta.tck.persistence.core.metamodelapi.mappedsuperclasstype.FullTimeEmployee</class>
+    <class>ee.jakarta.tck.persistence.core.metamodelapi.mappedsuperclasstype.FullTimeEmployee2</class>
+  </persistence-unit>
+  <persistence-unit name="CTS-EM-NOTX" transaction-type="RESOURCE_LOCAL">
+    <description>The persistence.xml file may be used to designate
+                  more than one persistence unit within the same scope.
+                  Persistence Unit for Application Managed Resource Local</description>
+    <non-jta-data-source>jdbc/DB_no_tx</non-jta-data-source>
+    <class>ee.jakarta.tck.persistence.core.metamodelapi.mappedsuperclasstype.Employee</class>
+    <class>ee.jakarta.tck.persistence.core.metamodelapi.mappedsuperclasstype.Employee2</class>
+    <class>ee.jakarta.tck.persistence.core.metamodelapi.mappedsuperclasstype.EmployeeId</class>
+    <class>ee.jakarta.tck.persistence.core.metamodelapi.mappedsuperclasstype.FullTimeEmployee</class>
+    <class>ee.jakarta.tck.persistence.core.metamodelapi.mappedsuperclasstype.FullTimeEmployee2</class>
+  </persistence-unit>
+</persistence>
+
diff --git a/jpa/spec-tests/src/main/java/ee/jakarta/tck/persistence/core/metamodelapi/metamodel/persistence.xml b/jpa/spec-tests/src/main/java/ee/jakarta/tck/persistence/core/metamodelapi/metamodel/persistence.xml
new file mode 100644
index 0000000000..cd9aba3ba3
--- /dev/null
+++ b/jpa/spec-tests/src/main/java/ee/jakarta/tck/persistence/core/metamodelapi/metamodel/persistence.xml
@@ -0,0 +1,53 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+
+    Copyright (c) 2018 Oracle and/or its affiliates. All rights reserved.
+
+    This program and the accompanying materials are made available under the
+    terms of the Eclipse Public License v. 2.0, which is available at
+    http://www.eclipse.org/legal/epl-2.0.
+
+    This Source Code may also be made available under the following Secondary
+    Licenses when the conditions for such availability set forth in the
+    Eclipse Public License v. 2.0 are satisfied: GNU General Public License,
+    version 2 with the GNU Classpath Exception, which is available at
+    https://www.gnu.org/software/classpath/license.html.
+
+    SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
+
+-->
+<persistence xmlns="https://jakarta.ee/xml/ns/persistence" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="https://jakarta.ee/xml/ns/persistence     https://jakarta.ee/xml/ns/persistence/persistence_3_0.xsd" version="3.0">
+  <persistence-unit name="CTS-EM" transaction-type="JTA">
+    <description>Persistence Unit for CTS Vehicle Tests</description>
+    <jta-data-source>jdbc/DB1</jta-data-source>
+    <class>ee.jakarta.tck.persistence.core.metamodelapi.metamodel.Address</class>
+    <class>ee.jakarta.tck.persistence.core.metamodelapi.metamodel.B</class>
+    <class>ee.jakarta.tck.persistence.core.metamodelapi.metamodel.Employee</class>
+    <class>ee.jakarta.tck.persistence.core.metamodelapi.metamodel.FullTimeEmployee</class>
+    <class>ee.jakarta.tck.persistence.core.metamodelapi.metamodel.Order</class>
+    <class>ee.jakarta.tck.persistence.core.metamodelapi.metamodel.ZipCode</class>
+  </persistence-unit>
+  <persistence-unit name="CTS-EM2" transaction-type="JTA">
+    <description>Persistence Unit for CTS Vehicle Tests</description>
+    <jta-data-source>jdbc/DB1</jta-data-source>
+    <class>ee.jakarta.tck.persistence.core.metamodelapi.metamodel.Address</class>
+    <class>ee.jakarta.tck.persistence.core.metamodelapi.metamodel.B</class>
+    <class>ee.jakarta.tck.persistence.core.metamodelapi.metamodel.Employee</class>
+    <class>ee.jakarta.tck.persistence.core.metamodelapi.metamodel.FullTimeEmployee</class>
+    <class>ee.jakarta.tck.persistence.core.metamodelapi.metamodel.Order</class>
+    <class>ee.jakarta.tck.persistence.core.metamodelapi.metamodel.ZipCode</class>
+  </persistence-unit>
+  <persistence-unit name="CTS-EM-NOTX" transaction-type="RESOURCE_LOCAL">
+    <description>The persistence.xml file may be used to designate
+                  more than one persistence unit within the same scope.
+                  Persistence Unit for Application Managed Resource Local</description>
+    <non-jta-data-source>jdbc/DB_no_tx</non-jta-data-source>
+    <class>ee.jakarta.tck.persistence.core.metamodelapi.metamodel.Address</class>
+    <class>ee.jakarta.tck.persistence.core.metamodelapi.metamodel.B</class>
+    <class>ee.jakarta.tck.persistence.core.metamodelapi.metamodel.Employee</class>
+    <class>ee.jakarta.tck.persistence.core.metamodelapi.metamodel.FullTimeEmployee</class>
+    <class>ee.jakarta.tck.persistence.core.metamodelapi.metamodel.Order</class>
+    <class>ee.jakarta.tck.persistence.core.metamodelapi.metamodel.ZipCode</class>
+  </persistence-unit>
+</persistence>
+
diff --git a/jpa/spec-tests/src/main/java/ee/jakarta/tck/persistence/core/metamodelapi/pluralattribute/persistence.xml b/jpa/spec-tests/src/main/java/ee/jakarta/tck/persistence/core/metamodelapi/pluralattribute/persistence.xml
new file mode 100644
index 0000000000..e546243d95
--- /dev/null
+++ b/jpa/spec-tests/src/main/java/ee/jakarta/tck/persistence/core/metamodelapi/pluralattribute/persistence.xml
@@ -0,0 +1,41 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+
+    Copyright (c) 2018 Oracle and/or its affiliates. All rights reserved.
+
+    This program and the accompanying materials are made available under the
+    terms of the Eclipse Public License v. 2.0, which is available at
+    http://www.eclipse.org/legal/epl-2.0.
+
+    This Source Code may also be made available under the following Secondary
+    Licenses when the conditions for such availability set forth in the
+    Eclipse Public License v. 2.0 are satisfied: GNU General Public License,
+    version 2 with the GNU Classpath Exception, which is available at
+    https://www.gnu.org/software/classpath/license.html.
+
+    SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
+
+-->
+<persistence xmlns="https://jakarta.ee/xml/ns/persistence" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="https://jakarta.ee/xml/ns/persistence     https://jakarta.ee/xml/ns/persistence/persistence_3_0.xsd" version="3.0">
+  <persistence-unit name="CTS-EM" transaction-type="JTA">
+    <description>Persistence Unit for CTS Vehicle Tests</description>
+    <jta-data-source>jdbc/DB1</jta-data-source>
+    <class>ee.jakarta.tck.persistence.core.metamodelapi.pluralattribute.Uni1XMPerson</class>
+    <class>ee.jakarta.tck.persistence.core.metamodelapi.pluralattribute.Uni1XMProject</class>
+  </persistence-unit>
+  <persistence-unit name="CTS-EM2" transaction-type="JTA">
+    <description>Persistence Unit for CTS Vehicle Tests</description>
+    <jta-data-source>jdbc/DB1</jta-data-source>
+    <class>ee.jakarta.tck.persistence.core.metamodelapi.pluralattribute.Uni1XMPerson</class>
+    <class>ee.jakarta.tck.persistence.core.metamodelapi.pluralattribute.Uni1XMProject</class>
+  </persistence-unit>
+  <persistence-unit name="CTS-EM-NOTX" transaction-type="RESOURCE_LOCAL">
+    <description>The persistence.xml file may be used to designate
+                  more than one persistence unit within the same scope.
+                  Persistence Unit for Application Managed Resource Local</description>
+    <non-jta-data-source>jdbc/DB_no_tx</non-jta-data-source>
+    <class>ee.jakarta.tck.persistence.core.metamodelapi.pluralattribute.Uni1XMPerson</class>
+    <class>ee.jakarta.tck.persistence.core.metamodelapi.pluralattribute.Uni1XMProject</class>
+  </persistence-unit>
+</persistence>
+
diff --git a/jpa/spec-tests/src/main/java/ee/jakarta/tck/persistence/core/metamodelapi/setattribute/persistence.xml b/jpa/spec-tests/src/main/java/ee/jakarta/tck/persistence/core/metamodelapi/setattribute/persistence.xml
new file mode 100644
index 0000000000..3de75ab833
--- /dev/null
+++ b/jpa/spec-tests/src/main/java/ee/jakarta/tck/persistence/core/metamodelapi/setattribute/persistence.xml
@@ -0,0 +1,44 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+
+    Copyright (c) 2018 Oracle and/or its affiliates. All rights reserved.
+
+    This program and the accompanying materials are made available under the
+    terms of the Eclipse Public License v. 2.0, which is available at
+    http://www.eclipse.org/legal/epl-2.0.
+
+    This Source Code may also be made available under the following Secondary
+    Licenses when the conditions for such availability set forth in the
+    Eclipse Public License v. 2.0 are satisfied: GNU General Public License,
+    version 2 with the GNU Classpath Exception, which is available at
+    https://www.gnu.org/software/classpath/license.html.
+
+    SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
+
+-->
+<persistence xmlns="https://jakarta.ee/xml/ns/persistence" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="https://jakarta.ee/xml/ns/persistence     https://jakarta.ee/xml/ns/persistence/persistence_3_0.xsd" version="3.0">
+  <persistence-unit name="CTS-EM" transaction-type="JTA">
+    <description>Persistence Unit for CTS Vehicle Tests</description>
+    <jta-data-source>jdbc/DB1</jta-data-source>
+    <class>ee.jakarta.tck.persistence.core.metamodelapi.setattribute.A</class>
+    <class>ee.jakarta.tck.persistence.core.metamodelapi.setattribute.Address</class>
+    <class>ee.jakarta.tck.persistence.core.metamodelapi.setattribute.ZipCode</class>
+  </persistence-unit>
+  <persistence-unit name="CTS-EM2" transaction-type="JTA">
+    <description>Persistence Unit for CTS Vehicle Tests</description>
+    <jta-data-source>jdbc/DB1</jta-data-source>
+    <class>ee.jakarta.tck.persistence.core.metamodelapi.setattribute.A</class>
+    <class>ee.jakarta.tck.persistence.core.metamodelapi.setattribute.Address</class>
+    <class>ee.jakarta.tck.persistence.core.metamodelapi.setattribute.ZipCode</class>
+  </persistence-unit>
+  <persistence-unit name="CTS-EM-NOTX" transaction-type="RESOURCE_LOCAL">
+    <description>The persistence.xml file may be used to designate
+                  more than one persistence unit within the same scope.
+                  Persistence Unit for Application Managed Resource Local</description>
+    <non-jta-data-source>jdbc/DB_no_tx</non-jta-data-source>
+    <class>ee.jakarta.tck.persistence.core.metamodelapi.setattribute.A</class>
+    <class>ee.jakarta.tck.persistence.core.metamodelapi.setattribute.Address</class>
+    <class>ee.jakarta.tck.persistence.core.metamodelapi.setattribute.ZipCode</class>
+  </persistence-unit>
+</persistence>
+
diff --git a/jpa/spec-tests/src/main/java/ee/jakarta/tck/persistence/core/metamodelapi/singularattribute/persistence.xml b/jpa/spec-tests/src/main/java/ee/jakarta/tck/persistence/core/metamodelapi/singularattribute/persistence.xml
new file mode 100644
index 0000000000..358f6129a2
--- /dev/null
+++ b/jpa/spec-tests/src/main/java/ee/jakarta/tck/persistence/core/metamodelapi/singularattribute/persistence.xml
@@ -0,0 +1,44 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+
+    Copyright (c) 2018 Oracle and/or its affiliates. All rights reserved.
+
+    This program and the accompanying materials are made available under the
+    terms of the Eclipse Public License v. 2.0, which is available at
+    http://www.eclipse.org/legal/epl-2.0.
+
+    This Source Code may also be made available under the following Secondary
+    Licenses when the conditions for such availability set forth in the
+    Eclipse Public License v. 2.0 are satisfied: GNU General Public License,
+    version 2 with the GNU Classpath Exception, which is available at
+    https://www.gnu.org/software/classpath/license.html.
+
+    SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
+
+-->
+<persistence xmlns="https://jakarta.ee/xml/ns/persistence" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="https://jakarta.ee/xml/ns/persistence     https://jakarta.ee/xml/ns/persistence/persistence_3_0.xsd" version="3.0">
+  <persistence-unit name="CTS-EM" transaction-type="JTA">
+    <description>Persistence Unit for CTS Vehicle Tests</description>
+    <jta-data-source>jdbc/DB1</jta-data-source>
+    <class>ee.jakarta.tck.persistence.core.metamodelapi.singularattribute.Address</class>
+    <class>ee.jakarta.tck.persistence.core.metamodelapi.singularattribute.B</class>
+    <class>ee.jakarta.tck.persistence.core.metamodelapi.singularattribute.ZipCode</class>
+  </persistence-unit>
+  <persistence-unit name="CTS-EM2" transaction-type="JTA">
+    <description>Persistence Unit for CTS Vehicle Tests</description>
+    <jta-data-source>jdbc/DB1</jta-data-source>
+    <class>ee.jakarta.tck.persistence.core.metamodelapi.singularattribute.Address</class>
+    <class>ee.jakarta.tck.persistence.core.metamodelapi.singularattribute.B</class>
+    <class>ee.jakarta.tck.persistence.core.metamodelapi.singularattribute.ZipCode</class>
+  </persistence-unit>
+  <persistence-unit name="CTS-EM-NOTX" transaction-type="RESOURCE_LOCAL">
+    <description>The persistence.xml file may be used to designate
+                  more than one persistence unit within the same scope.
+                  Persistence Unit for Application Managed Resource Local</description>
+    <non-jta-data-source>jdbc/DB_no_tx</non-jta-data-source>
+    <class>ee.jakarta.tck.persistence.core.metamodelapi.singularattribute.Address</class>
+    <class>ee.jakarta.tck.persistence.core.metamodelapi.singularattribute.B</class>
+    <class>ee.jakarta.tck.persistence.core.metamodelapi.singularattribute.ZipCode</class>
+  </persistence-unit>
+</persistence>
+
diff --git a/jpa/spec-tests/src/main/java/ee/jakarta/tck/persistence/core/metamodelapi/type/persistence.xml b/jpa/spec-tests/src/main/java/ee/jakarta/tck/persistence/core/metamodelapi/type/persistence.xml
new file mode 100644
index 0000000000..1500b61819
--- /dev/null
+++ b/jpa/spec-tests/src/main/java/ee/jakarta/tck/persistence/core/metamodelapi/type/persistence.xml
@@ -0,0 +1,47 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+
+    Copyright (c) 2018 Oracle and/or its affiliates. All rights reserved.
+
+    This program and the accompanying materials are made available under the
+    terms of the Eclipse Public License v. 2.0, which is available at
+    http://www.eclipse.org/legal/epl-2.0.
+
+    This Source Code may also be made available under the following Secondary
+    Licenses when the conditions for such availability set forth in the
+    Eclipse Public License v. 2.0 are satisfied: GNU General Public License,
+    version 2 with the GNU Classpath Exception, which is available at
+    https://www.gnu.org/software/classpath/license.html.
+
+    SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
+
+-->
+<persistence xmlns="https://jakarta.ee/xml/ns/persistence" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="https://jakarta.ee/xml/ns/persistence     https://jakarta.ee/xml/ns/persistence/persistence_3_0.xsd" version="3.0">
+  <persistence-unit name="CTS-EM" transaction-type="JTA">
+    <description>Persistence Unit for CTS Vehicle Tests</description>
+    <jta-data-source>jdbc/DB1</jta-data-source>
+    <class>ee.jakarta.tck.persistence.core.metamodelapi.type.Address</class>
+    <class>ee.jakarta.tck.persistence.core.metamodelapi.type.B</class>
+    <class>ee.jakarta.tck.persistence.core.metamodelapi.type.Order</class>
+    <class>ee.jakarta.tck.persistence.core.metamodelapi.type.ZipCode</class>
+  </persistence-unit>
+  <persistence-unit name="CTS-EM2" transaction-type="JTA">
+    <description>Persistence Unit for CTS Vehicle Tests</description>
+    <jta-data-source>jdbc/DB1</jta-data-source>
+    <class>ee.jakarta.tck.persistence.core.metamodelapi.type.Address</class>
+    <class>ee.jakarta.tck.persistence.core.metamodelapi.type.B</class>
+    <class>ee.jakarta.tck.persistence.core.metamodelapi.type.Order</class>
+    <class>ee.jakarta.tck.persistence.core.metamodelapi.type.ZipCode</class>
+  </persistence-unit>
+  <persistence-unit name="CTS-EM-NOTX" transaction-type="RESOURCE_LOCAL">
+    <description>The persistence.xml file may be used to designate
+                  more than one persistence unit within the same scope.
+                  Persistence Unit for Application Managed Resource Local</description>
+    <non-jta-data-source>jdbc/DB_no_tx</non-jta-data-source>
+    <class>ee.jakarta.tck.persistence.core.metamodelapi.type.Address</class>
+    <class>ee.jakarta.tck.persistence.core.metamodelapi.type.B</class>
+    <class>ee.jakarta.tck.persistence.core.metamodelapi.type.Order</class>
+    <class>ee.jakarta.tck.persistence.core.metamodelapi.type.ZipCode</class>
+  </persistence-unit>
+</persistence>
+
diff --git a/jpa/spec-tests/src/main/java/ee/jakarta/tck/persistence/core/nestedembedding/persistence.xml b/jpa/spec-tests/src/main/java/ee/jakarta/tck/persistence/core/nestedembedding/persistence.xml
new file mode 100644
index 0000000000..ab5bcdc2c2
--- /dev/null
+++ b/jpa/spec-tests/src/main/java/ee/jakarta/tck/persistence/core/nestedembedding/persistence.xml
@@ -0,0 +1,47 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+
+    Copyright (c) 2018 Oracle and/or its affiliates. All rights reserved.
+
+    This program and the accompanying materials are made available under the
+    terms of the Eclipse Public License v. 2.0, which is available at
+    http://www.eclipse.org/legal/epl-2.0.
+
+    This Source Code may also be made available under the following Secondary
+    Licenses when the conditions for such availability set forth in the
+    Eclipse Public License v. 2.0 are satisfied: GNU General Public License,
+    version 2 with the GNU Classpath Exception, which is available at
+    https://www.gnu.org/software/classpath/license.html.
+
+    SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
+
+-->
+<persistence xmlns="https://jakarta.ee/xml/ns/persistence" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="https://jakarta.ee/xml/ns/persistence     https://jakarta.ee/xml/ns/persistence/persistence_3_0.xsd" version="3.0">
+  <persistence-unit name="CTS-EM" transaction-type="JTA">
+    <description>Persistence Unit for CTS Vehicle Tests</description>
+    <jta-data-source>jdbc/DB1</jta-data-source>
+    <class>ee.jakarta.tck.persistence.core.nestedembedding.A</class>
+    <class>ee.jakarta.tck.persistence.core.nestedembedding.Address</class>
+    <class>ee.jakarta.tck.persistence.core.nestedembedding.B</class>
+    <class>ee.jakarta.tck.persistence.core.nestedembedding.ZipCode</class>
+  </persistence-unit>
+  <persistence-unit name="CTS-EM2" transaction-type="JTA">
+    <description>Persistence Unit for CTS Vehicle Tests</description>
+    <jta-data-source>jdbc/DB1</jta-data-source>
+    <class>ee.jakarta.tck.persistence.core.nestedembedding.A</class>
+    <class>ee.jakarta.tck.persistence.core.nestedembedding.Address</class>
+    <class>ee.jakarta.tck.persistence.core.nestedembedding.B</class>
+    <class>ee.jakarta.tck.persistence.core.nestedembedding.ZipCode</class>
+  </persistence-unit>
+  <persistence-unit name="CTS-EM-NOTX" transaction-type="RESOURCE_LOCAL">
+    <description>The persistence.xml file may be used to designate
+                  more than one persistence unit within the same scope.
+                  Persistence Unit for Application Managed Resource Local</description>
+    <non-jta-data-source>jdbc/DB_no_tx</non-jta-data-source>
+    <class>ee.jakarta.tck.persistence.core.nestedembedding.A</class>
+    <class>ee.jakarta.tck.persistence.core.nestedembedding.Address</class>
+    <class>ee.jakarta.tck.persistence.core.nestedembedding.B</class>
+    <class>ee.jakarta.tck.persistence.core.nestedembedding.ZipCode</class>
+  </persistence-unit>
+</persistence>
+
diff --git a/jpa/spec-tests/src/main/java/ee/jakarta/tck/persistence/core/override/attributeoverride/persistence.xml b/jpa/spec-tests/src/main/java/ee/jakarta/tck/persistence/core/override/attributeoverride/persistence.xml
new file mode 100644
index 0000000000..f0b6e139fd
--- /dev/null
+++ b/jpa/spec-tests/src/main/java/ee/jakarta/tck/persistence/core/override/attributeoverride/persistence.xml
@@ -0,0 +1,41 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+
+    Copyright (c) 2018 Oracle and/or its affiliates. All rights reserved.
+
+    This program and the accompanying materials are made available under the
+    terms of the Eclipse Public License v. 2.0, which is available at
+    http://www.eclipse.org/legal/epl-2.0.
+
+    This Source Code may also be made available under the following Secondary
+    Licenses when the conditions for such availability set forth in the
+    Eclipse Public License v. 2.0 are satisfied: GNU General Public License,
+    version 2 with the GNU Classpath Exception, which is available at
+    https://www.gnu.org/software/classpath/license.html.
+
+    SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
+
+-->
+<persistence xmlns="https://jakarta.ee/xml/ns/persistence" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="https://jakarta.ee/xml/ns/persistence     https://jakarta.ee/xml/ns/persistence/persistence_3_0.xsd" version="3.0">
+  <persistence-unit name="CTS-EM" transaction-type="JTA">
+    <description>Persistence Unit for CTS Vehicle Tests</description>
+    <jta-data-source>jdbc/DB1</jta-data-source>
+    <class>ee.jakarta.tck.persistence.core.override.attributeoverride.Book</class>
+    <class>ee.jakarta.tck.persistence.core.override.attributeoverride.LawBook</class>
+  </persistence-unit>
+  <persistence-unit name="CTS-EM2" transaction-type="JTA">
+    <description>Persistence Unit for CTS Vehicle Tests</description>
+    <jta-data-source>jdbc/DB1</jta-data-source>
+    <class>ee.jakarta.tck.persistence.core.override.attributeoverride.Book</class>
+    <class>ee.jakarta.tck.persistence.core.override.attributeoverride.LawBook</class>
+  </persistence-unit>
+  <persistence-unit name="CTS-EM-NOTX" transaction-type="RESOURCE_LOCAL">
+    <description>The persistence.xml file may be used to designate
+                  more than one persistence unit within the same scope.
+                  Persistence Unit for Application Managed Resource Local</description>
+    <non-jta-data-source>jdbc/DB_no_tx</non-jta-data-source>
+    <class>ee.jakarta.tck.persistence.core.override.attributeoverride.Book</class>
+    <class>ee.jakarta.tck.persistence.core.override.attributeoverride.LawBook</class>
+  </persistence-unit>
+</persistence>
+
diff --git a/jpa/spec-tests/src/main/java/ee/jakarta/tck/persistence/core/override/callbacklistener/persistence.xml b/jpa/spec-tests/src/main/java/ee/jakarta/tck/persistence/core/override/callbacklistener/persistence.xml
new file mode 100644
index 0000000000..ba2af9a91b
--- /dev/null
+++ b/jpa/spec-tests/src/main/java/ee/jakarta/tck/persistence/core/override/callbacklistener/persistence.xml
@@ -0,0 +1,41 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+
+    Copyright (c) 2018 Oracle and/or its affiliates. All rights reserved.
+
+    This program and the accompanying materials are made available under the
+    terms of the Eclipse Public License v. 2.0, which is available at
+    http://www.eclipse.org/legal/epl-2.0.
+
+    This Source Code may also be made available under the following Secondary
+    Licenses when the conditions for such availability set forth in the
+    Eclipse Public License v. 2.0 are satisfied: GNU General Public License,
+    version 2 with the GNU Classpath Exception, which is available at
+    https://www.gnu.org/software/classpath/license.html.
+
+    SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
+
+-->
+<persistence xmlns="https://jakarta.ee/xml/ns/persistence" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="https://jakarta.ee/xml/ns/persistence     https://jakarta.ee/xml/ns/persistence/persistence_3_0.xsd" version="3.0">
+  <persistence-unit name="CTS-EM" transaction-type="JTA">
+    <description>Persistence Unit for CTS Vehicle Tests</description>
+    <jta-data-source>jdbc/DB1</jta-data-source>
+    <class>ee.jakarta.tck.persistence.core.override.callbacklistener.OverridenCallBack</class>
+    <class>ee.jakarta.tck.persistence.core.override.util.CallBackCounts</class>
+  </persistence-unit>
+  <persistence-unit name="CTS-EM2" transaction-type="JTA">
+    <description>Persistence Unit for CTS Vehicle Tests</description>
+    <jta-data-source>jdbc/DB1</jta-data-source>
+    <class>ee.jakarta.tck.persistence.core.override.callbacklistener.OverridenCallBack</class>
+    <class>ee.jakarta.tck.persistence.core.override.util.CallBackCounts</class>
+  </persistence-unit>
+  <persistence-unit name="CTS-EM-NOTX" transaction-type="RESOURCE_LOCAL">
+    <description>The persistence.xml file may be used to designate
+                  more than one persistence unit within the same scope.
+                  Persistence Unit for Application Managed Resource Local</description>
+    <non-jta-data-source>jdbc/DB_no_tx</non-jta-data-source>
+    <class>ee.jakarta.tck.persistence.core.override.callbacklistener.OverridenCallBack</class>
+    <class>ee.jakarta.tck.persistence.core.override.util.CallBackCounts</class>
+  </persistence-unit>
+</persistence>
+
diff --git a/jpa/spec-tests/src/main/java/ee/jakarta/tck/persistence/core/override/embeddable/persistence.xml b/jpa/spec-tests/src/main/java/ee/jakarta/tck/persistence/core/override/embeddable/persistence.xml
new file mode 100644
index 0000000000..aff3345be9
--- /dev/null
+++ b/jpa/spec-tests/src/main/java/ee/jakarta/tck/persistence/core/override/embeddable/persistence.xml
@@ -0,0 +1,59 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+
+    Copyright (c) 2018 Oracle and/or its affiliates. All rights reserved.
+
+    This program and the accompanying materials are made available under the
+    terms of the Eclipse Public License v. 2.0, which is available at
+    http://www.eclipse.org/legal/epl-2.0.
+
+    This Source Code may also be made available under the following Secondary
+    Licenses when the conditions for such availability set forth in the
+    Eclipse Public License v. 2.0 are satisfied: GNU General Public License,
+    version 2 with the GNU Classpath Exception, which is available at
+    https://www.gnu.org/software/classpath/license.html.
+
+    SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
+
+-->
+<persistence xmlns="https://jakarta.ee/xml/ns/persistence" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="https://jakarta.ee/xml/ns/persistence     https://jakarta.ee/xml/ns/persistence/persistence_3_0.xsd" version="3.0">
+  <persistence-unit name="CTS-EM" transaction-type="JTA">
+    <description>Persistence Unit for CTS Vehicle Tests</description>
+    <jta-data-source>jdbc/DB1</jta-data-source>
+    <class>ee.jakarta.tck.persistence.core.override.embeddable.Applicant</class>
+    <class>ee.jakarta.tck.persistence.core.override.embeddable.Book</class>
+    <class>ee.jakarta.tck.persistence.core.override.embeddable.BookStore</class>
+    <class>ee.jakarta.tck.persistence.core.override.embeddable.Complaint</class>
+    <class>ee.jakarta.tck.persistence.core.override.embeddable.Film</class>
+    <class>ee.jakarta.tck.persistence.core.override.embeddable.MovieTicket</class>
+    <class>ee.jakarta.tck.persistence.core.override.embeddable.Publisher</class>
+    <class>ee.jakarta.tck.persistence.core.override.embeddable.Publisher1</class>
+  </persistence-unit>
+  <persistence-unit name="CTS-EM2" transaction-type="JTA">
+    <description>Persistence Unit for CTS Vehicle Tests</description>
+    <jta-data-source>jdbc/DB1</jta-data-source>
+    <class>ee.jakarta.tck.persistence.core.override.embeddable.Applicant</class>
+    <class>ee.jakarta.tck.persistence.core.override.embeddable.Book</class>
+    <class>ee.jakarta.tck.persistence.core.override.embeddable.BookStore</class>
+    <class>ee.jakarta.tck.persistence.core.override.embeddable.Complaint</class>
+    <class>ee.jakarta.tck.persistence.core.override.embeddable.Film</class>
+    <class>ee.jakarta.tck.persistence.core.override.embeddable.MovieTicket</class>
+    <class>ee.jakarta.tck.persistence.core.override.embeddable.Publisher</class>
+    <class>ee.jakarta.tck.persistence.core.override.embeddable.Publisher1</class>
+  </persistence-unit>
+  <persistence-unit name="CTS-EM-NOTX" transaction-type="RESOURCE_LOCAL">
+    <description>The persistence.xml file may be used to designate
+                  more than one persistence unit within the same scope.
+                  Persistence Unit for Application Managed Resource Local</description>
+    <non-jta-data-source>jdbc/DB_no_tx</non-jta-data-source>
+    <class>ee.jakarta.tck.persistence.core.override.embeddable.Applicant</class>
+    <class>ee.jakarta.tck.persistence.core.override.embeddable.Book</class>
+    <class>ee.jakarta.tck.persistence.core.override.embeddable.BookStore</class>
+    <class>ee.jakarta.tck.persistence.core.override.embeddable.Complaint</class>
+    <class>ee.jakarta.tck.persistence.core.override.embeddable.Film</class>
+    <class>ee.jakarta.tck.persistence.core.override.embeddable.MovieTicket</class>
+    <class>ee.jakarta.tck.persistence.core.override.embeddable.Publisher</class>
+    <class>ee.jakarta.tck.persistence.core.override.embeddable.Publisher1</class>
+  </persistence-unit>
+</persistence>
+
diff --git a/jpa/spec-tests/src/main/java/ee/jakarta/tck/persistence/core/override/entity/persistence.xml b/jpa/spec-tests/src/main/java/ee/jakarta/tck/persistence/core/override/entity/persistence.xml
new file mode 100644
index 0000000000..15459b5007
--- /dev/null
+++ b/jpa/spec-tests/src/main/java/ee/jakarta/tck/persistence/core/override/entity/persistence.xml
@@ -0,0 +1,47 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+
+    Copyright (c) 2018 Oracle and/or its affiliates. All rights reserved.
+
+    This program and the accompanying materials are made available under the
+    terms of the Eclipse Public License v. 2.0, which is available at
+    http://www.eclipse.org/legal/epl-2.0.
+
+    This Source Code may also be made available under the following Secondary
+    Licenses when the conditions for such availability set forth in the
+    Eclipse Public License v. 2.0 are satisfied: GNU General Public License,
+    version 2 with the GNU Classpath Exception, which is available at
+    https://www.gnu.org/software/classpath/license.html.
+
+    SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
+
+-->
+<persistence xmlns="https://jakarta.ee/xml/ns/persistence" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="https://jakarta.ee/xml/ns/persistence     https://jakarta.ee/xml/ns/persistence/persistence_3_0.xsd" version="3.0">
+  <persistence-unit name="CTS-EM" transaction-type="JTA">
+    <description>Persistence Unit for CTS Vehicle Tests</description>
+    <jta-data-source>jdbc/DB1</jta-data-source>
+    <class>ee.jakarta.tck.persistence.core.override.entity.NameOnlyInAnnotation</class>
+    <class>ee.jakarta.tck.persistence.core.override.entity.NameOnlyInXML</class>
+    <class>ee.jakarta.tck.persistence.core.override.entity.NameOverride</class>
+    <class>ee.jakarta.tck.persistence.core.override.entity.NoEntityAnnotation</class>
+  </persistence-unit>
+  <persistence-unit name="CTS-EM2" transaction-type="JTA">
+    <description>Persistence Unit for CTS Vehicle Tests</description>
+    <jta-data-source>jdbc/DB1</jta-data-source>
+    <class>ee.jakarta.tck.persistence.core.override.entity.NameOnlyInAnnotation</class>
+    <class>ee.jakarta.tck.persistence.core.override.entity.NameOnlyInXML</class>
+    <class>ee.jakarta.tck.persistence.core.override.entity.NameOverride</class>
+    <class>ee.jakarta.tck.persistence.core.override.entity.NoEntityAnnotation</class>
+  </persistence-unit>
+  <persistence-unit name="CTS-EM-NOTX" transaction-type="RESOURCE_LOCAL">
+    <description>The persistence.xml file may be used to designate
+                  more than one persistence unit within the same scope.
+                  Persistence Unit for Application Managed Resource Local</description>
+    <non-jta-data-source>jdbc/DB_no_tx</non-jta-data-source>
+    <class>ee.jakarta.tck.persistence.core.override.entity.NameOnlyInAnnotation</class>
+    <class>ee.jakarta.tck.persistence.core.override.entity.NameOnlyInXML</class>
+    <class>ee.jakarta.tck.persistence.core.override.entity.NameOverride</class>
+    <class>ee.jakarta.tck.persistence.core.override.entity.NoEntityAnnotation</class>
+  </persistence-unit>
+</persistence>
+
diff --git a/jpa/spec-tests/src/main/java/ee/jakarta/tck/persistence/core/override/entitylistener/persistence.xml b/jpa/spec-tests/src/main/java/ee/jakarta/tck/persistence/core/override/entitylistener/persistence.xml
new file mode 100644
index 0000000000..0492e989f0
--- /dev/null
+++ b/jpa/spec-tests/src/main/java/ee/jakarta/tck/persistence/core/override/entitylistener/persistence.xml
@@ -0,0 +1,59 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+
+    Copyright (c) 2018 Oracle and/or its affiliates. All rights reserved.
+
+    This program and the accompanying materials are made available under the
+    terms of the Eclipse Public License v. 2.0, which is available at
+    http://www.eclipse.org/legal/epl-2.0.
+
+    This Source Code may also be made available under the following Secondary
+    Licenses when the conditions for such availability set forth in the
+    Eclipse Public License v. 2.0 are satisfied: GNU General Public License,
+    version 2 with the GNU Classpath Exception, which is available at
+    https://www.gnu.org/software/classpath/license.html.
+
+    SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
+
+-->
+<persistence xmlns="https://jakarta.ee/xml/ns/persistence" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="https://jakarta.ee/xml/ns/persistence     https://jakarta.ee/xml/ns/persistence/persistence_3_0.xsd" version="3.0">
+  <persistence-unit name="CTS-EM" transaction-type="JTA">
+    <description>Persistence Unit for CTS Vehicle Tests</description>
+    <jta-data-source>jdbc/DB1</jta-data-source>
+    <class>ee.jakarta.tck.persistence.core.override.entitylistener.ListenerA</class>
+    <class>ee.jakarta.tck.persistence.core.override.entitylistener.ListenerB</class>
+    <class>ee.jakarta.tck.persistence.core.override.entitylistener.ListenerC</class>
+    <class>ee.jakarta.tck.persistence.core.override.entitylistener.ListenerD</class>
+    <class>ee.jakarta.tck.persistence.core.override.entitylistener.NoEntityListener</class>
+    <class>ee.jakarta.tck.persistence.core.override.entitylistener.NoListener</class>
+    <class>ee.jakarta.tck.persistence.core.override.entitylistener.OverridenListener</class>
+    <class>ee.jakarta.tck.persistence.core.override.util.CallBackCounts</class>
+  </persistence-unit>
+  <persistence-unit name="CTS-EM2" transaction-type="JTA">
+    <description>Persistence Unit for CTS Vehicle Tests</description>
+    <jta-data-source>jdbc/DB1</jta-data-source>
+    <class>ee.jakarta.tck.persistence.core.override.entitylistener.ListenerA</class>
+    <class>ee.jakarta.tck.persistence.core.override.entitylistener.ListenerB</class>
+    <class>ee.jakarta.tck.persistence.core.override.entitylistener.ListenerC</class>
+    <class>ee.jakarta.tck.persistence.core.override.entitylistener.ListenerD</class>
+    <class>ee.jakarta.tck.persistence.core.override.entitylistener.NoEntityListener</class>
+    <class>ee.jakarta.tck.persistence.core.override.entitylistener.NoListener</class>
+    <class>ee.jakarta.tck.persistence.core.override.entitylistener.OverridenListener</class>
+    <class>ee.jakarta.tck.persistence.core.override.util.CallBackCounts</class>
+  </persistence-unit>
+  <persistence-unit name="CTS-EM-NOTX" transaction-type="RESOURCE_LOCAL">
+    <description>The persistence.xml file may be used to designate
+                  more than one persistence unit within the same scope.
+                  Persistence Unit for Application Managed Resource Local</description>
+    <non-jta-data-source>jdbc/DB_no_tx</non-jta-data-source>
+    <class>ee.jakarta.tck.persistence.core.override.entitylistener.ListenerA</class>
+    <class>ee.jakarta.tck.persistence.core.override.entitylistener.ListenerB</class>
+    <class>ee.jakarta.tck.persistence.core.override.entitylistener.ListenerC</class>
+    <class>ee.jakarta.tck.persistence.core.override.entitylistener.ListenerD</class>
+    <class>ee.jakarta.tck.persistence.core.override.entitylistener.NoEntityListener</class>
+    <class>ee.jakarta.tck.persistence.core.override.entitylistener.NoListener</class>
+    <class>ee.jakarta.tck.persistence.core.override.entitylistener.OverridenListener</class>
+    <class>ee.jakarta.tck.persistence.core.override.util.CallBackCounts</class>
+  </persistence-unit>
+</persistence>
+
diff --git a/jpa/spec-tests/src/main/java/ee/jakarta/tck/persistence/core/override/joincolumn/persistence.xml b/jpa/spec-tests/src/main/java/ee/jakarta/tck/persistence/core/override/joincolumn/persistence.xml
new file mode 100644
index 0000000000..b72d3caa02
--- /dev/null
+++ b/jpa/spec-tests/src/main/java/ee/jakarta/tck/persistence/core/override/joincolumn/persistence.xml
@@ -0,0 +1,62 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+
+    Copyright (c) 2018 Oracle and/or its affiliates. All rights reserved.
+
+    This program and the accompanying materials are made available under the
+    terms of the Eclipse Public License v. 2.0, which is available at
+    http://www.eclipse.org/legal/epl-2.0.
+
+    This Source Code may also be made available under the following Secondary
+    Licenses when the conditions for such availability set forth in the
+    Eclipse Public License v. 2.0 are satisfied: GNU General Public License,
+    version 2 with the GNU Classpath Exception, which is available at
+    https://www.gnu.org/software/classpath/license.html.
+
+    SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
+
+-->
+<persistence xmlns="https://jakarta.ee/xml/ns/persistence" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="https://jakarta.ee/xml/ns/persistence     https://jakarta.ee/xml/ns/persistence/persistence_3_0.xsd" version="3.0">
+  <persistence-unit name="CTS-EM" transaction-type="JTA">
+    <description>Persistence Unit for CTS Vehicle Tests</description>
+    <jta-data-source>jdbc/DB1</jta-data-source>
+    <class>ee.jakarta.tck.persistence.core.override.joincolumn.Course</class>
+    <class>ee.jakarta.tck.persistence.core.override.joincolumn.Cubicle</class>
+    <class>ee.jakarta.tck.persistence.core.override.joincolumn.CubiclePK</class>
+    <class>ee.jakarta.tck.persistence.core.override.joincolumn.Customer1</class>
+    <class>ee.jakarta.tck.persistence.core.override.joincolumn.Hardware</class>
+    <class>ee.jakarta.tck.persistence.core.override.joincolumn.RetailOrder1</class>
+    <class>ee.jakarta.tck.persistence.core.override.joincolumn.Student</class>
+    <class>ee.jakarta.tck.persistence.core.override.joincolumn.TheatreCompany1</class>
+    <class>ee.jakarta.tck.persistence.core.override.joincolumn.TheatreLocation1</class>
+  </persistence-unit>
+  <persistence-unit name="CTS-EM2" transaction-type="JTA">
+    <description>Persistence Unit for CTS Vehicle Tests</description>
+    <jta-data-source>jdbc/DB1</jta-data-source>
+    <class>ee.jakarta.tck.persistence.core.override.joincolumn.Course</class>
+    <class>ee.jakarta.tck.persistence.core.override.joincolumn.Cubicle</class>
+    <class>ee.jakarta.tck.persistence.core.override.joincolumn.CubiclePK</class>
+    <class>ee.jakarta.tck.persistence.core.override.joincolumn.Customer1</class>
+    <class>ee.jakarta.tck.persistence.core.override.joincolumn.Hardware</class>
+    <class>ee.jakarta.tck.persistence.core.override.joincolumn.RetailOrder1</class>
+    <class>ee.jakarta.tck.persistence.core.override.joincolumn.Student</class>
+    <class>ee.jakarta.tck.persistence.core.override.joincolumn.TheatreCompany1</class>
+    <class>ee.jakarta.tck.persistence.core.override.joincolumn.TheatreLocation1</class>
+  </persistence-unit>
+  <persistence-unit name="CTS-EM-NOTX" transaction-type="RESOURCE_LOCAL">
+    <description>The persistence.xml file may be used to designate
+                  more than one persistence unit within the same scope.
+                  Persistence Unit for Application Managed Resource Local</description>
+    <non-jta-data-source>jdbc/DB_no_tx</non-jta-data-source>
+    <class>ee.jakarta.tck.persistence.core.override.joincolumn.Course</class>
+    <class>ee.jakarta.tck.persistence.core.override.joincolumn.Cubicle</class>
+    <class>ee.jakarta.tck.persistence.core.override.joincolumn.CubiclePK</class>
+    <class>ee.jakarta.tck.persistence.core.override.joincolumn.Customer1</class>
+    <class>ee.jakarta.tck.persistence.core.override.joincolumn.Hardware</class>
+    <class>ee.jakarta.tck.persistence.core.override.joincolumn.RetailOrder1</class>
+    <class>ee.jakarta.tck.persistence.core.override.joincolumn.Student</class>
+    <class>ee.jakarta.tck.persistence.core.override.joincolumn.TheatreCompany1</class>
+    <class>ee.jakarta.tck.persistence.core.override.joincolumn.TheatreLocation1</class>
+  </persistence-unit>
+</persistence>
+
diff --git a/jpa/spec-tests/src/main/java/ee/jakarta/tck/persistence/core/override/manytomany/persistence.xml b/jpa/spec-tests/src/main/java/ee/jakarta/tck/persistence/core/override/manytomany/persistence.xml
new file mode 100644
index 0000000000..e05cd37cf6
--- /dev/null
+++ b/jpa/spec-tests/src/main/java/ee/jakarta/tck/persistence/core/override/manytomany/persistence.xml
@@ -0,0 +1,41 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+
+    Copyright (c) 2018 Oracle and/or its affiliates. All rights reserved.
+
+    This program and the accompanying materials are made available under the
+    terms of the Eclipse Public License v. 2.0, which is available at
+    http://www.eclipse.org/legal/epl-2.0.
+
+    This Source Code may also be made available under the following Secondary
+    Licenses when the conditions for such availability set forth in the
+    Eclipse Public License v. 2.0 are satisfied: GNU General Public License,
+    version 2 with the GNU Classpath Exception, which is available at
+    https://www.gnu.org/software/classpath/license.html.
+
+    SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
+
+-->
+<persistence xmlns="https://jakarta.ee/xml/ns/persistence" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="https://jakarta.ee/xml/ns/persistence     https://jakarta.ee/xml/ns/persistence/persistence_3_0.xsd" version="3.0">
+  <persistence-unit name="CTS-EM" transaction-type="JTA">
+    <description>Persistence Unit for CTS Vehicle Tests</description>
+    <jta-data-source>jdbc/DB1</jta-data-source>
+    <class>ee.jakarta.tck.persistence.core.override.manytomany.Course</class>
+    <class>ee.jakarta.tck.persistence.core.override.manytomany.Student</class>
+  </persistence-unit>
+  <persistence-unit name="CTS-EM2" transaction-type="JTA">
+    <description>Persistence Unit for CTS Vehicle Tests</description>
+    <jta-data-source>jdbc/DB1</jta-data-source>
+    <class>ee.jakarta.tck.persistence.core.override.manytomany.Course</class>
+    <class>ee.jakarta.tck.persistence.core.override.manytomany.Student</class>
+  </persistence-unit>
+  <persistence-unit name="CTS-EM-NOTX" transaction-type="RESOURCE_LOCAL">
+    <description>The persistence.xml file may be used to designate
+                  more than one persistence unit within the same scope.
+                  Persistence Unit for Application Managed Resource Local</description>
+    <non-jta-data-source>jdbc/DB_no_tx</non-jta-data-source>
+    <class>ee.jakarta.tck.persistence.core.override.manytomany.Course</class>
+    <class>ee.jakarta.tck.persistence.core.override.manytomany.Student</class>
+  </persistence-unit>
+</persistence>
+
diff --git a/jpa/spec-tests/src/main/java/ee/jakarta/tck/persistence/core/override/mapkey/persistence.xml b/jpa/spec-tests/src/main/java/ee/jakarta/tck/persistence/core/override/mapkey/persistence.xml
new file mode 100644
index 0000000000..60aafc20ae
--- /dev/null
+++ b/jpa/spec-tests/src/main/java/ee/jakarta/tck/persistence/core/override/mapkey/persistence.xml
@@ -0,0 +1,65 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+
+    Copyright (c) 2018 Oracle and/or its affiliates. All rights reserved.
+
+    This program and the accompanying materials are made available under the
+    terms of the Eclipse Public License v. 2.0, which is available at
+    http://www.eclipse.org/legal/epl-2.0.
+
+    This Source Code may also be made available under the following Secondary
+    Licenses when the conditions for such availability set forth in the
+    Eclipse Public License v. 2.0 are satisfied: GNU General Public License,
+    version 2 with the GNU Classpath Exception, which is available at
+    https://www.gnu.org/software/classpath/license.html.
+
+    SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
+
+-->
+<persistence xmlns="https://jakarta.ee/xml/ns/persistence" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="https://jakarta.ee/xml/ns/persistence     https://jakarta.ee/xml/ns/persistence/persistence_3_0.xsd" version="3.0">
+  <persistence-unit name="CTS-EM" transaction-type="JTA">
+    <description>Persistence Unit for CTS Vehicle Tests</description>
+    <jta-data-source>jdbc/DB1</jta-data-source>
+    <class>ee.jakarta.tck.persistence.core.override.mapkey.Consumer</class>
+    <class>ee.jakarta.tck.persistence.core.override.mapkey.Customers</class>
+    <class>ee.jakarta.tck.persistence.core.override.mapkey.Department</class>
+    <class>ee.jakarta.tck.persistence.core.override.mapkey.Employee</class>
+    <class>ee.jakarta.tck.persistence.core.override.mapkey.EmployeeComparator</class>
+    <class>ee.jakarta.tck.persistence.core.override.mapkey.RetailOrder</class>
+    <class>ee.jakarta.tck.persistence.core.override.mapkey.RetailOrderCostComparatorDESC</class>
+    <class>ee.jakarta.tck.persistence.core.override.mapkey.Store</class>
+    <class>ee.jakarta.tck.persistence.core.override.mapkey.TheatreCompany</class>
+    <class>ee.jakarta.tck.persistence.core.override.mapkey.TheatreLocation</class>
+  </persistence-unit>
+  <persistence-unit name="CTS-EM2" transaction-type="JTA">
+    <description>Persistence Unit for CTS Vehicle Tests</description>
+    <jta-data-source>jdbc/DB1</jta-data-source>
+    <class>ee.jakarta.tck.persistence.core.override.mapkey.Consumer</class>
+    <class>ee.jakarta.tck.persistence.core.override.mapkey.Customers</class>
+    <class>ee.jakarta.tck.persistence.core.override.mapkey.Department</class>
+    <class>ee.jakarta.tck.persistence.core.override.mapkey.Employee</class>
+    <class>ee.jakarta.tck.persistence.core.override.mapkey.EmployeeComparator</class>
+    <class>ee.jakarta.tck.persistence.core.override.mapkey.RetailOrder</class>
+    <class>ee.jakarta.tck.persistence.core.override.mapkey.RetailOrderCostComparatorDESC</class>
+    <class>ee.jakarta.tck.persistence.core.override.mapkey.Store</class>
+    <class>ee.jakarta.tck.persistence.core.override.mapkey.TheatreCompany</class>
+    <class>ee.jakarta.tck.persistence.core.override.mapkey.TheatreLocation</class>
+  </persistence-unit>
+  <persistence-unit name="CTS-EM-NOTX" transaction-type="RESOURCE_LOCAL">
+    <description>The persistence.xml file may be used to designate
+                  more than one persistence unit within the same scope.
+                  Persistence Unit for Application Managed Resource Local</description>
+    <non-jta-data-source>jdbc/DB_no_tx</non-jta-data-source>
+    <class>ee.jakarta.tck.persistence.core.override.mapkey.Consumer</class>
+    <class>ee.jakarta.tck.persistence.core.override.mapkey.Customers</class>
+    <class>ee.jakarta.tck.persistence.core.override.mapkey.Department</class>
+    <class>ee.jakarta.tck.persistence.core.override.mapkey.Employee</class>
+    <class>ee.jakarta.tck.persistence.core.override.mapkey.EmployeeComparator</class>
+    <class>ee.jakarta.tck.persistence.core.override.mapkey.RetailOrder</class>
+    <class>ee.jakarta.tck.persistence.core.override.mapkey.RetailOrderCostComparatorDESC</class>
+    <class>ee.jakarta.tck.persistence.core.override.mapkey.Store</class>
+    <class>ee.jakarta.tck.persistence.core.override.mapkey.TheatreCompany</class>
+    <class>ee.jakarta.tck.persistence.core.override.mapkey.TheatreLocation</class>
+  </persistence-unit>
+</persistence>
+
diff --git a/jpa/spec-tests/src/main/java/ee/jakarta/tck/persistence/core/override/nocallbacklistener/persistence.xml b/jpa/spec-tests/src/main/java/ee/jakarta/tck/persistence/core/override/nocallbacklistener/persistence.xml
new file mode 100644
index 0000000000..0e70081cbd
--- /dev/null
+++ b/jpa/spec-tests/src/main/java/ee/jakarta/tck/persistence/core/override/nocallbacklistener/persistence.xml
@@ -0,0 +1,41 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+
+    Copyright (c) 2018 Oracle and/or its affiliates. All rights reserved.
+
+    This program and the accompanying materials are made available under the
+    terms of the Eclipse Public License v. 2.0, which is available at
+    http://www.eclipse.org/legal/epl-2.0.
+
+    This Source Code may also be made available under the following Secondary
+    Licenses when the conditions for such availability set forth in the
+    Eclipse Public License v. 2.0 are satisfied: GNU General Public License,
+    version 2 with the GNU Classpath Exception, which is available at
+    https://www.gnu.org/software/classpath/license.html.
+
+    SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
+
+-->
+<persistence xmlns="https://jakarta.ee/xml/ns/persistence" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="https://jakarta.ee/xml/ns/persistence     https://jakarta.ee/xml/ns/persistence/persistence_3_0.xsd" version="3.0">
+  <persistence-unit name="CTS-EM" transaction-type="JTA">
+    <description>Persistence Unit for CTS Vehicle Tests</description>
+    <jta-data-source>jdbc/DB1</jta-data-source>
+    <class>ee.jakarta.tck.persistence.core.override.nocallbacklistener.NoCallBackListener</class>
+    <class>ee.jakarta.tck.persistence.core.override.util.CallBackCounts</class>
+  </persistence-unit>
+  <persistence-unit name="CTS-EM2" transaction-type="JTA">
+    <description>Persistence Unit for CTS Vehicle Tests</description>
+    <jta-data-source>jdbc/DB1</jta-data-source>
+    <class>ee.jakarta.tck.persistence.core.override.nocallbacklistener.NoCallBackListener</class>
+    <class>ee.jakarta.tck.persistence.core.override.util.CallBackCounts</class>
+  </persistence-unit>
+  <persistence-unit name="CTS-EM-NOTX" transaction-type="RESOURCE_LOCAL">
+    <description>The persistence.xml file may be used to designate
+                  more than one persistence unit within the same scope.
+                  Persistence Unit for Application Managed Resource Local</description>
+    <non-jta-data-source>jdbc/DB_no_tx</non-jta-data-source>
+    <class>ee.jakarta.tck.persistence.core.override.nocallbacklistener.NoCallBackListener</class>
+    <class>ee.jakarta.tck.persistence.core.override.util.CallBackCounts</class>
+  </persistence-unit>
+</persistence>
+
diff --git a/jpa/spec-tests/src/main/java/ee/jakarta/tck/persistence/core/override/table/persistence.xml b/jpa/spec-tests/src/main/java/ee/jakarta/tck/persistence/core/override/table/persistence.xml
new file mode 100644
index 0000000000..5a29eee5bb
--- /dev/null
+++ b/jpa/spec-tests/src/main/java/ee/jakarta/tck/persistence/core/override/table/persistence.xml
@@ -0,0 +1,41 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+
+    Copyright (c) 2018 Oracle and/or its affiliates. All rights reserved.
+
+    This program and the accompanying materials are made available under the
+    terms of the Eclipse Public License v. 2.0, which is available at
+    http://www.eclipse.org/legal/epl-2.0.
+
+    This Source Code may also be made available under the following Secondary
+    Licenses when the conditions for such availability set forth in the
+    Eclipse Public License v. 2.0 are satisfied: GNU General Public License,
+    version 2 with the GNU Classpath Exception, which is available at
+    https://www.gnu.org/software/classpath/license.html.
+
+    SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
+
+-->
+<persistence xmlns="https://jakarta.ee/xml/ns/persistence" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="https://jakarta.ee/xml/ns/persistence     https://jakarta.ee/xml/ns/persistence/persistence_3_0.xsd" version="3.0">
+  <persistence-unit name="CTS-EM" transaction-type="JTA">
+    <description>Persistence Unit for CTS Vehicle Tests</description>
+    <jta-data-source>jdbc/DB1</jta-data-source>
+    <class>ee.jakarta.tck.persistence.core.override.table.NoTableAnnotation</class>
+    <class>ee.jakarta.tck.persistence.core.override.util.CallBackCounts</class>
+  </persistence-unit>
+  <persistence-unit name="CTS-EM2" transaction-type="JTA">
+    <description>Persistence Unit for CTS Vehicle Tests</description>
+    <jta-data-source>jdbc/DB1</jta-data-source>
+    <class>ee.jakarta.tck.persistence.core.override.table.NoTableAnnotation</class>
+    <class>ee.jakarta.tck.persistence.core.override.util.CallBackCounts</class>
+  </persistence-unit>
+  <persistence-unit name="CTS-EM-NOTX" transaction-type="RESOURCE_LOCAL">
+    <description>The persistence.xml file may be used to designate
+                  more than one persistence unit within the same scope.
+                  Persistence Unit for Application Managed Resource Local</description>
+    <non-jta-data-source>jdbc/DB_no_tx</non-jta-data-source>
+    <class>ee.jakarta.tck.persistence.core.override.table.NoTableAnnotation</class>
+    <class>ee.jakarta.tck.persistence.core.override.util.CallBackCounts</class>
+  </persistence-unit>
+</persistence>
+
diff --git a/jpa/spec-tests/src/main/java/ee/jakarta/tck/persistence/core/persistenceUnitUtil/persistence.xml b/jpa/spec-tests/src/main/java/ee/jakarta/tck/persistence/core/persistenceUnitUtil/persistence.xml
new file mode 100644
index 0000000000..1248ec61f1
--- /dev/null
+++ b/jpa/spec-tests/src/main/java/ee/jakarta/tck/persistence/core/persistenceUnitUtil/persistence.xml
@@ -0,0 +1,38 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+
+    Copyright (c) 2018 Oracle and/or its affiliates. All rights reserved.
+
+    This program and the accompanying materials are made available under the
+    terms of the Eclipse Public License v. 2.0, which is available at
+    http://www.eclipse.org/legal/epl-2.0.
+
+    This Source Code may also be made available under the following Secondary
+    Licenses when the conditions for such availability set forth in the
+    Eclipse Public License v. 2.0 are satisfied: GNU General Public License,
+    version 2 with the GNU Classpath Exception, which is available at
+    https://www.gnu.org/software/classpath/license.html.
+
+    SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
+
+-->
+<persistence xmlns="https://jakarta.ee/xml/ns/persistence" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="https://jakarta.ee/xml/ns/persistence     https://jakarta.ee/xml/ns/persistence/persistence_3_0.xsd" version="3.0">
+  <persistence-unit name="CTS-EM" transaction-type="JTA">
+    <description>Persistence Unit for CTS Vehicle Tests</description>
+    <jta-data-source>jdbc/DB1</jta-data-source>
+    <class>ee.jakarta.tck.persistence.core.persistenceUnitUtil.Employee</class>
+  </persistence-unit>
+  <persistence-unit name="CTS-EM2" transaction-type="JTA">
+    <description>Persistence Unit for CTS Vehicle Tests</description>
+    <jta-data-source>jdbc/DB1</jta-data-source>
+    <class>ee.jakarta.tck.persistence.core.persistenceUnitUtil.Employee</class>
+  </persistence-unit>
+  <persistence-unit name="CTS-EM-NOTX" transaction-type="RESOURCE_LOCAL">
+    <description>The persistence.xml file may be used to designate
+                  more than one persistence unit within the same scope.
+                  Persistence Unit for Application Managed Resource Local</description>
+    <non-jta-data-source>jdbc/DB_no_tx</non-jta-data-source>
+    <class>ee.jakarta.tck.persistence.core.persistenceUnitUtil.Employee</class>
+  </persistence-unit>
+</persistence>
+
diff --git a/jpa/spec-tests/src/main/java/ee/jakarta/tck/persistence/core/persistenceUtil/persistence.xml b/jpa/spec-tests/src/main/java/ee/jakarta/tck/persistence/core/persistenceUtil/persistence.xml
new file mode 100644
index 0000000000..f6fb155b23
--- /dev/null
+++ b/jpa/spec-tests/src/main/java/ee/jakarta/tck/persistence/core/persistenceUtil/persistence.xml
@@ -0,0 +1,38 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+
+    Copyright (c) 2018 Oracle and/or its affiliates. All rights reserved.
+
+    This program and the accompanying materials are made available under the
+    terms of the Eclipse Public License v. 2.0, which is available at
+    http://www.eclipse.org/legal/epl-2.0.
+
+    This Source Code may also be made available under the following Secondary
+    Licenses when the conditions for such availability set forth in the
+    Eclipse Public License v. 2.0 are satisfied: GNU General Public License,
+    version 2 with the GNU Classpath Exception, which is available at
+    https://www.gnu.org/software/classpath/license.html.
+
+    SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
+
+-->
+<persistence xmlns="https://jakarta.ee/xml/ns/persistence" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="https://jakarta.ee/xml/ns/persistence     https://jakarta.ee/xml/ns/persistence/persistence_3_0.xsd" version="3.0">
+  <persistence-unit name="CTS-EM" transaction-type="JTA">
+    <description>Persistence Unit for CTS Vehicle Tests</description>
+    <jta-data-source>jdbc/DB1</jta-data-source>
+    <class>ee.jakarta.tck.persistence.core.persistenceUtil.Employee</class>
+  </persistence-unit>
+  <persistence-unit name="CTS-EM2" transaction-type="JTA">
+    <description>Persistence Unit for CTS Vehicle Tests</description>
+    <jta-data-source>jdbc/DB1</jta-data-source>
+    <class>ee.jakarta.tck.persistence.core.persistenceUtil.Employee</class>
+  </persistence-unit>
+  <persistence-unit name="CTS-EM-NOTX" transaction-type="RESOURCE_LOCAL">
+    <description>The persistence.xml file may be used to designate
+                  more than one persistence unit within the same scope.
+                  Persistence Unit for Application Managed Resource Local</description>
+    <non-jta-data-source>jdbc/DB_no_tx</non-jta-data-source>
+    <class>ee.jakarta.tck.persistence.core.persistenceUtil.Employee</class>
+  </persistence-unit>
+</persistence>
+
diff --git a/jpa/spec-tests/src/main/java/ee/jakarta/tck/persistence/core/query/apitests/persistence.xml b/jpa/spec-tests/src/main/java/ee/jakarta/tck/persistence/core/query/apitests/persistence.xml
new file mode 100644
index 0000000000..38e09f7ef0
--- /dev/null
+++ b/jpa/spec-tests/src/main/java/ee/jakarta/tck/persistence/core/query/apitests/persistence.xml
@@ -0,0 +1,47 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+
+    Copyright (c) 2018 Oracle and/or its affiliates. All rights reserved.
+
+    This program and the accompanying materials are made available under the
+    terms of the Eclipse Public License v. 2.0, which is available at
+    http://www.eclipse.org/legal/epl-2.0.
+
+    This Source Code may also be made available under the following Secondary
+    Licenses when the conditions for such availability set forth in the
+    Eclipse Public License v. 2.0 are satisfied: GNU General Public License,
+    version 2 with the GNU Classpath Exception, which is available at
+    https://www.gnu.org/software/classpath/license.html.
+
+    SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
+
+-->
+<persistence xmlns="https://jakarta.ee/xml/ns/persistence" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="https://jakarta.ee/xml/ns/persistence     https://jakarta.ee/xml/ns/persistence/persistence_3_0.xsd" version="3.0">
+  <persistence-unit name="CTS-EM" transaction-type="JTA">
+    <description>Persistence Unit for CTS Vehicle Tests</description>
+    <jta-data-source>jdbc/DB1</jta-data-source>
+    <class>ee.jakarta.tck.persistence.core.query.apitests.DataTypes2</class>
+    <class>ee.jakarta.tck.persistence.core.query.apitests.Department</class>
+    <class>ee.jakarta.tck.persistence.core.query.apitests.Employee</class>
+    <class>ee.jakarta.tck.persistence.core.query.apitests.Insurance</class>
+  </persistence-unit>
+  <persistence-unit name="CTS-EM2" transaction-type="JTA">
+    <description>Persistence Unit for CTS Vehicle Tests</description>
+    <jta-data-source>jdbc/DB1</jta-data-source>
+    <class>ee.jakarta.tck.persistence.core.query.apitests.DataTypes2</class>
+    <class>ee.jakarta.tck.persistence.core.query.apitests.Department</class>
+    <class>ee.jakarta.tck.persistence.core.query.apitests.Employee</class>
+    <class>ee.jakarta.tck.persistence.core.query.apitests.Insurance</class>
+  </persistence-unit>
+  <persistence-unit name="CTS-EM-NOTX" transaction-type="RESOURCE_LOCAL">
+    <description>The persistence.xml file may be used to designate
+                  more than one persistence unit within the same scope.
+                  Persistence Unit for Application Managed Resource Local</description>
+    <non-jta-data-source>jdbc/DB_no_tx</non-jta-data-source>
+    <class>ee.jakarta.tck.persistence.core.query.apitests.DataTypes2</class>
+    <class>ee.jakarta.tck.persistence.core.query.apitests.Department</class>
+    <class>ee.jakarta.tck.persistence.core.query.apitests.Employee</class>
+    <class>ee.jakarta.tck.persistence.core.query.apitests.Insurance</class>
+  </persistence-unit>
+</persistence>
+
diff --git a/jpa/spec-tests/src/main/java/ee/jakarta/tck/persistence/core/query/flushmode/persistence.xml b/jpa/spec-tests/src/main/java/ee/jakarta/tck/persistence/core/query/flushmode/persistence.xml
new file mode 100644
index 0000000000..e0667a3c2c
--- /dev/null
+++ b/jpa/spec-tests/src/main/java/ee/jakarta/tck/persistence/core/query/flushmode/persistence.xml
@@ -0,0 +1,89 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+
+    Copyright (c) 2018 Oracle and/or its affiliates. All rights reserved.
+
+    This program and the accompanying materials are made available under the
+    terms of the Eclipse Public License v. 2.0, which is available at
+    http://www.eclipse.org/legal/epl-2.0.
+
+    This Source Code may also be made available under the following Secondary
+    Licenses when the conditions for such availability set forth in the
+    Eclipse Public License v. 2.0 are satisfied: GNU General Public License,
+    version 2 with the GNU Classpath Exception, which is available at
+    https://www.gnu.org/software/classpath/license.html.
+
+    SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
+
+-->
+<persistence xmlns="https://jakarta.ee/xml/ns/persistence" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="https://jakarta.ee/xml/ns/persistence     https://jakarta.ee/xml/ns/persistence/persistence_3_0.xsd" version="3.0">
+  <persistence-unit name="CTS-EM" transaction-type="JTA">
+    <description>Persistence Unit for CTS Vehicle Tests</description>
+    <jta-data-source>jdbc/DB1</jta-data-source>
+    <class>ee.jakarta.tck.persistence.common.schema30.Address</class>
+    <class>ee.jakarta.tck.persistence.common.schema30.Alias</class>
+    <class>ee.jakarta.tck.persistence.common.schema30.Country</class>
+    <class>ee.jakarta.tck.persistence.common.schema30.CreditCard</class>
+    <class>ee.jakarta.tck.persistence.common.schema30.Customer</class>
+    <class>ee.jakarta.tck.persistence.common.schema30.Department</class>
+    <class>ee.jakarta.tck.persistence.common.schema30.Employee</class>
+    <class>ee.jakarta.tck.persistence.common.schema30.HardwareProduct</class>
+    <class>ee.jakarta.tck.persistence.common.schema30.Info</class>
+    <class>ee.jakarta.tck.persistence.common.schema30.LineItem</class>
+    <class>ee.jakarta.tck.persistence.common.schema30.LineItemException</class>
+    <class>ee.jakarta.tck.persistence.common.schema30.Order</class>
+    <class>ee.jakarta.tck.persistence.common.schema30.Phone</class>
+    <class>ee.jakarta.tck.persistence.common.schema30.Product</class>
+    <class>ee.jakarta.tck.persistence.common.schema30.ShelfLife</class>
+    <class>ee.jakarta.tck.persistence.common.schema30.SoftwareProduct</class>
+    <class>ee.jakarta.tck.persistence.common.schema30.Spouse</class>
+    <class>ee.jakarta.tck.persistence.common.schema30.Trim</class>
+  </persistence-unit>
+  <persistence-unit name="CTS-EM2" transaction-type="JTA">
+    <description>Persistence Unit for CTS Vehicle Tests</description>
+    <jta-data-source>jdbc/DB1</jta-data-source>
+    <class>ee.jakarta.tck.persistence.common.schema30.Address</class>
+    <class>ee.jakarta.tck.persistence.common.schema30.Alias</class>
+    <class>ee.jakarta.tck.persistence.common.schema30.Country</class>
+    <class>ee.jakarta.tck.persistence.common.schema30.CreditCard</class>
+    <class>ee.jakarta.tck.persistence.common.schema30.Customer</class>
+    <class>ee.jakarta.tck.persistence.common.schema30.Department</class>
+    <class>ee.jakarta.tck.persistence.common.schema30.Employee</class>
+    <class>ee.jakarta.tck.persistence.common.schema30.HardwareProduct</class>
+    <class>ee.jakarta.tck.persistence.common.schema30.Info</class>
+    <class>ee.jakarta.tck.persistence.common.schema30.LineItem</class>
+    <class>ee.jakarta.tck.persistence.common.schema30.LineItemException</class>
+    <class>ee.jakarta.tck.persistence.common.schema30.Order</class>
+    <class>ee.jakarta.tck.persistence.common.schema30.Phone</class>
+    <class>ee.jakarta.tck.persistence.common.schema30.Product</class>
+    <class>ee.jakarta.tck.persistence.common.schema30.ShelfLife</class>
+    <class>ee.jakarta.tck.persistence.common.schema30.SoftwareProduct</class>
+    <class>ee.jakarta.tck.persistence.common.schema30.Spouse</class>
+    <class>ee.jakarta.tck.persistence.common.schema30.Trim</class>
+  </persistence-unit>
+  <persistence-unit name="CTS-EM-NOTX" transaction-type="RESOURCE_LOCAL">
+    <description>The persistence.xml file may be used to designate
+                  more than one persistence unit within the same scope.
+                  Persistence Unit for Application Managed Resource Local</description>
+    <non-jta-data-source>jdbc/DB_no_tx</non-jta-data-source>
+    <class>ee.jakarta.tck.persistence.common.schema30.Address</class>
+    <class>ee.jakarta.tck.persistence.common.schema30.Alias</class>
+    <class>ee.jakarta.tck.persistence.common.schema30.Country</class>
+    <class>ee.jakarta.tck.persistence.common.schema30.CreditCard</class>
+    <class>ee.jakarta.tck.persistence.common.schema30.Customer</class>
+    <class>ee.jakarta.tck.persistence.common.schema30.Department</class>
+    <class>ee.jakarta.tck.persistence.common.schema30.Employee</class>
+    <class>ee.jakarta.tck.persistence.common.schema30.HardwareProduct</class>
+    <class>ee.jakarta.tck.persistence.common.schema30.Info</class>
+    <class>ee.jakarta.tck.persistence.common.schema30.LineItem</class>
+    <class>ee.jakarta.tck.persistence.common.schema30.LineItemException</class>
+    <class>ee.jakarta.tck.persistence.common.schema30.Order</class>
+    <class>ee.jakarta.tck.persistence.common.schema30.Phone</class>
+    <class>ee.jakarta.tck.persistence.common.schema30.Product</class>
+    <class>ee.jakarta.tck.persistence.common.schema30.ShelfLife</class>
+    <class>ee.jakarta.tck.persistence.common.schema30.SoftwareProduct</class>
+    <class>ee.jakarta.tck.persistence.common.schema30.Spouse</class>
+    <class>ee.jakarta.tck.persistence.common.schema30.Trim</class>
+  </persistence-unit>
+</persistence>
+
diff --git a/jpa/spec-tests/src/main/java/ee/jakarta/tck/persistence/core/query/language/persistence.xml b/jpa/spec-tests/src/main/java/ee/jakarta/tck/persistence/core/query/language/persistence.xml
new file mode 100644
index 0000000000..e0667a3c2c
--- /dev/null
+++ b/jpa/spec-tests/src/main/java/ee/jakarta/tck/persistence/core/query/language/persistence.xml
@@ -0,0 +1,89 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+
+    Copyright (c) 2018 Oracle and/or its affiliates. All rights reserved.
+
+    This program and the accompanying materials are made available under the
+    terms of the Eclipse Public License v. 2.0, which is available at
+    http://www.eclipse.org/legal/epl-2.0.
+
+    This Source Code may also be made available under the following Secondary
+    Licenses when the conditions for such availability set forth in the
+    Eclipse Public License v. 2.0 are satisfied: GNU General Public License,
+    version 2 with the GNU Classpath Exception, which is available at
+    https://www.gnu.org/software/classpath/license.html.
+
+    SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
+
+-->
+<persistence xmlns="https://jakarta.ee/xml/ns/persistence" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="https://jakarta.ee/xml/ns/persistence     https://jakarta.ee/xml/ns/persistence/persistence_3_0.xsd" version="3.0">
+  <persistence-unit name="CTS-EM" transaction-type="JTA">
+    <description>Persistence Unit for CTS Vehicle Tests</description>
+    <jta-data-source>jdbc/DB1</jta-data-source>
+    <class>ee.jakarta.tck.persistence.common.schema30.Address</class>
+    <class>ee.jakarta.tck.persistence.common.schema30.Alias</class>
+    <class>ee.jakarta.tck.persistence.common.schema30.Country</class>
+    <class>ee.jakarta.tck.persistence.common.schema30.CreditCard</class>
+    <class>ee.jakarta.tck.persistence.common.schema30.Customer</class>
+    <class>ee.jakarta.tck.persistence.common.schema30.Department</class>
+    <class>ee.jakarta.tck.persistence.common.schema30.Employee</class>
+    <class>ee.jakarta.tck.persistence.common.schema30.HardwareProduct</class>
+    <class>ee.jakarta.tck.persistence.common.schema30.Info</class>
+    <class>ee.jakarta.tck.persistence.common.schema30.LineItem</class>
+    <class>ee.jakarta.tck.persistence.common.schema30.LineItemException</class>
+    <class>ee.jakarta.tck.persistence.common.schema30.Order</class>
+    <class>ee.jakarta.tck.persistence.common.schema30.Phone</class>
+    <class>ee.jakarta.tck.persistence.common.schema30.Product</class>
+    <class>ee.jakarta.tck.persistence.common.schema30.ShelfLife</class>
+    <class>ee.jakarta.tck.persistence.common.schema30.SoftwareProduct</class>
+    <class>ee.jakarta.tck.persistence.common.schema30.Spouse</class>
+    <class>ee.jakarta.tck.persistence.common.schema30.Trim</class>
+  </persistence-unit>
+  <persistence-unit name="CTS-EM2" transaction-type="JTA">
+    <description>Persistence Unit for CTS Vehicle Tests</description>
+    <jta-data-source>jdbc/DB1</jta-data-source>
+    <class>ee.jakarta.tck.persistence.common.schema30.Address</class>
+    <class>ee.jakarta.tck.persistence.common.schema30.Alias</class>
+    <class>ee.jakarta.tck.persistence.common.schema30.Country</class>
+    <class>ee.jakarta.tck.persistence.common.schema30.CreditCard</class>
+    <class>ee.jakarta.tck.persistence.common.schema30.Customer</class>
+    <class>ee.jakarta.tck.persistence.common.schema30.Department</class>
+    <class>ee.jakarta.tck.persistence.common.schema30.Employee</class>
+    <class>ee.jakarta.tck.persistence.common.schema30.HardwareProduct</class>
+    <class>ee.jakarta.tck.persistence.common.schema30.Info</class>
+    <class>ee.jakarta.tck.persistence.common.schema30.LineItem</class>
+    <class>ee.jakarta.tck.persistence.common.schema30.LineItemException</class>
+    <class>ee.jakarta.tck.persistence.common.schema30.Order</class>
+    <class>ee.jakarta.tck.persistence.common.schema30.Phone</class>
+    <class>ee.jakarta.tck.persistence.common.schema30.Product</class>
+    <class>ee.jakarta.tck.persistence.common.schema30.ShelfLife</class>
+    <class>ee.jakarta.tck.persistence.common.schema30.SoftwareProduct</class>
+    <class>ee.jakarta.tck.persistence.common.schema30.Spouse</class>
+    <class>ee.jakarta.tck.persistence.common.schema30.Trim</class>
+  </persistence-unit>
+  <persistence-unit name="CTS-EM-NOTX" transaction-type="RESOURCE_LOCAL">
+    <description>The persistence.xml file may be used to designate
+                  more than one persistence unit within the same scope.
+                  Persistence Unit for Application Managed Resource Local</description>
+    <non-jta-data-source>jdbc/DB_no_tx</non-jta-data-source>
+    <class>ee.jakarta.tck.persistence.common.schema30.Address</class>
+    <class>ee.jakarta.tck.persistence.common.schema30.Alias</class>
+    <class>ee.jakarta.tck.persistence.common.schema30.Country</class>
+    <class>ee.jakarta.tck.persistence.common.schema30.CreditCard</class>
+    <class>ee.jakarta.tck.persistence.common.schema30.Customer</class>
+    <class>ee.jakarta.tck.persistence.common.schema30.Department</class>
+    <class>ee.jakarta.tck.persistence.common.schema30.Employee</class>
+    <class>ee.jakarta.tck.persistence.common.schema30.HardwareProduct</class>
+    <class>ee.jakarta.tck.persistence.common.schema30.Info</class>
+    <class>ee.jakarta.tck.persistence.common.schema30.LineItem</class>
+    <class>ee.jakarta.tck.persistence.common.schema30.LineItemException</class>
+    <class>ee.jakarta.tck.persistence.common.schema30.Order</class>
+    <class>ee.jakarta.tck.persistence.common.schema30.Phone</class>
+    <class>ee.jakarta.tck.persistence.common.schema30.Product</class>
+    <class>ee.jakarta.tck.persistence.common.schema30.ShelfLife</class>
+    <class>ee.jakarta.tck.persistence.common.schema30.SoftwareProduct</class>
+    <class>ee.jakarta.tck.persistence.common.schema30.Spouse</class>
+    <class>ee.jakarta.tck.persistence.common.schema30.Trim</class>
+  </persistence-unit>
+</persistence>
+
diff --git a/jpa/spec-tests/src/main/java/ee/jakarta/tck/persistence/core/query/parameter/persistence.xml b/jpa/spec-tests/src/main/java/ee/jakarta/tck/persistence/core/query/parameter/persistence.xml
new file mode 100644
index 0000000000..8f8d519a6a
--- /dev/null
+++ b/jpa/spec-tests/src/main/java/ee/jakarta/tck/persistence/core/query/parameter/persistence.xml
@@ -0,0 +1,38 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+
+    Copyright (c) 2018 Oracle and/or its affiliates. All rights reserved.
+
+    This program and the accompanying materials are made available under the
+    terms of the Eclipse Public License v. 2.0, which is available at
+    http://www.eclipse.org/legal/epl-2.0.
+
+    This Source Code may also be made available under the following Secondary
+    Licenses when the conditions for such availability set forth in the
+    Eclipse Public License v. 2.0 are satisfied: GNU General Public License,
+    version 2 with the GNU Classpath Exception, which is available at
+    https://www.gnu.org/software/classpath/license.html.
+
+    SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
+
+-->
+<persistence xmlns="https://jakarta.ee/xml/ns/persistence" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="https://jakarta.ee/xml/ns/persistence     https://jakarta.ee/xml/ns/persistence/persistence_3_0.xsd" version="3.0">
+  <persistence-unit name="CTS-EM" transaction-type="JTA">
+    <description>Persistence Unit for CTS Vehicle Tests</description>
+    <jta-data-source>jdbc/DB1</jta-data-source>
+    <class>ee.jakarta.tck.persistence.core.query.parameter.Employee</class>
+  </persistence-unit>
+  <persistence-unit name="CTS-EM2" transaction-type="JTA">
+    <description>Persistence Unit for CTS Vehicle Tests</description>
+    <jta-data-source>jdbc/DB1</jta-data-source>
+    <class>ee.jakarta.tck.persistence.core.query.parameter.Employee</class>
+  </persistence-unit>
+  <persistence-unit name="CTS-EM-NOTX" transaction-type="RESOURCE_LOCAL">
+    <description>The persistence.xml file may be used to designate
+                  more than one persistence unit within the same scope.
+                  Persistence Unit for Application Managed Resource Local</description>
+    <non-jta-data-source>jdbc/DB_no_tx</non-jta-data-source>
+    <class>ee.jakarta.tck.persistence.core.query.parameter.Employee</class>
+  </persistence-unit>
+</persistence>
+
diff --git a/jpa/spec-tests/src/main/java/ee/jakarta/tck/persistence/core/relationship/annotations/persistence.xml b/jpa/spec-tests/src/main/java/ee/jakarta/tck/persistence/core/relationship/annotations/persistence.xml
new file mode 100644
index 0000000000..0e1e1600d5
--- /dev/null
+++ b/jpa/spec-tests/src/main/java/ee/jakarta/tck/persistence/core/relationship/annotations/persistence.xml
@@ -0,0 +1,56 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+
+    Copyright (c) 2018 Oracle and/or its affiliates. All rights reserved.
+
+    This program and the accompanying materials are made available under the
+    terms of the Eclipse Public License v. 2.0, which is available at
+    http://www.eclipse.org/legal/epl-2.0.
+
+    This Source Code may also be made available under the following Secondary
+    Licenses when the conditions for such availability set forth in the
+    Eclipse Public License v. 2.0 are satisfied: GNU General Public License,
+    version 2 with the GNU Classpath Exception, which is available at
+    https://www.gnu.org/software/classpath/license.html.
+
+    SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
+
+-->
+<persistence xmlns="https://jakarta.ee/xml/ns/persistence" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="https://jakarta.ee/xml/ns/persistence     https://jakarta.ee/xml/ns/persistence/persistence_3_0.xsd" version="3.0">
+  <persistence-unit name="CTS-EM" transaction-type="JTA">
+    <description>Persistence Unit for CTS Vehicle Tests</description>
+    <jta-data-source>jdbc/DB1</jta-data-source>
+    <class>ee.jakarta.tck.persistence.core.relationship.annotations.Address</class>
+    <class>ee.jakarta.tck.persistence.core.relationship.annotations.AnnualReview</class>
+    <class>ee.jakarta.tck.persistence.core.relationship.annotations.Company</class>
+    <class>ee.jakarta.tck.persistence.core.relationship.annotations.Insurance</class>
+    <class>ee.jakarta.tck.persistence.core.relationship.annotations.Person</class>
+    <class>ee.jakarta.tck.persistence.core.relationship.annotations.Project</class>
+    <class>ee.jakarta.tck.persistence.core.relationship.annotations.Team</class>
+  </persistence-unit>
+  <persistence-unit name="CTS-EM2" transaction-type="JTA">
+    <description>Persistence Unit for CTS Vehicle Tests</description>
+    <jta-data-source>jdbc/DB1</jta-data-source>
+    <class>ee.jakarta.tck.persistence.core.relationship.annotations.Address</class>
+    <class>ee.jakarta.tck.persistence.core.relationship.annotations.AnnualReview</class>
+    <class>ee.jakarta.tck.persistence.core.relationship.annotations.Company</class>
+    <class>ee.jakarta.tck.persistence.core.relationship.annotations.Insurance</class>
+    <class>ee.jakarta.tck.persistence.core.relationship.annotations.Person</class>
+    <class>ee.jakarta.tck.persistence.core.relationship.annotations.Project</class>
+    <class>ee.jakarta.tck.persistence.core.relationship.annotations.Team</class>
+  </persistence-unit>
+  <persistence-unit name="CTS-EM-NOTX" transaction-type="RESOURCE_LOCAL">
+    <description>The persistence.xml file may be used to designate
+                  more than one persistence unit within the same scope.
+                  Persistence Unit for Application Managed Resource Local</description>
+    <non-jta-data-source>jdbc/DB_no_tx</non-jta-data-source>
+    <class>ee.jakarta.tck.persistence.core.relationship.annotations.Address</class>
+    <class>ee.jakarta.tck.persistence.core.relationship.annotations.AnnualReview</class>
+    <class>ee.jakarta.tck.persistence.core.relationship.annotations.Company</class>
+    <class>ee.jakarta.tck.persistence.core.relationship.annotations.Insurance</class>
+    <class>ee.jakarta.tck.persistence.core.relationship.annotations.Person</class>
+    <class>ee.jakarta.tck.persistence.core.relationship.annotations.Project</class>
+    <class>ee.jakarta.tck.persistence.core.relationship.annotations.Team</class>
+  </persistence-unit>
+</persistence>
+
diff --git a/jpa/spec-tests/src/main/java/ee/jakarta/tck/persistence/core/relationship/bidirmanyxmany/persistence.xml b/jpa/spec-tests/src/main/java/ee/jakarta/tck/persistence/core/relationship/bidirmanyxmany/persistence.xml
new file mode 100644
index 0000000000..51bfacb3d5
--- /dev/null
+++ b/jpa/spec-tests/src/main/java/ee/jakarta/tck/persistence/core/relationship/bidirmanyxmany/persistence.xml
@@ -0,0 +1,41 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+
+    Copyright (c) 2018 Oracle and/or its affiliates. All rights reserved.
+
+    This program and the accompanying materials are made available under the
+    terms of the Eclipse Public License v. 2.0, which is available at
+    http://www.eclipse.org/legal/epl-2.0.
+
+    This Source Code may also be made available under the following Secondary
+    Licenses when the conditions for such availability set forth in the
+    Eclipse Public License v. 2.0 are satisfied: GNU General Public License,
+    version 2 with the GNU Classpath Exception, which is available at
+    https://www.gnu.org/software/classpath/license.html.
+
+    SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
+
+-->
+<persistence xmlns="https://jakarta.ee/xml/ns/persistence" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="https://jakarta.ee/xml/ns/persistence     https://jakarta.ee/xml/ns/persistence/persistence_3_0.xsd" version="3.0">
+  <persistence-unit name="CTS-EM" transaction-type="JTA">
+    <description>Persistence Unit for CTS Vehicle Tests</description>
+    <jta-data-source>jdbc/DB1</jta-data-source>
+    <class>ee.jakarta.tck.persistence.core.relationship.bidirmanyxmany.BiDirMXMPerson</class>
+    <class>ee.jakarta.tck.persistence.core.relationship.bidirmanyxmany.BiDirMXMProject</class>
+  </persistence-unit>
+  <persistence-unit name="CTS-EM2" transaction-type="JTA">
+    <description>Persistence Unit for CTS Vehicle Tests</description>
+    <jta-data-source>jdbc/DB1</jta-data-source>
+    <class>ee.jakarta.tck.persistence.core.relationship.bidirmanyxmany.BiDirMXMPerson</class>
+    <class>ee.jakarta.tck.persistence.core.relationship.bidirmanyxmany.BiDirMXMProject</class>
+  </persistence-unit>
+  <persistence-unit name="CTS-EM-NOTX" transaction-type="RESOURCE_LOCAL">
+    <description>The persistence.xml file may be used to designate
+                  more than one persistence unit within the same scope.
+                  Persistence Unit for Application Managed Resource Local</description>
+    <non-jta-data-source>jdbc/DB_no_tx</non-jta-data-source>
+    <class>ee.jakarta.tck.persistence.core.relationship.bidirmanyxmany.BiDirMXMPerson</class>
+    <class>ee.jakarta.tck.persistence.core.relationship.bidirmanyxmany.BiDirMXMProject</class>
+  </persistence-unit>
+</persistence>
+
diff --git a/jpa/spec-tests/src/main/java/ee/jakarta/tck/persistence/core/relationship/bidirmanyxone/persistence.xml b/jpa/spec-tests/src/main/java/ee/jakarta/tck/persistence/core/relationship/bidirmanyxone/persistence.xml
new file mode 100644
index 0000000000..83bcc1523f
--- /dev/null
+++ b/jpa/spec-tests/src/main/java/ee/jakarta/tck/persistence/core/relationship/bidirmanyxone/persistence.xml
@@ -0,0 +1,41 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+
+    Copyright (c) 2018 Oracle and/or its affiliates. All rights reserved.
+
+    This program and the accompanying materials are made available under the
+    terms of the Eclipse Public License v. 2.0, which is available at
+    http://www.eclipse.org/legal/epl-2.0.
+
+    This Source Code may also be made available under the following Secondary
+    Licenses when the conditions for such availability set forth in the
+    Eclipse Public License v. 2.0 are satisfied: GNU General Public License,
+    version 2 with the GNU Classpath Exception, which is available at
+    https://www.gnu.org/software/classpath/license.html.
+
+    SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
+
+-->
+<persistence xmlns="https://jakarta.ee/xml/ns/persistence" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="https://jakarta.ee/xml/ns/persistence     https://jakarta.ee/xml/ns/persistence/persistence_3_0.xsd" version="3.0">
+  <persistence-unit name="CTS-EM" transaction-type="JTA">
+    <description>Persistence Unit for CTS Vehicle Tests</description>
+    <jta-data-source>jdbc/DB1</jta-data-source>
+    <class>ee.jakarta.tck.persistence.core.relationship.bidirmanyxone.BiDirMX1Person</class>
+    <class>ee.jakarta.tck.persistence.core.relationship.bidirmanyxone.BiDirMX1Project</class>
+  </persistence-unit>
+  <persistence-unit name="CTS-EM2" transaction-type="JTA">
+    <description>Persistence Unit for CTS Vehicle Tests</description>
+    <jta-data-source>jdbc/DB1</jta-data-source>
+    <class>ee.jakarta.tck.persistence.core.relationship.bidirmanyxone.BiDirMX1Person</class>
+    <class>ee.jakarta.tck.persistence.core.relationship.bidirmanyxone.BiDirMX1Project</class>
+  </persistence-unit>
+  <persistence-unit name="CTS-EM-NOTX" transaction-type="RESOURCE_LOCAL">
+    <description>The persistence.xml file may be used to designate
+                  more than one persistence unit within the same scope.
+                  Persistence Unit for Application Managed Resource Local</description>
+    <non-jta-data-source>jdbc/DB_no_tx</non-jta-data-source>
+    <class>ee.jakarta.tck.persistence.core.relationship.bidirmanyxone.BiDirMX1Person</class>
+    <class>ee.jakarta.tck.persistence.core.relationship.bidirmanyxone.BiDirMX1Project</class>
+  </persistence-unit>
+</persistence>
+
diff --git a/jpa/spec-tests/src/main/java/ee/jakarta/tck/persistence/core/relationship/bidironexmany/persistence.xml b/jpa/spec-tests/src/main/java/ee/jakarta/tck/persistence/core/relationship/bidironexmany/persistence.xml
new file mode 100644
index 0000000000..bf22b7a58e
--- /dev/null
+++ b/jpa/spec-tests/src/main/java/ee/jakarta/tck/persistence/core/relationship/bidironexmany/persistence.xml
@@ -0,0 +1,41 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+
+    Copyright (c) 2018 Oracle and/or its affiliates. All rights reserved.
+
+    This program and the accompanying materials are made available under the
+    terms of the Eclipse Public License v. 2.0, which is available at
+    http://www.eclipse.org/legal/epl-2.0.
+
+    This Source Code may also be made available under the following Secondary
+    Licenses when the conditions for such availability set forth in the
+    Eclipse Public License v. 2.0 are satisfied: GNU General Public License,
+    version 2 with the GNU Classpath Exception, which is available at
+    https://www.gnu.org/software/classpath/license.html.
+
+    SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
+
+-->
+<persistence xmlns="https://jakarta.ee/xml/ns/persistence" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="https://jakarta.ee/xml/ns/persistence     https://jakarta.ee/xml/ns/persistence/persistence_3_0.xsd" version="3.0">
+  <persistence-unit name="CTS-EM" transaction-type="JTA">
+    <description>Persistence Unit for CTS Vehicle Tests</description>
+    <jta-data-source>jdbc/DB1</jta-data-source>
+    <class>ee.jakarta.tck.persistence.core.relationship.bidironexmany.BiDir1XMPerson</class>
+    <class>ee.jakarta.tck.persistence.core.relationship.bidironexmany.BiDir1XMProject</class>
+  </persistence-unit>
+  <persistence-unit name="CTS-EM2" transaction-type="JTA">
+    <description>Persistence Unit for CTS Vehicle Tests</description>
+    <jta-data-source>jdbc/DB1</jta-data-source>
+    <class>ee.jakarta.tck.persistence.core.relationship.bidironexmany.BiDir1XMPerson</class>
+    <class>ee.jakarta.tck.persistence.core.relationship.bidironexmany.BiDir1XMProject</class>
+  </persistence-unit>
+  <persistence-unit name="CTS-EM-NOTX" transaction-type="RESOURCE_LOCAL">
+    <description>The persistence.xml file may be used to designate
+                  more than one persistence unit within the same scope.
+                  Persistence Unit for Application Managed Resource Local</description>
+    <non-jta-data-source>jdbc/DB_no_tx</non-jta-data-source>
+    <class>ee.jakarta.tck.persistence.core.relationship.bidironexmany.BiDir1XMPerson</class>
+    <class>ee.jakarta.tck.persistence.core.relationship.bidironexmany.BiDir1XMProject</class>
+  </persistence-unit>
+</persistence>
+
diff --git a/jpa/spec-tests/src/main/java/ee/jakarta/tck/persistence/core/relationship/bidironexone/persistence.xml b/jpa/spec-tests/src/main/java/ee/jakarta/tck/persistence/core/relationship/bidironexone/persistence.xml
new file mode 100644
index 0000000000..0080a5253d
--- /dev/null
+++ b/jpa/spec-tests/src/main/java/ee/jakarta/tck/persistence/core/relationship/bidironexone/persistence.xml
@@ -0,0 +1,41 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+
+    Copyright (c) 2018 Oracle and/or its affiliates. All rights reserved.
+
+    This program and the accompanying materials are made available under the
+    terms of the Eclipse Public License v. 2.0, which is available at
+    http://www.eclipse.org/legal/epl-2.0.
+
+    This Source Code may also be made available under the following Secondary
+    Licenses when the conditions for such availability set forth in the
+    Eclipse Public License v. 2.0 are satisfied: GNU General Public License,
+    version 2 with the GNU Classpath Exception, which is available at
+    https://www.gnu.org/software/classpath/license.html.
+
+    SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
+
+-->
+<persistence xmlns="https://jakarta.ee/xml/ns/persistence" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="https://jakarta.ee/xml/ns/persistence     https://jakarta.ee/xml/ns/persistence/persistence_3_0.xsd" version="3.0">
+  <persistence-unit name="CTS-EM" transaction-type="JTA">
+    <description>Persistence Unit for CTS Vehicle Tests</description>
+    <jta-data-source>jdbc/DB1</jta-data-source>
+    <class>ee.jakarta.tck.persistence.core.relationship.bidironexone.BiDir1X1Person</class>
+    <class>ee.jakarta.tck.persistence.core.relationship.bidironexone.BiDir1X1Project</class>
+  </persistence-unit>
+  <persistence-unit name="CTS-EM2" transaction-type="JTA">
+    <description>Persistence Unit for CTS Vehicle Tests</description>
+    <jta-data-source>jdbc/DB1</jta-data-source>
+    <class>ee.jakarta.tck.persistence.core.relationship.bidironexone.BiDir1X1Person</class>
+    <class>ee.jakarta.tck.persistence.core.relationship.bidironexone.BiDir1X1Project</class>
+  </persistence-unit>
+  <persistence-unit name="CTS-EM-NOTX" transaction-type="RESOURCE_LOCAL">
+    <description>The persistence.xml file may be used to designate
+                  more than one persistence unit within the same scope.
+                  Persistence Unit for Application Managed Resource Local</description>
+    <non-jta-data-source>jdbc/DB_no_tx</non-jta-data-source>
+    <class>ee.jakarta.tck.persistence.core.relationship.bidironexone.BiDir1X1Person</class>
+    <class>ee.jakarta.tck.persistence.core.relationship.bidironexone.BiDir1X1Project</class>
+  </persistence-unit>
+</persistence>
+
diff --git a/jpa/spec-tests/src/main/java/ee/jakarta/tck/persistence/core/relationship/defaults/persistence.xml b/jpa/spec-tests/src/main/java/ee/jakarta/tck/persistence/core/relationship/defaults/persistence.xml
new file mode 100644
index 0000000000..c5675e665c
--- /dev/null
+++ b/jpa/spec-tests/src/main/java/ee/jakarta/tck/persistence/core/relationship/defaults/persistence.xml
@@ -0,0 +1,56 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+
+    Copyright (c) 2018 Oracle and/or its affiliates. All rights reserved.
+
+    This program and the accompanying materials are made available under the
+    terms of the Eclipse Public License v. 2.0, which is available at
+    http://www.eclipse.org/legal/epl-2.0.
+
+    This Source Code may also be made available under the following Secondary
+    Licenses when the conditions for such availability set forth in the
+    Eclipse Public License v. 2.0 are satisfied: GNU General Public License,
+    version 2 with the GNU Classpath Exception, which is available at
+    https://www.gnu.org/software/classpath/license.html.
+
+    SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
+
+-->
+<persistence xmlns="https://jakarta.ee/xml/ns/persistence" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="https://jakarta.ee/xml/ns/persistence     https://jakarta.ee/xml/ns/persistence/persistence_3_0.xsd" version="3.0">
+  <persistence-unit name="CTS-EM" transaction-type="JTA">
+    <description>Persistence Unit for CTS Vehicle Tests</description>
+    <jta-data-source>jdbc/DB1</jta-data-source>
+    <class>ee.jakarta.tck.persistence.core.relationship.defaults.Address</class>
+    <class>ee.jakarta.tck.persistence.core.relationship.defaults.AnnualReview</class>
+    <class>ee.jakarta.tck.persistence.core.relationship.defaults.Company</class>
+    <class>ee.jakarta.tck.persistence.core.relationship.defaults.Insurance</class>
+    <class>ee.jakarta.tck.persistence.core.relationship.defaults.Person</class>
+    <class>ee.jakarta.tck.persistence.core.relationship.defaults.Project</class>
+    <class>ee.jakarta.tck.persistence.core.relationship.defaults.Team</class>
+  </persistence-unit>
+  <persistence-unit name="CTS-EM2" transaction-type="JTA">
+    <description>Persistence Unit for CTS Vehicle Tests</description>
+    <jta-data-source>jdbc/DB1</jta-data-source>
+    <class>ee.jakarta.tck.persistence.core.relationship.defaults.Address</class>
+    <class>ee.jakarta.tck.persistence.core.relationship.defaults.AnnualReview</class>
+    <class>ee.jakarta.tck.persistence.core.relationship.defaults.Company</class>
+    <class>ee.jakarta.tck.persistence.core.relationship.defaults.Insurance</class>
+    <class>ee.jakarta.tck.persistence.core.relationship.defaults.Person</class>
+    <class>ee.jakarta.tck.persistence.core.relationship.defaults.Project</class>
+    <class>ee.jakarta.tck.persistence.core.relationship.defaults.Team</class>
+  </persistence-unit>
+  <persistence-unit name="CTS-EM-NOTX" transaction-type="RESOURCE_LOCAL">
+    <description>The persistence.xml file may be used to designate
+                  more than one persistence unit within the same scope.
+                  Persistence Unit for Application Managed Resource Local</description>
+    <non-jta-data-source>jdbc/DB_no_tx</non-jta-data-source>
+    <class>ee.jakarta.tck.persistence.core.relationship.defaults.Address</class>
+    <class>ee.jakarta.tck.persistence.core.relationship.defaults.AnnualReview</class>
+    <class>ee.jakarta.tck.persistence.core.relationship.defaults.Company</class>
+    <class>ee.jakarta.tck.persistence.core.relationship.defaults.Insurance</class>
+    <class>ee.jakarta.tck.persistence.core.relationship.defaults.Person</class>
+    <class>ee.jakarta.tck.persistence.core.relationship.defaults.Project</class>
+    <class>ee.jakarta.tck.persistence.core.relationship.defaults.Team</class>
+  </persistence-unit>
+</persistence>
+
diff --git a/jpa/spec-tests/src/main/java/ee/jakarta/tck/persistence/core/relationship/descriptors/persistence.xml b/jpa/spec-tests/src/main/java/ee/jakarta/tck/persistence/core/relationship/descriptors/persistence.xml
new file mode 100644
index 0000000000..92a2f724b3
--- /dev/null
+++ b/jpa/spec-tests/src/main/java/ee/jakarta/tck/persistence/core/relationship/descriptors/persistence.xml
@@ -0,0 +1,56 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+
+    Copyright (c) 2018 Oracle and/or its affiliates. All rights reserved.
+
+    This program and the accompanying materials are made available under the
+    terms of the Eclipse Public License v. 2.0, which is available at
+    http://www.eclipse.org/legal/epl-2.0.
+
+    This Source Code may also be made available under the following Secondary
+    Licenses when the conditions for such availability set forth in the
+    Eclipse Public License v. 2.0 are satisfied: GNU General Public License,
+    version 2 with the GNU Classpath Exception, which is available at
+    https://www.gnu.org/software/classpath/license.html.
+
+    SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
+
+-->
+<persistence xmlns="https://jakarta.ee/xml/ns/persistence" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="https://jakarta.ee/xml/ns/persistence     https://jakarta.ee/xml/ns/persistence/persistence_3_0.xsd" version="3.0">
+  <persistence-unit name="CTS-EM" transaction-type="JTA">
+    <description>Persistence Unit for CTS Vehicle Tests</description>
+    <jta-data-source>jdbc/DB1</jta-data-source>
+    <class>ee.jakarta.tck.persistence.core.relationship.descriptors.XAddress</class>
+    <class>ee.jakarta.tck.persistence.core.relationship.descriptors.XAnnualReview</class>
+    <class>ee.jakarta.tck.persistence.core.relationship.descriptors.XCompany</class>
+    <class>ee.jakarta.tck.persistence.core.relationship.descriptors.XInsurance</class>
+    <class>ee.jakarta.tck.persistence.core.relationship.descriptors.XPerson</class>
+    <class>ee.jakarta.tck.persistence.core.relationship.descriptors.XProject</class>
+    <class>ee.jakarta.tck.persistence.core.relationship.descriptors.XTeam</class>
+  </persistence-unit>
+  <persistence-unit name="CTS-EM2" transaction-type="JTA">
+    <description>Persistence Unit for CTS Vehicle Tests</description>
+    <jta-data-source>jdbc/DB1</jta-data-source>
+    <class>ee.jakarta.tck.persistence.core.relationship.descriptors.XAddress</class>
+    <class>ee.jakarta.tck.persistence.core.relationship.descriptors.XAnnualReview</class>
+    <class>ee.jakarta.tck.persistence.core.relationship.descriptors.XCompany</class>
+    <class>ee.jakarta.tck.persistence.core.relationship.descriptors.XInsurance</class>
+    <class>ee.jakarta.tck.persistence.core.relationship.descriptors.XPerson</class>
+    <class>ee.jakarta.tck.persistence.core.relationship.descriptors.XProject</class>
+    <class>ee.jakarta.tck.persistence.core.relationship.descriptors.XTeam</class>
+  </persistence-unit>
+  <persistence-unit name="CTS-EM-NOTX" transaction-type="RESOURCE_LOCAL">
+    <description>The persistence.xml file may be used to designate
+                  more than one persistence unit within the same scope.
+                  Persistence Unit for Application Managed Resource Local</description>
+    <non-jta-data-source>jdbc/DB_no_tx</non-jta-data-source>
+    <class>ee.jakarta.tck.persistence.core.relationship.descriptors.XAddress</class>
+    <class>ee.jakarta.tck.persistence.core.relationship.descriptors.XAnnualReview</class>
+    <class>ee.jakarta.tck.persistence.core.relationship.descriptors.XCompany</class>
+    <class>ee.jakarta.tck.persistence.core.relationship.descriptors.XInsurance</class>
+    <class>ee.jakarta.tck.persistence.core.relationship.descriptors.XPerson</class>
+    <class>ee.jakarta.tck.persistence.core.relationship.descriptors.XProject</class>
+    <class>ee.jakarta.tck.persistence.core.relationship.descriptors.XTeam</class>
+  </persistence-unit>
+</persistence>
+
diff --git a/jpa/spec-tests/src/main/java/ee/jakarta/tck/persistence/core/relationship/unimanyxmany/persistence.xml b/jpa/spec-tests/src/main/java/ee/jakarta/tck/persistence/core/relationship/unimanyxmany/persistence.xml
new file mode 100644
index 0000000000..b2f933088b
--- /dev/null
+++ b/jpa/spec-tests/src/main/java/ee/jakarta/tck/persistence/core/relationship/unimanyxmany/persistence.xml
@@ -0,0 +1,41 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+
+    Copyright (c) 2018 Oracle and/or its affiliates. All rights reserved.
+
+    This program and the accompanying materials are made available under the
+    terms of the Eclipse Public License v. 2.0, which is available at
+    http://www.eclipse.org/legal/epl-2.0.
+
+    This Source Code may also be made available under the following Secondary
+    Licenses when the conditions for such availability set forth in the
+    Eclipse Public License v. 2.0 are satisfied: GNU General Public License,
+    version 2 with the GNU Classpath Exception, which is available at
+    https://www.gnu.org/software/classpath/license.html.
+
+    SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
+
+-->
+<persistence xmlns="https://jakarta.ee/xml/ns/persistence" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="https://jakarta.ee/xml/ns/persistence     https://jakarta.ee/xml/ns/persistence/persistence_3_0.xsd" version="3.0">
+  <persistence-unit name="CTS-EM" transaction-type="JTA">
+    <description>Persistence Unit for CTS Vehicle Tests</description>
+    <jta-data-source>jdbc/DB1</jta-data-source>
+    <class>ee.jakarta.tck.persistence.core.relationship.unimanyxmany.UniMXMPerson</class>
+    <class>ee.jakarta.tck.persistence.core.relationship.unimanyxmany.UniMXMProject</class>
+  </persistence-unit>
+  <persistence-unit name="CTS-EM2" transaction-type="JTA">
+    <description>Persistence Unit for CTS Vehicle Tests</description>
+    <jta-data-source>jdbc/DB1</jta-data-source>
+    <class>ee.jakarta.tck.persistence.core.relationship.unimanyxmany.UniMXMPerson</class>
+    <class>ee.jakarta.tck.persistence.core.relationship.unimanyxmany.UniMXMProject</class>
+  </persistence-unit>
+  <persistence-unit name="CTS-EM-NOTX" transaction-type="RESOURCE_LOCAL">
+    <description>The persistence.xml file may be used to designate
+                  more than one persistence unit within the same scope.
+                  Persistence Unit for Application Managed Resource Local</description>
+    <non-jta-data-source>jdbc/DB_no_tx</non-jta-data-source>
+    <class>ee.jakarta.tck.persistence.core.relationship.unimanyxmany.UniMXMPerson</class>
+    <class>ee.jakarta.tck.persistence.core.relationship.unimanyxmany.UniMXMProject</class>
+  </persistence-unit>
+</persistence>
+
diff --git a/jpa/spec-tests/src/main/java/ee/jakarta/tck/persistence/core/relationship/unimanyxone/persistence.xml b/jpa/spec-tests/src/main/java/ee/jakarta/tck/persistence/core/relationship/unimanyxone/persistence.xml
new file mode 100644
index 0000000000..f06432ef0e
--- /dev/null
+++ b/jpa/spec-tests/src/main/java/ee/jakarta/tck/persistence/core/relationship/unimanyxone/persistence.xml
@@ -0,0 +1,41 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+
+    Copyright (c) 2018 Oracle and/or its affiliates. All rights reserved.
+
+    This program and the accompanying materials are made available under the
+    terms of the Eclipse Public License v. 2.0, which is available at
+    http://www.eclipse.org/legal/epl-2.0.
+
+    This Source Code may also be made available under the following Secondary
+    Licenses when the conditions for such availability set forth in the
+    Eclipse Public License v. 2.0 are satisfied: GNU General Public License,
+    version 2 with the GNU Classpath Exception, which is available at
+    https://www.gnu.org/software/classpath/license.html.
+
+    SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
+
+-->
+<persistence xmlns="https://jakarta.ee/xml/ns/persistence" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="https://jakarta.ee/xml/ns/persistence     https://jakarta.ee/xml/ns/persistence/persistence_3_0.xsd" version="3.0">
+  <persistence-unit name="CTS-EM" transaction-type="JTA">
+    <description>Persistence Unit for CTS Vehicle Tests</description>
+    <jta-data-source>jdbc/DB1</jta-data-source>
+    <class>ee.jakarta.tck.persistence.core.relationship.unimanyxone.UniMX1Person</class>
+    <class>ee.jakarta.tck.persistence.core.relationship.unimanyxone.UniMX1Project</class>
+  </persistence-unit>
+  <persistence-unit name="CTS-EM2" transaction-type="JTA">
+    <description>Persistence Unit for CTS Vehicle Tests</description>
+    <jta-data-source>jdbc/DB1</jta-data-source>
+    <class>ee.jakarta.tck.persistence.core.relationship.unimanyxone.UniMX1Person</class>
+    <class>ee.jakarta.tck.persistence.core.relationship.unimanyxone.UniMX1Project</class>
+  </persistence-unit>
+  <persistence-unit name="CTS-EM-NOTX" transaction-type="RESOURCE_LOCAL">
+    <description>The persistence.xml file may be used to designate
+                  more than one persistence unit within the same scope.
+                  Persistence Unit for Application Managed Resource Local</description>
+    <non-jta-data-source>jdbc/DB_no_tx</non-jta-data-source>
+    <class>ee.jakarta.tck.persistence.core.relationship.unimanyxone.UniMX1Person</class>
+    <class>ee.jakarta.tck.persistence.core.relationship.unimanyxone.UniMX1Project</class>
+  </persistence-unit>
+</persistence>
+
diff --git a/jpa/spec-tests/src/main/java/ee/jakarta/tck/persistence/core/relationship/unionexmany/persistence.xml b/jpa/spec-tests/src/main/java/ee/jakarta/tck/persistence/core/relationship/unionexmany/persistence.xml
new file mode 100644
index 0000000000..c006b4af5c
--- /dev/null
+++ b/jpa/spec-tests/src/main/java/ee/jakarta/tck/persistence/core/relationship/unionexmany/persistence.xml
@@ -0,0 +1,41 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+
+    Copyright (c) 2018 Oracle and/or its affiliates. All rights reserved.
+
+    This program and the accompanying materials are made available under the
+    terms of the Eclipse Public License v. 2.0, which is available at
+    http://www.eclipse.org/legal/epl-2.0.
+
+    This Source Code may also be made available under the following Secondary
+    Licenses when the conditions for such availability set forth in the
+    Eclipse Public License v. 2.0 are satisfied: GNU General Public License,
+    version 2 with the GNU Classpath Exception, which is available at
+    https://www.gnu.org/software/classpath/license.html.
+
+    SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
+
+-->
+<persistence xmlns="https://jakarta.ee/xml/ns/persistence" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="https://jakarta.ee/xml/ns/persistence     https://jakarta.ee/xml/ns/persistence/persistence_3_0.xsd" version="3.0">
+  <persistence-unit name="CTS-EM" transaction-type="JTA">
+    <description>Persistence Unit for CTS Vehicle Tests</description>
+    <jta-data-source>jdbc/DB1</jta-data-source>
+    <class>ee.jakarta.tck.persistence.core.relationship.unionexmany.Uni1XMPerson</class>
+    <class>ee.jakarta.tck.persistence.core.relationship.unionexmany.Uni1XMProject</class>
+  </persistence-unit>
+  <persistence-unit name="CTS-EM2" transaction-type="JTA">
+    <description>Persistence Unit for CTS Vehicle Tests</description>
+    <jta-data-source>jdbc/DB1</jta-data-source>
+    <class>ee.jakarta.tck.persistence.core.relationship.unionexmany.Uni1XMPerson</class>
+    <class>ee.jakarta.tck.persistence.core.relationship.unionexmany.Uni1XMProject</class>
+  </persistence-unit>
+  <persistence-unit name="CTS-EM-NOTX" transaction-type="RESOURCE_LOCAL">
+    <description>The persistence.xml file may be used to designate
+                  more than one persistence unit within the same scope.
+                  Persistence Unit for Application Managed Resource Local</description>
+    <non-jta-data-source>jdbc/DB_no_tx</non-jta-data-source>
+    <class>ee.jakarta.tck.persistence.core.relationship.unionexmany.Uni1XMPerson</class>
+    <class>ee.jakarta.tck.persistence.core.relationship.unionexmany.Uni1XMProject</class>
+  </persistence-unit>
+</persistence>
+
diff --git a/jpa/spec-tests/src/main/java/ee/jakarta/tck/persistence/core/relationship/unionexone/persistence.xml b/jpa/spec-tests/src/main/java/ee/jakarta/tck/persistence/core/relationship/unionexone/persistence.xml
new file mode 100644
index 0000000000..cd1e8f9361
--- /dev/null
+++ b/jpa/spec-tests/src/main/java/ee/jakarta/tck/persistence/core/relationship/unionexone/persistence.xml
@@ -0,0 +1,41 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+
+    Copyright (c) 2018 Oracle and/or its affiliates. All rights reserved.
+
+    This program and the accompanying materials are made available under the
+    terms of the Eclipse Public License v. 2.0, which is available at
+    http://www.eclipse.org/legal/epl-2.0.
+
+    This Source Code may also be made available under the following Secondary
+    Licenses when the conditions for such availability set forth in the
+    Eclipse Public License v. 2.0 are satisfied: GNU General Public License,
+    version 2 with the GNU Classpath Exception, which is available at
+    https://www.gnu.org/software/classpath/license.html.
+
+    SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
+
+-->
+<persistence xmlns="https://jakarta.ee/xml/ns/persistence" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="https://jakarta.ee/xml/ns/persistence     https://jakarta.ee/xml/ns/persistence/persistence_3_0.xsd" version="3.0">
+  <persistence-unit name="CTS-EM" transaction-type="JTA">
+    <description>Persistence Unit for CTS Vehicle Tests</description>
+    <jta-data-source>jdbc/DB1</jta-data-source>
+    <class>ee.jakarta.tck.persistence.core.relationship.unionexone.Uni1X1Person</class>
+    <class>ee.jakarta.tck.persistence.core.relationship.unionexone.Uni1X1Project</class>
+  </persistence-unit>
+  <persistence-unit name="CTS-EM2" transaction-type="JTA">
+    <description>Persistence Unit for CTS Vehicle Tests</description>
+    <jta-data-source>jdbc/DB1</jta-data-source>
+    <class>ee.jakarta.tck.persistence.core.relationship.unionexone.Uni1X1Person</class>
+    <class>ee.jakarta.tck.persistence.core.relationship.unionexone.Uni1X1Project</class>
+  </persistence-unit>
+  <persistence-unit name="CTS-EM-NOTX" transaction-type="RESOURCE_LOCAL">
+    <description>The persistence.xml file may be used to designate
+                  more than one persistence unit within the same scope.
+                  Persistence Unit for Application Managed Resource Local</description>
+    <non-jta-data-source>jdbc/DB_no_tx</non-jta-data-source>
+    <class>ee.jakarta.tck.persistence.core.relationship.unionexone.Uni1X1Person</class>
+    <class>ee.jakarta.tck.persistence.core.relationship.unionexone.Uni1X1Project</class>
+  </persistence-unit>
+</persistence>
+
diff --git a/jpa/spec-tests/src/main/java/ee/jakarta/tck/persistence/core/types/auto/persistence.xml b/jpa/spec-tests/src/main/java/ee/jakarta/tck/persistence/core/types/auto/persistence.xml
new file mode 100644
index 0000000000..ff767ed69c
--- /dev/null
+++ b/jpa/spec-tests/src/main/java/ee/jakarta/tck/persistence/core/types/auto/persistence.xml
@@ -0,0 +1,38 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+
+    Copyright (c) 2018 Oracle and/or its affiliates. All rights reserved.
+
+    This program and the accompanying materials are made available under the
+    terms of the Eclipse Public License v. 2.0, which is available at
+    http://www.eclipse.org/legal/epl-2.0.
+
+    This Source Code may also be made available under the following Secondary
+    Licenses when the conditions for such availability set forth in the
+    Eclipse Public License v. 2.0 are satisfied: GNU General Public License,
+    version 2 with the GNU Classpath Exception, which is available at
+    https://www.gnu.org/software/classpath/license.html.
+
+    SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
+
+-->
+<persistence xmlns="https://jakarta.ee/xml/ns/persistence" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="https://jakarta.ee/xml/ns/persistence     https://jakarta.ee/xml/ns/persistence/persistence_3_0.xsd" version="3.0">
+  <persistence-unit name="CTS-EM" transaction-type="JTA">
+    <description>Persistence Unit for CTS Vehicle Tests</description>
+    <jta-data-source>jdbc/DB1</jta-data-source>
+    <class>ee.jakarta.tck.persistence.core.types.auto.DataTypes</class>
+  </persistence-unit>
+  <persistence-unit name="CTS-EM2" transaction-type="JTA">
+    <description>Persistence Unit for CTS Vehicle Tests</description>
+    <jta-data-source>jdbc/DB1</jta-data-source>
+    <class>ee.jakarta.tck.persistence.core.types.auto.DataTypes</class>
+  </persistence-unit>
+  <persistence-unit name="CTS-EM-NOTX" transaction-type="RESOURCE_LOCAL">
+    <description>The persistence.xml file may be used to designate
+                  more than one persistence unit within the same scope.
+                  Persistence Unit for Application Managed Resource Local</description>
+    <non-jta-data-source>jdbc/DB_no_tx</non-jta-data-source>
+    <class>ee.jakarta.tck.persistence.core.types.auto.DataTypes</class>
+  </persistence-unit>
+</persistence>
+
diff --git a/jpa/spec-tests/src/main/java/ee/jakarta/tck/persistence/core/types/field/persistence.xml b/jpa/spec-tests/src/main/java/ee/jakarta/tck/persistence/core/types/field/persistence.xml
new file mode 100644
index 0000000000..035d6a7905
--- /dev/null
+++ b/jpa/spec-tests/src/main/java/ee/jakarta/tck/persistence/core/types/field/persistence.xml
@@ -0,0 +1,47 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+
+    Copyright (c) 2018 Oracle and/or its affiliates. All rights reserved.
+
+    This program and the accompanying materials are made available under the
+    terms of the Eclipse Public License v. 2.0, which is available at
+    http://www.eclipse.org/legal/epl-2.0.
+
+    This Source Code may also be made available under the following Secondary
+    Licenses when the conditions for such availability set forth in the
+    Eclipse Public License v. 2.0 are satisfied: GNU General Public License,
+    version 2 with the GNU Classpath Exception, which is available at
+    https://www.gnu.org/software/classpath/license.html.
+
+    SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
+
+-->
+<persistence xmlns="https://jakarta.ee/xml/ns/persistence" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="https://jakarta.ee/xml/ns/persistence     https://jakarta.ee/xml/ns/persistence/persistence_3_0.xsd" version="3.0">
+  <persistence-unit name="CTS-EM" transaction-type="JTA">
+    <description>Persistence Unit for CTS Vehicle Tests</description>
+    <jta-data-source>jdbc/DB1</jta-data-source>
+    <class>ee.jakarta.tck.persistence.core.types.common.Grade</class>
+    <class>ee.jakarta.tck.persistence.core.types.field.DataTypes</class>
+    <class>ee.jakarta.tck.persistence.core.types.field.DataTypes2</class>
+    <class>ee.jakarta.tck.persistence.core.types.field.UUIDType</class>
+  </persistence-unit>
+  <persistence-unit name="CTS-EM2" transaction-type="JTA">
+    <description>Persistence Unit for CTS Vehicle Tests</description>
+    <jta-data-source>jdbc/DB1</jta-data-source>
+    <class>ee.jakarta.tck.persistence.core.types.common.Grade</class>
+    <class>ee.jakarta.tck.persistence.core.types.field.DataTypes</class>
+    <class>ee.jakarta.tck.persistence.core.types.field.DataTypes2</class>
+    <class>ee.jakarta.tck.persistence.core.types.field.UUIDType</class>
+  </persistence-unit>
+  <persistence-unit name="CTS-EM-NOTX" transaction-type="RESOURCE_LOCAL">
+    <description>The persistence.xml file may be used to designate
+                  more than one persistence unit within the same scope.
+                  Persistence Unit for Application Managed Resource Local</description>
+    <non-jta-data-source>jdbc/DB_no_tx</non-jta-data-source>
+    <class>ee.jakarta.tck.persistence.core.types.common.Grade</class>
+    <class>ee.jakarta.tck.persistence.core.types.field.DataTypes</class>
+    <class>ee.jakarta.tck.persistence.core.types.field.DataTypes2</class>
+    <class>ee.jakarta.tck.persistence.core.types.field.UUIDType</class>
+  </persistence-unit>
+</persistence>
+
diff --git a/jpa/spec-tests/src/main/java/ee/jakarta/tck/persistence/core/types/generator/persistence.xml b/jpa/spec-tests/src/main/java/ee/jakarta/tck/persistence/core/types/generator/persistence.xml
new file mode 100644
index 0000000000..4e67284293
--- /dev/null
+++ b/jpa/spec-tests/src/main/java/ee/jakarta/tck/persistence/core/types/generator/persistence.xml
@@ -0,0 +1,47 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+
+    Copyright (c) 2018 Oracle and/or its affiliates. All rights reserved.
+
+    This program and the accompanying materials are made available under the
+    terms of the Eclipse Public License v. 2.0, which is available at
+    http://www.eclipse.org/legal/epl-2.0.
+
+    This Source Code may also be made available under the following Secondary
+    Licenses when the conditions for such availability set forth in the
+    Eclipse Public License v. 2.0 are satisfied: GNU General Public License,
+    version 2 with the GNU Classpath Exception, which is available at
+    https://www.gnu.org/software/classpath/license.html.
+
+    SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
+
+-->
+<persistence xmlns="https://jakarta.ee/xml/ns/persistence" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="https://jakarta.ee/xml/ns/persistence     https://jakarta.ee/xml/ns/persistence/persistence_3_0.xsd" version="3.0">
+  <persistence-unit name="CTS-EM" transaction-type="JTA">
+    <description>Persistence Unit for CTS Vehicle Tests</description>
+    <jta-data-source>jdbc/DB1</jta-data-source>
+    <class>ee.jakarta.tck.persistence.core.types.generator.DataTypes</class>
+    <class>ee.jakarta.tck.persistence.core.types.generator.DataTypes2</class>
+    <class>ee.jakarta.tck.persistence.core.types.generator.DataTypes3</class>
+    <class>ee.jakarta.tck.persistence.core.types.generator.DataTypes4</class>
+  </persistence-unit>
+  <persistence-unit name="CTS-EM2" transaction-type="JTA">
+    <description>Persistence Unit for CTS Vehicle Tests</description>
+    <jta-data-source>jdbc/DB1</jta-data-source>
+    <class>ee.jakarta.tck.persistence.core.types.generator.DataTypes</class>
+    <class>ee.jakarta.tck.persistence.core.types.generator.DataTypes2</class>
+    <class>ee.jakarta.tck.persistence.core.types.generator.DataTypes3</class>
+    <class>ee.jakarta.tck.persistence.core.types.generator.DataTypes4</class>
+  </persistence-unit>
+  <persistence-unit name="CTS-EM-NOTX" transaction-type="RESOURCE_LOCAL">
+    <description>The persistence.xml file may be used to designate
+                  more than one persistence unit within the same scope.
+                  Persistence Unit for Application Managed Resource Local</description>
+    <non-jta-data-source>jdbc/DB_no_tx</non-jta-data-source>
+    <class>ee.jakarta.tck.persistence.core.types.generator.DataTypes</class>
+    <class>ee.jakarta.tck.persistence.core.types.generator.DataTypes2</class>
+    <class>ee.jakarta.tck.persistence.core.types.generator.DataTypes3</class>
+    <class>ee.jakarta.tck.persistence.core.types.generator.DataTypes4</class>
+  </persistence-unit>
+</persistence>
+
diff --git a/jpa/spec-tests/src/main/java/ee/jakarta/tck/persistence/core/types/primarykey/compound/persistence.xml b/jpa/spec-tests/src/main/java/ee/jakarta/tck/persistence/core/types/primarykey/compound/persistence.xml
new file mode 100644
index 0000000000..2337c1b2bd
--- /dev/null
+++ b/jpa/spec-tests/src/main/java/ee/jakarta/tck/persistence/core/types/primarykey/compound/persistence.xml
@@ -0,0 +1,53 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+
+    Copyright (c) 2018 Oracle and/or its affiliates. All rights reserved.
+
+    This program and the accompanying materials are made available under the
+    terms of the Eclipse Public License v. 2.0, which is available at
+    http://www.eclipse.org/legal/epl-2.0.
+
+    This Source Code may also be made available under the following Secondary
+    Licenses when the conditions for such availability set forth in the
+    Eclipse Public License v. 2.0 are satisfied: GNU General Public License,
+    version 2 with the GNU Classpath Exception, which is available at
+    https://www.gnu.org/software/classpath/license.html.
+
+    SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
+
+-->
+<persistence xmlns="https://jakarta.ee/xml/ns/persistence" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="https://jakarta.ee/xml/ns/persistence     https://jakarta.ee/xml/ns/persistence/persistence_3_0.xsd" version="3.0">
+  <persistence-unit name="CTS-EM" transaction-type="JTA">
+    <description>Persistence Unit for CTS Vehicle Tests</description>
+    <jta-data-source>jdbc/DB1</jta-data-source>
+    <class>ee.jakarta.tck.persistence.core.types.primarykey.compound.CompoundPK</class>
+    <class>ee.jakarta.tck.persistence.core.types.primarykey.compound.CompoundPK2</class>
+    <class>ee.jakarta.tck.persistence.core.types.primarykey.compound.CompoundPK3</class>
+    <class>ee.jakarta.tck.persistence.core.types.primarykey.compound.TestBean</class>
+    <class>ee.jakarta.tck.persistence.core.types.primarykey.compound.TestBean2</class>
+    <class>ee.jakarta.tck.persistence.core.types.primarykey.compound.TestBean3</class>
+  </persistence-unit>
+  <persistence-unit name="CTS-EM2" transaction-type="JTA">
+    <description>Persistence Unit for CTS Vehicle Tests</description>
+    <jta-data-source>jdbc/DB1</jta-data-source>
+    <class>ee.jakarta.tck.persistence.core.types.primarykey.compound.CompoundPK</class>
+    <class>ee.jakarta.tck.persistence.core.types.primarykey.compound.CompoundPK2</class>
+    <class>ee.jakarta.tck.persistence.core.types.primarykey.compound.CompoundPK3</class>
+    <class>ee.jakarta.tck.persistence.core.types.primarykey.compound.TestBean</class>
+    <class>ee.jakarta.tck.persistence.core.types.primarykey.compound.TestBean2</class>
+    <class>ee.jakarta.tck.persistence.core.types.primarykey.compound.TestBean3</class>
+  </persistence-unit>
+  <persistence-unit name="CTS-EM-NOTX" transaction-type="RESOURCE_LOCAL">
+    <description>The persistence.xml file may be used to designate
+                  more than one persistence unit within the same scope.
+                  Persistence Unit for Application Managed Resource Local</description>
+    <non-jta-data-source>jdbc/DB_no_tx</non-jta-data-source>
+    <class>ee.jakarta.tck.persistence.core.types.primarykey.compound.CompoundPK</class>
+    <class>ee.jakarta.tck.persistence.core.types.primarykey.compound.CompoundPK2</class>
+    <class>ee.jakarta.tck.persistence.core.types.primarykey.compound.CompoundPK3</class>
+    <class>ee.jakarta.tck.persistence.core.types.primarykey.compound.TestBean</class>
+    <class>ee.jakarta.tck.persistence.core.types.primarykey.compound.TestBean2</class>
+    <class>ee.jakarta.tck.persistence.core.types.primarykey.compound.TestBean3</class>
+  </persistence-unit>
+</persistence>
+
diff --git a/jpa/spec-tests/src/main/java/ee/jakarta/tck/persistence/core/types/property/persistence.xml b/jpa/spec-tests/src/main/java/ee/jakarta/tck/persistence/core/types/property/persistence.xml
new file mode 100644
index 0000000000..2fee6f0f5f
--- /dev/null
+++ b/jpa/spec-tests/src/main/java/ee/jakarta/tck/persistence/core/types/property/persistence.xml
@@ -0,0 +1,47 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+
+    Copyright (c) 2018 Oracle and/or its affiliates. All rights reserved.
+
+    This program and the accompanying materials are made available under the
+    terms of the Eclipse Public License v. 2.0, which is available at
+    http://www.eclipse.org/legal/epl-2.0.
+
+    This Source Code may also be made available under the following Secondary
+    Licenses when the conditions for such availability set forth in the
+    Eclipse Public License v. 2.0 are satisfied: GNU General Public License,
+    version 2 with the GNU Classpath Exception, which is available at
+    https://www.gnu.org/software/classpath/license.html.
+
+    SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
+
+-->
+<persistence xmlns="https://jakarta.ee/xml/ns/persistence" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="https://jakarta.ee/xml/ns/persistence     https://jakarta.ee/xml/ns/persistence/persistence_3_0.xsd" version="3.0">
+  <persistence-unit name="CTS-EM" transaction-type="JTA">
+    <description>Persistence Unit for CTS Vehicle Tests</description>
+    <jta-data-source>jdbc/DB1</jta-data-source>
+    <class>ee.jakarta.tck.persistence.core.types.common.Grade</class>
+    <class>ee.jakarta.tck.persistence.core.types.property.Customer</class>
+    <class>ee.jakarta.tck.persistence.core.types.property.DataTypes</class>
+    <class>ee.jakarta.tck.persistence.core.types.property.DataTypes2</class>
+  </persistence-unit>
+  <persistence-unit name="CTS-EM2" transaction-type="JTA">
+    <description>Persistence Unit for CTS Vehicle Tests</description>
+    <jta-data-source>jdbc/DB1</jta-data-source>
+    <class>ee.jakarta.tck.persistence.core.types.common.Grade</class>
+    <class>ee.jakarta.tck.persistence.core.types.property.Customer</class>
+    <class>ee.jakarta.tck.persistence.core.types.property.DataTypes</class>
+    <class>ee.jakarta.tck.persistence.core.types.property.DataTypes2</class>
+  </persistence-unit>
+  <persistence-unit name="CTS-EM-NOTX" transaction-type="RESOURCE_LOCAL">
+    <description>The persistence.xml file may be used to designate
+                  more than one persistence unit within the same scope.
+                  Persistence Unit for Application Managed Resource Local</description>
+    <non-jta-data-source>jdbc/DB_no_tx</non-jta-data-source>
+    <class>ee.jakarta.tck.persistence.core.types.common.Grade</class>
+    <class>ee.jakarta.tck.persistence.core.types.property.Customer</class>
+    <class>ee.jakarta.tck.persistence.core.types.property.DataTypes</class>
+    <class>ee.jakarta.tck.persistence.core.types.property.DataTypes2</class>
+  </persistence-unit>
+</persistence>
+
diff --git a/jpa/spec-tests/src/main/java/ee/jakarta/tck/persistence/core/versioning/persistence.xml b/jpa/spec-tests/src/main/java/ee/jakarta/tck/persistence/core/versioning/persistence.xml
new file mode 100644
index 0000000000..bd4a7b9d40
--- /dev/null
+++ b/jpa/spec-tests/src/main/java/ee/jakarta/tck/persistence/core/versioning/persistence.xml
@@ -0,0 +1,38 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+
+    Copyright (c) 2018 Oracle and/or its affiliates. All rights reserved.
+
+    This program and the accompanying materials are made available under the
+    terms of the Eclipse Public License v. 2.0, which is available at
+    http://www.eclipse.org/legal/epl-2.0.
+
+    This Source Code may also be made available under the following Secondary
+    Licenses when the conditions for such availability set forth in the
+    Eclipse Public License v. 2.0 are satisfied: GNU General Public License,
+    version 2 with the GNU Classpath Exception, which is available at
+    https://www.gnu.org/software/classpath/license.html.
+
+    SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
+
+-->
+<persistence xmlns="https://jakarta.ee/xml/ns/persistence" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="https://jakarta.ee/xml/ns/persistence     https://jakarta.ee/xml/ns/persistence/persistence_3_0.xsd" version="3.0">
+  <persistence-unit name="CTS-EM" transaction-type="JTA">
+    <description>Persistence Unit for CTS Vehicle Tests</description>
+    <jta-data-source>jdbc/DB1</jta-data-source>
+    <class>ee.jakarta.tck.persistence.core.versioning.Member</class>
+  </persistence-unit>
+  <persistence-unit name="CTS-EM2" transaction-type="JTA">
+    <description>Persistence Unit for CTS Vehicle Tests</description>
+    <jta-data-source>jdbc/DB1</jta-data-source>
+    <class>ee.jakarta.tck.persistence.core.versioning.Member</class>
+  </persistence-unit>
+  <persistence-unit name="CTS-EM-NOTX" transaction-type="RESOURCE_LOCAL">
+    <description>The persistence.xml file may be used to designate
+                  more than one persistence unit within the same scope.
+                  Persistence Unit for Application Managed Resource Local</description>
+    <non-jta-data-source>jdbc/DB_no_tx</non-jta-data-source>
+    <class>ee.jakarta.tck.persistence.core.versioning.Member</class>
+  </persistence-unit>
+</persistence>
+
diff --git a/jpa/spec-tests/src/main/java/ee/jakarta/tck/persistence/entitytest/persist/oneXmanyFetchEager/persistence.xml b/jpa/spec-tests/src/main/java/ee/jakarta/tck/persistence/entitytest/persist/oneXmanyFetchEager/persistence.xml
new file mode 100644
index 0000000000..ea4b9b3212
--- /dev/null
+++ b/jpa/spec-tests/src/main/java/ee/jakarta/tck/persistence/entitytest/persist/oneXmanyFetchEager/persistence.xml
@@ -0,0 +1,41 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+
+    Copyright (c) 2018 Oracle and/or its affiliates. All rights reserved.
+
+    This program and the accompanying materials are made available under the
+    terms of the Eclipse Public License v. 2.0, which is available at
+    http://www.eclipse.org/legal/epl-2.0.
+
+    This Source Code may also be made available under the following Secondary
+    Licenses when the conditions for such availability set forth in the
+    Eclipse Public License v. 2.0 are satisfied: GNU General Public License,
+    version 2 with the GNU Classpath Exception, which is available at
+    https://www.gnu.org/software/classpath/license.html.
+
+    SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
+
+-->
+<persistence xmlns="https://jakarta.ee/xml/ns/persistence" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="https://jakarta.ee/xml/ns/persistence     https://jakarta.ee/xml/ns/persistence/persistence_3_0.xsd" version="3.0">
+  <persistence-unit name="CTS-EM" transaction-type="JTA">
+    <description>Persistence Unit for CTS Vehicle Tests</description>
+    <jta-data-source>jdbc/DB1</jta-data-source>
+    <class>ee.jakarta.tck.persistence.entitytest.persist.oneXmanyFetchEager.A</class>
+    <class>ee.jakarta.tck.persistence.entitytest.persist.oneXmanyFetchEager.B</class>
+  </persistence-unit>
+  <persistence-unit name="CTS-EM2" transaction-type="JTA">
+    <description>Persistence Unit for CTS Vehicle Tests</description>
+    <jta-data-source>jdbc/DB1</jta-data-source>
+    <class>ee.jakarta.tck.persistence.entitytest.persist.oneXmanyFetchEager.A</class>
+    <class>ee.jakarta.tck.persistence.entitytest.persist.oneXmanyFetchEager.B</class>
+  </persistence-unit>
+  <persistence-unit name="CTS-EM-NOTX" transaction-type="RESOURCE_LOCAL">
+    <description>The persistence.xml file may be used to designate
+                  more than one persistence unit within the same scope.
+                  Persistence Unit for Application Managed Resource Local</description>
+    <non-jta-data-source>jdbc/DB_no_tx</non-jta-data-source>
+    <class>ee.jakarta.tck.persistence.entitytest.persist.oneXmanyFetchEager.A</class>
+    <class>ee.jakarta.tck.persistence.entitytest.persist.oneXmanyFetchEager.B</class>
+  </persistence-unit>
+</persistence>
+
diff --git a/jpa/spec-tests/src/main/java/ee/jakarta/tck/persistence/jpa22/generators/tablegenerators/persistence.xml b/jpa/spec-tests/src/main/java/ee/jakarta/tck/persistence/jpa22/generators/tablegenerators/persistence.xml
new file mode 100644
index 0000000000..7c90ae2599
--- /dev/null
+++ b/jpa/spec-tests/src/main/java/ee/jakarta/tck/persistence/jpa22/generators/tablegenerators/persistence.xml
@@ -0,0 +1,38 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+
+    Copyright (c) 2018 Oracle and/or its affiliates. All rights reserved.
+
+    This program and the accompanying materials are made available under the
+    terms of the Eclipse Public License v. 2.0, which is available at
+    http://www.eclipse.org/legal/epl-2.0.
+
+    This Source Code may also be made available under the following Secondary
+    Licenses when the conditions for such availability set forth in the
+    Eclipse Public License v. 2.0 are satisfied: GNU General Public License,
+    version 2 with the GNU Classpath Exception, which is available at
+    https://www.gnu.org/software/classpath/license.html.
+
+    SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
+
+-->
+<persistence xmlns="https://jakarta.ee/xml/ns/persistence" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="https://jakarta.ee/xml/ns/persistence     https://jakarta.ee/xml/ns/persistence/persistence_3_0.xsd" version="3.0">
+  <persistence-unit name="CTS-EM" transaction-type="JTA">
+    <description>Persistence Unit for CTS Vehicle Tests</description>
+    <jta-data-source>jdbc/DB1</jta-data-source>
+    <class>ee.jakarta.tck.persistence.jpa22.generators.tablegenerators.DataTypes</class>
+  </persistence-unit>
+  <persistence-unit name="CTS-EM2" transaction-type="JTA">
+    <description>Persistence Unit for CTS Vehicle Tests</description>
+    <jta-data-source>jdbc/DB1</jta-data-source>
+    <class>ee.jakarta.tck.persistence.jpa22.generators.tablegenerators.DataTypes</class>
+  </persistence-unit>
+  <persistence-unit name="CTS-EM-NOTX" transaction-type="RESOURCE_LOCAL">
+    <description>The persistence.xml file may be used to designate
+                  more than one persistence unit within the same scope.
+                  Persistence Unit for Application Managed Resource Local</description>
+    <non-jta-data-source>jdbc/DB_no_tx</non-jta-data-source>
+    <class>ee.jakarta.tck.persistence.jpa22.generators.tablegenerators.DataTypes</class>
+  </persistence-unit>
+</persistence>
+
diff --git a/jpa/spec-tests/src/main/java/ee/jakarta/tck/persistence/jpa22/query/stream/persistence.xml b/jpa/spec-tests/src/main/java/ee/jakarta/tck/persistence/jpa22/query/stream/persistence.xml
new file mode 100644
index 0000000000..9d2caeaa08
--- /dev/null
+++ b/jpa/spec-tests/src/main/java/ee/jakarta/tck/persistence/jpa22/query/stream/persistence.xml
@@ -0,0 +1,44 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+
+    Copyright (c) 2018 Oracle and/or its affiliates. All rights reserved.
+
+    This program and the accompanying materials are made available under the
+    terms of the Eclipse Public License v. 2.0, which is available at
+    http://www.eclipse.org/legal/epl-2.0.
+
+    This Source Code may also be made available under the following Secondary
+    Licenses when the conditions for such availability set forth in the
+    Eclipse Public License v. 2.0 are satisfied: GNU General Public License,
+    version 2 with the GNU Classpath Exception, which is available at
+    https://www.gnu.org/software/classpath/license.html.
+
+    SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
+
+-->
+<persistence xmlns="https://jakarta.ee/xml/ns/persistence" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="https://jakarta.ee/xml/ns/persistence     https://jakarta.ee/xml/ns/persistence/persistence_3_0.xsd" version="3.0">
+  <persistence-unit name="CTS-EM" transaction-type="JTA">
+    <description>Persistence Unit for CTS Vehicle Tests</description>
+    <jta-data-source>jdbc/DB1</jta-data-source>
+    <class>ee.jakarta.tck.persistence.jpa22.query.stream.Department</class>
+    <class>ee.jakarta.tck.persistence.jpa22.query.stream.Employee</class>
+    <class>ee.jakarta.tck.persistence.jpa22.query.stream.Insurance</class>
+  </persistence-unit>
+  <persistence-unit name="CTS-EM2" transaction-type="JTA">
+    <description>Persistence Unit for CTS Vehicle Tests</description>
+    <jta-data-source>jdbc/DB1</jta-data-source>
+    <class>ee.jakarta.tck.persistence.jpa22.query.stream.Department</class>
+    <class>ee.jakarta.tck.persistence.jpa22.query.stream.Employee</class>
+    <class>ee.jakarta.tck.persistence.jpa22.query.stream.Insurance</class>
+  </persistence-unit>
+  <persistence-unit name="CTS-EM-NOTX" transaction-type="RESOURCE_LOCAL">
+    <description>The persistence.xml file may be used to designate
+                  more than one persistence unit within the same scope.
+                  Persistence Unit for Application Managed Resource Local</description>
+    <non-jta-data-source>jdbc/DB_no_tx</non-jta-data-source>
+    <class>ee.jakarta.tck.persistence.jpa22.query.stream.Department</class>
+    <class>ee.jakarta.tck.persistence.jpa22.query.stream.Employee</class>
+    <class>ee.jakarta.tck.persistence.jpa22.query.stream.Insurance</class>
+  </persistence-unit>
+</persistence>
+
diff --git a/jpa/spec-tests/src/main/java/ee/jakarta/tck/persistence/jpa22/repeatable/attroverride/persistence.xml b/jpa/spec-tests/src/main/java/ee/jakarta/tck/persistence/jpa22/repeatable/attroverride/persistence.xml
new file mode 100644
index 0000000000..b27cb4a95d
--- /dev/null
+++ b/jpa/spec-tests/src/main/java/ee/jakarta/tck/persistence/jpa22/repeatable/attroverride/persistence.xml
@@ -0,0 +1,53 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+
+    Copyright (c) 2018 Oracle and/or its affiliates. All rights reserved.
+
+    This program and the accompanying materials are made available under the
+    terms of the Eclipse Public License v. 2.0, which is available at
+    http://www.eclipse.org/legal/epl-2.0.
+
+    This Source Code may also be made available under the following Secondary
+    Licenses when the conditions for such availability set forth in the
+    Eclipse Public License v. 2.0 are satisfied: GNU General Public License,
+    version 2 with the GNU Classpath Exception, which is available at
+    https://www.gnu.org/software/classpath/license.html.
+
+    SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
+
+-->
+<persistence xmlns="https://jakarta.ee/xml/ns/persistence" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="https://jakarta.ee/xml/ns/persistence     https://jakarta.ee/xml/ns/persistence/persistence_3_0.xsd" version="3.0">
+  <persistence-unit name="CTS-EM" transaction-type="JTA">
+    <description>Persistence Unit for CTS Vehicle Tests</description>
+    <jta-data-source>jdbc/DB1</jta-data-source>
+    <class>ee.jakarta.tck.persistence.jpa22.repeatable.attroverride.AbstractPersonnel</class>
+    <class>ee.jakarta.tck.persistence.jpa22.repeatable.attroverride.Department</class>
+    <class>ee.jakarta.tck.persistence.jpa22.repeatable.attroverride.Employee</class>
+    <class>ee.jakarta.tck.persistence.jpa22.repeatable.attroverride.FullTimeEmployee</class>
+    <class>ee.jakarta.tck.persistence.jpa22.repeatable.attroverride.PartTimeEmployee</class>
+    <class>ee.jakarta.tck.persistence.jpa22.repeatable.attroverride.Project</class>
+  </persistence-unit>
+  <persistence-unit name="CTS-EM2" transaction-type="JTA">
+    <description>Persistence Unit for CTS Vehicle Tests</description>
+    <jta-data-source>jdbc/DB1</jta-data-source>
+    <class>ee.jakarta.tck.persistence.jpa22.repeatable.attroverride.AbstractPersonnel</class>
+    <class>ee.jakarta.tck.persistence.jpa22.repeatable.attroverride.Department</class>
+    <class>ee.jakarta.tck.persistence.jpa22.repeatable.attroverride.Employee</class>
+    <class>ee.jakarta.tck.persistence.jpa22.repeatable.attroverride.FullTimeEmployee</class>
+    <class>ee.jakarta.tck.persistence.jpa22.repeatable.attroverride.PartTimeEmployee</class>
+    <class>ee.jakarta.tck.persistence.jpa22.repeatable.attroverride.Project</class>
+  </persistence-unit>
+  <persistence-unit name="CTS-EM-NOTX" transaction-type="RESOURCE_LOCAL">
+    <description>The persistence.xml file may be used to designate
+                  more than one persistence unit within the same scope.
+                  Persistence Unit for Application Managed Resource Local</description>
+    <non-jta-data-source>jdbc/DB_no_tx</non-jta-data-source>
+    <class>ee.jakarta.tck.persistence.jpa22.repeatable.attroverride.AbstractPersonnel</class>
+    <class>ee.jakarta.tck.persistence.jpa22.repeatable.attroverride.Department</class>
+    <class>ee.jakarta.tck.persistence.jpa22.repeatable.attroverride.Employee</class>
+    <class>ee.jakarta.tck.persistence.jpa22.repeatable.attroverride.FullTimeEmployee</class>
+    <class>ee.jakarta.tck.persistence.jpa22.repeatable.attroverride.PartTimeEmployee</class>
+    <class>ee.jakarta.tck.persistence.jpa22.repeatable.attroverride.Project</class>
+  </persistence-unit>
+</persistence>
+
diff --git a/jpa/spec-tests/src/main/java/ee/jakarta/tck/persistence/jpa22/repeatable/convert/persistence.xml b/jpa/spec-tests/src/main/java/ee/jakarta/tck/persistence/jpa22/repeatable/convert/persistence.xml
new file mode 100644
index 0000000000..ede0e8e570
--- /dev/null
+++ b/jpa/spec-tests/src/main/java/ee/jakarta/tck/persistence/jpa22/repeatable/convert/persistence.xml
@@ -0,0 +1,50 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+
+    Copyright (c) 2018 Oracle and/or its affiliates. All rights reserved.
+
+    This program and the accompanying materials are made available under the
+    terms of the Eclipse Public License v. 2.0, which is available at
+    http://www.eclipse.org/legal/epl-2.0.
+
+    This Source Code may also be made available under the following Secondary
+    Licenses when the conditions for such availability set forth in the
+    Eclipse Public License v. 2.0 are satisfied: GNU General Public License,
+    version 2 with the GNU Classpath Exception, which is available at
+    https://www.gnu.org/software/classpath/license.html.
+
+    SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
+
+-->
+<persistence xmlns="https://jakarta.ee/xml/ns/persistence" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="https://jakarta.ee/xml/ns/persistence     https://jakarta.ee/xml/ns/persistence/persistence_3_0.xsd" version="3.0">
+  <persistence-unit name="CTS-EM" transaction-type="JTA">
+    <description>Persistence Unit for CTS Vehicle Tests</description>
+    <jta-data-source>jdbc/DB1</jta-data-source>
+    <class>ee.jakarta.tck.persistence.jpa22.repeatable.convert.Address</class>
+    <class>ee.jakarta.tck.persistence.jpa22.repeatable.convert.B</class>
+    <class>ee.jakarta.tck.persistence.jpa22.repeatable.convert.DotConverter</class>
+    <class>ee.jakarta.tck.persistence.jpa22.repeatable.convert.Employee3</class>
+    <class>ee.jakarta.tck.persistence.jpa22.repeatable.convert.NumberToStateConverter</class>
+  </persistence-unit>
+  <persistence-unit name="CTS-EM2" transaction-type="JTA">
+    <description>Persistence Unit for CTS Vehicle Tests</description>
+    <jta-data-source>jdbc/DB1</jta-data-source>
+    <class>ee.jakarta.tck.persistence.jpa22.repeatable.convert.Address</class>
+    <class>ee.jakarta.tck.persistence.jpa22.repeatable.convert.B</class>
+    <class>ee.jakarta.tck.persistence.jpa22.repeatable.convert.DotConverter</class>
+    <class>ee.jakarta.tck.persistence.jpa22.repeatable.convert.Employee3</class>
+    <class>ee.jakarta.tck.persistence.jpa22.repeatable.convert.NumberToStateConverter</class>
+  </persistence-unit>
+  <persistence-unit name="CTS-EM-NOTX" transaction-type="RESOURCE_LOCAL">
+    <description>The persistence.xml file may be used to designate
+                  more than one persistence unit within the same scope.
+                  Persistence Unit for Application Managed Resource Local</description>
+    <non-jta-data-source>jdbc/DB_no_tx</non-jta-data-source>
+    <class>ee.jakarta.tck.persistence.jpa22.repeatable.convert.Address</class>
+    <class>ee.jakarta.tck.persistence.jpa22.repeatable.convert.B</class>
+    <class>ee.jakarta.tck.persistence.jpa22.repeatable.convert.DotConverter</class>
+    <class>ee.jakarta.tck.persistence.jpa22.repeatable.convert.Employee3</class>
+    <class>ee.jakarta.tck.persistence.jpa22.repeatable.convert.NumberToStateConverter</class>
+  </persistence-unit>
+</persistence>
+
diff --git a/jpa/spec-tests/src/main/java/ee/jakarta/tck/persistence/jpa22/repeatable/joincolumn/persistence.xml b/jpa/spec-tests/src/main/java/ee/jakarta/tck/persistence/jpa22/repeatable/joincolumn/persistence.xml
new file mode 100644
index 0000000000..cc8d5d6311
--- /dev/null
+++ b/jpa/spec-tests/src/main/java/ee/jakarta/tck/persistence/jpa22/repeatable/joincolumn/persistence.xml
@@ -0,0 +1,47 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+
+    Copyright (c) 2018 Oracle and/or its affiliates. All rights reserved.
+
+    This program and the accompanying materials are made available under the
+    terms of the Eclipse Public License v. 2.0, which is available at
+    http://www.eclipse.org/legal/epl-2.0.
+
+    This Source Code may also be made available under the following Secondary
+    Licenses when the conditions for such availability set forth in the
+    Eclipse Public License v. 2.0 are satisfied: GNU General Public License,
+    version 2 with the GNU Classpath Exception, which is available at
+    https://www.gnu.org/software/classpath/license.html.
+
+    SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
+
+-->
+<persistence xmlns="https://jakarta.ee/xml/ns/persistence" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="https://jakarta.ee/xml/ns/persistence     https://jakarta.ee/xml/ns/persistence/persistence_3_0.xsd" version="3.0">
+  <persistence-unit name="CTS-EM" transaction-type="JTA">
+    <description>Persistence Unit for CTS Vehicle Tests</description>
+    <jta-data-source>jdbc/DB1</jta-data-source>
+    <class>ee.jakarta.tck.persistence.jpa22.repeatable.joincolumn.DID2Dependent</class>
+    <class>ee.jakarta.tck.persistence.jpa22.repeatable.joincolumn.DID2DependentId</class>
+    <class>ee.jakarta.tck.persistence.jpa22.repeatable.joincolumn.DID2Employee</class>
+    <class>ee.jakarta.tck.persistence.jpa22.repeatable.joincolumn.DID2EmployeeId</class>
+  </persistence-unit>
+  <persistence-unit name="CTS-EM2" transaction-type="JTA">
+    <description>Persistence Unit for CTS Vehicle Tests</description>
+    <jta-data-source>jdbc/DB1</jta-data-source>
+    <class>ee.jakarta.tck.persistence.jpa22.repeatable.joincolumn.DID2Dependent</class>
+    <class>ee.jakarta.tck.persistence.jpa22.repeatable.joincolumn.DID2DependentId</class>
+    <class>ee.jakarta.tck.persistence.jpa22.repeatable.joincolumn.DID2Employee</class>
+    <class>ee.jakarta.tck.persistence.jpa22.repeatable.joincolumn.DID2EmployeeId</class>
+  </persistence-unit>
+  <persistence-unit name="CTS-EM-NOTX" transaction-type="RESOURCE_LOCAL">
+    <description>The persistence.xml file may be used to designate
+                  more than one persistence unit within the same scope.
+                  Persistence Unit for Application Managed Resource Local</description>
+    <non-jta-data-source>jdbc/DB_no_tx</non-jta-data-source>
+    <class>ee.jakarta.tck.persistence.jpa22.repeatable.joincolumn.DID2Dependent</class>
+    <class>ee.jakarta.tck.persistence.jpa22.repeatable.joincolumn.DID2DependentId</class>
+    <class>ee.jakarta.tck.persistence.jpa22.repeatable.joincolumn.DID2Employee</class>
+    <class>ee.jakarta.tck.persistence.jpa22.repeatable.joincolumn.DID2EmployeeId</class>
+  </persistence-unit>
+</persistence>
+
diff --git a/jpa/spec-tests/src/main/java/ee/jakarta/tck/persistence/jpa22/repeatable/mapkeyjoincolumn/persistence.xml b/jpa/spec-tests/src/main/java/ee/jakarta/tck/persistence/jpa22/repeatable/mapkeyjoincolumn/persistence.xml
new file mode 100644
index 0000000000..0021d10c91
--- /dev/null
+++ b/jpa/spec-tests/src/main/java/ee/jakarta/tck/persistence/jpa22/repeatable/mapkeyjoincolumn/persistence.xml
@@ -0,0 +1,44 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+
+    Copyright (c) 2018 Oracle and/or its affiliates. All rights reserved.
+
+    This program and the accompanying materials are made available under the
+    terms of the Eclipse Public License v. 2.0, which is available at
+    http://www.eclipse.org/legal/epl-2.0.
+
+    This Source Code may also be made available under the following Secondary
+    Licenses when the conditions for such availability set forth in the
+    Eclipse Public License v. 2.0 are satisfied: GNU General Public License,
+    version 2 with the GNU Classpath Exception, which is available at
+    https://www.gnu.org/software/classpath/license.html.
+
+    SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
+
+-->
+<persistence xmlns="https://jakarta.ee/xml/ns/persistence" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="https://jakarta.ee/xml/ns/persistence     https://jakarta.ee/xml/ns/persistence/persistence_3_0.xsd" version="3.0">
+  <persistence-unit name="CTS-EM" transaction-type="JTA">
+    <description>Persistence Unit for CTS Vehicle Tests</description>
+    <jta-data-source>jdbc/DB1</jta-data-source>
+    <class>ee.jakarta.tck.persistence.jpa22.repeatable.mapkeyjoincolumn.Course</class>
+    <class>ee.jakarta.tck.persistence.jpa22.repeatable.mapkeyjoincolumn.Semester</class>
+    <class>ee.jakarta.tck.persistence.jpa22.repeatable.mapkeyjoincolumn.Student</class>
+  </persistence-unit>
+  <persistence-unit name="CTS-EM2" transaction-type="JTA">
+    <description>Persistence Unit for CTS Vehicle Tests</description>
+    <jta-data-source>jdbc/DB1</jta-data-source>
+    <class>ee.jakarta.tck.persistence.jpa22.repeatable.mapkeyjoincolumn.Course</class>
+    <class>ee.jakarta.tck.persistence.jpa22.repeatable.mapkeyjoincolumn.Semester</class>
+    <class>ee.jakarta.tck.persistence.jpa22.repeatable.mapkeyjoincolumn.Student</class>
+  </persistence-unit>
+  <persistence-unit name="CTS-EM-NOTX" transaction-type="RESOURCE_LOCAL">
+    <description>The persistence.xml file may be used to designate
+                  more than one persistence unit within the same scope.
+                  Persistence Unit for Application Managed Resource Local</description>
+    <non-jta-data-source>jdbc/DB_no_tx</non-jta-data-source>
+    <class>ee.jakarta.tck.persistence.jpa22.repeatable.mapkeyjoincolumn.Course</class>
+    <class>ee.jakarta.tck.persistence.jpa22.repeatable.mapkeyjoincolumn.Semester</class>
+    <class>ee.jakarta.tck.persistence.jpa22.repeatable.mapkeyjoincolumn.Student</class>
+  </persistence-unit>
+</persistence>
+
diff --git a/jpa/spec-tests/src/main/java/ee/jakarta/tck/persistence/jpa22/repeatable/namedentitygraph/persistence.xml b/jpa/spec-tests/src/main/java/ee/jakarta/tck/persistence/jpa22/repeatable/namedentitygraph/persistence.xml
new file mode 100644
index 0000000000..34fbfaed5b
--- /dev/null
+++ b/jpa/spec-tests/src/main/java/ee/jakarta/tck/persistence/jpa22/repeatable/namedentitygraph/persistence.xml
@@ -0,0 +1,47 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+
+    Copyright (c) 2018 Oracle and/or its affiliates. All rights reserved.
+
+    This program and the accompanying materials are made available under the
+    terms of the Eclipse Public License v. 2.0, which is available at
+    http://www.eclipse.org/legal/epl-2.0.
+
+    This Source Code may also be made available under the following Secondary
+    Licenses when the conditions for such availability set forth in the
+    Eclipse Public License v. 2.0 are satisfied: GNU General Public License,
+    version 2 with the GNU Classpath Exception, which is available at
+    https://www.gnu.org/software/classpath/license.html.
+
+    SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
+
+-->
+<persistence xmlns="https://jakarta.ee/xml/ns/persistence" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="https://jakarta.ee/xml/ns/persistence     https://jakarta.ee/xml/ns/persistence/persistence_3_0.xsd" version="3.0">
+  <persistence-unit name="CTS-EM" transaction-type="JTA">
+    <description>Persistence Unit for CTS Vehicle Tests</description>
+    <jta-data-source>jdbc/DB1</jta-data-source>
+    <class>ee.jakarta.tck.persistence.jpa22.repeatable.namedentitygraph.Department</class>
+    <class>ee.jakarta.tck.persistence.jpa22.repeatable.namedentitygraph.Employee</class>
+    <class>ee.jakarta.tck.persistence.jpa22.repeatable.namedentitygraph.Employee2</class>
+    <class>ee.jakarta.tck.persistence.jpa22.repeatable.namedentitygraph.Employee3</class>
+  </persistence-unit>
+  <persistence-unit name="CTS-EM2" transaction-type="JTA">
+    <description>Persistence Unit for CTS Vehicle Tests</description>
+    <jta-data-source>jdbc/DB1</jta-data-source>
+    <class>ee.jakarta.tck.persistence.jpa22.repeatable.namedentitygraph.Department</class>
+    <class>ee.jakarta.tck.persistence.jpa22.repeatable.namedentitygraph.Employee</class>
+    <class>ee.jakarta.tck.persistence.jpa22.repeatable.namedentitygraph.Employee2</class>
+    <class>ee.jakarta.tck.persistence.jpa22.repeatable.namedentitygraph.Employee3</class>
+  </persistence-unit>
+  <persistence-unit name="CTS-EM-NOTX" transaction-type="RESOURCE_LOCAL">
+    <description>The persistence.xml file may be used to designate
+                  more than one persistence unit within the same scope.
+                  Persistence Unit for Application Managed Resource Local</description>
+    <non-jta-data-source>jdbc/DB_no_tx</non-jta-data-source>
+    <class>ee.jakarta.tck.persistence.jpa22.repeatable.namedentitygraph.Department</class>
+    <class>ee.jakarta.tck.persistence.jpa22.repeatable.namedentitygraph.Employee</class>
+    <class>ee.jakarta.tck.persistence.jpa22.repeatable.namedentitygraph.Employee2</class>
+    <class>ee.jakarta.tck.persistence.jpa22.repeatable.namedentitygraph.Employee3</class>
+  </persistence-unit>
+</persistence>
+
diff --git a/jpa/spec-tests/src/main/java/ee/jakarta/tck/persistence/jpa22/repeatable/namednativequery/persistence.xml b/jpa/spec-tests/src/main/java/ee/jakarta/tck/persistence/jpa22/repeatable/namednativequery/persistence.xml
new file mode 100644
index 0000000000..aa7b3dae4f
--- /dev/null
+++ b/jpa/spec-tests/src/main/java/ee/jakarta/tck/persistence/jpa22/repeatable/namednativequery/persistence.xml
@@ -0,0 +1,38 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+
+    Copyright (c) 2018 Oracle and/or its affiliates. All rights reserved.
+
+    This program and the accompanying materials are made available under the
+    terms of the Eclipse Public License v. 2.0, which is available at
+    http://www.eclipse.org/legal/epl-2.0.
+
+    This Source Code may also be made available under the following Secondary
+    Licenses when the conditions for such availability set forth in the
+    Eclipse Public License v. 2.0 are satisfied: GNU General Public License,
+    version 2 with the GNU Classpath Exception, which is available at
+    https://www.gnu.org/software/classpath/license.html.
+
+    SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
+
+-->
+<persistence xmlns="https://jakarta.ee/xml/ns/persistence" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="https://jakarta.ee/xml/ns/persistence     https://jakarta.ee/xml/ns/persistence/persistence_3_0.xsd" version="3.0">
+  <persistence-unit name="CTS-EM" transaction-type="JTA">
+    <description>Persistence Unit for CTS Vehicle Tests</description>
+    <jta-data-source>jdbc/DB1</jta-data-source>
+    <class>ee.jakarta.tck.persistence.jpa22.repeatable.namednativequery.Coffee</class>
+  </persistence-unit>
+  <persistence-unit name="CTS-EM2" transaction-type="JTA">
+    <description>Persistence Unit for CTS Vehicle Tests</description>
+    <jta-data-source>jdbc/DB1</jta-data-source>
+    <class>ee.jakarta.tck.persistence.jpa22.repeatable.namednativequery.Coffee</class>
+  </persistence-unit>
+  <persistence-unit name="CTS-EM-NOTX" transaction-type="RESOURCE_LOCAL">
+    <description>The persistence.xml file may be used to designate
+                  more than one persistence unit within the same scope.
+                  Persistence Unit for Application Managed Resource Local</description>
+    <non-jta-data-source>jdbc/DB_no_tx</non-jta-data-source>
+    <class>ee.jakarta.tck.persistence.jpa22.repeatable.namednativequery.Coffee</class>
+  </persistence-unit>
+</persistence>
+
diff --git a/jpa/spec-tests/src/main/java/ee/jakarta/tck/persistence/jpa22/repeatable/namedstoredprocedurequery/persistence.xml b/jpa/spec-tests/src/main/java/ee/jakarta/tck/persistence/jpa22/repeatable/namedstoredprocedurequery/persistence.xml
new file mode 100644
index 0000000000..ffc5436736
--- /dev/null
+++ b/jpa/spec-tests/src/main/java/ee/jakarta/tck/persistence/jpa22/repeatable/namedstoredprocedurequery/persistence.xml
@@ -0,0 +1,38 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+
+    Copyright (c) 2018 Oracle and/or its affiliates. All rights reserved.
+
+    This program and the accompanying materials are made available under the
+    terms of the Eclipse Public License v. 2.0, which is available at
+    http://www.eclipse.org/legal/epl-2.0.
+
+    This Source Code may also be made available under the following Secondary
+    Licenses when the conditions for such availability set forth in the
+    Eclipse Public License v. 2.0 are satisfied: GNU General Public License,
+    version 2 with the GNU Classpath Exception, which is available at
+    https://www.gnu.org/software/classpath/license.html.
+
+    SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
+
+-->
+<persistence xmlns="https://jakarta.ee/xml/ns/persistence" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="https://jakarta.ee/xml/ns/persistence     https://jakarta.ee/xml/ns/persistence/persistence_3_0.xsd" version="3.0">
+  <persistence-unit name="CTS-EM" transaction-type="JTA">
+    <description>Persistence Unit for CTS Vehicle Tests</description>
+    <jta-data-source>jdbc/DB1</jta-data-source>
+    <class>ee.jakarta.tck.persistence.jpa22.repeatable.namedstoredprocedurequery.Employee</class>
+  </persistence-unit>
+  <persistence-unit name="CTS-EM2" transaction-type="JTA">
+    <description>Persistence Unit for CTS Vehicle Tests</description>
+    <jta-data-source>jdbc/DB1</jta-data-source>
+    <class>ee.jakarta.tck.persistence.jpa22.repeatable.namedstoredprocedurequery.Employee</class>
+  </persistence-unit>
+  <persistence-unit name="CTS-EM-NOTX" transaction-type="RESOURCE_LOCAL">
+    <description>The persistence.xml file may be used to designate
+                  more than one persistence unit within the same scope.
+                  Persistence Unit for Application Managed Resource Local</description>
+    <non-jta-data-source>jdbc/DB_no_tx</non-jta-data-source>
+    <class>ee.jakarta.tck.persistence.jpa22.repeatable.namedstoredprocedurequery.Employee</class>
+  </persistence-unit>
+</persistence>
+