diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/event/fires/FireEventTest.java b/impl/src/main/java/org/jboss/cdi/tck/tests/event/fires/FireEventTest.java
index a450847c34..43209a5d43 100644
--- a/impl/src/main/java/org/jboss/cdi/tck/tests/event/fires/FireEventTest.java
+++ b/impl/src/main/java/org/jboss/cdi/tck/tests/event/fires/FireEventTest.java
@@ -42,7 +42,6 @@
 import org.jboss.arquillian.container.test.api.Deployment;
 import org.jboss.cdi.tck.AbstractTest;
 import org.jboss.cdi.tck.shrinkwrap.WebArchiveBuilder;
-import org.jboss.cdi.tck.tests.full.extensions.beanManager.broken.event.ContainerLifecycleEvents;
 import org.jboss.shrinkwrap.api.spec.WebArchive;
 import org.jboss.test.audit.annotations.SpecAssertion;
 import org.jboss.test.audit.annotations.SpecAssertions;
@@ -61,7 +60,7 @@ public class FireEventTest extends AbstractTest {
 
     @Deployment
     public static WebArchive createTestArchive() {
-        return new WebArchiveBuilder().withTestClassPackage(FireEventTest.class).withClass(ContainerLifecycleEvents.class).build();
+        return new WebArchiveBuilder().withTestClassPackage(FireEventTest.class).build();
     }
 
     @SuppressWarnings("serial")
@@ -288,10 +287,4 @@ public <T> void testEventFireThrowsExceptionIfEventObjectTypeContainsUnresovable
         miniBar.itemEvent.fire(new Item_Illegal<T>("12 oz Beer", 6));
     }
 
-    @Test(dataProvider = ARQUILLIAN_DATA_PROVIDER)
-    @SpecAssertion(section = EVENT, id = "g")
-    public void testFireContainerLifecycleEvent(ContainerLifecycleEventDispatcher containerLifecycleEvents) {
-        containerLifecycleEvents.fireContainerLifecycleEvents();
-    }
-
 }
diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/event/fires/ContainerLifecycleEventDispatcher.java b/impl/src/main/java/org/jboss/cdi/tck/tests/full/event/fires/ContainerLifecycleEventDispatcher.java
similarity index 98%
rename from impl/src/main/java/org/jboss/cdi/tck/tests/event/fires/ContainerLifecycleEventDispatcher.java
rename to impl/src/main/java/org/jboss/cdi/tck/tests/full/event/fires/ContainerLifecycleEventDispatcher.java
index b09c60d619..287336ffdb 100644
--- a/impl/src/main/java/org/jboss/cdi/tck/tests/event/fires/ContainerLifecycleEventDispatcher.java
+++ b/impl/src/main/java/org/jboss/cdi/tck/tests/full/event/fires/ContainerLifecycleEventDispatcher.java
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.jboss.cdi.tck.tests.event.fires;
+package org.jboss.cdi.tck.tests.full.event.fires;
 
 import static org.jboss.cdi.tck.tests.full.extensions.beanManager.broken.event.ContainerLifecycleEvents.AFTER_BEAN_DISCOVERY;
 import static org.jboss.cdi.tck.tests.full.extensions.beanManager.broken.event.ContainerLifecycleEvents.AFTER_DEPLOYMENT_VALIDATION;
diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/full/event/fires/FireEventTest.java b/impl/src/main/java/org/jboss/cdi/tck/tests/full/event/fires/FireEventTest.java
new file mode 100644
index 0000000000..da5260a2de
--- /dev/null
+++ b/impl/src/main/java/org/jboss/cdi/tck/tests/full/event/fires/FireEventTest.java
@@ -0,0 +1,29 @@
+package org.jboss.cdi.tck.tests.full.event.fires;
+
+import static org.jboss.cdi.tck.TestGroups.CDI_FULL;
+import static org.jboss.cdi.tck.cdi.Sections.EVENT;
+
+import org.jboss.arquillian.container.test.api.Deployment;
+import org.jboss.cdi.tck.AbstractTest;
+import org.jboss.cdi.tck.shrinkwrap.WebArchiveBuilder;
+import org.jboss.cdi.tck.tests.full.extensions.beanManager.broken.event.ContainerLifecycleEvents;
+import org.jboss.shrinkwrap.api.spec.WebArchive;
+import org.jboss.test.audit.annotations.SpecAssertion;
+import org.jboss.test.audit.annotations.SpecVersion;
+import org.testng.annotations.Test;
+
+@Test(groups = CDI_FULL)
+@SpecVersion(spec = "cdi", version = "4.0")
+public class FireEventTest extends AbstractTest {
+
+    @Deployment
+    public static WebArchive createTestArchive() {
+        return new WebArchiveBuilder().withTestClassPackage(FireEventTest.class).withClass(ContainerLifecycleEvents.class).build();
+    }
+
+    @Test(dataProvider = ARQUILLIAN_DATA_PROVIDER)
+    @SpecAssertion(section = EVENT, id = "g")
+    public void testFireContainerLifecycleEvent(ContainerLifecycleEventDispatcher containerLifecycleEvents) {
+        containerLifecycleEvents.fireContainerLifecycleEvents();
+    }
+}