diff --git a/cdi-ee-tck/tck-dist/artifact-install.pom b/cdi-ee-tck/tck-dist/artifact-install.pom
index 419085ede0..6091991af2 100644
--- a/cdi-ee-tck/tck-dist/artifact-install.pom
+++ b/cdi-ee-tck/tck-dist/artifact-install.pom
@@ -38,7 +38,7 @@
               <artifactId>cdi-tck-ee-parent</artifactId>
               <version>${project.version}</version>
               <packaging>pom</packaging>
-              <file>cdi-tck-parent-${project.version}.pom</file>
+              <file>cdi-tck-ee-parent-${project.version}.pom</file>
               <generatePom>false</generatePom>
             </configuration>
           </execution>
@@ -52,11 +52,9 @@
             <configuration>
               <groupId>jakarta.enterprise</groupId>
               <artifactId>cdi-tck-api</artifactId>
-              <version>${project.version}</version>
+              <version>${cdi.core.tck.version}</version>
               <packaging>jar</packaging>
-              <file>cdi-tck-api-${project.version}.jar</file>
-              <javadoc>cdi-tck-api-${project.version}-javadoc.jar</javadoc>
-              <sources>cdi-tck-api-${project.version}-sources.jar</sources>
+              <file>cdi-tck-api-${cdi.core.tck.version}.jar</file>
               <generatePom>true</generatePom>
             </configuration>
           </execution>
@@ -70,9 +68,9 @@
             <configuration>
               <groupId>jakarta.enterprise</groupId>
               <artifactId>cdi-tck-ext-lib</artifactId>
-              <version>${project.version}</version>
+              <version>${cdi.core.tck.version}</version>
               <packaging>jar</packaging>
-              <file>cdi-tck-ext-lib-${project.version}.jar</file>
+              <file>cdi-tck-ext-lib-${cdi.core.tck.version}.jar</file>
               <generatePom>true</generatePom>
             </configuration>
           </execution>
@@ -88,7 +86,7 @@
               <artifactId>cdi-tck-ee-impl</artifactId>
               <version>${project.version}</version>
               <packaging>jar</packaging>
-              <file>cdi-ee-tck-impl-${project.version}.jar</file>
+              <file>cdi-tck-ee-impl-${project.version}.jar</file>
               <generatePom>true</generatePom>
             </configuration>
           </execution>
diff --git a/cdi-ee-tck/tck-dist/pom.xml b/cdi-ee-tck/tck-dist/pom.xml
index b2053009e2..f69f96142e 100644
--- a/cdi-ee-tck/tck-dist/pom.xml
+++ b/cdi-ee-tck/tck-dist/pom.xml
@@ -21,6 +21,17 @@
    </properties>
 
    <dependencies>
+      <dependency>
+         <groupId>jakarta.enterprise</groupId>
+         <artifactId>cdi-tck-api</artifactId>
+         <version>${cdi.core.tck.version}</version>
+      </dependency>
+      <dependency>
+         <groupId>jakarta.enterprise</groupId>
+         <artifactId>cdi-tck-ext-lib</artifactId>
+         <version>${cdi.core.tck.version}</version>
+      </dependency>
+
       <dependency>
          <groupId>jakarta.tck</groupId>
          <artifactId>cdi-tck-ee-parent</artifactId>
diff --git a/cdi-ee-tck/tck-dist/src/main/assembly/assembly.xml b/cdi-ee-tck/tck-dist/src/main/assembly/assembly.xml
index 69f56a4627..0472b96263 100644
--- a/cdi-ee-tck/tck-dist/src/main/assembly/assembly.xml
+++ b/cdi-ee-tck/tck-dist/src/main/assembly/assembly.xml
@@ -55,6 +55,8 @@
          <includes>
             <include>jakarta.tck:cdi-tck-ee-parent:pom</include>
             <include>jakarta.tck:cdi-tck-ee-impl</include>
+            <include>jakarta.enterprise:cdi-tck-api</include>
+            <include>jakarta.enterprise:cdi-tck-ext-lib</include>
          </includes>
          <useTransitiveDependencies>true</useTransitiveDependencies>
          <outputDirectory>artifacts</outputDirectory>
diff --git a/glassfish-runner/cdi-tck/pom.xml b/glassfish-runner/cdi-tck/pom.xml
index d142b98595..1f6def2237 100644
--- a/glassfish-runner/cdi-tck/pom.xml
+++ b/glassfish-runner/cdi-tck/pom.xml
@@ -31,19 +31,23 @@
     <description>Aggregates dependencies and runs the CDI TCK (both standalone and on GlassFish)</description>
 
     <properties>
+        <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 -->
-        <glassfish.version>8.0.0-M6</glassfish.version>
+        <glassfish.version>8.0.0-M7</glassfish.version>
 
         <!-- This matches the htmlunit version in TCK -->
         <htmlunit.version>2.50.0</htmlunit.version>
 
         <maven.build.cache.enabled>false</maven.build.cache.enabled>
 
