diff --git a/glassfish-runner/batch-tck/pom.xml b/glassfish-runner/batch-tck/pom.xml
index f822b09650..c336ffed90 100644
--- a/glassfish-runner/batch-tck/pom.xml
+++ b/glassfish-runner/batch-tck/pom.xml
@@ -38,8 +38,8 @@ Copyright (c) 2022 Contributors to the Eclipse Foundation
     </modules>
 
     <properties>
-        <glassfish.version>7.0.0-M10</glassfish.version>
         <glassfish.toplevel.dir>glassfish7</glassfish.toplevel.dir>
+        <glassfish.version>7.0.0-M10</glassfish.version>
         <jakarta.batch.version>2.1.0</jakarta.batch.version>
     </properties>
 
diff --git a/glassfish-runner/batch-tck/sigtests/pom.xml b/glassfish-runner/batch-tck/sigtests/pom.xml
index b1f83bdf02..96541e226c 100644
--- a/glassfish-runner/batch-tck/sigtests/pom.xml
+++ b/glassfish-runner/batch-tck/sigtests/pom.xml
@@ -14,8 +14,8 @@
     <artifactId>glassfish.batch-tck.sigtests</artifactId>
 
     <properties>
-        <glassfish.version>7.0.0-M10</glassfish.version>
         <glassfish.toplevel.dir>glassfish7</glassfish.toplevel.dir>
+        <glassfish.version>7.0.0-M10</glassfish.version>
         <jakarta.batch.version>2.1.5</jakarta.batch.version>
     </properties>
 
diff --git a/glassfish-runner/cdi-tck/pom.xml b/glassfish-runner/cdi-tck/pom.xml
index 1f6def2237..ec2dc84058 100644
--- a/glassfish-runner/cdi-tck/pom.xml
+++ b/glassfish-runner/cdi-tck/pom.xml
@@ -32,9 +32,9 @@
 
     <properties>
         <cdi.ee.tck.version>11.0.0-SNAPSHOT</cdi.ee.tck.version>
+        <cdi.ee.tck.version>11.0.0-SNAPSHOT</cdi.ee.tck.version>
 
         <cdi.tck-4-1.version>4.1.0</cdi.tck-4-1.version>
-        <cdi.ee.tck.version>11.0.0-SNAPSHOT</cdi.ee.tck.version>
         <glassfish.root>${project.build.directory}</glassfish.root>
 
         <!-- Note M6 still has some failures, future M7 passes all -->
diff --git a/glassfish-runner/pom.xml b/glassfish-runner/pom.xml
index 14e54e3aac..5200c748ba 100644
--- a/glassfish-runner/pom.xml
+++ b/glassfish-runner/pom.xml
@@ -39,20 +39,20 @@
         <module>jsonb-tck</module>
         <module>jsonp-tck</module>
         <module>pages-tck</module>
-        <module>jpa-platform-tck</module>
+        <module>persistence-platform-tck</module>
         <module>servlet-tck</module>
     </modules>
 
     <properties>
+        <arquillian.version>1.9.1.Final</arquillian.version>
         <glassfish-artifact-id>glassfish</glassfish-artifact-id>
-        <glassfish.version>7.0.0</glassfish.version>
         <glassfish.toplevel.dir>glassfish7</glassfish.toplevel.dir>
+        <glassfish.version>7.0.0</glassfish.version>
         <jakarta.rest.version>3.1.0</jakarta.rest.version>
         <json.tck.version>2.1.0</json.tck.version>
         <jsonb.tck.version>3.0.0</jsonb.tck.version>
         <maven.compiler.source>11</maven.compiler.source>
         <tck.artifactId>jakarta-restful-ws-tck</tck.artifactId>
-        <arquillian.version>1.9.1.Final</arquillian.version>
     </properties>
 
     <dependencyManagement>
@@ -66,7 +66,6 @@
             </dependency>
         </dependencies>
     </dependencyManagement>
-            
 
     <repositories>
         <repository>
