diff --git a/src/lib/features/feature-lifecycle/feature-lifecycle.e2e.test.ts b/src/lib/features/feature-lifecycle/feature-lifecycle.e2e.test.ts
index 5d15fd25ff..56d05cb8e7 100644
--- a/src/lib/features/feature-lifecycle/feature-lifecycle.e2e.test.ts
+++ b/src/lib/features/feature-lifecycle/feature-lifecycle.e2e.test.ts
@@ -98,7 +98,8 @@ const uncompleteFeature = async (featureName: string, expectedCode = 200) => {
 function reachedStage(feature: string, stage: StageName) {
     return new Promise((resolve) =>
         featureLifecycleService.on(STAGE_ENTERED, (event) => {
-            if (event.stage === stage) resolve(stage);
+            if (event.stage === stage && event.feature === feature)
+                resolve(stage);
         }),
     );
 }