+        <!-- set to tru to skip the core or ee TCK -->
+        <skip.core.cdi.tck>false</skip.core.cdi.tck>
+        <skip.ee.cdi.tck>false</skip.ee.cdi.tck>
         <!-- Weld uses 2 versions numbers. Some artefact use one version, other the second. -->
         <weld.version>5.1.2.Final</weld.version>
         <weld.version2>6.0.Beta5</weld.version2>
@@ -64,7 +68,6 @@
                 <version>2.0.0</version>
             </dependency>
 
-
         </dependencies>
     </dependencyManagement>
 
@@ -230,8 +233,8 @@
             <groupId>jakarta.enterprise</groupId>
             <artifactId>cdi-tck-ee-impl</artifactId>
             <version>${cdi.ee.tck.version}</version>
-            <type>xml</type>
             <classifier>suite</classifier>
+            <type>xml</type>
             <scope>test</scope>
         </dependency>
 
@@ -355,6 +358,16 @@
                                     <overWrite>false</overWrite>
                                     <destFileName>tck-core-suite.xml</destFileName>
                                 </artifactItem>
+                                <artifactItem>
+                                    <groupId>jakarta.tck</groupId>
+                                    <artifactId>cdi-tck-ee-impl</artifactId>
+                                    <version>${cdi.ee.tck.version}</version>
+                                    <type>xml</type>
+                                    <classifier>suite</classifier>
+                                    <overWrite>false</overWrite>
+                                    <destFileName>tck-ee-suite.xml</destFileName>
+                                </artifactItem>
+
                             </artifactItems>
                             <outputDirectory>target/suites</outputDirectory>
                             <overWriteReleases>false</overWriteReleases>
@@ -410,44 +423,6 @@
             <plugin>
                 <artifactId>maven-failsafe-plugin</artifactId>
                 <version>3.3.0</version>
-                <configuration>
-                    <argLine>-Xmx768m</argLine>
-                    <!-- Surefire / TestNG Properties -->
-                    <!-- The suite, the exclude and the test dependencies together determine which tests are being run -->
-                    <suiteXmlFiles>
-                        <suiteXmlFile>target/suites/tck-core-suite.xml</suiteXmlFile>
-                    </suiteXmlFiles>
-                    <excludedGroups>${excluded.groups}</excludedGroups>
-                    <dependenciesToScan>
-                        <dependency>jakarta.enterprise:cdi-tck-core-impl</dependency>
-                    </dependenciesToScan>
-                    <properties>
-                        <property>
-                            <name>surefire.testng.verbose</name>
-                            <value>1</value>
-                        </property>
-                    </properties>
-                    <forkCount>1</forkCount>
-                    <reuseForks>true</reuseForks>
-                    <!-- System Properties -->
-                    <systemPropertyVariables>
-                        <glassfish.home>${glassfish.root}/glassfish8</glassfish.home>
-                        <glassfish.enableDerby>true</glassfish.enableDerby>
-                        <glassfish.maxHeapSize>2048m</glassfish.maxHeapSize>
-                        <glassfish.enableAssertions>:org.jboss.cdi.tck...</glassfish.enableAssertions>
-                        <glassfish.systemProperties>cdiTckExcludeDummy=true
-                            glassfish.servlet.loadAllOnStartup=true</glassfish.systemProperties>
-                        <glassfish.postBootCommands>create-jms-resource --restype jakarta.jms.Queue --property Name=queue_test queue_test
-                            create-jms-resource --restype jakarta.jms.Topic --property Name=topic_test topic_test
-                            set configs.config.server-config.cdi-service.enable-implicit-cdi=true
-                            create-file-user --groups student --passwordfile ${project.build.directory}/test-classes/password.txt student
-                            create-file-user --groups printer --passwordfile ${project.build.directory}/test-classes/password.txt printer
-                            create-file-user --groups student:alarm --passwordfile ${project.build.directory}/test-classes/password.txt alarm</glassfish.postBootCommands>
-                        <libPath>${project.build.outputDirectory}</libPath>
-                        <org.jboss.cdi.tck.libraryDirectory>${project.build.directory}/dependency/lib</org.jboss.cdi.tck.libraryDirectory>
-                        <debugMode>true</debugMode>
-                    </systemPropertyVariables>
-                </configuration>
                 <dependencies>
                     <dependency>
                         <groupId>org.apache.maven.surefire</groupId>
@@ -457,11 +432,97 @@
                 </dependencies>
                 <executions>
                     <execution>
-                        <id>run tck</id>
+                        <id>run core tck</id>
                         <goals>
                             <goal>integration-test</goal>
                         </goals>
                         <phase>integration-test</phase>