diff --git a/glassfish-runner/transactions-platform-tck/j2ee.pass b/glassfish-runner/transactions-platform-tck/j2ee.pass
deleted file mode 100644
index dccc3037eb..0000000000
--- a/glassfish-runner/transactions-platform-tck/j2ee.pass
+++ /dev/null
@@ -1,17 +0,0 @@
-
-#
-# Copyright (c) 2023 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
-#
-AS_ADMIN_USERPASSWORD=j2ee
diff --git a/glassfish-runner/transactions-platform-tck/javajoe.pass b/glassfish-runner/transactions-platform-tck/javajoe.pass
deleted file mode 100644
index d69a7520e5..0000000000
--- a/glassfish-runner/transactions-platform-tck/javajoe.pass
+++ /dev/null
@@ -1,16 +0,0 @@
-#
-# Copyright (c) 2023 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
-#
-AS_ADMIN_USERPASSWORD=javajoe
diff --git a/glassfish-runner/transactions-tck/pom.xml b/glassfish-runner/transactions-tck/pom.xml
new file mode 100644
index 0000000000..ba1453df90
--- /dev/null
+++ b/glassfish-runner/transactions-tck/pom.xml
@@ -0,0 +1,36 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+    Copyright (c) 2024  Contributors to the Eclipse Foundation.
+    Copyright (c) 2022 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
+-->
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+
+    <modelVersion>4.0.0</modelVersion>
+
+    <parent>
+        <groupId>org.glassfish</groupId>
+        <artifactId>standalone-tck</artifactId>
+        <version>11.0.0-SNAPSHOT</version>
+    </parent>
+
+    <artifactId>transactions-tck</artifactId>
+    <version>4.0.0-SNAPSHOT</version>
+    <packaging>pom</packaging>
+
+    <modules>
+        <module>transactions-tck-install</module>
+        <module>transactions-tck-run</module>
+    </modules>
+</project>
diff --git a/glassfish-runner/transactions-tck/transactions-tck-install/pom.xml b/glassfish-runner/transactions-tck/transactions-tck-install/pom.xml
new file mode 100644
index 0000000000..29aeb007b9
--- /dev/null
+++ b/glassfish-runner/transactions-tck/transactions-tck-install/pom.xml
@@ -0,0 +1,112 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+
+    Copyright (c) 2021, 2024 Contributors to the Eclipse Foundation. 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
+
+-->
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd">
+    <modelVersion>4.0.0</modelVersion>
+
+    <parent>
+        <groupId>org.glassfish</groupId>
+        <artifactId>transactions-tck</artifactId>
+        <version>4.0.0-SNAPSHOT</version>
+    </parent>
+
+    <artifactId>transactions-tck-install</artifactId>
+    <packaging>pom</packaging>
+    <name>TCK: Install Jakarta transactions TCK</name>
+
+    <build>
+        <plugins>
+            <plugin>
+                <groupId>com.googlecode.maven-download-plugin</groupId>
+                <artifactId>download-maven-plugin</artifactId>
+                <version>1.11.0</version>
+                <configuration>
+                    <unpack>true</unpack>
+                    <outputDirectory>${project.build.directory}</outputDirectory>
+                </configuration>
+                <executions>
+
+                    <execution>
+                        <id>download-tck-tools</id>
+                        <goals>
+                            <goal>wget</goal>
+                        </goals>
+                        <phase>generate-resources</phase>
+                        <configuration>
+                            <url>https://github.com/eclipse-ee4j/jakartaee-tck-tools/archive/refs/heads/master.zip</url>
+                        </configuration>
+                    </execution>
+                    <execution>
+                        <id>download-transactions-tck</id>
+                        <goals>
+                            <goal>wget</goal>
+                        </goals>
+                        <phase>generate-resources</phase>
+                        <configuration>
+                            <excludes>**/extensions.xml</excludes>
+                            <url>https://github.com/jakartaee/platform-tck/archive/refs/heads/main.zip</url>
+                        </configuration>
+                    </execution>
+                </executions>
+            </plugin>
+
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-invoker-plugin</artifactId>
+                <version>3.8.0</version>
+                <executions>
+
+                    <!-- Build and install the platform TCK -->
+                    <execution>
+                        <id>tck_full_build</id>
+                        <goals>
+                            <goal>run</goal>
+                        </goals>
+                        <phase>generate-resources</phase>
+                        <configuration>
+                            <streamLogs>true</streamLogs>
+                            <projectsDirectory>${project.build.directory}/platform-tck-main</projectsDirectory>
+                            <pomIncludes>
+                                <pomInclude>pom.xml</pomInclude>
+                            </pomIncludes>
+                            <goals>clean install</goals>
+                        </configuration>
+                    </execution>
+
+                    <!-- Build and install the Arquillian tools for the TCK -->
+                    <execution>
+                        <id>tools_build</id>
+                        <goals>
+                            <goal>run</goal>
+                        </goals>
+                        <phase>process-resources</phase>
+                        <configuration>
+                            <streamLogs>true</streamLogs>
+                            <projectsDirectory>${project.build.directory}/jakartaee-tck-tools-master/arquillian</projectsDirectory>
+                            <pomIncludes>
+                                <pomInclude>pom.xml</pomInclude>
+                            </pomIncludes>
+                            <goals>clean source:jar install</goals>
+                        </configuration>
+                    </execution>
+                </executions>
+            </plugin>
+        </plugins>
+    </build>
+
+</project>
diff --git a/glassfish-runner/transactions-platform-tck/jakartaeetck/bin/certificates/clientcert.jks b/glassfish-runner/transactions-tck/transactions-tck-run/jakartaeetck/bin/certificates/clientcert.jks
similarity index 100%
rename from glassfish-runner/transactions-platform-tck/jakartaeetck/bin/certificates/clientcert.jks
rename to glassfish-runner/transactions-tck/transactions-tck-run/jakartaeetck/bin/certificates/clientcert.jks
diff --git a/glassfish-runner/transactions-platform-tck/jakartaeetck/bin/certificates/clientcert.p12 b/glassfish-runner/transactions-tck/transactions-tck-run/jakartaeetck/bin/certificates/clientcert.p12
similarity index 100%
rename from glassfish-runner/transactions-platform-tck/jakartaeetck/bin/certificates/clientcert.p12
rename to glassfish-runner/transactions-tck/transactions-tck-run/jakartaeetck/bin/certificates/clientcert.p12
diff --git a/glassfish-runner/transactions-platform-tck/jakartaeetck/bin/certificates/cts_cert b/glassfish-runner/transactions-tck/transactions-tck-run/jakartaeetck/bin/certificates/cts_cert
similarity index 100%
rename from glassfish-runner/transactions-platform-tck/jakartaeetck/bin/certificates/cts_cert
rename to glassfish-runner/transactions-tck/transactions-tck-run/jakartaeetck/bin/certificates/cts_cert
diff --git a/glassfish-runner/transactions-platform-tck/jakartaeetck/bin/ts.jte b/glassfish-runner/transactions-tck/transactions-tck-run/jakartaeetck/bin/ts.jte
similarity index 100%
rename from glassfish-runner/transactions-platform-tck/jakartaeetck/bin/ts.jte
rename to glassfish-runner/transactions-tck/transactions-tck-run/jakartaeetck/bin/ts.jte
diff --git a/glassfish-runner/transactions-platform-tck/pom.xml b/glassfish-runner/transactions-tck/transactions-tck-run/pom.xml
similarity index 80%
rename from glassfish-runner/transactions-platform-tck/pom.xml
rename to glassfish-runner/transactions-tck/transactions-tck-run/pom.xml
index 1e8f378b2c..8624fc95c8 100644
--- a/glassfish-runner/transactions-platform-tck/pom.xml
+++ b/glassfish-runner/transactions-tck/transactions-tck-run/pom.xml
@@ -23,15 +23,13 @@
         <version>11.0.0-SNAPSHOT</version>
     </parent>
 
