diff --git a/glassfish-runner/rest-platform-extra-tck/pom.xml b/glassfish-runner/rest-platform-extra-tck/pom.xml
new file mode 100644
index 0000000000..2c0fa25e34
--- /dev/null
+++ b/glassfish-runner/rest-platform-extra-tck/pom.xml
@@ -0,0 +1,37 @@
+
+
+
+
+ 4.0.0
+
+
+ org.eclipse.ee4j
+ project
+ 1.0.9
+
+
+
+ rest-platform-extra-tck
+ 4.0.0-SNAPSHOT
+ pom
+
+
+ rest-platform-extra-tck-install
+ rest-platform-extra-tck-run
+
+
diff --git a/glassfish-runner/rest-platform-extra-tck/rest-platform-extra-tck-install/pom.xml b/glassfish-runner/rest-platform-extra-tck/rest-platform-extra-tck-install/pom.xml
new file mode 100644
index 0000000000..7abe14de54
--- /dev/null
+++ b/glassfish-runner/rest-platform-extra-tck/rest-platform-extra-tck-install/pom.xml
@@ -0,0 +1,87 @@
+
+
+
+ 4.0.0
+
+
+ org.eclipse.ee4j
+ project
+ 1.0.9
+
+
+
+ rest-extra-tck-install
+ 4.0.0-SNAPSHOT
+ pom
+ TCK: Install Jakarta REST Platform Extra TCK
+
+
+ jakarta-rest-extra-tck-${tck.test.rest-extra.version}.zip
+ https://download.eclipse.org/ee4j/jakartaee-tck/jakartaee11/staged/eftl/${tck.test.rest-extra.file}
+ 4.0.0-M1
+
+
+
+
+
+ com.googlecode.maven-download-plugin
+ download-maven-plugin
+ 1.13.0
+
+ ${tck.test.rest-extra.url}
+ true
+ ${project.build.directory}
+
+
+
+ download-rest-extra-tck
+
+ wget
+
+ generate-resources
+
+
+
+
+
+ maven-install-plugin
+ 3.1.3
+
+
+ install-rest-extra-tck-pom
+
+ install-file
+
+ process-resources
+
+ ${project.build.directory}/rest-platform-tck-${tck.test.rest-extra.version}.jar
+ ${project.build.directory}/rest-platform-tck-${tck.test.rest-extra.version}-sources.jar
+ jakarta.tck
+ rest-platform-tck
+ ${tck.test.rest-extra.version}
+ jar
+
+
+
+
+
+
+
+
+
diff --git a/glassfish-runner/rest-platform-tck/README b/glassfish-runner/rest-platform-extra-tck/rest-platform-extra-tck-run/README
similarity index 100%
rename from glassfish-runner/rest-platform-tck/README
rename to glassfish-runner/rest-platform-extra-tck/rest-platform-extra-tck-run/README
diff --git a/glassfish-runner/rest-platform-tck/j2ee.pass b/glassfish-runner/rest-platform-extra-tck/rest-platform-extra-tck-run/j2ee.pass
similarity index 100%
rename from glassfish-runner/rest-platform-tck/j2ee.pass
rename to glassfish-runner/rest-platform-extra-tck/rest-platform-extra-tck-run/j2ee.pass
diff --git a/glassfish-runner/rest-platform-tck/javajoe.pass b/glassfish-runner/rest-platform-extra-tck/rest-platform-extra-tck-run/javajoe.pass
similarity index 100%
rename from glassfish-runner/rest-platform-tck/javajoe.pass
rename to glassfish-runner/rest-platform-extra-tck/rest-platform-extra-tck-run/javajoe.pass
diff --git a/glassfish-runner/rest-platform-extra-tck/rest-platform-extra-tck-run/pom.xml b/glassfish-runner/rest-platform-extra-tck/rest-platform-extra-tck-run/pom.xml
new file mode 100644
index 0000000000..cc7b73c919
--- /dev/null
+++ b/glassfish-runner/rest-platform-extra-tck/rest-platform-extra-tck-run/pom.xml
@@ -0,0 +1,203 @@
+
+
+
+ 4.0.0
+
+
+ org.eclipse.ee4j
+ project
+ 1.0.9
+
+
+
+ jakarta
+ glassfish-restful-tests
+ 4.0.0-SNAPSHOT
+
+ TCK: Run Jakarta REST Platform Extra TCK
+
+ This verifies the compliance of Glassfish using the extra Jakarta REST tests for Jakarta EE Platform
+ by running rest-platform-tck
+
+
+
+
+
+ glassfish8
+
+ 8.0.0-JDK17-M9
+ 4.0.0-M1
+
+
+
+
+
+
+ org.junit
+ junit-bom
+ 5.11.4
+ pom
+ import
+
+
+ org.jboss.arquillian
+ arquillian-bom
+ 1.9.3.Final
+ pom
+ import
+
+
+
+
+
+
+ jakarta.tck
+ rest-platform-tck
+ ${tck.version}
+ test
+
+
+
+
+ org.junit.jupiter
+ junit-jupiter
+
+
+ org.jboss.arquillian.junit5
+ arquillian-junit5-container
+
+
+ commons-httpclient
+ commons-httpclient
+ 3.1
+
+
+ org.hamcrest
+ hamcrest
+ 3.0
+ test
+
+
+
+
+ org.omnifaces.arquillian
+ arquillian-glassfish-server-managed
+ 1.7
+ test
+
+
+ org.omnifaces.arquillian
+ glassfish-client-ee11
+ 1.7.1
+ test
+
+
+
+
+
+
+ org.apache.maven.plugins
+ maven-dependency-plugin
+ 3.8.1
+
+
+ 01-unpack
+
+ unpack
+
+ generate-resources
+
+
+
+ org.glassfish.main.distributions
+ ${glassfish-artifact-id}
+ ${glassfish.version}
+ zip
+ false
+ ${project.build.directory}
+
+
+
+
+
+
+
+
+ maven-failsafe-plugin
+ 3.5.2
+
+
+ gf-tests
+
+ integration-test
+ verify
+
+
+ jakarta.tck:rest-platform-tck
+
+
+ ${project.build.directory}/${glassfish.toplevel.dir}
+ 2048m
+
+ create-file-user --groups staff:mgr:DIRECTOR --passwordfile ${project.build.directory}/../j2ee.pass j2ee
+ create-file-user --groups guest:OTHERROLE --passwordfile ${project.build.directory}/../javajoe.pass javajoe
+ set server-config.network-config.protocols.protocol.http-listener-1.http.trace-enabled=true
+
+
+ org.glassfish.jersey.servlet.ServletContainer
+ localhost
+ 8080
+ true
+
+ j2ee
+ j2ee
+ javajoe
+ javajoe
+
+ com.sun.ts.tests.jaxrs.lib.implementation.sun.common.SunRIURL
+
+
+
+
+
+
+
+
+
+
+
+ full
+
+ true
+
+
+ glassfish
+
+
+
+ web
+
+ web
+
+
+
+
diff --git a/glassfish-runner/rest-platform-tck/pom.xml b/glassfish-runner/rest-platform-tck/pom.xml
deleted file mode 100644
index 9859fbb8ad..0000000000
--- a/glassfish-runner/rest-platform-tck/pom.xml
+++ /dev/null
@@ -1,220 +0,0 @@
-
-
-
- 4.0.0
-
-
- org.glassfish
- standalone-tck
- 11.0.0-SNAPSHOT
-
-
- jakarta
- glassfish-restful-tests
- 11.0.0-SNAPSHOT
- jar
- Jakarta restful webservices platform tests run on Glassfish
- This verifies the compliance of Glassfish using Jakarta restful webservices tests for Jakarta EE Platform
- by running jaxrs-platform-tck
-
-
-
- 8.0.0-JDK17-M7
-
-
- glassfish8
- 5.9.1
- jaxrs-platform-tck
- ${project.version}
-
-
-
-
- org.junit.jupiter
- junit-jupiter
- ${junit.jupiter.version}
-
-
- jakarta.tck
- ${tck.artifactId}
- ${tck.version}
- test
-
-
- org.glassfish.main.common
- simple-glassfish-api
- ${glassfish.version}
-
-
- org.jboss.arquillian.junit5
- arquillian-junit5-container
-
-
- org.jboss.arquillian.junit5
- arquillian-junit5-core
-
-
- org.jboss.arquillian.container
- arquillian-container-test-spi
-
-
- org.omnifaces.arquillian
- arquillian-glassfish-server-managed
- 1.4
- test
-
-
- commons-httpclient
- commons-httpclient
- 3.1
-
-
- org.glassfish.hk2
- hk2-locator
- 3.0.3
-
-
- org.hamcrest
- hamcrest
- 2.2
- test
-
-
-
-
-
-
- org.apache.maven.plugins
- maven-dependency-plugin
- 3.2.0
-
-
- 01-unpack
-
- unpack
-
- generate-resources
-
-
-
- org.glassfish.main.distributions
- ${glassfish-artifact-id}
- ${glassfish.version}
- zip
- false
- ${project.build.directory}
-
-
-
-
-
-
-
- maven-antrun-plugin
- 3.0.0
-
-
- 02-asadmin-permission
-
- run
-
- generate-resources
-
-
-
-
-
-
-
-
-
- maven-failsafe-plugin
-
-
- gf-tests
-
- integration-test
- verify
-
-
-
- ${project.build.directory}/${glassfish.toplevel.dir}/glassfish/modules/jersey-server.jar
- ${project.build.directory}/${glassfish.toplevel.dir}/glassfish/modules/jersey-client.jar
- ${project.build.directory}/${glassfish.toplevel.dir}/glassfish/modules/jersey-common.jar
- ${project.build.directory}/${glassfish.toplevel.dir}/glassfish/modules/jersey-media-sse.jar
- ${project.build.directory}/${glassfish.toplevel.dir}/glassfish/modules/jersey-container-grizzly2-http.jar
- ${project.build.directory}/${glassfish.toplevel.dir}/glassfish/modules/jersey-container-servlet.jar
- ${project.build.directory}/${glassfish.toplevel.dir}/glassfish/modules/jersey-container-servlet-core.jar
- ${project.build.directory}/${glassfish.toplevel.dir}/glassfish/modules/jersey-media-json-binding.jar
- ${project.build.directory}/${glassfish.toplevel.dir}/glassfish/modules/jersey-media-jaxb.jar
- ${project.build.directory}/${glassfish.toplevel.dir}/glassfish/modules/jakarta.ws.rs-api.jar
- ${project.build.directory}/${glassfish.toplevel.dir}/glassfish/modules/jakarta.xml.bind-api.jar
- ${project.build.directory}/${glassfish.toplevel.dir}/glassfish/modules/jakarta.json.bind-api.jar
- ${project.build.directory}/${glassfish.toplevel.dir}/glassfish/modules/jakarta.json-api.jar
- ${project.build.directory}/${glassfish.toplevel.dir}/glassfish/modules/parsson.jar
- ${project.build.directory}/${glassfish.toplevel.dir}/glassfish/modules/hk2-locator.jar
- ${project.build.directory}/${glassfish.toplevel.dir}/glassfish/modules/jaxb-osgi.jar
- ${project.build.directory}/${glassfish.toplevel.dir}/glassfish/modules/yasson.jar
- ${project.build.directory}/${glassfish.toplevel.dir}/glassfish/modules/nucleus-grizzly-all.jar
- ${project.build.directory}/${glassfish.toplevel.dir}/glassfish/modules/jakarta.activation-api.jar
- ${project.build.directory}/${glassfish.toplevel.dir}/glassfish/modules/angus-activation.jar
-
- jakarta.tck:${tck.artifactId}
-
- ${project.build.directory}/${glassfish.toplevel.dir}
- 2048m
- create-file-user --groups staff:mgr:DIRECTOR --passwordfile ${project.build.directory}/../j2ee.pass j2ee
- create-file-user --groups guest:OTHERROLE --passwordfile ${project.build.directory}/../javajoe.pass javajoe
- set server-config.network-config.protocols.protocol.http-listener-1.http.trace-enabled=true
- org.glassfish.jersey.servlet.ServletContainer
- localhost
- 8080
- true
- j2ee
- j2ee
- javajoe
- javajoe
- com.sun.ts.tests.jaxrs.lib.implementation.sun.common.SunRIURL
-
-
-
-
-
-
-
-
-
-
-
- full
-
- true
-
-
- glassfish
-
-
-
- web
-
- web
-
-
-
-