+                        <configuration>
+                            <skipITs>${skip.core.cdi.tck}</skipITs>
+                            <argLine>-Xmx768m</argLine>
+                            <!-- Surefire / TestNG Properties -->
+                            <!-- The suite, the exclude and the test dependencies together determine which tests are being run -->
+                            <suiteXmlFiles>
+                                <suiteXmlFile>target/suites/tck-core-suite.xml</suiteXmlFile>
+                            </suiteXmlFiles>
+                            <excludedGroups>${excluded.groups}</excludedGroups>
+                            <dependenciesToScan>
+                                <dependency>jakarta.enterprise:cdi-tck-core-impl</dependency>
+                            </dependenciesToScan>
+                            <properties>
+                                <property>
+                                    <name>surefire.testng.verbose</name>
+                                    <value>1</value>
+                                </property>
+                            </properties>
+                            <forkCount>1</forkCount>
+                            <reuseForks>true</reuseForks>
+                            <!-- System Properties -->
+                            <systemPropertyVariables>
+                                <glassfish.home>${glassfish.root}/glassfish8</glassfish.home>
+                                <glassfish.enableDerby>true</glassfish.enableDerby>
+                                <glassfish.maxHeapSize>2048m</glassfish.maxHeapSize>
+                                <glassfish.enableAssertions>:org.jboss.cdi.tck...</glassfish.enableAssertions>
+                                <glassfish.systemProperties>cdiTckExcludeDummy=true
+                                    glassfish.servlet.loadAllOnStartup=true</glassfish.systemProperties>
+                                <glassfish.postBootCommands>create-jms-resource --restype jakarta.jms.Queue --property Name=queue_test queue_test
+                                    create-jms-resource --restype jakarta.jms.Topic --property Name=topic_test topic_test
+                                    set configs.config.server-config.cdi-service.enable-implicit-cdi=true
+                                    create-file-user --groups student --passwordfile ${project.build.directory}/test-classes/password.txt student
+                                    create-file-user --groups printer --passwordfile ${project.build.directory}/test-classes/password.txt printer
+                                    create-file-user --groups student:alarm --passwordfile ${project.build.directory}/test-classes/password.txt alarm</glassfish.postBootCommands>
+                                <libPath>${project.build.outputDirectory}</libPath>
+                                <org.jboss.cdi.tck.libraryDirectory>${project.build.directory}/dependency/lib</org.jboss.cdi.tck.libraryDirectory>
+                                <debugMode>true</debugMode>
+                            </systemPropertyVariables>
+                        </configuration>
+                    </execution>
+
+                    <execution>
+                        <id>run ee tck</id>
+                        <goals>
+                            <goal>integration-test</goal>
+                        </goals>
+                        <phase>integration-test</phase>
+                        <configuration>
+                            <skipITs>${skip.ee.cdi.tck}</skipITs>
+                            <argLine>-Xmx768m</argLine>
+                            <!-- Surefire / TestNG Properties -->
+                            <!-- The suite, the exclude and the test dependencies together determine which tests are being run -->
+                            <suiteXmlFiles>
+                                <suiteXmlFile>target/suites/tck-ee-suite.xml</suiteXmlFile>
+                            </suiteXmlFiles>
+                            <excludedGroups>${excluded.groups}</excludedGroups>
+                            <dependenciesToScan>
+                                <dependency>jakarta.tck:cdi-tck-ee-impl</dependency>
+                            </dependenciesToScan>
+                            <properties>
+                                <property>
+                                    <name>surefire.testng.verbose</name>
+                                    <value>1</value>
+                                </property>
+                            </properties>
+                            <forkCount>1</forkCount>
+                            <reuseForks>true</reuseForks>
+                            <!-- System Properties -->
+                            <systemPropertyVariables>
+                                <glassfish.home>${glassfish.root}/glassfish8</glassfish.home>
+                                <glassfish.enableDerby>true</glassfish.enableDerby>
+                                <glassfish.maxHeapSize>2048m</glassfish.maxHeapSize>
+                                <glassfish.enableAssertions>:org.jboss.cdi.tck...</glassfish.enableAssertions>
+                                <glassfish.systemProperties>cdiTckExcludeDummy=true
+                                    glassfish.servlet.loadAllOnStartup=true</glassfish.systemProperties>
+                                <glassfish.postBootCommands>create-jms-resource --restype jakarta.jms.Queue --property Name=queue_test queue_test
+                                    create-jms-resource --restype jakarta.jms.Topic --property Name=topic_test topic_test
+                                    set configs.config.server-config.cdi-service.enable-implicit-cdi=true
+                                    create-file-user --groups student --passwordfile ${project.build.directory}/test-classes/password.txt student
+                                    create-file-user --groups printer --passwordfile ${project.build.directory}/test-classes/password.txt printer
+                                    create-file-user --groups student:alarm --passwordfile ${project.build.directory}/test-classes/password.txt alarm</glassfish.postBootCommands>
+                                <libPath>${project.build.outputDirectory}</libPath>
+                                <org.jboss.cdi.tck.libraryDirectory>${project.build.directory}/dependency/lib</org.jboss.cdi.tck.libraryDirectory>
+                                <debugMode>true</debugMode>
+                            </systemPropertyVariables>
+                        </configuration>
                     </execution>
                 </executions>
             </plugin>