-    <groupId>jakarta</groupId>
-    <artifactId>glassfish.jta-platform-tck</artifactId>
-    <packaging>jar</packaging>
+    <artifactId>transactions-tck-run</artifactId>
 
     <properties>
         <glassfish.home>${glassfish.root}/glassfish${glassfish.version.main}</glassfish.home>
         <glassfish.lib.dir>${glassfish.home}/glassfish/lib</glassfish.lib.dir>
         <glassfish.root>${project.build.directory}</glassfish.root>
-        <glassfish.version>8.0.0-JDK17-M8</glassfish.version>
+        <glassfish.version>8.0.0-M8</glassfish.version>
         <glassfish.version.main>8</glassfish.version.main>
 
         <jakarta.platform.version>11.0.0-M2</jakarta.platform.version>
@@ -60,20 +58,7 @@
         </dependencies>
     </dependencyManagement>
     <dependencies>
-        <dependency>
-            <groupId>org.junit.jupiter</groupId>
-            <artifactId>junit-jupiter</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>org.junit.vintage</groupId>
-            <artifactId>junit-vintage-engine</artifactId>
-            <scope>test</scope>
-        </dependency>
-        <dependency>
-            <groupId>jakarta.tck</groupId>
-            <artifactId>jta-tck</artifactId>
-            <version>${tck.version}</version>
-        </dependency>
+        <!-- Jakarta EE APIs -->
         <dependency>
             <groupId>jakarta.platform</groupId>
             <artifactId>jakarta.jakartaee-api</artifactId>
