diff --git a/glassfish-runner/pages-platform-extra-tck/pages-platform-extra-tck-install/pom.xml b/glassfish-runner/pages-platform-extra-tck/pages-platform-extra-tck-install/pom.xml
new file mode 100644
index 0000000000..4fb0e4c66f
--- /dev/null
+++ b/glassfish-runner/pages-platform-extra-tck/pages-platform-extra-tck-install/pom.xml
@@ -0,0 +1,87 @@
+
+
+
+ 4.0.0
+
+
+ org.eclipse.ee4j
+ project
+ 1.0.9
+
+
+
+ pages-extra-tck-install
+ 4.0.0-SNAPSHOT
+ pom
+ TCK: Install Jakarta Pages Platform Extra TCK
+
+
+ jakarta-pages-extra-tck-${tck.test.pages-extra.version}.zip
+ https://download.eclipse.org/ee4j/jakartaee-tck/jakartaee11/staged/eftl/${tck.test.pages-extra.file}
+ 4.0.0-M1
+
+
+
+
+
+ com.googlecode.maven-download-plugin
+ download-maven-plugin
+ 1.13.0
+
+ ${tck.test.pages-extra.url}
+ true
+ ${project.build.directory}
+
+
+
+ download-pages-extra-tck
+
+ wget
+
+ generate-resources
+
+
+
+
+
+ maven-install-plugin
+ 3.1.3
+
+
+ install-pages-extra-tck-pom
+
+ install-file
+
+ process-resources
+
+ ${project.build.directory}/jakarta-pages-extra-tck-${tck.test.pages-extra.version}.jar
+ ${project.build.directory}/jakarta-pages-extra-tck-${tck.test.pages-extra.version}-sources.jar
+ jakarta.tck
+ pages-platform-tck
+ ${tck.test.pages-extra.version}
+ jar
+
+
+
+
+
+
+
+
+
diff --git a/glassfish-runner/pages-platform-tck/j2ee.pass b/glassfish-runner/pages-platform-extra-tck/pages-platform-extra-tck-run/j2ee.pass
similarity index 100%
rename from glassfish-runner/pages-platform-tck/j2ee.pass
rename to glassfish-runner/pages-platform-extra-tck/pages-platform-extra-tck-run/j2ee.pass
diff --git a/glassfish-runner/pages-platform-tck/javajoe.pass b/glassfish-runner/pages-platform-extra-tck/pages-platform-extra-tck-run/javajoe.pass
similarity index 100%
rename from glassfish-runner/pages-platform-tck/javajoe.pass
rename to glassfish-runner/pages-platform-extra-tck/pages-platform-extra-tck-run/javajoe.pass
diff --git a/glassfish-runner/pages-platform-tck/pom.xml b/glassfish-runner/pages-platform-extra-tck/pages-platform-extra-tck-run/pom.xml
similarity index 99%
rename from glassfish-runner/pages-platform-tck/pom.xml
rename to glassfish-runner/pages-platform-extra-tck/pages-platform-extra-tck-run/pom.xml
index ccfdd8a1a7..98cb18a278 100644
--- a/glassfish-runner/pages-platform-tck/pom.xml
+++ b/glassfish-runner/pages-platform-extra-tck/pages-platform-extra-tck-run/pom.xml
@@ -34,7 +34,7 @@
11.0.0-M4
5.9.1
pages-platform-tck
- 11.0.0-SNAPSHOT
+ 4.0.0-M1
diff --git a/glassfish-runner/pages-platform-tck/src/main/java/org/glassfish/pages/core/tck/GlassfishApplicationArchiveProcessor.java b/glassfish-runner/pages-platform-extra-tck/pages-platform-extra-tck-run/src/main/java/org/glassfish/pages/core/tck/GlassfishApplicationArchiveProcessor.java
similarity index 100%
rename from glassfish-runner/pages-platform-tck/src/main/java/org/glassfish/pages/core/tck/GlassfishApplicationArchiveProcessor.java
rename to glassfish-runner/pages-platform-extra-tck/pages-platform-extra-tck-run/src/main/java/org/glassfish/pages/core/tck/GlassfishApplicationArchiveProcessor.java
diff --git a/glassfish-runner/pages-platform-tck/src/main/java/org/glassfish/pages/core/tck/GlassfishLoadableExtension.java b/glassfish-runner/pages-platform-extra-tck/pages-platform-extra-tck-run/src/main/java/org/glassfish/pages/core/tck/GlassfishLoadableExtension.java
similarity index 100%
rename from glassfish-runner/pages-platform-tck/src/main/java/org/glassfish/pages/core/tck/GlassfishLoadableExtension.java
rename to glassfish-runner/pages-platform-extra-tck/pages-platform-extra-tck-run/src/main/java/org/glassfish/pages/core/tck/GlassfishLoadableExtension.java
diff --git a/glassfish-runner/pages-platform-tck/src/main/resources/META-INF/services/org.jboss.arquillian.core.spi.LoadableExtension b/glassfish-runner/pages-platform-extra-tck/pages-platform-extra-tck-run/src/main/resources/META-INF/services/org.jboss.arquillian.core.spi.LoadableExtension
similarity index 100%
rename from glassfish-runner/pages-platform-tck/src/main/resources/META-INF/services/org.jboss.arquillian.core.spi.LoadableExtension
rename to glassfish-runner/pages-platform-extra-tck/pages-platform-extra-tck-run/src/main/resources/META-INF/services/org.jboss.arquillian.core.spi.LoadableExtension
diff --git a/glassfish-runner/pages-platform-tck/src/main/resources/jsp_sec_secbasic_web.war.sun-web.xml b/glassfish-runner/pages-platform-extra-tck/pages-platform-extra-tck-run/src/main/resources/jsp_sec_secbasic_web.war.sun-web.xml
similarity index 100%
rename from glassfish-runner/pages-platform-tck/src/main/resources/jsp_sec_secbasic_web.war.sun-web.xml
rename to glassfish-runner/pages-platform-extra-tck/pages-platform-extra-tck-run/src/main/resources/jsp_sec_secbasic_web.war.sun-web.xml
diff --git a/glassfish-runner/pages-platform-tck/src/main/resources/jsp_sec_secform_web.war.sun-web.xml b/glassfish-runner/pages-platform-extra-tck/pages-platform-extra-tck-run/src/main/resources/jsp_sec_secform_web.war.sun-web.xml
similarity index 100%
rename from glassfish-runner/pages-platform-tck/src/main/resources/jsp_sec_secform_web.war.sun-web.xml
rename to glassfish-runner/pages-platform-extra-tck/pages-platform-extra-tck-run/src/main/resources/jsp_sec_secform_web.war.sun-web.xml
diff --git a/glassfish-runner/pages-platform-tck/src/main/resources/jsp_tagext_resource_httplistener_web.war.sun-web.xml b/glassfish-runner/pages-platform-extra-tck/pages-platform-extra-tck-run/src/main/resources/jsp_tagext_resource_httplistener_web.war.sun-web.xml
similarity index 100%
rename from glassfish-runner/pages-platform-tck/src/main/resources/jsp_tagext_resource_httplistener_web.war.sun-web.xml
rename to glassfish-runner/pages-platform-extra-tck/pages-platform-extra-tck-run/src/main/resources/jsp_tagext_resource_httplistener_web.war.sun-web.xml
diff --git a/glassfish-runner/pages-platform-tck/src/main/resources/jsp_tagext_resource_listener_web.war.sun-web.xml b/glassfish-runner/pages-platform-extra-tck/pages-platform-extra-tck-run/src/main/resources/jsp_tagext_resource_listener_web.war.sun-web.xml
similarity index 100%
rename from glassfish-runner/pages-platform-tck/src/main/resources/jsp_tagext_resource_listener_web.war.sun-web.xml
rename to glassfish-runner/pages-platform-extra-tck/pages-platform-extra-tck-run/src/main/resources/jsp_tagext_resource_listener_web.war.sun-web.xml
diff --git a/glassfish-runner/pages-platform-tck/src/main/resources/jsp_tagext_resource_taghandler_web.war.sun-web.xml b/glassfish-runner/pages-platform-extra-tck/pages-platform-extra-tck-run/src/main/resources/jsp_tagext_resource_taghandler_web.war.sun-web.xml
similarity index 100%
rename from glassfish-runner/pages-platform-tck/src/main/resources/jsp_tagext_resource_taghandler_web.war.sun-web.xml
rename to glassfish-runner/pages-platform-extra-tck/pages-platform-extra-tck-run/src/main/resources/jsp_tagext_resource_taghandler_web.war.sun-web.xml
diff --git a/glassfish-runner/pages-platform-tck/src/test/resources/arquillian.xml b/glassfish-runner/pages-platform-extra-tck/pages-platform-extra-tck-run/src/test/resources/arquillian.xml
similarity index 100%
rename from glassfish-runner/pages-platform-tck/src/test/resources/arquillian.xml
rename to glassfish-runner/pages-platform-extra-tck/pages-platform-extra-tck-run/src/test/resources/arquillian.xml
diff --git a/glassfish-runner/pages-platform-extra-tck/pom.xml b/glassfish-runner/pages-platform-extra-tck/pom.xml
new file mode 100644
index 0000000000..55b897f9df
--- /dev/null
+++ b/glassfish-runner/pages-platform-extra-tck/pom.xml
@@ -0,0 +1,37 @@
+
+
+
+
+ 4.0.0
+
+
+ org.eclipse.ee4j
+ project
+ 1.0.9
+
+
+
+ pages-platform-extra-tck
+ 4.0.0-SNAPSHOT
+ pom
+
+
+ pages-platform-extra-tck-install
+ pages-platform-extra-tck-run
+
+