@@ -81,67 +66,52 @@
             <scope>provided</scope>
         </dependency>
 
+        <!-- The actual TCK containing the tests -->
         <dependency>
-            <groupId>org.jboss.arquillian.container</groupId>
-            <artifactId>arquillian-container-test-spi</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>org.jboss.arquillian.container</groupId>
-            <artifactId>arquillian-container-spi</artifactId>
+            <groupId>jakarta.tck</groupId>
+            <artifactId>jta-tck</artifactId>
+            <version>${tck.version}</version>
         </dependency>
+
+        <!-- Junit5 -->
         <dependency>
-            <groupId>org.jboss.arquillian.core</groupId>
-            <artifactId>arquillian-core-spi</artifactId>
+            <groupId>org.junit.jupiter</groupId>
+            <artifactId>junit-jupiter</artifactId>
         </dependency>
         <dependency>
-            <groupId>org.jboss.arquillian.test</groupId>
-            <artifactId>arquillian-test-impl-base</artifactId>
+            <groupId>org.junit.vintage</groupId>
+            <artifactId>junit-vintage-engine</artifactId>
+            <scope>test</scope>
         </dependency>
+
         <dependency>
             <groupId>org.jboss.arquillian.junit5</groupId>
             <artifactId>arquillian-junit5-container</artifactId>
         </dependency>
         <dependency>
-            <groupId>org.jboss.arquillian.junit</groupId>
-            <artifactId>arquillian-junit-core</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>org.jboss.arquillian.junit5</groupId>
-            <artifactId>arquillian-junit5-core</artifactId>
+            <groupId>org.jboss.arquillian.container</groupId>
+            <artifactId>arquillian-container-spi</artifactId>
         </dependency>
+
+        <!--
+            The Arquillian connector that starts GlassFish and deploys archives to it.
+        -->
         <dependency>
             <groupId>org.omnifaces.arquillian</groupId>
             <artifactId>arquillian-glassfish-server-managed</artifactId>
             <version>1.7</version>
             <scope>test</scope>
         </dependency>
+
+        <!--
+            The Arquillian protocol to use the application client container for testing
+        -->
         <dependency>
             <groupId>jakarta.tck.arquillian</groupId>
             <artifactId>arquillian-protocol-appclient</artifactId>
             <version>${project.version}</version>
         </dependency>
 
-        <dependency>
-            <groupId>org.jboss.shrinkwrap.resolver</groupId>
-            <artifactId>shrinkwrap-resolver-api</artifactId>
-            <version>3.2.0</version>
-        </dependency>
-        <dependency>
-            <groupId>org.jboss.shrinkwrap.resolver</groupId>
-            <artifactId>shrinkwrap-resolver-impl-maven</artifactId>
-            <version>3.2.0</version>
-        </dependency>
-        <dependency>
-            <groupId>org.jboss.shrinkwrap.resolver</groupId>
-            <artifactId>shrinkwrap-resolver-api-maven</artifactId>
-            <version>3.2.0</version>
-        </dependency>
-        <dependency>
-            <groupId>org.jboss.shrinkwrap.resolver</groupId>
-            <artifactId>shrinkwrap-resolver-spi-maven</artifactId>
-            <version>3.2.0</version>
-        </dependency>
-
         <dependency>
             <groupId>jakarta.tck.arquillian</groupId>
             <artifactId>arquillian-protocol-javatest</artifactId>
@@ -179,33 +149,6 @@
             <groupId>jakarta.tck.arquillian</groupId>
             <artifactId>tck-porting-lib</artifactId>
         </dependency>
-        <dependency>
-            <groupId>jakarta.tck</groupId>
-            <artifactId>common</artifactId>
-            <version>${project.version}</version>
-        </dependency>
-        <dependency>
-            <groupId>jakarta.tck</groupId>
-            <artifactId>libutil</artifactId>
-            <version>${project.version}</version>
-        </dependency>
-        <dependency>
-            <groupId>jakarta.tck</groupId>
-            <artifactId>runtime</artifactId>
-            <version>${project.version}</version>
-        </dependency>
-        <dependency>
-            <groupId>jakarta.tck</groupId>
-            <artifactId>dbprocedures</artifactId>
-            <version>3.2.0</version>
-            <scope>test</scope>
-            <exclusions>
-                <exclusion>
-                    <groupId>jakarta.persistence</groupId>
-                    <artifactId>jakarta.persistence-api</artifactId>
-                </exclusion>
-            </exclusions>
-        </dependency>
     </dependencies>
 
     <build>
@@ -233,7 +176,7 @@
                         </configuration>
                     </execution>
                     <execution>
-                        <id>004-copy-lib</id>
+                        <id>002-copy-lib</id>
                         <goals>
                             <goal>copy</goal>
                         </goals>
@@ -271,13 +214,14 @@
                             <goal>verify</goal>
                         </goals>
                         <configuration>
+                            <dependenciesToScan>jakarta.tck:jta-tck</dependenciesToScan>
                             <!-- Select the @Tag("tck-appclient") tests -->
                             <groups>tck-appclient</groups>
                             <includes>
                                 <include>com/sun/ts/tests/jta/ee/txpropagationtest/*Ejb*.java</include>
                                 <include>com/sun/ts/tests/jta/ee/usertransaction/**/*EjbTest*.java</include>
                             </includes>
-                            <dependenciesToScan>jakarta.tck:jta-tck</dependenciesToScan>
+
                             <systemPropertyVariables>
                                 <ts.home>${ts.home}</ts.home>
 
@@ -289,8 +233,6 @@
 
                                 <glassfish.home>${glassfish.home}</glassfish.home>
                                 <glassfish.postBootCommands>set server-config.network-config.protocols.protocol.http-listener-1.http.trace-enabled=true
-                                create-file-user --groups guest --passwordfile ${project.basedir}/javajoe.pass javajoe
-                                create-file-user --groups staff:mgr --passwordfile ${project.basedir}/j2ee.pass j2ee
                                 create-jdbc-connection-pool --restype javax.sql.DataSource --datasourceclassname org.apache.derby.jdbc.ClientDataSource --property databaseName=${glassfish.home}/glassfish/domains/domain1/config/derbyDB:serverName=localhost:portNumber=1527:user=cts1:password=cts1 --steadypoolsize 32 --maxpoolsize 64 cts-derby-pool
                                 create-jdbc-resource --connectionpoolid cts-derby-pool jdbc/DB1
                                 list-jdbc-connection-pools
@@ -310,12 +252,9 @@
                             <goal>verify</goal>
                         </goals>
                         <configuration>
-                            <additionalClasspathElements>
-                                <additionalClasspathElement>${glassfish.home}/javadb/lib/derbytools.jar</additionalClasspathElement>
-                                <additionalClasspathElement>${glassfish.home}/javadb/lib/derbyclient.jar</additionalClasspathElement>
-                                <additionalClasspathElement>${glassfish.home}/javadb/lib/derby.jar</additionalClasspathElement>
-                                <additionalClasspathElement>${glassfish.home}/glassfish/modules/glassfish-naming.jar</additionalClasspathElement>
-                            </additionalClasspathElements>
+                            <dependenciesToScan>jakarta.tck:jta-tck</dependenciesToScan>
+                            <!-- Select the @Tag("tck-javatest") tests -->
+                            <groups>${javatest-testGroups}</groups>
                             <includes>
                                 <include>com/sun/ts/tests/jta/ee/transactional/ClientEjblitejspTest*.java</include>
                                 <include>com/sun/ts/tests/jta/ee/transactional/ClientEjbliteservletTest*.java</include>
@@ -326,9 +265,7 @@
                                 <include>com/sun/ts/tests/jta/ee/usertransaction/**/*JspTest*.java</include>
                                 <include>com/sun/ts/tests/jta/ee/usertransaction/**/*ServletTest*.java</include>
                             </includes>
-                            <!-- Select the @Tag("tck-javatest") tests -->
-                            <groups>${javatest-testGroups}</groups>
-                            <dependenciesToScan>jakarta.tck:jta-tck</dependenciesToScan>
+
                             <systemPropertyVariables>
                                 <glassfish.enableDerby>true</glassfish.enableDerby>
                                 <glassfish.derbyDatabaseName>${glassfish.home}/glassfish/domains/domain1/config/derbyDB;create=true</glassfish.derbyDatabaseName>
diff --git a/glassfish-runner/transactions-platform-tck/sql/derby/derby.ddl.sql b/glassfish-runner/transactions-tck/transactions-tck-run/sql/derby/derby.ddl.sql
similarity index 100%
rename from glassfish-runner/transactions-platform-tck/sql/derby/derby.ddl.sql
rename to glassfish-runner/transactions-tck/transactions-tck-run/sql/derby/derby.ddl.sql
diff --git a/glassfish-runner/transactions-platform-tck/sql/derby/derby.dml.sql b/glassfish-runner/transactions-tck/transactions-tck-run/sql/derby/derby.dml.sql
similarity index 100%
rename from glassfish-runner/transactions-platform-tck/sql/derby/derby.dml.sql
rename to glassfish-runner/transactions-tck/transactions-tck-run/sql/derby/derby.dml.sql
diff --git a/glassfish-runner/transactions-platform-tck/sql/derby/password.txt b/glassfish-runner/transactions-tck/transactions-tck-run/sql/derby/password.txt
similarity index 100%
rename from glassfish-runner/transactions-platform-tck/sql/derby/password.txt
rename to glassfish-runner/transactions-tck/transactions-tck-run/sql/derby/password.txt
diff --git a/glassfish-runner/transactions-platform-tck/src/main/java/org/glassfish/transactions/tck/GlassfishLoadableExtension.java b/glassfish-runner/transactions-tck/transactions-tck-run/src/main/java/org/glassfish/transactions/tck/GlassfishLoadableExtension.java
similarity index 100%
rename from glassfish-runner/transactions-platform-tck/src/main/java/org/glassfish/transactions/tck/GlassfishLoadableExtension.java
rename to glassfish-runner/transactions-tck/transactions-tck-run/src/main/java/org/glassfish/transactions/tck/GlassfishLoadableExtension.java
diff --git a/glassfish-runner/transactions-platform-tck/src/main/java/org/glassfish/transactions/tck/GlassfishTestArchiveProcessor.java b/glassfish-runner/transactions-tck/transactions-tck-run/src/main/java/org/glassfish/transactions/tck/GlassfishTestArchiveProcessor.java
similarity index 100%
rename from glassfish-runner/transactions-platform-tck/src/main/java/org/glassfish/transactions/tck/GlassfishTestArchiveProcessor.java
rename to glassfish-runner/transactions-tck/transactions-tck-run/src/main/java/org/glassfish/transactions/tck/GlassfishTestArchiveProcessor.java
diff --git a/glassfish-runner/transactions-platform-tck/src/main/resources/META-INF/services/org.jboss.arquillian.core.spi.LoadableExtension b/glassfish-runner/transactions-tck/transactions-tck-run/src/main/resources/META-INF/services/org.jboss.arquillian.core.spi.LoadableExtension
similarity index 100%
rename from glassfish-runner/transactions-platform-tck/src/main/resources/META-INF/services/org.jboss.arquillian.core.spi.LoadableExtension
rename to glassfish-runner/transactions-tck/transactions-tck-run/src/main/resources/META-INF/services/org.jboss.arquillian.core.spi.LoadableExtension
diff --git a/glassfish-runner/transactions-platform-tck/src/test/resources/appclient-arquillian.xml b/glassfish-runner/transactions-tck/transactions-tck-run/src/test/resources/appclient-arquillian.xml
similarity index 100%
rename from glassfish-runner/transactions-platform-tck/src/test/resources/appclient-arquillian.xml
rename to glassfish-runner/transactions-tck/transactions-tck-run/src/test/resources/appclient-arquillian.xml
diff --git a/glassfish-runner/transactions-platform-tck/src/test/resources/arquillian.xml b/glassfish-runner/transactions-tck/transactions-tck-run/src/test/resources/arquillian.xml
similarity index 100%
rename from glassfish-runner/transactions-platform-tck/src/test/resources/arquillian.xml
rename to glassfish-runner/transactions-tck/transactions-tck-run/src/test/resources/arquillian.xml